diff --git a/.gitmodules b/.gitmodules index f931b28d97..c319a7c828 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "submodules/rlottie/rlottie"] path = submodules/rlottie/rlottie - url = https://github.com/laktyushin/rlottie.git +url=../rlottie.git diff --git a/Makefile b/Makefile index 169f5aa33f..ff68b48e5b 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include Utils.makefile BUCK_OPTIONS=\ - --config custom.appVersion="5.14" \ + --config custom.appVersion="5.14.1" \ --config custom.developmentCodeSignIdentity="${DEVELOPMENT_CODE_SIGN_IDENTITY}" \ --config custom.distributionCodeSignIdentity="${DISTRIBUTION_CODE_SIGN_IDENTITY}" \ --config custom.developmentTeam="${DEVELOPMENT_TEAM}" \ diff --git a/NotificationService/InAppNotificationSettings.swift b/NotificationService/InAppNotificationSettings.swift index a5f3ce36cc..ea6e849c8f 100644 --- a/NotificationService/InAppNotificationSettings.swift +++ b/NotificationService/InAppNotificationSettings.swift @@ -40,7 +40,7 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable { public var displayNotificationsFromAllAccounts: Bool public static var defaultSettings: InAppNotificationSettings { - return InAppNotificationSettings(playSounds: true, vibrate: false, displayPreviews: true, totalUnreadCountDisplayStyle: .filtered, totalUnreadCountDisplayCategory: .messages, totalUnreadCountIncludeTags: [.regularChatsAndPrivateGroups], displayNameOnLockscreen: true, displayNotificationsFromAllAccounts: true) + return InAppNotificationSettings(playSounds: true, vibrate: false, displayPreviews: true, totalUnreadCountDisplayStyle: .filtered, totalUnreadCountDisplayCategory: .messages, totalUnreadCountIncludeTags: [.privateChat, .secretChat, .bot, .privateGroup], displayNameOnLockscreen: true, displayNotificationsFromAllAccounts: true) } public init(playSounds: Bool, vibrate: Bool, displayPreviews: Bool, totalUnreadCountDisplayStyle: TotalUnreadCountDisplayStyle, totalUnreadCountDisplayCategory: TotalUnreadCountDisplayCategory, totalUnreadCountIncludeTags: PeerSummaryCounterTags, displayNameOnLockscreen: Bool, displayNotificationsFromAllAccounts: Bool) { @@ -60,10 +60,25 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable { self.displayPreviews = decoder.decodeInt32ForKey("p", orElse: 0) != 0 self.totalUnreadCountDisplayStyle = TotalUnreadCountDisplayStyle(rawValue: decoder.decodeInt32ForKey("cds", orElse: 0)) ?? .filtered self.totalUnreadCountDisplayCategory = TotalUnreadCountDisplayCategory(rawValue: decoder.decodeInt32ForKey("totalUnreadCountDisplayCategory", orElse: 1)) ?? .messages - if let value = decoder.decodeOptionalInt32ForKey("totalUnreadCountIncludeTags") { + if let value = decoder.decodeOptionalInt32ForKey("totalUnreadCountIncludeTags_2") { self.totalUnreadCountIncludeTags = PeerSummaryCounterTags(rawValue: value) + } else if let value = decoder.decodeOptionalInt32ForKey("totalUnreadCountIncludeTags") { + var resultTags: PeerSummaryCounterTags = [] + for legacyTag in LegacyPeerSummaryCounterTags(rawValue: value) { + if legacyTag == .regularChatsAndPrivateGroups { + resultTags.insert(.privateChat) + resultTags.insert(.secretChat) + resultTags.insert(.bot) + resultTags.insert(.privateGroup) + } else if legacyTag == .publicGroups { + resultTags.insert(.publicGroup) + } else if legacyTag == .channels { + resultTags.insert(.channel) + } + } + self.totalUnreadCountIncludeTags = resultTags } else { - self.totalUnreadCountIncludeTags = [.regularChatsAndPrivateGroups] + self.totalUnreadCountIncludeTags = [.privateChat, .secretChat, .bot, .privateGroup] } self.displayNameOnLockscreen = decoder.decodeInt32ForKey("displayNameOnLockscreen", orElse: 1) != 0 self.displayNotificationsFromAllAccounts = decoder.decodeInt32ForKey("displayNotificationsFromAllAccounts", orElse: 1) != 0 @@ -75,7 +90,7 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable { encoder.encodeInt32(self.displayPreviews ? 1 : 0, forKey: "p") encoder.encodeInt32(self.totalUnreadCountDisplayStyle.rawValue, forKey: "cds") encoder.encodeInt32(self.totalUnreadCountDisplayCategory.rawValue, forKey: "totalUnreadCountDisplayCategory") - encoder.encodeInt32(self.totalUnreadCountIncludeTags.rawValue, forKey: "totalUnreadCountIncludeTags") + encoder.encodeInt32(self.totalUnreadCountIncludeTags.rawValue, forKey: "totalUnreadCountIncludeTags_2") encoder.encodeInt32(self.displayNameOnLockscreen ? 1 : 0, forKey: "displayNameOnLockscreen") encoder.encodeInt32(self.displayNotificationsFromAllAccounts ? 1 : 0, forKey: "displayNotificationsFromAllAccounts") } diff --git a/NotificationService/Namespaces.swift b/NotificationService/Namespaces.swift index b60b7ff89a..d8aed1ec40 100644 --- a/NotificationService/Namespaces.swift +++ b/NotificationService/Namespaces.swift @@ -1,9 +1,43 @@ import PostboxDataTypes +struct LegacyPeerSummaryCounterTags: OptionSet, Sequence, Hashable { + var rawValue: Int32 + + init(rawValue: Int32) { + self.rawValue = rawValue + } + + static let regularChatsAndPrivateGroups = LegacyPeerSummaryCounterTags(rawValue: 1 << 0) + static let publicGroups = LegacyPeerSummaryCounterTags(rawValue: 1 << 1) + static let channels = LegacyPeerSummaryCounterTags(rawValue: 1 << 2) + + public func makeIterator() -> AnyIterator { + var index = 0 + return AnyIterator { () -> LegacyPeerSummaryCounterTags? in + while index < 31 { + let currentTags = self.rawValue >> UInt32(index) + let tag = LegacyPeerSummaryCounterTags(rawValue: 1 << UInt32(index)) + index += 1 + if currentTags == 0 { + break + } + + if (currentTags & 1) != 0 { + return tag + } + } + return nil + } + } +} + extension PeerSummaryCounterTags { - static let regularChatsAndPrivateGroups = PeerSummaryCounterTags(rawValue: 1 << 0) - static let publicGroups = PeerSummaryCounterTags(rawValue: 1 << 1) - static let channels = PeerSummaryCounterTags(rawValue: 1 << 2) + static let privateChat = PeerSummaryCounterTags(rawValue: 1 << 3) + static let secretChat = PeerSummaryCounterTags(rawValue: 1 << 4) + static let privateGroup = PeerSummaryCounterTags(rawValue: 1 << 5) + static let bot = PeerSummaryCounterTags(rawValue: 1 << 6) + static let channel = PeerSummaryCounterTags(rawValue: 1 << 7) + static let publicGroup = PeerSummaryCounterTags(rawValue: 1 << 8) } struct Namespaces { @@ -17,4 +51,4 @@ struct Namespaces { static let CloudChannel: Int32 = 2 static let SecretChat: Int32 = 3 } -} \ No newline at end of file +} diff --git a/NotificationService/Sync.swift b/NotificationService/Sync.swift index 21a93f439b..26fdd95d42 100644 --- a/NotificationService/Sync.swift +++ b/NotificationService/Sync.swift @@ -94,19 +94,21 @@ enum SyncProviderImpl { if let channel = peerTable.get(peerId) as? TelegramChannel { switch channel.info { case .broadcast: - tag = .channels + tag = .channel case .group: if channel.username != nil { - tag = .publicGroups + tag = .publicGroup } else { - tag = .regularChatsAndPrivateGroups + tag = .privateGroup } } } else { - tag = .channels + tag = .channel } + } else if peerId.namespace == Namespaces.Peer.CloudGroup { + tag = .privateGroup } else { - tag = .regularChatsAndPrivateGroups + tag = .privateChat } var totalCount: Int32 = -1 diff --git a/SiriIntents/IntentHandler.swift b/SiriIntents/IntentHandler.swift index e0d00c1ea1..efc0b4076a 100644 --- a/SiriIntents/IntentHandler.swift +++ b/SiriIntents/IntentHandler.swift @@ -567,9 +567,9 @@ public class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchFo completion(.success(with: .missed)) } - public func resolveCallType(for intent: INSearchCallHistoryIntent, with completion: @escaping (INCallRecordTypeResolutionResult) -> Void) { + /*public func resolveCallType(for intent: INSearchCallHistoryIntent, with completion: @escaping (INCallRecordTypeResolutionResult) -> Void) { completion(.success(with: .missed)) - } + }*/ public func handle(intent: INSearchCallHistoryIntent, completion: @escaping (INSearchCallHistoryIntentResponse) -> Void) { self.actionDisposable.set((self.accountPromise.get() diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 67b8058d9d..ca26c1740e 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -22,6 +22,10 @@ "PUSH_CHANNEL_MESSAGE_POLL" = "%1$@|posted a poll %2$@"; "PUSH_PINNED_POLL" = "%1$@|pinned a poll"; +"PUSH_MESSAGE_QUIZ" = "%1$@|sent you a quiz %2$@"; +"PUSH_CHANNEL_MESSAGE_QUIZ" = "%1$@|posted a quiz %2$@"; +"PUSH_PINNED_QUIZ" = "%1$@|pinned a quiz"; + "PUSH_CHAT_MESSAGE_TEXT" = "%2$@|%1$@: %3$@"; "PUSH_CHAT_MESSAGE_NOTEXT" = "%2$@|%1$@ sent a message"; "PUSH_CHAT_MESSAGE_PHOTO" = "%2$@|%1$@ sent a photo"; @@ -93,6 +97,7 @@ "PUSH_MESSAGE_GEO" = "%1$@|sent you a map"; "PUSH_MESSAGE_GEOLIVE" = "%1$@|started sharing their live location"; "PUSH_MESSAGE_POLL" = "%1$@|sent you a poll"; +"PUSH_MESSAGE_QUIZ" = "%1$@|sent you a quiz"; "PUSH_MESSAGE_GIF" = "%1$@|sent you a GIF"; "PUSH_MESSAGE_GAME" = "%1$@|invited you to play %2$@"; "PUSH_MESSAGE_INVOICE" = "%1$@|sent you an invoice for %2$@"; @@ -125,6 +130,7 @@ "PUSH_CHANNEL_MESSAGE_GEO" = "%1$@|posted a map"; "PUSH_CHANNEL_MESSAGE_GEOLIVE" = "%1$@|posted a live location"; "PUSH_CHANNEL_MESSAGE_POLL" = "%1$@|posted a poll"; +"PUSH_CHANNEL_MESSAGE_QUIZ" = "%1$@|posted a quiz"; "PUSH_CHANNEL_MESSAGE_GIF" = "%1$@|posted a GIF"; "PUSH_CHANNEL_MESSAGE_GAME" = "%1$@|invited you to play %2$@"; "PUSH_CHANNEL_MESSAGE_FWD" = "%1$@|posted a forwarded message"; @@ -155,6 +161,7 @@ "PUSH_CHAT_MESSAGE_GEO" = "%2$@|%1$@ sent a map"; "PUSH_CHAT_MESSAGE_GEOLIVE" = "%2$@|%1$@ started sharing their live location"; "PUSH_CHAT_MESSAGE_POLL" = "%2$@|%1$@ sent a poll %3$@ to the group"; +"PUSH_CHAT_MESSAGE_QUIZ" = "%2$@|%1$@ sent a quiz %3$@ to the group"; "PUSH_CHAT_MESSAGE_GIF" = "%2$@|%1$@ sent a GIF"; "PUSH_CHAT_MESSAGE_GAME" = "%2$@|%1$@ invited the group to play %3$@"; "PUSH_CHAT_MESSAGE_INVOICE" = "%2$@|%1$@ sent an invoice for %3$@"; @@ -197,6 +204,7 @@ "PUSH_PINNED_GEO" = "%1$@|pinned a map"; "PUSH_PINNED_GEOLIVE" = "%1$@|pinned a live location"; "PUSH_PINNED_POLL" = "|%1$@|pinned a poll %2$@"; +"PUSH_PINNED_QUIZ" = "|%1$@|pinned a quiz %2$@"; "PUSH_PINNED_GAME" = "%1$@|pinned a game"; "PUSH_PINNED_INVOICE" = "%1$@|pinned an invoice"; "PUSH_PINNED_GIF" = "%1$@|pinned a GIF"; @@ -254,6 +262,11 @@ "State.Updating" = "Updating..."; "State.WaitingForNetwork" = "Waiting for network"; +"ChatState.Connecting" = "connecting..."; +"ChatState.ConnectingToProxy" = "connecting to proxy..."; +"ChatState.Updating" = "updating..."; +"ChatState.WaitingForNetwork" = "waiting for network..."; + // Presence "Presence.online" = "online"; @@ -1927,6 +1940,7 @@ "Notification.PinnedContactMessage" = "%@ pinned a contact"; "Notification.PinnedDeletedMessage" = "%@ pinned deleted message"; "Notification.PinnedPollMessage" = "%@ pinned a poll"; +"Notification.PinnedQuizMessage" = "%@ pinned a quiz"; "Message.PinnedTextMessage" = "pinned \"%@\" "; "Message.PinnedPhotoMessage" = "pinned photo"; @@ -1937,7 +1951,6 @@ "Message.PinnedStickerMessage" = "pinned sticker"; "Message.PinnedLocationMessage" = "pinned location"; "Message.PinnedContactMessage" = "pinned contact"; -"Message.PinnedPollMessage" = "pinned poll"; "Notification.PinnedMessage" = "pinned message"; @@ -3793,6 +3806,7 @@ Unused sets are archived when you add more."; "MessagePoll.VotedCount_any" = "%@ votes"; "AttachmentMenu.Poll" = "Poll"; "Conversation.PinnedPoll" = "Pinned Poll"; +"Conversation.PinnedQuiz" = "Pinned Quiz"; "CreatePoll.Title" = "New Poll"; "CreatePoll.Create" = "Send"; @@ -5283,6 +5297,11 @@ Any member of this group will be able to see messages in the channel."; "Map.PlacesInThisArea" = "Places In This Area"; +"Appearance.BubbleCornersSetting" = "Message Corners"; +"Appearance.BubbleCorners.Title" = "Message Corners"; +"Appearance.BubbleCorners.AdjustAdjacent" = "Adjust Adjacent Corners"; +"Appearance.BubbleCorners.Apply" = "Set"; + "Conversation.LiveLocationYouAndOther" = "**You** and %@"; "PeopleNearby.MakeVisible" = "Make Myself Visible"; diff --git a/buildbox/deploy-appcenter.sh b/buildbox/deploy-appcenter.sh new file mode 100644 index 0000000000..58376b2c20 --- /dev/null +++ b/buildbox/deploy-appcenter.sh @@ -0,0 +1,83 @@ +#!/bin/bash + +set -e +set -x + +API_HOST="https://api.appcenter.ms" +IPA_PATH="build/artifacts/Telegram.ipa" +DSYM_PATH="build/artifacts/Telegram.DSYMs.zip" + +upload_ipa() { + GROUP_DATA=$(curl \ + -X GET \ + --header "X-API-Token: $API_TOKEN" \ + "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/distribution_groups/Internal" \ + ) + + GROUP_ID=$(echo "$GROUP_DATA" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["id"];') + + UPLOAD_TOKEN=$(curl \ + -X POST \ + --header "Content-Type: application/json" \ + --header "Accept: application/json" \ + --header "X-API-Token: $API_TOKEN" \ + "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/release_uploads" \ + ) + + + UPLOAD_URL=$(echo "$UPLOAD_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["upload_url"];') + UPLOAD_ID=$(echo "$UPLOAD_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["upload_id"];') + + curl --progress-bar -F "ipa=@${IPA_PATH}" "$UPLOAD_URL" + + RELEASE_TOKEN=$(curl \ + -X PATCH \ + --header "Content-Type: application/json" \ + --header "Accept: application/json" \ + --header "X-API-Token: $API_TOKEN" \ + -d '{ "status": "committed" }' \ + "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/release_uploads/$UPLOAD_ID" \ + ) + + + RELEASE_URL=$(echo "$RELEASE_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["release_url"];') + RELEASE_ID=$(echo "$RELEASE_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["release_id"];') + + curl \ + -X POST \ + --header "Content-Type: application/json" \ + --header "Accept: application/json" \ + --header "X-API-Token: $API_TOKEN" \ + -d "{ \"id\": \"$GROUP_ID\", \"mandatory_update\": false, \"notify_testers\": false }" \ + "$API_HOST/$RELEASE_URL/groups" +} + +upload_dsym() { + UPLOAD_DSYM_DATA=$(curl \ + -X POST \ + --header "Content-Type: application/json" \ + --header "Accept: application/json" \ + --header "X-API-Token: $API_TOKEN" \ + -d "{ \"symbol_type\": \"Apple\"}" \ + "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/symbol_uploads" \ + ) + + DSYM_UPLOAD_URL=$(echo "$UPLOAD_DSYM_DATA" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["upload_url"];') + DSYM_UPLOAD_ID=$(echo "$UPLOAD_DSYM_DATA" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["symbol_upload_id"];') + + curl \ + --progress-bar \ + --header "x-ms-blob-type: BlockBlob" \ + --upload-file "${DSYM_PATH}" \ + "$DSYM_UPLOAD_URL" + + curl \ + -X PATCH \ + --header "Content-Type: application/json" \ + --header "Accept: application/json" \ + --header "X-API-Token: $API_TOKEN" \ + -d '{ "status": "committed" }' \ + "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/symbol_uploads/$DSYM_UPLOAD_ID" +} + +upload_ipa diff --git a/buildbox/deploy-telegram.sh b/buildbox/deploy-telegram.sh index 85374f2d68..744c99ea44 100644 --- a/buildbox/deploy-telegram.sh +++ b/buildbox/deploy-telegram.sh @@ -34,12 +34,10 @@ fi if [ "$CONFIGURATION" == "hockeyapp" ]; then FASTLANE_PASSWORD="" FASTLANE_ITC_TEAM_NAME="" - FASTLANE_BUILD_CONFIGURATION="internalhockeyapp" elif [ "$CONFIGURATION" == "appstore" ]; then FASTLANE_PASSWORD="$TELEGRAM_BUILD_APPSTORE_PASSWORD" FASTLANE_ITC_TEAM_NAME="$TELEGRAM_BUILD_APPSTORE_TEAM_NAME" FASTLANE_ITC_USERNAME="$TELEGRAM_BUILD_APPSTORE_USERNAME" - FASTLANE_BUILD_CONFIGURATION="testflight_llc" else echo "Unknown configuration $CONFIGURATION" exit 1 @@ -62,7 +60,6 @@ fi if [ "$1" == "appstore" ]; then export DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS="-t DAV" FASTLANE_PASSWORD="$FASTLANE_PASSWORD" xcrun altool --upload-app --type ios --file "$IPA_PATH" --username "$FASTLANE_ITC_USERNAME" --password "@env:FASTLANE_PASSWORD" - #FASTLANE_PASSWORD="$FASTLANE_PASSWORD" FASTLANE_ITC_TEAM_NAME="$FASTLANE_ITC_TEAM_NAME" fastlane "$FASTLANE_BUILD_CONFIGURATION" build_number:"$BUILD_NUMBER" commit_hash:"$COMMIT_ID" commit_author:"$COMMIT_AUTHOR" skip_build:1 skip_pilot:1 -else - FASTLANE_PASSWORD="$FASTLANE_PASSWORD" FASTLANE_ITC_TEAM_NAME="$FASTLANE_ITC_TEAM_NAME" fastlane "$FASTLANE_BUILD_CONFIGURATION" build_number:"$BUILD_NUMBER" commit_hash:"$COMMIT_ID" commit_author:"$COMMIT_AUTHOR" skip_build:1 +elif [ "$1" == "hockeyapp" ]; then + API_USER_NAME="$API_USER_NAME" API_APP_NAME="$API_APP_NAME" API_TOKEN="$API_TOKEN" sh buildbox/deploy-appcenter.sh fi diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift index 063be71577..56df2567ab 100644 --- a/submodules/AccountContext/Sources/AccountContext.swift +++ b/submodules/AccountContext/Sources/AccountContext.swift @@ -197,12 +197,13 @@ public final class NavigateToChatControllerParams { public let keepStack: NavigateToChatKeepStack public let purposefulAction: (() -> Void)? public let scrollToEndIfExists: Bool + public let activateMessageSearch: Bool public let animated: Bool public let options: NavigationAnimationOptions public let parentGroupId: PeerGroupId? public let completion: () -> Void - public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping () -> Void = {}) { + public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: Bool = false, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping () -> Void = {}) { self.navigationController = navigationController self.chatController = chatController self.context = context @@ -214,6 +215,7 @@ public final class NavigateToChatControllerParams { self.keepStack = keepStack self.purposefulAction = purposefulAction self.scrollToEndIfExists = scrollToEndIfExists + self.activateMessageSearch = activateMessageSearch self.animated = animated self.options = options self.parentGroupId = parentGroupId @@ -440,14 +442,14 @@ public protocol SharedAccountContext: class { func openChatMessage(_ params: OpenChatMessageParams) -> Bool func messageFromPreloadedChatHistoryViewForLocation(id: MessageId, location: ChatHistoryLocationInput, account: Account, chatLocation: ChatLocation, tagMask: MessageTags?) -> Signal<(MessageIndex?, Bool), NoError> func makeOverlayAudioPlayerController(context: AccountContext, peerId: PeerId, type: MediaManagerPlayerType, initialMessageId: MessageId, initialOrder: MusicPlaybackSettingsOrder, parentNavigationController: NavigationController?) -> ViewController & OverlayAudioPlayerController - func makePeerInfoController(context: AccountContext, peer: Peer, mode: PeerInfoControllerMode) -> ViewController? + func makePeerInfoController(context: AccountContext, peer: Peer, mode: PeerInfoControllerMode, avatarInitiallyExpanded: Bool) -> ViewController? func makeDeviceContactInfoController(context: AccountContext, subject: DeviceContactInfoSubject, completed: (() -> Void)?, cancelled: (() -> Void)?) -> ViewController func makePeersNearbyController(context: AccountContext) -> ViewController func makeComposeController(context: AccountContext) -> ViewController func makeChatListController(context: AccountContext, groupId: PeerGroupId, controlsHistoryPreload: Bool, hideNetworkActivityStatus: Bool, previewing: Bool, enableDebugActions: Bool) -> ChatListController func makeChatController(context: AccountContext, chatLocation: ChatLocation, subject: ChatControllerSubject?, botStart: ChatControllerInitialBotStart?, mode: ChatControllerPresentationMode) -> ChatController - func makeChatMessagePreviewItem(context: AccountContext, message: Message, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)?, clickThroughMessage: (() -> Void)?) -> ListViewItem - func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader + func makeChatMessagePreviewItem(context: AccountContext, message: Message, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)?, clickThroughMessage: (() -> Void)?) -> ListViewItem + func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader func makePeerSharedMediaController(context: AccountContext, peerId: PeerId) -> ViewController? func makeContactSelectionController(_ params: ContactSelectionControllerParams) -> ContactSelectionController func makeContactMultiselectionController(_ params: ContactMultiselectionControllerParams) -> ContactMultiselectionController diff --git a/submodules/AppLock/Sources/AppLock.swift b/submodules/AppLock/Sources/AppLock.swift index fdb2016360..e339ed19ad 100644 --- a/submodules/AppLock/Sources/AppLock.swift +++ b/submodules/AppLock/Sources/AppLock.swift @@ -201,6 +201,7 @@ public final class AppLockContextImpl: AppLockContext { } } passcodeController.presentedOverCoveringView = true + passcodeController.isOpaqueWhenInOverlay = true strongSelf.passcodeController = passcodeController if let rootViewController = strongSelf.rootController { if let presentedViewController = rootViewController.presentedViewController as? UIActivityViewController { diff --git a/submodules/AvatarNode/Sources/AvatarNode.swift b/submodules/AvatarNode/Sources/AvatarNode.swift index 18f61800f6..2f4e502e6a 100644 --- a/submodules/AvatarNode/Sources/AvatarNode.swift +++ b/submodules/AvatarNode/Sources/AvatarNode.swift @@ -150,8 +150,14 @@ public final class AvatarEditOverlayNode: ASDisplayNode { context.setBlendMode(.normal) - if let editAvatarIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/EditAvatarIcon"), color: .white) { - context.draw(editAvatarIcon.cgImage!, in: CGRect(origin: CGPoint(x: floor((bounds.size.width - editAvatarIcon.size.width) / 2.0) + 0.5, y: floor((bounds.size.height - editAvatarIcon.size.height) / 2.0) + 1.0), size: editAvatarIcon.size)) + if bounds.width > 90.0 { + if let editAvatarIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/EditAvatarIconLarge"), color: .white) { + context.draw(editAvatarIcon.cgImage!, in: CGRect(origin: CGPoint(x: floor((bounds.size.width - editAvatarIcon.size.width) / 2.0) + 0.5, y: floor((bounds.size.height - editAvatarIcon.size.height) / 2.0) + 1.0), size: editAvatarIcon.size)) + } + } else { + if let editAvatarIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/EditAvatarIcon"), color: .white) { + context.draw(editAvatarIcon.cgImage!, in: CGRect(origin: CGPoint(x: floor((bounds.size.width - editAvatarIcon.size.width) / 2.0) + 0.5, y: floor((bounds.size.height - editAvatarIcon.size.height) / 2.0) + 1.0), size: editAvatarIcon.size)) + } } } } @@ -191,6 +197,8 @@ public final class AvatarNode: ASDisplayNode { private let imageReadyDisposable = MetaDisposable() private var state: AvatarNodeState = .empty + public var unroundedImage: UIImage? + private let imageReady = Promise(false) public var ready: Signal { let imageReady = self.imageReady @@ -283,7 +291,7 @@ public final class AvatarNode: ASDisplayNode { self.imageNode.isHidden = true } - public func setPeer(context: AccountContext, theme: PresentationTheme, peer: Peer?, authorOfMessage: MessageReference? = nil, overrideImage: AvatarNodeImageOverride? = nil, emptyColor: UIColor? = nil, clipStyle: AvatarNodeClipStyle = .round, synchronousLoad: Bool = false, displayDimensions: CGSize = CGSize(width: 60.0, height: 60.0)) { + public func setPeer(context: AccountContext, theme: PresentationTheme, peer: Peer?, authorOfMessage: MessageReference? = nil, overrideImage: AvatarNodeImageOverride? = nil, emptyColor: UIColor? = nil, clipStyle: AvatarNodeClipStyle = .round, synchronousLoad: Bool = false, displayDimensions: CGSize = CGSize(width: 60.0, height: 60.0), storeUnrounded: Bool = false) { var synchronousLoad = synchronousLoad var representation: TelegramMediaImageRepresentation? var icon = AvatarNodeIcon.none @@ -318,11 +326,18 @@ public final class AvatarNode: ASDisplayNode { let parameters: AvatarNodeParameters - if let peer = peer, let signal = peerAvatarImage(account: context.account, peerReference: PeerReference(peer), authorOfMessage: authorOfMessage, representation: representation, displayDimensions: displayDimensions, emptyColor: emptyColor, synchronousLoad: synchronousLoad) { + if let peer = peer, let signal = peerAvatarImage(account: context.account, peerReference: PeerReference(peer), authorOfMessage: authorOfMessage, representation: representation, displayDimensions: displayDimensions, emptyColor: emptyColor, synchronousLoad: synchronousLoad, provideUnrounded: storeUnrounded) { self.contents = nil self.displaySuspended = true self.imageReady.set(self.imageNode.ready) - self.imageNode.setSignal(signal) + self.imageNode.setSignal(signal |> beforeNext { [weak self] next in + Queue.mainQueue().async { + self?.unroundedImage = next?.1 + } + } + |> map { next -> UIImage? in + return next?.0 + }) if case .editAvatarIcon = icon { if self.editOverlayNode == nil { @@ -492,7 +507,9 @@ public final class AvatarNode: ASDisplayNode { context.scaleBy(x: 1.0, y: -1.0) context.translateBy(x: -bounds.size.width / 2.0, y: -bounds.size.height / 2.0) - if let editAvatarIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/EditAvatarIcon"), color: theme.list.itemAccentColor) { + if bounds.width > 90.0, let editAvatarIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/EditAvatarIconLarge"), color: theme.list.itemAccentColor) { + context.draw(editAvatarIcon.cgImage!, in: CGRect(origin: CGPoint(x: floor((bounds.size.width - editAvatarIcon.size.width) / 2.0) + 0.5, y: floor((bounds.size.height - editAvatarIcon.size.height) / 2.0) + 1.0), size: editAvatarIcon.size)) + } else if let editAvatarIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/EditAvatarIcon"), color: theme.list.itemAccentColor) { context.draw(editAvatarIcon.cgImage!, in: CGRect(origin: CGPoint(x: floor((bounds.size.width - editAvatarIcon.size.width) / 2.0) + 0.5, y: floor((bounds.size.height - editAvatarIcon.size.height) / 2.0) + 1.0), size: editAvatarIcon.size)) } } else if case .archivedChatsIcon = parameters.icon { diff --git a/submodules/AvatarNode/Sources/PeerAvatar.swift b/submodules/AvatarNode/Sources/PeerAvatar.swift index 183a06137a..5419985f9f 100644 --- a/submodules/AvatarNode/Sources/PeerAvatar.swift +++ b/submodules/AvatarNode/Sources/PeerAvatar.swift @@ -64,23 +64,31 @@ public func peerAvatarImageData(account: Account, peerReference: PeerReference?, } } -public func peerAvatarImage(account: Account, peerReference: PeerReference?, authorOfMessage: MessageReference?, representation: TelegramMediaImageRepresentation?, displayDimensions: CGSize = CGSize(width: 60.0, height: 60.0), round: Bool = true, inset: CGFloat = 0.0, emptyColor: UIColor? = nil, synchronousLoad: Bool = false) -> Signal? { +public func peerAvatarImage(account: Account, peerReference: PeerReference?, authorOfMessage: MessageReference?, representation: TelegramMediaImageRepresentation?, displayDimensions: CGSize = CGSize(width: 60.0, height: 60.0), round: Bool = true, inset: CGFloat = 0.0, emptyColor: UIColor? = nil, synchronousLoad: Bool = false, provideUnrounded: Bool = false) -> Signal<(UIImage, UIImage)?, NoError>? { if let imageData = peerAvatarImageData(account: account, peerReference: peerReference, authorOfMessage: authorOfMessage, representation: representation, synchronousLoad: synchronousLoad) { return imageData - |> mapToSignal { data -> Signal in - let generate = deferred { () -> Signal in + |> mapToSignal { data -> Signal<(UIImage, UIImage)?, NoError> in + let generate = deferred { () -> Signal<(UIImage, UIImage)?, NoError> in if emptyColor == nil && data == nil { return .single(nil) } - return .single(generateImage(displayDimensions, contextGenerator: { size, context -> Void in + let roundedImage = generateImage(displayDimensions, contextGenerator: { size, context -> Void in if let data = data { if let imageSource = CGImageSourceCreateWithData(data as CFData, nil), let dataImage = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) { context.clear(CGRect(origin: CGPoint(), size: displayDimensions)) context.setBlendMode(.copy) + + if round && displayDimensions.width != 60.0 { + context.addEllipse(in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) + context.clip() + } + context.draw(dataImage, in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) if round { - context.setBlendMode(.destinationOut) - context.draw(roundCorners.cgImage!, in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) + if displayDimensions.width == 60.0 { + context.setBlendMode(.destinationOut) + context.draw(roundCorners.cgImage!, in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) + } } } else { if let emptyColor = emptyColor { @@ -102,7 +110,41 @@ public func peerAvatarImage(account: Account, peerReference: PeerReference?, aut context.fill(CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) } } - })) + }) + let unroundedImage: UIImage? + if provideUnrounded { + unroundedImage = generateImage(displayDimensions, contextGenerator: { size, context -> Void in + if let data = data { + if let imageSource = CGImageSourceCreateWithData(data as CFData, nil), let dataImage = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) { + context.clear(CGRect(origin: CGPoint(), size: displayDimensions)) + context.setBlendMode(.copy) + + context.draw(dataImage, in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) + } else { + if let emptyColor = emptyColor { + context.clear(CGRect(origin: CGPoint(), size: displayDimensions)) + context.setFillColor(emptyColor.cgColor) + context.fill(CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) + } + } + } else if let emptyColor = emptyColor { + context.clear(CGRect(origin: CGPoint(), size: displayDimensions)) + context.setFillColor(emptyColor.cgColor) + if round { + context.fillEllipse(in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) + } else { + context.fill(CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset)) + } + } + }) + } else { + unroundedImage = roundedImage + } + if let roundedImage = roundedImage, let unroundedImage = unroundedImage { + return .single((roundedImage, unroundedImage)) + } else { + return .single(nil) + } } if synchronousLoad { return generate diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift index 75896af9e9..51c459351e 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift @@ -335,7 +335,8 @@ private func formSupportApplePay(_ paymentForm: BotPaymentForm) -> Bool { "stripe", "sberbank", "yandex", - "privatbank" + "privatbank", + "tranzzo" ]) if !applePayProviders.contains(nativeProvider.name) { return false diff --git a/submodules/CallListUI/Sources/CallListController.swift b/submodules/CallListUI/Sources/CallListController.swift index 974cd94fc7..4fd2407c0f 100644 --- a/submodules/CallListUI/Sources/CallListController.swift +++ b/submodules/CallListUI/Sources/CallListController.swift @@ -154,7 +154,7 @@ public final class CallListController: ViewController { let _ = (strongSelf.context.account.postbox.loadedPeerWithId(peerId) |> take(1) |> deliverOnMainQueue).start(next: { peer in - if let strongSelf = self, let controller = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .calls(messages: messages)) { + if let strongSelf = self, let controller = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .calls(messages: messages), avatarInitiallyExpanded: false) { (strongSelf.navigationController as? NavigationController)?.pushViewController(controller) } }) diff --git a/submodules/ChatListUI/BUCK b/submodules/ChatListUI/BUCK index 3b391fe24e..77299792c5 100644 --- a/submodules/ChatListUI/BUCK +++ b/submodules/ChatListUI/BUCK @@ -42,6 +42,7 @@ static_library( "//submodules/ContextUI:ContextUI", "//submodules/PhoneNumberFormat:PhoneNumberFormat", "//submodules/TelegramIntents:TelegramIntents", + "//submodules/ItemListPeerActionItem:ItemListPeerActionItem", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index 4874490784..30d8fc5e4a 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -95,7 +95,7 @@ private final class ContextControllerContentSourceImpl: ContextControllerContent } } -public class ChatListControllerImpl: TelegramBaseController, ChatListController, UIViewControllerPreviewingDelegate { +public class ChatListControllerImpl: TelegramBaseController, ChatListController, UIViewControllerPreviewingDelegate, TabBarContainedController { private var validLayout: ContainerViewLayout? public let context: AccountContext @@ -103,6 +103,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, private let hideNetworkActivityStatus: Bool public let groupId: PeerGroupId + public let filter: ChatListFilter? public let previewing: Bool let openMessageFromSearchDisposable: MetaDisposable = MetaDisposable() @@ -141,12 +142,13 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, } } - public init(context: AccountContext, groupId: PeerGroupId, controlsHistoryPreload: Bool, hideNetworkActivityStatus: Bool = false, previewing: Bool = false, enableDebugActions: Bool) { + public init(context: AccountContext, groupId: PeerGroupId, filter: ChatListFilter? = nil, controlsHistoryPreload: Bool, hideNetworkActivityStatus: Bool = false, previewing: Bool = false, enableDebugActions: Bool) { self.context = context self.controlsHistoryPreload = controlsHistoryPreload self.hideNetworkActivityStatus = hideNetworkActivityStatus self.groupId = groupId + self.filter = filter self.previewing = previewing self.presentationData = (context.sharedContext.currentPresentationData.with { $0 }) @@ -159,7 +161,9 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style let title: String - if case .root = self.groupId { + if let filter = self.filter { + title = filter.title ?? "" + } else if self.groupId == .root { title = self.presentationData.strings.DialogList_Title self.navigationBar?.item = nil } else { @@ -170,7 +174,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, self.navigationItem.titleView = self.titleView if !previewing { - if case .root = groupId { + if self.groupId == .root && self.filter == nil { self.tabBarItem.title = self.presentationData.strings.DialogList_Title let icon: UIImage? @@ -257,16 +261,27 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, } if !self.hideNetworkActivityStatus { - self.titleDisposable = combineLatest(queue: .mainQueue(), context.account.networkState, hasProxy, passcode, self.chatListDisplayNode.chatListNode.state).start(next: { [weak self] networkState, proxy, passcode, state in + self.titleDisposable = combineLatest(queue: .mainQueue(), + context.account.networkState, + hasProxy, + passcode, + self.chatListDisplayNode.chatListNode.state, + self.chatListDisplayNode.chatListNode.chatListFilterSignal + ).start(next: { [weak self] networkState, proxy, passcode, state, chatListFilter in if let strongSelf = self { let defaultTitle: String - if case .root = strongSelf.groupId { - defaultTitle = strongSelf.presentationData.strings.DialogList_Title + if strongSelf.groupId == .root { + if let chatListFilter = chatListFilter { + let title: String = chatListFilter.title ?? "" + defaultTitle = title + } else { + defaultTitle = strongSelf.presentationData.strings.DialogList_Title + } } else { defaultTitle = strongSelf.presentationData.strings.ChatList_ArchivedChatsTitle } if state.editing { - if case .root = strongSelf.groupId { + if strongSelf.groupId == .root && strongSelf.filter == nil { strongSelf.navigationItem.rightBarButtonItem = nil } @@ -276,9 +291,11 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, var isRoot = false if case .root = strongSelf.groupId { isRoot = true - let rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationComposeIcon(strongSelf.presentationData.theme), style: .plain, target: strongSelf, action: #selector(strongSelf.composePressed)) - rightBarButtonItem.accessibilityLabel = strongSelf.presentationData.strings.VoiceOver_Navigation_Compose - strongSelf.navigationItem.rightBarButtonItem = rightBarButtonItem + if strongSelf.filter == nil { + let rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationComposeIcon(strongSelf.presentationData.theme), style: .plain, target: strongSelf, action: #selector(strongSelf.composePressed)) + rightBarButtonItem.accessibilityLabel = strongSelf.presentationData.strings.VoiceOver_Navigation_Compose + strongSelf.navigationItem.rightBarButtonItem = rightBarButtonItem + } } let (hasProxy, connectsViaProxy) = proxy @@ -301,7 +318,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, case .online: strongSelf.titleView.title = NetworkStatusTitle(text: defaultTitle, activity: false, hasProxy: isRoot && hasProxy, connectsViaProxy: connectsViaProxy, isPasscodeSet: isRoot && isPasscodeSet, isManuallyLocked: isRoot && isManuallyLocked) } - if case .root = groupId, checkProxy { + if groupId == .root && filter == nil && checkProxy { if strongSelf.proxyUnavailableTooltipController == nil && !strongSelf.didShowProxyUnavailableTooltipController && strongSelf.isNodeLoaded && strongSelf.displayNode.view.window != nil && strongSelf.navigationController?.topViewController === self { strongSelf.didShowProxyUnavailableTooltipController = true let tooltipController = TooltipController(content: .text(strongSelf.presentationData.strings.Proxy_TooltipUnavailable), baseFontSize: strongSelf.presentationData.listsFontSize.baseDisplaySize, timeout: 60.0, dismissByTapOutside: true) @@ -423,7 +440,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, editItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed)) editItem.accessibilityLabel = self.presentationData.strings.Common_Edit } - if case .root = self.groupId { + if self.groupId == .root && self.filter == nil { self.navigationItem.leftBarButtonItem = editItem let rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationComposeIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.composePressed)) rightBarButtonItem.accessibilityLabel = self.presentationData.strings.VoiceOver_Navigation_Compose @@ -443,7 +460,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, } override public func loadDisplayNode() { - self.displayNode = ChatListControllerNode(context: self.context, groupId: self.groupId, previewing: self.previewing, controlsHistoryPreload: self.controlsHistoryPreload, presentationData: self.presentationData, controller: self) + self.displayNode = ChatListControllerNode(context: self.context, groupId: self.groupId, filter: self.filter, previewing: self.previewing, controlsHistoryPreload: self.controlsHistoryPreload, presentationData: self.presentationData, controller: self) self.chatListDisplayNode.navigationBar = self.navigationBar @@ -1786,4 +1803,51 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, return nil } } + + public func presentTabBarPreviewingController(sourceNodes: [ASDisplayNode]) { + if self.isNodeLoaded { + let _ = (self.context.account.postbox.transaction { transaction -> [ChatListFilter] in + let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default + return settings.filters + } + |> deliverOnMainQueue).start(next: { [weak self] presetList in + guard let strongSelf = self else { + return + } + let controller = TabBarChatListFilterController(context: strongSelf.context, sourceNodes: sourceNodes, presetList: presetList, currentPreset: strongSelf.chatListDisplayNode.chatListNode.chatListFilter, setup: { + guard let strongSelf = self else { + return + } + strongSelf.push(chatListFilterPresetListController(context: strongSelf.context, updated: { presets in + guard let strongSelf = self else { + return + } + /*if let currentPreset = strongSelf.chatListDisplayNode.chatListNode.chatListFilter { + var found = false + if let index = presets.index(where: { $0.id == currentPreset.id }) { + found = true + if currentPreset != presets[index] { + strongSelf.chatListDisplayNode.chatListNode.chatListFilter = presets[index] + } + } + if !found { + strongSelf.chatListDisplayNode.chatListNode.chatListFilter = nil + } + }*/ + })) + }, updatePreset: { value in + guard let strongSelf = self else { + return + } + strongSelf.push(ChatListControllerImpl(context: strongSelf.context, groupId: .root, filter: value, controlsHistoryPreload: false, hideNetworkActivityStatus: true, previewing: false, enableDebugActions: false)) + //strongSelf.chatListDisplayNode.chatListNode.chatListFilter = value + }) + strongSelf.context.sharedContext.mainWindow?.present(controller, on: .root) + }) + } + } + + public func updateTabBarPreviewingControllerPresentation(_ update: TabBarContainedControllerPresentationUpdate) { + + } } diff --git a/submodules/ChatListUI/Sources/ChatListControllerNode.swift b/submodules/ChatListUI/Sources/ChatListControllerNode.swift index 6065cc3b7c..9eb336e963 100644 --- a/submodules/ChatListUI/Sources/ChatListControllerNode.swift +++ b/submodules/ChatListUI/Sources/ChatListControllerNode.swift @@ -72,12 +72,12 @@ final class ChatListControllerNode: ASDisplayNode { let debugListView = ListView() - init(context: AccountContext, groupId: PeerGroupId, previewing: Bool, controlsHistoryPreload: Bool, presentationData: PresentationData, controller: ChatListControllerImpl) { + init(context: AccountContext, groupId: PeerGroupId, filter: ChatListFilter?, previewing: Bool, controlsHistoryPreload: Bool, presentationData: PresentationData, controller: ChatListControllerImpl) { self.context = context self.groupId = groupId self.presentationData = presentationData - self.chatListNode = ChatListNode(context: context, groupId: groupId, previewing: previewing, controlsHistoryPreload: controlsHistoryPreload, mode: .chatList, theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations) + self.chatListNode = ChatListNode(context: context, groupId: groupId, chatListFilter: filter, previewing: previewing, controlsHistoryPreload: controlsHistoryPreload, mode: .chatList, theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations) self.controller = controller @@ -244,6 +244,7 @@ final class ChatListControllerNode: ASDisplayNode { self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ChatListSearchContainerNode(context: self.context, filter: [], groupId: self.groupId, openPeer: { [weak self] peer, dismissSearch in self?.requestOpenPeerFromSearch?(peer, dismissSearch) + }, openDisabledPeer: { _ in }, openRecentPeerOptions: { [weak self] peer in self?.requestOpenRecentPeerOptions?(peer) }, openMessage: { [weak self] peer, messageId in diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift new file mode 100644 index 0000000000..49065df51e --- /dev/null +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift @@ -0,0 +1,407 @@ +import Foundation +import UIKit +import Display +import SwiftSignalKit +import Postbox +import TelegramCore +import SyncCore +import TelegramPresentationData +import ItemListUI +import AccountContext +import TelegramUIPreferences +import ItemListPeerItem +import ItemListPeerActionItem + +private final class ChatListFilterPresetControllerArguments { + let context: AccountContext + let updateState: ((ChatListFilterPresetControllerState) -> ChatListFilterPresetControllerState) -> Void + let openAddPeer: () -> Void + let deleteAdditionalPeer: (PeerId) -> Void + let setPeerIdWithRevealedOptions: (PeerId?, PeerId?) -> Void + + init(context: AccountContext, updateState: @escaping ((ChatListFilterPresetControllerState) -> ChatListFilterPresetControllerState) -> Void, openAddPeer: @escaping () -> Void, deleteAdditionalPeer: @escaping (PeerId) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void) { + self.context = context + self.updateState = updateState + self.openAddPeer = openAddPeer + self.deleteAdditionalPeer = deleteAdditionalPeer + self.setPeerIdWithRevealedOptions = setPeerIdWithRevealedOptions + } +} + +private enum ChatListFilterPresetControllerSection: Int32 { + case name + case categories + case excludeCategories + case additionalPeers +} + +private func filterEntry(presentationData: ItemListPresentationData, arguments: ChatListFilterPresetControllerArguments, title: String, value: Bool, filter: ChatListFilterPeerCategories, section: Int32) -> ItemListCheckboxItem { + return ItemListCheckboxItem(presentationData: presentationData, title: title, style: .left, checked: value, zeroSeparatorInsets: false, sectionId: section, action: { + arguments.updateState { current in + var state = current + if state.includeCategories.contains(filter) { + state.includeCategories.remove(filter) + } else { + state.includeCategories.insert(filter) + } + return state + } + }) +} + +private enum ChatListFilterPresetEntryStableId: Hashable { + case index(Int) + case peer(PeerId) + case additionalPeerInfo +} + +private enum ChatListFilterPresetEntry: ItemListNodeEntry { + case nameHeader(String) + case name(placeholder: String, value: String) + case filterPrivateChats(title: String, value: Bool) + case filterSecretChats(title: String, value: Bool) + case filterPrivateGroups(title: String, value: Bool) + case filterBots(title: String, value: Bool) + case filterPublicGroups(title: String, value: Bool) + case filterChannels(title: String, value: Bool) + case filterMuted(title: String, value: Bool) + case filterRead(title: String, value: Bool) + case additionalPeersHeader(String) + case addAdditionalPeer(title: String) + case additionalPeer(index: Int, peer: RenderedPeer, isRevealed: Bool) + case additionalPeerInfo(String) + + var section: ItemListSectionId { + switch self { + case .nameHeader, .name: + return ChatListFilterPresetControllerSection.name.rawValue + case .filterPrivateChats, .filterSecretChats, .filterPrivateGroups, .filterBots, .filterPublicGroups, .filterChannels: + return ChatListFilterPresetControllerSection.categories.rawValue + case .filterMuted, .filterRead: + return ChatListFilterPresetControllerSection.excludeCategories.rawValue + case .additionalPeersHeader, .addAdditionalPeer, .additionalPeer, .additionalPeerInfo: + return ChatListFilterPresetControllerSection.additionalPeers.rawValue + } + } + + var stableId: ChatListFilterPresetEntryStableId { + switch self { + case .nameHeader: + return .index(0) + case .name: + return .index(1) + case .filterPrivateChats: + return .index(2) + case .filterSecretChats: + return .index(3) + case .filterPrivateGroups: + return .index(4) + case .filterBots: + return .index(5) + case .filterPublicGroups: + return .index(6) + case .filterChannels: + return .index(7) + case .filterMuted: + return .index(8) + case .filterRead: + return .index(9) + case .additionalPeersHeader: + return .index(10) + case .addAdditionalPeer: + return .index(11) + case let .additionalPeer(additionalPeer): + return .peer(additionalPeer.peer.peerId) + case .additionalPeerInfo: + return .additionalPeerInfo + } + } + + static func <(lhs: ChatListFilterPresetEntry, rhs: ChatListFilterPresetEntry) -> Bool { + switch lhs.stableId { + case let .index(lhsIndex): + switch rhs.stableId { + case let .index(rhsIndex): + return lhsIndex < rhsIndex + case .peer: + return true + case .additionalPeerInfo: + return true + } + case .peer: + switch lhs { + case let .additionalPeer(lhsIndex, _, _): + switch rhs.stableId { + case .index: + return false + case .additionalPeerInfo: + return true + case .peer: + switch rhs { + case let .additionalPeer(rhsIndex, _, _): + return lhsIndex < rhsIndex + default: + preconditionFailure() + } + } + default: + preconditionFailure() + } + case .additionalPeerInfo: + switch rhs.stableId { + case .index: + return false + case .peer: + return false + case .additionalPeerInfo: + return false + } + } + } + + func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem { + let arguments = arguments as! ChatListFilterPresetControllerArguments + switch self { + case let .nameHeader(title): + return ItemListSectionHeaderItem(presentationData: presentationData, text: title, sectionId: self.section) + case let .name(placeholder, value): + return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(), text: value, placeholder: placeholder, type: .regular(capitalization: true, autocorrection: false), sectionId: self.section, textUpdated: { value in + arguments.updateState { current in + var state = current + state.name = value + return state + } + }, action: {}) + case let .filterPrivateChats(title, value): + return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .privateChats, section: self.section) + case let .filterSecretChats(title, value): + return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .secretChats, section: self.section) + case let .filterPrivateGroups(title, value): + return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .privateGroups, section: self.section) + case let .filterBots(title, value): + return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .bots, section: self.section) + case let .filterPublicGroups(title, value): + return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .publicGroups, section: self.section) + case let .filterChannels(title, value): + return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .channels, section: self.section) + case let .filterMuted(title, value): + return ItemListSwitchItem(presentationData: presentationData, title: title, value: value, sectionId: self.section, style: .blocks, updated: { _ in + arguments.updateState { current in + var state = current + state.excludeMuted = !state.excludeMuted + return state + } + }) + case let .filterRead(title, value): + return ItemListSwitchItem(presentationData: presentationData, title: title, value: value, sectionId: self.section, style: .blocks, updated: { _ in + arguments.updateState { current in + var state = current + state.excludeRead = !state.excludeRead + return state + } + }) + case let .additionalPeersHeader(title): + return ItemListSectionHeaderItem(presentationData: presentationData, text: title, sectionId: self.section) + case let .addAdditionalPeer(title): + return ItemListPeerActionItem(presentationData: presentationData, icon: PresentationResourcesItemList.addPersonIcon(presentationData.theme), title: title, alwaysPlain: false, sectionId: self.section, height: .peerList, editing: false, action: { + arguments.openAddPeer() + }) + case let .additionalPeer(title, peer, isRevealed): + return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: PresentationDateTimeFormat(timeFormat: .regular, dateFormat: .monthFirst, dateSeparator: ".", decimalSeparator: ".", groupingSeparator: "."), nameDisplayOrder: .firstLast, context: arguments.context, peer: peer.chatMainPeer!, height: .peerList, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: isRevealed), revealOptions: ItemListPeerItemRevealOptions(options: [ItemListPeerItemRevealOption(type: .destructive, title: presentationData.strings.Common_Delete, action: { + arguments.deleteAdditionalPeer(peer.peerId) + })]), switchValue: nil, enabled: true, selectable: false, sectionId: self.section, action: nil, setPeerIdWithRevealedOptions: { lhs, rhs in + arguments.setPeerIdWithRevealedOptions(lhs, rhs) + }, removePeer: { id in + arguments.deleteAdditionalPeer(id) + }) + case let .additionalPeerInfo(text): + return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section) + } + } +} + +private struct ChatListFilterPresetControllerState: Equatable { + var name: String + var includeCategories: ChatListFilterPeerCategories + var excludeMuted: Bool + var excludeRead: Bool + var additionallyIncludePeers: [PeerId] + + var revealedPeerId: PeerId? + + var isComplete: Bool { + if self.name.isEmpty { + return false + } + if self.includeCategories.isEmpty && self.additionallyIncludePeers.isEmpty && !self.excludeMuted && !self.excludeRead { + return false + } + return true + } +} + +private func chatListFilterPresetControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetControllerState, peers: [RenderedPeer]) -> [ChatListFilterPresetEntry] { + var entries: [ChatListFilterPresetEntry] = [] + + entries.append(.nameHeader("NAME")) + entries.append(.name(placeholder: "Preset Name", value: state.name)) + + entries.append(.filterPrivateChats(title: "Private Chats", value: state.includeCategories.contains(.privateChats))) + entries.append(.filterSecretChats(title: "Secret Chats", value: state.includeCategories.contains(.secretChats))) + entries.append(.filterPrivateGroups(title: "Private Groups", value: state.includeCategories.contains(.privateGroups))) + entries.append(.filterBots(title: "Bots", value: state.includeCategories.contains(.bots))) + entries.append(.filterPublicGroups(title: "Public Groups", value: state.includeCategories.contains(.publicGroups))) + entries.append(.filterChannels(title: "Channels", value: state.includeCategories.contains(.channels))) + + entries.append(.filterMuted(title: "Exclude Muted", value: state.excludeMuted)) + entries.append(.filterRead(title: "Exclude Read", value: state.excludeRead)) + + entries.append(.additionalPeersHeader("ALWAYS INCLUDE")) + entries.append(.addAdditionalPeer(title: "Add")) + + for peer in peers { + entries.append(.additionalPeer(index: entries.count, peer: peer, isRevealed: state.revealedPeerId == peer.peerId)) + } + + entries.append(.additionalPeerInfo("These chats will always be included in the list.")) + + return entries +} + +func chatListFilterPresetController(context: AccountContext, currentPreset: ChatListFilter?, updated: @escaping ([ChatListFilter]) -> Void) -> ViewController { + let initialName: String + if let currentPreset = currentPreset { + initialName = currentPreset.title ?? "" + } else { + initialName = "New Preset" + } + let initialState = ChatListFilterPresetControllerState(name: initialName, includeCategories: currentPreset?.categories ?? .all, excludeMuted: currentPreset?.excludeMuted ?? false, excludeRead: currentPreset?.excludeRead ?? false, additionallyIncludePeers: currentPreset?.includePeers ?? []) + let stateValue = Atomic(value: initialState) + let statePromise = ValuePromise(initialState, ignoreRepeated: true) + let updateState: ((ChatListFilterPresetControllerState) -> ChatListFilterPresetControllerState) -> Void = { f in + statePromise.set(stateValue.modify { f($0) }) + } + + let actionsDisposable = DisposableSet() + + let addPeerDisposable = MetaDisposable() + actionsDisposable.add(addPeerDisposable) + + var presentControllerImpl: ((ViewController, Any?) -> Void)? + var dismissImpl: (() -> Void)? + + let arguments = ChatListFilterPresetControllerArguments( + context: context, + updateState: { f in + updateState(f) + }, + openAddPeer: { + let controller = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .peerSelection(searchChatList: true, searchGroups: true), options: [])) + addPeerDisposable.set((controller.result + |> take(1) + |> deliverOnMainQueue).start(next: { [weak controller] peerIds in + controller?.dismiss() + updateState { state in + var state = state + for peerId in peerIds { + switch peerId { + case let .peer(id): + if !state.additionallyIncludePeers.contains(id) { + state.additionallyIncludePeers.append(id) + } + default: + break + } + } + return state + } + })) + presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + }, + deleteAdditionalPeer: { peerId in + updateState { state in + var state = state + if let index = state.additionallyIncludePeers.index(of: peerId) { + state.additionallyIncludePeers.remove(at: index) + } + return state + } + }, + setPeerIdWithRevealedOptions: { peerId, fromPeerId in + updateState { state in + var state = state + if (peerId == nil && fromPeerId == state.revealedPeerId) || (peerId != nil && fromPeerId == nil) { + state.revealedPeerId = peerId + } + return state + } + } + ) + + let statePeers = statePromise.get() + |> map { state -> [PeerId] in + return state.additionallyIncludePeers + } + |> distinctUntilChanged + |> mapToSignal { peerIds -> Signal<[RenderedPeer], NoError> in + return context.account.postbox.transaction { transaction -> [RenderedPeer] in + var result: [RenderedPeer] = [] + for peerId in peerIds { + if let peer = transaction.getPeer(peerId) { + result.append(RenderedPeer(peer: peer)) + } + } + return result + } + } + + let signal = combineLatest(queue: .mainQueue(), + context.sharedContext.presentationData, + statePromise.get(), + statePeers + ) + |> deliverOnMainQueue + |> map { presentationData, state, statePeers -> (ItemListControllerState, (ItemListNodeState, Any)) in + let leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: { + dismissImpl?() + }) + let rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: state.isComplete, action: { + let state = stateValue.with { $0 } + let preset = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, includePeers: state.additionallyIncludePeers) + let _ = (updateChatListFilterSettingsInteractively(postbox: context.account.postbox, { settings in + var preset = preset + if currentPreset == nil { + preset.id = max(2, settings.filters.map({ $0.id }).max() ?? 2) + } + var settings = settings + settings.filters = settings.filters.filter { $0 != preset && $0 != currentPreset } + settings.filters.append(preset) + return settings + }) + |> deliverOnMainQueue).start(next: { settings in + updated(settings.filters) + dismissImpl?() + }) + }) + + let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.SocksProxySetup_Title), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false) + let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetControllerEntries(presentationData: presentationData, state: state, peers: statePeers), style: .blocks, emptyStateItem: nil, animateChanges: true) + + return (controllerState, (listState, arguments)) + } + |> afterDisposed { + actionsDisposable.dispose() + } + + let controller = ItemListController(context: context, state: signal) + controller.navigationPresentation = .modal + presentControllerImpl = { [weak controller] c, d in + controller?.present(c, in: .window(.root), with: d) + } + dismissImpl = { [weak controller] in + let _ = controller?.dismiss() + } + + return controller +} + diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift new file mode 100644 index 0000000000..c71904a4af --- /dev/null +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift @@ -0,0 +1,208 @@ +import Foundation +import UIKit +import Display +import SwiftSignalKit +import Postbox +import TelegramCore +import SyncCore +import TelegramPresentationData +import TelegramUIPreferences +import ItemListUI +import AccountContext + +private final class ChatListFilterPresetListControllerArguments { + let context: AccountContext + + let openPreset: (ChatListFilter) -> Void + let addNew: () -> Void + let setItemWithRevealedOptions: (Int32?, Int32?) -> Void + let removePreset: (Int32) -> Void + + init(context: AccountContext, openPreset: @escaping (ChatListFilter) -> Void, addNew: @escaping () -> Void, setItemWithRevealedOptions: @escaping (Int32?, Int32?) -> Void, removePreset: @escaping (Int32) -> Void) { + self.context = context + self.openPreset = openPreset + self.addNew = addNew + self.setItemWithRevealedOptions = setItemWithRevealedOptions + self.removePreset = removePreset + } +} + +private enum ChatListFilterPresetListSection: Int32 { + case list +} + +private func stringForUserCount(_ peers: [PeerId: SelectivePrivacyPeer], strings: PresentationStrings) -> String { + if peers.isEmpty { + return strings.PrivacyLastSeenSettings_EmpryUsersPlaceholder + } else { + var result = 0 + for (_, peer) in peers { + result += peer.userCount + } + return strings.UserCount(Int32(result)) + } +} + +private enum ChatListFilterPresetListEntryStableId: Hashable { + case listHeader + case preset(Int32) + case addItem + case listFooter +} + +private enum ChatListFilterPresetListEntry: ItemListNodeEntry { + case listHeader(String) + case preset(index: Int, title: String?, preset: ChatListFilter, canBeReordered: Bool, canBeDeleted: Bool) + case addItem(String) + case listFooter(String) + + var section: ItemListSectionId { + switch self { + case .listHeader, .preset, .addItem, .listFooter: + return ChatListFilterPresetListSection.list.rawValue + } + } + + var sortId: Int { + switch self { + case .listHeader: + return 0 + case let .preset(preset): + return 1 + preset.index + case .addItem: + return 1000 + case .listFooter: + return 1001 + } + } + + var stableId: ChatListFilterPresetListEntryStableId { + switch self { + case .listHeader: + return .listHeader + case let .preset(preset): + return .preset(preset.preset.id) + case .addItem: + return .addItem + case .listFooter: + return .listFooter + } + } + + static func <(lhs: ChatListFilterPresetListEntry, rhs: ChatListFilterPresetListEntry) -> Bool { + return lhs.sortId < rhs.sortId + } + + func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem { + let arguments = arguments as! ChatListFilterPresetListControllerArguments + switch self { + case let .listHeader(text): + return ItemListSectionHeaderItem(presentationData: presentationData, text: text, multiline: true, sectionId: self.section) + case let .preset(index, title, preset, canBeReordered, canBeDeleted): + return ChatListFilterPresetListItem(presentationData: presentationData, preset: preset, title: title ?? "", editing: ChatListFilterPresetListItemEditing(editable: true, editing: false, revealed: false), canBeReordered: canBeReordered, canBeDeleted: canBeDeleted, sectionId: self.section, action: { + arguments.openPreset(preset) + }, setItemWithRevealedOptions: { lhs, rhs in + arguments.setItemWithRevealedOptions(lhs, rhs) + }, remove: { + arguments.removePreset(preset.id) + }) + case let .addItem(text): + return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { + arguments.addNew() + }) + case let .listFooter(text): + return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section) + } + } +} + +private struct ChatListFilterPresetListControllerState: Equatable { + var revealedPreset: Int32? = nil +} + +private func chatListFilterPresetListControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetListControllerState, settings: ChatListFiltersState) -> [ChatListFilterPresetListEntry] { + var entries: [ChatListFilterPresetListEntry] = [] + + entries.append(.listHeader("FILTERS")) + for preset in settings.filters { + entries.append(.preset(index: entries.count, title: preset.title, preset: preset, canBeReordered: settings.filters.count > 1, canBeDeleted: true)) + } + entries.append(.addItem("Add New")) + entries.append(.listFooter("Add custom presets")) + + return entries +} + +func chatListFilterPresetListController(context: AccountContext, updated: @escaping ([ChatListFilter]) -> Void) -> ViewController { + let initialState = ChatListFilterPresetListControllerState() + let statePromise = ValuePromise(initialState, ignoreRepeated: true) + let stateValue = Atomic(value: initialState) + let updateState: ((ChatListFilterPresetListControllerState) -> ChatListFilterPresetListControllerState) -> Void = { f in + statePromise.set(stateValue.modify { f($0) }) + } + + var dismissImpl: (() -> Void)? + var pushControllerImpl: ((ViewController) -> Void)? + var presentControllerImpl: ((ViewController, Any?) -> Void)? + + let arguments = ChatListFilterPresetListControllerArguments(context: context, openPreset: { preset in + pushControllerImpl?(chatListFilterPresetController(context: context, currentPreset: preset, updated: updated)) + }, addNew: { + pushControllerImpl?(chatListFilterPresetController(context: context, currentPreset: nil, updated: updated)) + }, setItemWithRevealedOptions: { preset, fromPreset in + updateState { state in + var state = state + if (preset == nil && fromPreset == state.revealedPreset) || (preset != nil && fromPreset == nil) { + state.revealedPreset = preset + } + return state + } + }, removePreset: { id in + let _ = (updateChatListFilterSettingsInteractively(postbox: context.account.postbox, { settings in + var settings = settings + if let index = settings.filters.index(where: { $0.id == id }) { + settings.filters.remove(at: index) + } + return settings + }) + |> deliverOnMainQueue).start(next: { settings in + updated(settings.filters) + }) + }) + + let preferences = context.account.postbox.preferencesView(keys: [PreferencesKeys.chatListFilters]) + + let signal = combineLatest(queue: .mainQueue(), + context.sharedContext.presentationData, + statePromise.get(), + preferences + ) + |> map { presentationData, state, preferences -> (ItemListControllerState, (ItemListNodeState, Any)) in + let settings = preferences.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState ?? ChatListFiltersState.default + let leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Close), style: .regular, enabled: true, action: { + let _ = replaceRemoteChatListFilters(account: context.account).start() + dismissImpl?() + }) + + let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text("Filter Presets"), leftNavigationButton: leftNavigationButton, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false) + let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetListControllerEntries(presentationData: presentationData, state: state, settings: settings), style: .blocks, animateChanges: true) + + return (controllerState, (listState, arguments)) + } + |> afterDisposed { + } + + let controller = ItemListController(context: context, state: signal) + controller.navigationPresentation = .modal + pushControllerImpl = { [weak controller] c in + controller?.push(c) + } + presentControllerImpl = { [weak controller] c, a in + controller?.present(c, in: .window(.root), with: a) + } + dismissImpl = { [weak controller] in + controller?.dismiss() + } + + return controller +} diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift new file mode 100644 index 0000000000..adad852881 --- /dev/null +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift @@ -0,0 +1,437 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import SwiftSignalKit +import Postbox +import TelegramCore +import SyncCore +import TelegramPresentationData +import ItemListUI +import TelegramUIPreferences + +struct ChatListFilterPresetListItemEditing: Equatable { + let editable: Bool + let editing: Bool + let revealed: Bool +} + +final class ChatListFilterPresetListItem: ListViewItem, ItemListItem { + let presentationData: ItemListPresentationData + let preset: ChatListFilter + let title: String + let editing: ChatListFilterPresetListItemEditing + let canBeReordered: Bool + let canBeDeleted: Bool + let sectionId: ItemListSectionId + let action: () -> Void + let setItemWithRevealedOptions: (Int32?, Int32?) -> Void + let remove: () -> Void + + init( + presentationData: ItemListPresentationData, + preset: ChatListFilter, + title: String, + editing: ChatListFilterPresetListItemEditing, + canBeReordered: Bool, + canBeDeleted: Bool, + sectionId: ItemListSectionId, + action: @escaping () -> Void, + setItemWithRevealedOptions: @escaping (Int32?, Int32?) -> Void, + remove: @escaping () -> Void + ) { + self.presentationData = presentationData + self.preset = preset + self.title = title + self.editing = editing + self.canBeReordered = canBeReordered + self.canBeDeleted = canBeDeleted + self.sectionId = sectionId + self.action = action + self.setItemWithRevealedOptions = setItemWithRevealedOptions + self.remove = remove + } + + func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { + async { + let node = ChatListFilterPresetListItemNode() + let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + + node.contentSize = layout.contentSize + node.insets = layout.insets + + Queue.mainQueue().async { + completion(node, { + return (nil, { _ in apply(false) }) + }) + } + } + } + + func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) { + Queue.mainQueue().async { + if let nodeValue = node() as? ChatListFilterPresetListItemNode { + let makeLayout = nodeValue.asyncLayout() + + var animated = true + if case .None = animation { + animated = false + } + + async { + let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + Queue.mainQueue().async { + completion(layout, { _ in + apply(animated) + }) + } + } + } + } + } + + var selectable: Bool = true + + func selected(listView: ListView){ + listView.clearHighlightAnimated(true) + self.action() + } +} + +private let titleFont = Font.regular(17.0) + +private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemNode { + private let backgroundNode: ASDisplayNode + private let topStripeNode: ASDisplayNode + private let bottomStripeNode: ASDisplayNode + private let highlightedBackgroundNode: ASDisplayNode + private let maskNode: ASImageNode + + private let titleNode: TextNode + + private let activateArea: AccessibilityAreaNode + + private var editableControlNode: ItemListEditableControlNode? + private var reorderControlNode: ItemListEditableReorderControlNode? + + private var item: ChatListFilterPresetListItem? + private var layoutParams: ListViewItemLayoutParams? + + override var canBeSelected: Bool { + if self.editableControlNode != nil { + return false + } + return true + } + + init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + + self.topStripeNode = ASDisplayNode() + self.topStripeNode.isLayerBacked = true + + self.bottomStripeNode = ASDisplayNode() + self.bottomStripeNode.isLayerBacked = true + + self.maskNode = ASImageNode() + + self.titleNode = TextNode() + self.titleNode.isUserInteractionEnabled = false + self.titleNode.contentMode = .left + self.titleNode.contentsScale = UIScreen.main.scale + + self.activateArea = AccessibilityAreaNode() + + self.highlightedBackgroundNode = ASDisplayNode() + self.highlightedBackgroundNode.isLayerBacked = true + + super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false) + + self.addSubnode(self.titleNode) + self.addSubnode(self.activateArea) + + self.activateArea.activate = { [weak self] in + self?.item?.action() + return true + } + } + + func asyncLayout() -> (_ item: ChatListFilterPresetListItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, (Bool) -> Void) { + let makeTitleLayout = TextNode.asyncLayout(self.titleNode) + let editableControlLayout = ItemListEditableControlNode.asyncLayout(self.editableControlNode) + let reorderControlLayout = ItemListEditableReorderControlNode.asyncLayout(self.reorderControlNode) + + let currentItem = self.item + + return { item, params, neighbors in + var updatedTheme: PresentationTheme? + + if currentItem?.presentationData.theme !== item.presentationData.theme { + updatedTheme = item.presentationData.theme + } + + let peerRevealOptions: [ItemListRevealOption] + if item.editing.editable && item.canBeDeleted { + peerRevealOptions = [ItemListRevealOption(key: 0, title: item.presentationData.strings.Common_Delete, icon: .none, color: item.presentationData.theme.list.itemDisclosureActions.destructive.fillColor, textColor: item.presentationData.theme.list.itemDisclosureActions.destructive.foregroundColor)] + } else { + peerRevealOptions = [] + } + + let titleAttributedString = NSMutableAttributedString() + titleAttributedString.append(NSAttributedString(string: item.title, font: titleFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor)) + + var editableControlSizeAndApply: (CGFloat, (CGFloat) -> ItemListEditableControlNode)? + var reorderControlSizeAndApply: (CGFloat, (CGFloat, Bool, ContainedViewLayoutTransition) -> ItemListEditableReorderControlNode)? + + let editingOffset: CGFloat = 0.0 + var reorderInset: CGFloat = 0.0 + + if item.editing.editing && item.canBeReordered { + /*let sizeAndApply = editableControlLayout(item.presentationData.theme, false) + editableControlSizeAndApply = sizeAndApply + editingOffset = sizeAndApply.0*/ + + let reorderSizeAndApply = reorderControlLayout(item.presentationData.theme) + reorderControlSizeAndApply = reorderSizeAndApply + reorderInset = reorderSizeAndApply.0 + } + + let leftInset: CGFloat = 16.0 + params.leftInset + let rightInset: CGFloat = params.rightInset + max(reorderInset, 55.0) + + let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .middle, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let insets = itemListNeighborsGroupedInsets(neighbors) + let contentSize = CGSize(width: params.width, height: titleLayout.size.height + 11.0 * 2.0) + let separatorHeight = UIScreenPixel + + let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) + let layoutSize = layout.size + + return (layout, { [weak self] animated in + if let strongSelf = self { + strongSelf.item = item + strongSelf.layoutParams = params + + strongSelf.activateArea.accessibilityLabel = "\(titleAttributedString.string))" + + if let _ = updatedTheme { + strongSelf.topStripeNode.backgroundColor = item.presentationData.theme.list.itemBlocksSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = item.presentationData.theme.list.itemBlocksSeparatorColor + strongSelf.backgroundNode.backgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor + strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor + } + + let revealOffset = strongSelf.revealOffset + + let transition: ContainedViewLayoutTransition + if animated { + transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring) + } else { + transition = .immediate + } + + if let editableControlSizeAndApply = editableControlSizeAndApply { + let editableControlFrame = CGRect(origin: CGPoint(x: params.leftInset + revealOffset, y: 0.0), size: CGSize(width: editableControlSizeAndApply.0, height: layout.contentSize.height)) + if strongSelf.editableControlNode == nil { + let editableControlNode = editableControlSizeAndApply.1(layout.contentSize.height) + editableControlNode.tapped = { + if let strongSelf = self { + strongSelf.setRevealOptionsOpened(true, animated: true) + strongSelf.revealOptionsInteractivelyOpened() + } + } + strongSelf.editableControlNode = editableControlNode + strongSelf.insertSubnode(editableControlNode, aboveSubnode: strongSelf.titleNode) + editableControlNode.frame = editableControlFrame + transition.animatePosition(node: editableControlNode, from: CGPoint(x: -editableControlFrame.size.width / 2.0, y: editableControlFrame.midY)) + editableControlNode.alpha = 0.0 + transition.updateAlpha(node: editableControlNode, alpha: 1.0) + } else { + strongSelf.editableControlNode?.frame = editableControlFrame + } + strongSelf.editableControlNode?.isHidden = !item.editing.editable + } else if let editableControlNode = strongSelf.editableControlNode { + var editableControlFrame = editableControlNode.frame + editableControlFrame.origin.x = -editableControlFrame.size.width + strongSelf.editableControlNode = nil + transition.updateAlpha(node: editableControlNode, alpha: 0.0) + transition.updateFrame(node: editableControlNode, frame: editableControlFrame, completion: { [weak editableControlNode] _ in + editableControlNode?.removeFromSupernode() + }) + } + + if let reorderControlSizeAndApply = reorderControlSizeAndApply { + if strongSelf.reorderControlNode == nil { + let reorderControlNode = reorderControlSizeAndApply.1(layout.contentSize.height, false, .immediate) + strongSelf.reorderControlNode = reorderControlNode + strongSelf.addSubnode(reorderControlNode) + reorderControlNode.alpha = 0.0 + transition.updateAlpha(node: reorderControlNode, alpha: 1.0) + } + let reorderControlFrame = CGRect(origin: CGPoint(x: params.width + revealOffset - params.rightInset - reorderControlSizeAndApply.0, y: 0.0), size: CGSize(width: reorderControlSizeAndApply.0, height: layout.contentSize.height)) + strongSelf.reorderControlNode?.frame = reorderControlFrame + } else if let reorderControlNode = strongSelf.reorderControlNode { + strongSelf.reorderControlNode = nil + transition.updateAlpha(node: reorderControlNode, alpha: 0.0, completion: { [weak reorderControlNode] _ in + reorderControlNode?.removeFromSupernode() + }) + } + + let _ = titleApply() + + if strongSelf.backgroundNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0) + } + if strongSelf.topStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1) + } + if strongSelf.bottomStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2) + } + if strongSelf.maskNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.maskNode, at: 3) + } + + let hasCorners = itemListHasRoundedBlockLayout(params) + var hasTopCorners = false + var hasBottomCorners = false + switch neighbors.top { + case .sameSection(false): + strongSelf.topStripeNode.isHidden = true + default: + hasTopCorners = true + strongSelf.topStripeNode.isHidden = hasCorners + } + let bottomStripeInset: CGFloat + let bottomStripeOffset: CGFloat + switch neighbors.bottom { + case .sameSection(false): + bottomStripeInset = leftInset + editingOffset + bottomStripeOffset = -separatorHeight + default: + bottomStripeInset = 0.0 + bottomStripeOffset = 0.0 + hasBottomCorners = true + strongSelf.bottomStripeNode.isHidden = hasCorners + } + + strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil + + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight))) + strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0) + transition.updateFrame(node: strongSelf.topStripeNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight))) + transition.updateFrame(node: strongSelf.bottomStripeNode, frame: CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))) + + transition.updateFrame(node: strongSelf.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + revealOffset + editingOffset, y: 11.0), size: titleLayout.size)) + + strongSelf.activateArea.frame = CGRect(origin: CGPoint(x: leftInset + revealOffset + editingOffset, y: 0.0), size: CGSize(width: params.width - params.rightInset - 56.0 - (leftInset + revealOffset + editingOffset), height: layout.contentSize.height)) + + strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: layout.contentSize.height + UIScreenPixel + UIScreenPixel)) + + strongSelf.updateLayout(size: layout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset) + + strongSelf.setRevealOptions((left: [], right: peerRevealOptions)) + strongSelf.setRevealOptionsOpened(item.editing.revealed, animated: animated) + } + }) + } + } + + override func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) { + super.setHighlighted(highlighted, at: point, animated: animated) + + if highlighted { + self.highlightedBackgroundNode.alpha = 1.0 + if self.highlightedBackgroundNode.supernode == nil { + var anchorNode: ASDisplayNode? + if self.bottomStripeNode.supernode != nil { + anchorNode = self.bottomStripeNode + } else if self.topStripeNode.supernode != nil { + anchorNode = self.topStripeNode + } else if self.backgroundNode.supernode != nil { + anchorNode = self.backgroundNode + } + if let anchorNode = anchorNode { + self.insertSubnode(self.highlightedBackgroundNode, aboveSubnode: anchorNode) + } else { + self.addSubnode(self.highlightedBackgroundNode) + } + } + } else { + if self.highlightedBackgroundNode.supernode != nil { + if animated { + self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in + if let strongSelf = self { + if completed { + strongSelf.highlightedBackgroundNode.removeFromSupernode() + } + } + }) + self.highlightedBackgroundNode.alpha = 0.0 + } else { + self.highlightedBackgroundNode.removeFromSupernode() + } + } + } + } + + override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4) + } + + override func animateRemoved(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) + } + + override func updateRevealOffset(offset: CGFloat, transition: ContainedViewLayoutTransition) { + super.updateRevealOffset(offset: offset, transition: transition) + + guard let params = self.layoutParams else { + return + } + + let leftInset: CGFloat = 16.0 + params.leftInset + + let editingOffset: CGFloat + if let editableControlNode = self.editableControlNode { + editingOffset = editableControlNode.bounds.size.width + var editableControlFrame = editableControlNode.frame + editableControlFrame.origin.x = params.leftInset + offset + transition.updateFrame(node: editableControlNode, frame: editableControlFrame) + } else { + editingOffset = 0.0 + } + + transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + offset + editingOffset, y: self.titleNode.frame.minY), size: self.titleNode.bounds.size)) + } + + override func revealOptionsInteractivelyOpened() { + if let item = self.item { + item.setItemWithRevealedOptions(item.preset.id, nil) + } + } + + override func revealOptionsInteractivelyClosed() { + if let item = self.item { + item.setItemWithRevealedOptions(nil, item.preset.id) + } + } + + override func revealOptionSelected(_ option: ItemListRevealOption, animated: Bool) { + self.setRevealOptionsOpened(false, animated: true) + self.revealOptionsInteractivelyClosed() + + if let item = self.item { + item.remove() + } + } + + override func isReorderable(at point: CGPoint) -> Bool { + if let reorderControlNode = self.reorderControlNode, reorderControlNode.frame.contains(point), !self.isDisplayingRevealedOptions { + return true + } + return false + } +} diff --git a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift index af2a6d1b88..0826e73dfe 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift @@ -81,7 +81,7 @@ private enum ChatListRecentEntry: Comparable, Identifiable { } } - func item(context: AccountContext, presentationData: ChatListPresentationData, filter: ChatListNodePeersFilter, peerSelected: @escaping (Peer) -> Void, peerContextAction: ((Peer, ChatListSearchContextActionSource, ASDisplayNode, ContextGesture?) -> Void)?, clearRecentlySearchedPeers: @escaping () -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, deletePeer: @escaping (PeerId) -> Void) -> ListViewItem { + func item(context: AccountContext, presentationData: ChatListPresentationData, filter: ChatListNodePeersFilter, peerSelected: @escaping (Peer) -> Void, disaledPeerSelected: @escaping (Peer) -> Void, peerContextAction: ((Peer, ChatListSearchContextActionSource, ASDisplayNode, ContextGesture?) -> Void)?, clearRecentlySearchedPeers: @escaping () -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, deletePeer: @escaping (PeerId) -> Void) -> ListViewItem { switch self { case let .topPeers(peers, theme, strings): return ChatListRecentPeersListItem(theme: theme, strings: strings, context: context, peers: peers, peerSelected: { peer in @@ -133,6 +133,12 @@ private enum ChatListRecentEntry: Comparable, Identifiable { } } + if filter.contains(.excludeChannels) { + if let channel = primaryPeer as? TelegramChannel, case .broadcast = channel.info { + enabled = false + } + } + let status: ContactsPeerItemStatus if let user = primaryPeer as? TelegramUser { let servicePeer = isServicePeer(primaryPeer) @@ -181,10 +187,16 @@ private enum ChatListRecentEntry: Comparable, Identifiable { if let chatPeer = peer.peer.peers[peer.peer.peerId] { peerSelected(chatPeer) } + }, disabledAction: { _ in + if let chatPeer = peer.peer.peers[peer.peer.peerId] { + disaledPeerSelected(chatPeer) + } }, setPeerIdWithRevealedOptions: setPeerIdWithRevealedOptions, deletePeer: deletePeer, contextAction: peerContextAction.flatMap { peerContextAction in return { node, gesture in - if let chatPeer = peer.peer.peers[peer.peer.peerId] { + if let chatPeer = peer.peer.peers[peer.peer.peerId], chatPeer.id.namespace != Namespaces.Peer.SecretChat { peerContextAction(chatPeer, .recentSearch, node, gesture) + } else { + gesture?.cancel() } } }) @@ -405,7 +417,7 @@ public enum ChatListSearchEntry: Comparable, Identifiable { interaction.peerSelected(peer) }, contextAction: peerContextAction.flatMap { peerContextAction in return { node, gesture in - if let chatPeer = chatPeer { + if let chatPeer = chatPeer, chatPeer.id.namespace != Namespaces.Peer.SecretChat { peerContextAction(chatPeer, .search, node, gesture) } else { gesture?.cancel() @@ -501,12 +513,12 @@ public struct ChatListSearchContainerTransition { } } -private func chatListSearchContainerPreparedRecentTransition(from fromEntries: [ChatListRecentEntry], to toEntries: [ChatListRecentEntry], context: AccountContext, presentationData: ChatListPresentationData, filter: ChatListNodePeersFilter, peerSelected: @escaping (Peer) -> Void, peerContextAction: ((Peer, ChatListSearchContextActionSource, ASDisplayNode, ContextGesture?) -> Void)?, clearRecentlySearchedPeers: @escaping () -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, deletePeer: @escaping (PeerId) -> Void) -> ChatListSearchContainerRecentTransition { +private func chatListSearchContainerPreparedRecentTransition(from fromEntries: [ChatListRecentEntry], to toEntries: [ChatListRecentEntry], context: AccountContext, presentationData: ChatListPresentationData, filter: ChatListNodePeersFilter, peerSelected: @escaping (Peer) -> Void, disaledPeerSelected: @escaping (Peer) -> Void, peerContextAction: ((Peer, ChatListSearchContextActionSource, ASDisplayNode, ContextGesture?) -> Void)?, clearRecentlySearchedPeers: @escaping () -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, deletePeer: @escaping (PeerId) -> Void) -> ChatListSearchContainerRecentTransition { let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } - let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, filter: filter, peerSelected: peerSelected, peerContextAction: peerContextAction, clearRecentlySearchedPeers: clearRecentlySearchedPeers, setPeerIdWithRevealedOptions: setPeerIdWithRevealedOptions, deletePeer: deletePeer), directionHint: nil) } - let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, filter: filter, peerSelected: peerSelected, peerContextAction: peerContextAction, clearRecentlySearchedPeers: clearRecentlySearchedPeers, setPeerIdWithRevealedOptions: setPeerIdWithRevealedOptions, deletePeer: deletePeer), directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, filter: filter, peerSelected: peerSelected, disaledPeerSelected: disaledPeerSelected, peerContextAction: peerContextAction, clearRecentlySearchedPeers: clearRecentlySearchedPeers, setPeerIdWithRevealedOptions: setPeerIdWithRevealedOptions, deletePeer: deletePeer), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, filter: filter, peerSelected: peerSelected, disaledPeerSelected: disaledPeerSelected, peerContextAction: peerContextAction, clearRecentlySearchedPeers: clearRecentlySearchedPeers, setPeerIdWithRevealedOptions: setPeerIdWithRevealedOptions, deletePeer: deletePeer), directionHint: nil) } return ChatListSearchContainerRecentTransition(deletions: deletions, insertions: insertions, updates: updates) } @@ -615,7 +627,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo private let filter: ChatListNodePeersFilter - public init(context: AccountContext, filter: ChatListNodePeersFilter, groupId: PeerGroupId, openPeer originalOpenPeer: @escaping (Peer, Bool) -> Void, openRecentPeerOptions: @escaping (Peer) -> Void, openMessage originalOpenMessage: @escaping (Peer, MessageId) -> Void, addContact: ((String) -> Void)?, peerContextAction: ((Peer, ChatListSearchContextActionSource, ASDisplayNode, ContextGesture?) -> Void)?) { + public init(context: AccountContext, filter: ChatListNodePeersFilter, groupId: PeerGroupId, openPeer originalOpenPeer: @escaping (Peer, Bool) -> Void, openDisabledPeer: @escaping (Peer) -> Void, openRecentPeerOptions: @escaping (Peer) -> Void, openMessage originalOpenMessage: @escaping (Peer, MessageId) -> Void, addContact: ((String) -> Void)?, peerContextAction: ((Peer, ChatListSearchContextActionSource, ASDisplayNode, ContextGesture?) -> Void)?) { self.context = context self.filter = filter self.dimNode = ASDisplayNode() @@ -1119,6 +1131,8 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo openPeer(peer, true) let _ = addRecentlySearchedPeer(postbox: context.account.postbox, peerId: peer.id).start() self?.recentListNode.clearHighlightAnimated(true) + }, disaledPeerSelected: { peer in + openDisabledPeer(peer) }, peerContextAction: peerContextAction, clearRecentlySearchedPeers: { self?.clearRecentSearch() diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift index 8803effaeb..1b4ef38ca5 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift @@ -699,7 +699,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { isPeerGroup = false isAd = isAdValue displayAsMessage = displayAsMessageValue - hasFailedMessages = hasFailedMessagesValue + hasFailedMessages = messageValue?.flags.contains(.Failed) ?? false // hasFailedMessagesValue case let .groupReference(_, peers, messageValue, unreadState, hiddenByDefault): if let _ = messageValue, !peers.isEmpty { contentPeer = .chat(peers[0].peer) @@ -1360,7 +1360,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { transition.updateAlpha(node: strongSelf.statusNode, alpha: 1.0) } - let avatarFrame = CGRect(origin: CGPoint(x: leftInset - avatarLeftInset + editingOffset + 10.0 + revealOffset, y: floor((layout.contentSize.height - avatarDiameter) / 2.0)), size: CGSize(width: avatarDiameter, height: avatarDiameter)) + let avatarFrame = CGRect(origin: CGPoint(x: leftInset - avatarLeftInset + editingOffset + 10.0 + revealOffset, y: floor((itemHeight - avatarDiameter) / 2.0)), size: CGSize(width: avatarDiameter, height: avatarDiameter)) transition.updateFrame(node: strongSelf.avatarNode, frame: avatarFrame) let onlineFrame = CGRect(origin: CGPoint(x: avatarFrame.maxX - onlineLayout.width - 2.0, y: avatarFrame.maxY - onlineLayout.height - 2.0), size: onlineLayout) diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift index 0276a2bd8b..fdd814e57a 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift @@ -366,6 +366,11 @@ public final class ChatListNode: ListView { } private var currentLocation: ChatListNodeLocation? + let chatListFilter: ChatListFilter? + private let chatListFilterValue = Promise() + var chatListFilterSignal: Signal { + return self.chatListFilterValue.get() + } private let chatListLocation = ValuePromise() private let chatListDisposable = MetaDisposable() private var activityStatusesDisposable: Disposable? @@ -408,9 +413,11 @@ public final class ChatListNode: ListView { private var hapticFeedback: HapticFeedback? - public init(context: AccountContext, groupId: PeerGroupId, previewing: Bool, controlsHistoryPreload: Bool, mode: ChatListNodeMode, theme: PresentationTheme, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool) { + public init(context: AccountContext, groupId: PeerGroupId, chatListFilter: ChatListFilter? = nil, previewing: Bool, controlsHistoryPreload: Bool, mode: ChatListNodeMode, theme: PresentationTheme, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool) { self.context = context self.groupId = groupId + self.chatListFilter = chatListFilter + self.chatListFilterValue.set(.single(chatListFilter)) self.controlsHistoryPreload = controlsHistoryPreload self.mode = mode @@ -524,8 +531,11 @@ public final class ChatListNode: ListView { let chatListViewUpdate = self.chatListLocation.get() |> distinctUntilChanged - |> mapToSignal { location in + |> mapToSignal { location -> Signal<(ChatListNodeViewUpdate, ChatListFilter?), NoError> in return chatListViewForLocation(groupId: groupId, location: location, account: context.account) + |> map { update in + return (update, location.filter) + } } let previousState = Atomic(value: self.currentState) @@ -575,7 +585,8 @@ public final class ChatListNode: ListView { let currentPeerId: PeerId = context.account.peerId let chatListNodeViewTransition = combineLatest(queue: viewProcessingQueue, hideArchivedFolderByDefault, displayArchiveIntro, savedMessagesPeer, chatListViewUpdate, self.statePromise.get()) - |> mapToQueue { (hideArchivedFolderByDefault, displayArchiveIntro, savedMessagesPeer, update, state) -> Signal in + |> mapToQueue { (hideArchivedFolderByDefault, displayArchiveIntro, savedMessagesPeer, updateAndFilter, state) -> Signal in + let (update, filter) = updateAndFilter let previousHideArchivedFolderByDefaultValue = previousHideArchivedFolderByDefault.swap(hideArchivedFolderByDefault) @@ -633,7 +644,7 @@ public final class ChatListNode: ListView { } } - let processedView = ChatListNodeView(originalView: update.view, filteredEntries: entries, isLoading: isLoading) + let processedView = ChatListNodeView(originalView: update.view, filteredEntries: entries, isLoading: isLoading, filter: filter) let previousView = previousView.swap(processedView) let previousState = previousState.swap(state) @@ -746,6 +757,11 @@ public final class ChatListNode: ListView { searchMode = true } + if filter != previousView?.filter { + disableAnimations = true + updatedScrollPosition = nil + } + return preparedChatListNodeViewTransition(from: previousView, to: processedView, reason: reason, previewing: previewing, disableAnimations: disableAnimations, account: context.account, scrollPosition: updatedScrollPosition, searchMode: searchMode) |> map({ mappedChatListNodeViewListTransition(context: context, nodeInteraction: nodeInteraction, peerGroupId: groupId, mode: mode, transition: $0) }) |> runOn(prepareOnMainQueue ? Queue.mainQueue() : viewProcessingQueue) @@ -764,9 +780,9 @@ public final class ChatListNode: ListView { if let range = range.loadedRange { var location: ChatListNodeLocation? if range.firstIndex < 5 && originalView.laterIndex != nil { - location = .navigation(index: originalView.entries[originalView.entries.count - 1].index) + location = .navigation(index: originalView.entries[originalView.entries.count - 1].index, filter: strongSelf.chatListFilter) } else if range.firstIndex >= 5 && range.lastIndex >= originalView.entries.count - 5 && originalView.earlierIndex != nil { - location = .navigation(index: originalView.entries[0].index) + location = .navigation(index: originalView.entries[0].index, filter: strongSelf.chatListFilter) } if let location = location, location != strongSelf.currentLocation { @@ -822,10 +838,10 @@ public final class ChatListNode: ListView { let initialLocation: ChatListNodeLocation switch mode { - case .chatList: - initialLocation = .initial(count: 50) - case .peers: - initialLocation = .initial(count: 200) + case .chatList: + initialLocation = .initial(count: 50, filter: self.chatListFilter) + case .peers: + initialLocation = .initial(count: 200, filter: self.chatListFilter) } self.setChatListLocation(initialLocation) @@ -1304,12 +1320,12 @@ public final class ChatListNode: ListView { if view.laterIndex == nil { self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) } else { - let location: ChatListNodeLocation = .scroll(index: .absoluteUpperBound, sourceIndex: .absoluteLowerBound, scrollPosition: .top(0.0), animated: true) + let location: ChatListNodeLocation = .scroll(index: .absoluteUpperBound, sourceIndex: .absoluteLowerBound, scrollPosition: .top(0.0), animated: true, filter: self.chatListFilter) self.setChatListLocation(location) } } else { let location: ChatListNodeLocation = .scroll(index: .absoluteUpperBound, sourceIndex: .absoluteLowerBound - , scrollPosition: .top(0.0), animated: true) + , scrollPosition: .top(0.0), animated: true, filter: self.chatListFilter) self.setChatListLocation(location) } } @@ -1345,11 +1361,11 @@ public final class ChatListNode: ListView { if let index = index { let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: self?.currentlyVisibleLatestChatListIndex() ?? .absoluteUpperBound - , scrollPosition: .center(.top), animated: true) + , scrollPosition: .center(.top), animated: true, filter: strongSelf.chatListFilter) strongSelf.setChatListLocation(location) } else { let location: ChatListNodeLocation = .scroll(index: .absoluteUpperBound, sourceIndex: .absoluteLowerBound - , scrollPosition: .top(0.0), animated: true) + , scrollPosition: .top(0.0), animated: true, filter: strongSelf.chatListFilter) strongSelf.setChatListLocation(location) } }) @@ -1405,7 +1421,7 @@ public final class ChatListNode: ListView { guard let strongSelf = self, let index = index else { return } - let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: strongSelf.currentlyVisibleLatestChatListIndex() ?? .absoluteUpperBound, scrollPosition: .center(.top), animated: true) + let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: strongSelf.currentlyVisibleLatestChatListIndex() ?? .absoluteUpperBound, scrollPosition: .center(.top), animated: true, filter: strongSelf.chatListFilter) strongSelf.setChatListLocation(location) strongSelf.peerSelected?(index.messageIndex.id.peerId, false, false) }) @@ -1429,7 +1445,7 @@ public final class ChatListNode: ListView { } } if let target = target { - let location: ChatListNodeLocation = .scroll(index: target.0, sourceIndex: .absoluteLowerBound, scrollPosition: .center(.top), animated: true) + let location: ChatListNodeLocation = .scroll(index: target.0, sourceIndex: .absoluteLowerBound, scrollPosition: .center(.top), animated: true, filter: self.chatListFilter) self.setChatListLocation(location) self.peerSelected?(target.1, false, false) } @@ -1439,17 +1455,23 @@ public final class ChatListNode: ListView { guard index < 10 else { return } - let _ = (chatListViewForLocation(groupId: self.groupId, location: .initial(count: 10), account: self.context.account) + let _ = (self.chatListFilterValue.get() |> take(1) - |> deliverOnMainQueue).start(next: { update in - let entries = update.view.entries - if entries.count > index, case let .MessageEntry(index, _, _, _, _, renderedPeer, _, _, _) = entries[10 - index - 1] { - let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: .absoluteLowerBound, scrollPosition: .center(.top), animated: true) - self.setChatListLocation(location) - self.peerSelected?(renderedPeer.peerId, false, false) + |> deliverOnMainQueue).start(next: { [weak self] filter in + guard let self = self else { + return } + let _ = (chatListViewForLocation(groupId: self.groupId, location: .initial(count: 10, filter: filter), account: self.context.account) + |> take(1) + |> deliverOnMainQueue).start(next: { update in + let entries = update.view.entries + if entries.count > index, case let .MessageEntry(index, _, _, _, _, renderedPeer, _, _, _) = entries[10 - index - 1] { + let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: .absoluteLowerBound, scrollPosition: .center(.top), animated: true, filter: filter) + self.setChatListLocation(location) + self.peerSelected?(renderedPeer.peerId, false, false) + } + }) }) - break } } diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift index 45a78f684b..5878d7df08 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift @@ -4,23 +4,21 @@ import TelegramCore import SyncCore import SwiftSignalKit import Display +import TelegramUIPreferences enum ChatListNodeLocation: Equatable { - case initial(count: Int) - case navigation(index: ChatListIndex) - case scroll(index: ChatListIndex, sourceIndex: ChatListIndex, scrollPosition: ListViewScrollPosition, animated: Bool) + case initial(count: Int, filter: ChatListFilter?) + case navigation(index: ChatListIndex, filter: ChatListFilter?) + case scroll(index: ChatListIndex, sourceIndex: ChatListIndex, scrollPosition: ListViewScrollPosition, animated: Bool, filter: ChatListFilter?) - static func ==(lhs: ChatListNodeLocation, rhs: ChatListNodeLocation) -> Bool { - switch lhs { - case let .navigation(index): - switch rhs { - case .navigation(index): - return true - default: - return false - } - default: - return false + var filter: ChatListFilter? { + switch self { + case let .initial(initial): + return initial.filter + case let .navigation(navigation): + return navigation.filter + case let .scroll(scroll): + return scroll.filter } } } @@ -32,17 +30,90 @@ struct ChatListNodeViewUpdate { } func chatListViewForLocation(groupId: PeerGroupId, location: ChatListNodeLocation, account: Account) -> Signal { + let filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)? + if let filter = location.filter { + let includePeers = Set(filter.includePeers) + filterPredicate = { peer, notificationSettings, isUnread in + if includePeers.contains(peer.id) { + return true + } + if filter.excludeRead { + if !isUnread { + return false + } + } + if filter.excludeMuted { + if let notificationSettings = notificationSettings as? TelegramPeerNotificationSettings { + if case .muted = notificationSettings.muteState { + return false + } + } else { + return false + } + } + if !filter.categories.contains(.privateChats) { + if let user = peer as? TelegramUser { + if user.botInfo == nil { + return false + } + } + } + if !filter.categories.contains(.secretChats) { + if let _ = peer as? TelegramSecretChat { + return false + } + } + if !filter.categories.contains(.bots) { + if let user = peer as? TelegramUser { + if user.botInfo != nil { + return false + } + } + } + if !filter.categories.contains(.privateGroups) { + if let _ = peer as? TelegramGroup { + return false + } else if let channel = peer as? TelegramChannel { + if case .group = channel.info { + if channel.username == nil { + return false + } + } + } + } + if !filter.categories.contains(.publicGroups) { + if let channel = peer as? TelegramChannel { + if case .group = channel.info { + if channel.username != nil { + return false + } + } + } + } + if !filter.categories.contains(.channels) { + if let channel = peer as? TelegramChannel { + if case .broadcast = channel.info { + return false + } + } + } + return true + } + } else { + filterPredicate = nil + } + switch location { - case let .initial(count): + case let .initial(count, _): let signal: Signal<(ChatListView, ViewUpdateType), NoError> - signal = account.viewTracker.tailChatListView(groupId: groupId, count: count) + signal = account.viewTracker.tailChatListView(groupId: groupId, filterPredicate: filterPredicate, count: count) return signal |> map { view, updateType -> ChatListNodeViewUpdate in return ChatListNodeViewUpdate(view: view, type: updateType, scrollPosition: nil) } - case let .navigation(index): + case let .navigation(index, _): var first = true - return account.viewTracker.aroundChatListView(groupId: groupId, index: index, count: 80) + return account.viewTracker.aroundChatListView(groupId: groupId, filterPredicate: filterPredicate, index: index, count: 80) |> map { view, updateType -> ChatListNodeViewUpdate in let genericType: ViewUpdateType if first { @@ -53,11 +124,11 @@ func chatListViewForLocation(groupId: PeerGroupId, location: ChatListNodeLocatio } return ChatListNodeViewUpdate(view: view, type: genericType, scrollPosition: nil) } - case let .scroll(index, sourceIndex, scrollPosition, animated): + case let .scroll(index, sourceIndex, scrollPosition, animated, _): let directionHint: ListViewScrollToItemDirectionHint = sourceIndex > index ? .Down : .Up let chatScrollPosition: ChatListNodeViewScrollPosition = .index(index: index, position: scrollPosition, directionHint: directionHint, animated: animated) var first = true - return account.viewTracker.aroundChatListView(groupId: groupId, index: index, count: 80) + return account.viewTracker.aroundChatListView(groupId: groupId, filterPredicate: filterPredicate, index: index, count: 80) |> map { view, updateType -> ChatListNodeViewUpdate in let genericType: ViewUpdateType let scrollPosition: ChatListNodeViewScrollPosition? = first ? chatScrollPosition : nil diff --git a/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift b/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift index 6c10849cca..d7997ee48c 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift @@ -6,11 +6,13 @@ import SwiftSignalKit import Display import MergeLists import SearchUI +import TelegramUIPreferences struct ChatListNodeView { let originalView: ChatListView let filteredEntries: [ChatListNodeEntry] let isLoading: Bool + let filter: ChatListFilter? } enum ChatListNodeViewTransitionReason { @@ -165,7 +167,7 @@ func preparedChatListNodeViewTransition(from fromView: ChatListNodeView?, to toV var fromEmptyView = false if let fromView = fromView { - if fromView.filteredEntries.isEmpty { + if fromView.filteredEntries.isEmpty || fromView.filter != toView.filter { options.remove(.AnimateInsertion) options.remove(.AnimateAlpha) fromEmptyView = true diff --git a/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift new file mode 100644 index 0000000000..6cb265b924 --- /dev/null +++ b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift @@ -0,0 +1,701 @@ +import Foundation +import UIKit +import Display +import SwiftSignalKit +import AsyncDisplayKit +import TelegramPresentationData +import AccountContext +import SyncCore +import Postbox +import TelegramUIPreferences +import TelegramCore + +final class TabBarChatListFilterController: ViewController { + private var controllerNode: TabBarChatListFilterControllerNode { + return self.displayNode as! TabBarChatListFilterControllerNode + } + + private let _ready = Promise() + override public var ready: Promise { + return self._ready + } + + private let context: AccountContext + private let sourceNodes: [ASDisplayNode] + private let presetList: [ChatListFilter] + private let currentPreset: ChatListFilter? + private let setup: () -> Void + private let updatePreset: (ChatListFilter?) -> Void + + private var presentationData: PresentationData + private var didPlayPresentationAnimation = false + + private let hapticFeedback = HapticFeedback() + + public init(context: AccountContext, sourceNodes: [ASDisplayNode], presetList: [ChatListFilter], currentPreset: ChatListFilter?, setup: @escaping () -> Void, updatePreset: @escaping (ChatListFilter?) -> Void) { + self.context = context + self.sourceNodes = sourceNodes + self.presetList = presetList + self.currentPreset = currentPreset + self.setup = setup + self.updatePreset = updatePreset + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + + super.init(navigationBarPresentationData: nil) + + self.statusBar.statusBarStyle = .Ignore + self.statusBar.ignoreInCall = true + + self.lockOrientation = true + } + + required public init(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + deinit { + } + + override public func loadDisplayNode() { + self.displayNode = TabBarChatListFilterControllerNode(context: self.context, presentationData: self.presentationData, cancel: { [weak self] in + self?.dismiss() + }, sourceNodes: self.sourceNodes, presetList: self.presetList, currentPreset: self.currentPreset, setup: { [weak self] in + self?.setup() + self?.dismiss(sourceNodes: [], fadeOutIcon: true) + }, updatePreset: { [weak self] filter in + self?.updatePreset(filter) + self?.dismiss() + }) + self._ready.set(self.controllerNode.isReady.get()) + self.displayNodeDidLoad() + } + + override public func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + if !self.didPlayPresentationAnimation { + self.didPlayPresentationAnimation = true + + self.hapticFeedback.impact() + self.controllerNode.animateIn() + } + } + + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.controllerNode.containerLayoutUpdated(layout, transition: transition) + } + + override public func dismiss(completion: (() -> Void)? = nil) { + self.dismiss(sourceNodes: [], fadeOutIcon: false) + } + + func dismiss(sourceNodes: [ASDisplayNode], fadeOutIcon: Bool) { + self.controllerNode.animateOut(sourceNodes: sourceNodes, fadeOutIcon: fadeOutIcon, completion: { [weak self] in + self?.didPlayPresentationAnimation = false + self?.presentingViewController?.dismiss(animated: false, completion: nil) + }) + } +} + +private let animationDurationFactor: Double = 1.0 + +private protocol AbstractTabBarChatListFilterItemNode { + func updateLayout(maxWidth: CGFloat) -> (CGFloat, CGFloat, (CGFloat) -> Void) +} + +private final class AddFilterItemNode: ASDisplayNode, AbstractTabBarChatListFilterItemNode { + private let action: () -> Void + + private let separatorNode: ASDisplayNode + private let highlightedBackgroundNode: ASDisplayNode + private let buttonNode: HighlightTrackingButtonNode + private let plusNode: ASImageNode + private let titleNode: ImmediateTextNode + + init(displaySeparator: Bool, presentationData: PresentationData, action: @escaping () -> Void) { + self.action = action + + self.separatorNode = ASDisplayNode() + self.separatorNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemSeparatorColor + self.separatorNode.isHidden = !displaySeparator + + self.highlightedBackgroundNode = ASDisplayNode() + self.highlightedBackgroundNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemHighlightedBackgroundColor + self.highlightedBackgroundNode.alpha = 0.0 + + self.buttonNode = HighlightTrackingButtonNode() + + self.titleNode = ImmediateTextNode() + self.titleNode.maximumNumberOfLines = 1 + self.titleNode.attributedText = NSAttributedString(string: "Setup", font: Font.regular(17.0), textColor: presentationData.theme.actionSheet.primaryTextColor) + + self.plusNode = ASImageNode() + self.plusNode.image = generateItemListPlusIcon(presentationData.theme.actionSheet.primaryTextColor) + + super.init() + + self.addSubnode(self.separatorNode) + self.addSubnode(self.highlightedBackgroundNode) + self.addSubnode(self.titleNode) + self.addSubnode(self.plusNode) + self.addSubnode(self.buttonNode) + + self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside) + self.buttonNode.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.highlightedBackgroundNode.layer.removeAnimation(forKey: "opacity") + strongSelf.highlightedBackgroundNode.alpha = 1.0 + } else { + strongSelf.highlightedBackgroundNode.alpha = 0.0 + strongSelf.highlightedBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3) + } + } + } + } + + func updateLayout(maxWidth: CGFloat) -> (CGFloat, CGFloat, (CGFloat) -> Void) { + let leftInset: CGFloat = 16.0 + let rightInset: CGFloat = 10.0 + let iconInset: CGFloat = 60.0 + let titleSize = self.titleNode.updateLayout(CGSize(width: maxWidth - leftInset - rightInset, height: .greatestFiniteMagnitude)) + let height: CGFloat = 61.0 + + return (titleSize.width + leftInset + rightInset, height, { width in + self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((height - titleSize.height) / 2.0)), size: titleSize) + + if let image = self.plusNode.image { + self.plusNode.frame = CGRect(origin: CGPoint(x: floor(width - iconInset + (iconInset - image.size.width) / 2.0), y: floor((height - image.size.height) / 2.0)), size: image.size) + } + + self.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: height - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel)) + self.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height)) + self.buttonNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height)) + }) + } + + @objc private func buttonPressed() { + self.action() + } +} + +private final class FilterItemNode: ASDisplayNode, AbstractTabBarChatListFilterItemNode { + private let context: AccountContext + private let title: String + let preset: ChatListFilter? + private let isCurrent: Bool + private let presentationData: PresentationData + private let action: () -> Bool + + private let separatorNode: ASDisplayNode + private let highlightedBackgroundNode: ASDisplayNode + private let buttonNode: HighlightTrackingButtonNode + private let titleNode: ImmediateTextNode + private let checkNode: ASImageNode + + private let badgeBackgroundNode: ASImageNode + private let badgeTitleNode: ImmediateTextNode + private var badgeText: String = "" + + init(context: AccountContext, title: String, preset: ChatListFilter?, isCurrent: Bool, displaySeparator: Bool, presentationData: PresentationData, action: @escaping () -> Bool) { + self.context = context + self.title = title + self.preset = preset + self.isCurrent = isCurrent + self.presentationData = presentationData + self.action = action + + self.separatorNode = ASDisplayNode() + self.separatorNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemSeparatorColor + self.separatorNode.isHidden = !displaySeparator + + self.highlightedBackgroundNode = ASDisplayNode() + self.highlightedBackgroundNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemHighlightedBackgroundColor + self.highlightedBackgroundNode.alpha = 0.0 + + self.buttonNode = HighlightTrackingButtonNode() + + self.titleNode = ImmediateTextNode() + self.titleNode.maximumNumberOfLines = 1 + self.titleNode.attributedText = NSAttributedString(string: title, font: Font.regular(17.0), textColor: presentationData.theme.actionSheet.primaryTextColor) + + self.checkNode = ASImageNode() + self.checkNode.image = generateItemListCheckIcon(color: presentationData.theme.actionSheet.primaryTextColor) + self.checkNode.isHidden = true//!isCurrent + + self.badgeBackgroundNode = ASImageNode() + self.badgeBackgroundNode.image = generateStretchableFilledCircleImage(diameter: 20.0, color: presentationData.theme.list.itemCheckColors.fillColor) + self.badgeTitleNode = ImmediateTextNode() + self.badgeBackgroundNode.isHidden = true + self.badgeTitleNode.isHidden = true + + super.init() + + self.addSubnode(self.separatorNode) + self.addSubnode(self.highlightedBackgroundNode) + self.addSubnode(self.titleNode) + self.addSubnode(self.checkNode) + self.addSubnode(self.badgeBackgroundNode) + self.addSubnode(self.badgeTitleNode) + self.addSubnode(self.buttonNode) + + self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside) + self.buttonNode.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.highlightedBackgroundNode.layer.removeAnimation(forKey: "opacity") + strongSelf.highlightedBackgroundNode.alpha = 1.0 + } else { + strongSelf.highlightedBackgroundNode.alpha = 0.0 + strongSelf.highlightedBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3) + } + } + } + } + + func updateLayout(maxWidth: CGFloat) -> (CGFloat, CGFloat, (CGFloat) -> Void) { + let leftInset: CGFloat = 16.0 + + let badgeTitleSize = self.badgeTitleNode.updateLayout(CGSize(width: 100.0, height: .greatestFiniteMagnitude)) + let badgeMinSize = self.badgeBackgroundNode.image?.size.width ?? 20.0 + let badgeSize = CGSize(width: max(badgeMinSize, badgeTitleSize.width + 12.0), height: badgeMinSize) + + let rightInset: CGFloat = max(20.0, badgeSize.width + 20.0) + + let titleSize = self.titleNode.updateLayout(CGSize(width: maxWidth - leftInset - rightInset, height: .greatestFiniteMagnitude)) + + let height: CGFloat = 61.0 + + return (titleSize.width + leftInset + rightInset, height, { width in + self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((height - titleSize.height) / 2.0)), size: titleSize) + + if let image = self.checkNode.image { + self.checkNode.frame = CGRect(origin: CGPoint(x: width - rightInset + floor((rightInset - image.size.width) / 2.0), y: floor((height - image.size.height) / 2.0)), size: image.size) + } + + let badgeBackgroundFrame = CGRect(origin: CGPoint(x: width - rightInset + floor((rightInset - badgeSize.width) / 2.0), y: floor((height - badgeSize.height) / 2.0)), size: badgeSize) + self.badgeBackgroundNode.frame = badgeBackgroundFrame + self.badgeTitleNode.frame = CGRect(origin: CGPoint(x: badgeBackgroundFrame.minX + floor((badgeBackgroundFrame.width - badgeTitleSize.width) / 2.0), y: badgeBackgroundFrame.minY + floor((badgeBackgroundFrame.height - badgeTitleSize.height) / 2.0)), size: badgeTitleSize) + + self.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: height - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel)) + self.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height)) + self.buttonNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height)) + }) + } + + @objc private func buttonPressed() { + let _ = self.action() + //self.checkNode.isHidden = !isCurrent + } + + func updateBadge(text: String) -> Bool { + if text != self.badgeText { + self.badgeText = text + self.badgeTitleNode.attributedText = NSAttributedString(string: text, font: Font.regular(14.0), textColor: self.presentationData.theme.list.itemCheckColors.foregroundColor) + self.badgeBackgroundNode.isHidden = text.isEmpty + self.badgeTitleNode.isHidden = text.isEmpty + return true + } else { + return false + } + } +} + +private final class TabBarChatListFilterControllerNode: ViewControllerTracingNode { + private let presentationData: PresentationData + private let cancel: () -> Void + + private let effectView: UIVisualEffectView + private var propertyAnimator: AnyObject? + private var displayLinkAnimator: DisplayLinkAnimator? + private let dimNode: ASDisplayNode + + private let contentContainerNode: ASDisplayNode + private let contentNodes: [ASDisplayNode & AbstractTabBarChatListFilterItemNode] + + private var sourceNodes: [ASDisplayNode] + private var snapshotViews: [UIView] = [] + + private var validLayout: ContainerViewLayout? + + private var countsDisposable: Disposable? + let isReady = Promise() + private var didSetIsReady = false + + init(context: AccountContext, presentationData: PresentationData, cancel: @escaping () -> Void, sourceNodes: [ASDisplayNode], presetList: [ChatListFilter], currentPreset: ChatListFilter?, setup: @escaping () -> Void, updatePreset: @escaping (ChatListFilter?) -> Void) { + self.presentationData = presentationData + self.cancel = cancel + self.sourceNodes = sourceNodes + + self.effectView = UIVisualEffectView() + if #available(iOS 9.0, *) { + } else { + if presentationData.theme.rootController.keyboardColor == .dark { + self.effectView.effect = UIBlurEffect(style: .dark) + } else { + self.effectView.effect = UIBlurEffect(style: .light) + } + self.effectView.alpha = 0.0 + } + + self.dimNode = ASDisplayNode() + self.dimNode.alpha = 1.0 + if presentationData.theme.rootController.keyboardColor == .light { + self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.04) + } else { + self.dimNode.backgroundColor = presentationData.theme.chatList.backgroundColor.withAlphaComponent(0.2) + } + + self.contentContainerNode = ASDisplayNode() + self.contentContainerNode.backgroundColor = self.presentationData.theme.actionSheet.opaqueItemBackgroundColor + self.contentContainerNode.cornerRadius = 20.0 + self.contentContainerNode.clipsToBounds = true + + var contentNodes: [ASDisplayNode & AbstractTabBarChatListFilterItemNode] = [] + contentNodes.append(AddFilterItemNode(displaySeparator: true, presentationData: presentationData, action: { + setup() + })) + + for i in 0 ..< presetList.count { + let preset = presetList[i] + + let title: String = preset.title ?? "" + contentNodes.append(FilterItemNode(context: context, title: title, preset: preset, isCurrent: currentPreset == preset, displaySeparator: i != presetList.count - 1, presentationData: presentationData, action: { + updatePreset(preset) + return false + })) + } + self.contentNodes = contentNodes + + super.init() + + self.view.addSubview(self.effectView) + self.addSubnode(self.dimNode) + self.addSubnode(self.contentContainerNode) + self.contentNodes.forEach(self.contentContainerNode.addSubnode) + + self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) + + var unreadCountItems: [UnreadMessageCountsItem] = [] + unreadCountItems.append(.total(nil)) + var additionalPeerIds = Set() + for preset in presetList { + additionalPeerIds.formUnion(preset.includePeers) + } + if !additionalPeerIds.isEmpty { + for peerId in additionalPeerIds { + unreadCountItems.append(.peer(peerId)) + } + } + let unreadKey: PostboxViewKey = .unreadCounts(items: unreadCountItems) + var keys: [PostboxViewKey] = [] + keys.append(unreadKey) + for peerId in additionalPeerIds { + keys.append(.basicPeer(peerId)) + } + + self.countsDisposable = (context.account.postbox.combinedView(keys: keys) + |> deliverOnMainQueue).start(next: { [weak self] view in + guard let strongSelf = self else { + return + } + + if let unreadCounts = view.views[unreadKey] as? UnreadMessageCountsView { + var peerTagAndCount: [PeerId: (PeerSummaryCounterTags, Int)] = [:] + + var totalState: ChatListTotalUnreadState? + for entry in unreadCounts.entries { + switch entry { + case let .total(_, totalStateValue): + totalState = totalStateValue + case let .peer(peerId, state): + if let state = state, state.isUnread { + if let peerView = view.views[.basicPeer(peerId)] as? BasicPeerView, let peer = peerView.peer { + let tag = context.account.postbox.seedConfiguration.peerSummaryCounterTags(peer) + var peerCount = Int(state.count) + if state.isUnread { + peerCount = max(1, peerCount) + } + peerTagAndCount[peerId] = (tag, peerCount) + } + } + } + } + + var totalUnreadChatCount = 0 + if let totalState = totalState { + for (_, counters) in totalState.filteredCounters { + totalUnreadChatCount += Int(counters.chatCount) + } + } + + var shouldUpdateLayout = false + for case let contentNode as FilterItemNode in strongSelf.contentNodes { + let badgeString: String + if let preset = contentNode.preset { + var tags: [PeerSummaryCounterTags] = [] + if preset.categories.contains(.privateChats) { + tags.append(.privateChat) + } + if preset.categories.contains(.secretChats) { + tags.append(.secretChat) + } + if preset.categories.contains(.privateGroups) { + tags.append(.privateGroup) + } + if preset.categories.contains(.bots) { + tags.append(.bot) + } + if preset.categories.contains(.publicGroups) { + tags.append(.publicGroup) + } + if preset.categories.contains(.channels) { + tags.append(.channel) + } + + var count = 0 + if let totalState = totalState { + for tag in tags { + if let value = totalState.filteredCounters[tag] { + count += Int(value.chatCount) + } + } + } + for peerId in preset.includePeers { + if let (tag, peerCount) = peerTagAndCount[peerId] { + if !tags.contains(tag) { + count += peerCount + } + } + } + if count != 0 { + badgeString = "\(count)" + } else { + badgeString = "" + } + } else { + badgeString = "" + } + if contentNode.updateBadge(text: badgeString) { + shouldUpdateLayout = true + } + } + + if shouldUpdateLayout { + if let layout = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout, transition: .immediate) + } + } + } + + if !strongSelf.didSetIsReady { + strongSelf.didSetIsReady = true + strongSelf.isReady.set(.single(true)) + } + }) + } + + deinit { + if let propertyAnimator = self.propertyAnimator { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { + let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator + propertyAnimator?.stopAnimation(true) + } + } + + self.countsDisposable?.dispose() + } + + func animateIn() { + self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + + if #available(iOS 10.0, *) { + if let propertyAnimator = self.propertyAnimator { + let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator + propertyAnimator?.stopAnimation(true) + } + self.propertyAnimator = UIViewPropertyAnimator(duration: 0.2 * animationDurationFactor, curve: .easeInOut, animations: { [weak self] in + self?.effectView.effect = makeCustomZoomBlurEffect() + }) + } + + if let _ = self.propertyAnimator { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { + self.displayLinkAnimator = DisplayLinkAnimator(duration: 0.2 * animationDurationFactor, from: 0.0, to: 1.0, update: { [weak self] value in + (self?.propertyAnimator as? UIViewPropertyAnimator)?.fractionComplete = value + }, completion: { + }) + } + } else { + UIView.animate(withDuration: 0.2 * animationDurationFactor, animations: { + self.effectView.effect = makeCustomZoomBlurEffect() + }, completion: { _ in + }) + } + + self.contentContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + + if let _ = self.validLayout, let sourceNode = self.sourceNodes.first { + let sourceFrame = sourceNode.view.convert(sourceNode.bounds, to: self.view) + self.contentContainerNode.layer.animateFrame(from: sourceFrame, to: self.contentContainerNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) + } + + for sourceNode in self.sourceNodes { + if let imageNode = sourceNode as? ASImageNode { + let snapshot = UIImageView() + snapshot.image = imageNode.image + snapshot.frame = sourceNode.view.convert(sourceNode.bounds, to: self.view) + snapshot.isUserInteractionEnabled = false + self.view.addSubview(snapshot) + self.snapshotViews.append(snapshot) + } else if let snapshot = sourceNode.view.snapshotContentTree() { + snapshot.frame = sourceNode.view.convert(sourceNode.bounds, to: self.view) + snapshot.isUserInteractionEnabled = false + self.view.addSubview(snapshot) + self.snapshotViews.append(snapshot) + } + sourceNode.alpha = 0.0 + } + } + + func animateOut(sourceNodes: [ASDisplayNode], fadeOutIcon: Bool, completion: @escaping () -> Void) { + self.isUserInteractionEnabled = false + + var completedEffect = false + var completedSourceNodes = false + + let intermediateCompletion: () -> Void = { + if completedEffect && completedSourceNodes { + completion() + } + } + + if #available(iOS 10.0, *) { + if let propertyAnimator = self.propertyAnimator { + let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator + propertyAnimator?.stopAnimation(true) + } + self.propertyAnimator = UIViewPropertyAnimator(duration: 0.2, curve: .easeInOut, animations: { [weak self] in + self?.effectView.effect = nil + }) + } + + if let _ = self.propertyAnimator { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { + self.displayLinkAnimator = DisplayLinkAnimator(duration: 0.2 * animationDurationFactor, from: 0.0, to: 0.999, update: { [weak self] value in + (self?.propertyAnimator as? UIViewPropertyAnimator)?.fractionComplete = value + }, completion: { [weak self] in + if let strongSelf = self { + for sourceNode in strongSelf.sourceNodes { + sourceNode.alpha = 1.0 + } + } + + completedEffect = true + intermediateCompletion() + }) + } + self.effectView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.05 * animationDurationFactor, delay: 0.15, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false) + } else { + UIView.animate(withDuration: 0.21 * animationDurationFactor, animations: { + if #available(iOS 9.0, *) { + self.effectView.effect = nil + } else { + self.effectView.alpha = 0.0 + } + }, completion: { [weak self] _ in + if let strongSelf = self { + for sourceNode in strongSelf.sourceNodes { + sourceNode.alpha = 1.0 + } + } + + completedEffect = true + intermediateCompletion() + }) + } + + self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false) + self.contentContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.12, removeOnCompletion: false, completion: { _ in + }) + if let _ = self.validLayout, let sourceNode = self.sourceNodes.first { + let sourceFrame = sourceNode.view.convert(sourceNode.bounds, to: self.view) + self.contentContainerNode.layer.animateFrame(from: self.contentContainerNode.frame, to: sourceFrame, duration: 0.15, timingFunction: CAMediaTimingFunctionName.easeIn.rawValue, removeOnCompletion: false) + } + if fadeOutIcon { + for snapshotView in self.snapshotViews { + snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false) + } + completedSourceNodes = true + } else { + completedSourceNodes = true + } + } + + func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + self.validLayout = layout + + transition.updateFrame(view: self.effectView, frame: CGRect(origin: CGPoint(), size: layout.size)) + transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + + let sideInset: CGFloat = 18.0 + + var contentSize = CGSize() + contentSize.width = min(layout.size.width - 40.0, 260.0) + var applyNodes: [(ASDisplayNode, CGFloat, (CGFloat) -> Void)] = [] + for itemNode in self.contentNodes { + let (width, height, apply) = itemNode.updateLayout(maxWidth: contentSize.width - sideInset * 2.0) + applyNodes.append((itemNode, height, apply)) + contentSize.width = max(contentSize.width, width) + contentSize.height += height + } + + let insets = layout.insets(options: .input) + + let contentOrigin: CGPoint + if let sourceNode = self.sourceNodes.first, let screenFrame = sourceNode.supernode?.convert(sourceNode.frame, to: nil) { + contentOrigin = CGPoint(x: max(16.0, screenFrame.maxX - contentSize.width + 8.0), y: layout.size.height - 66.0 - insets.bottom - contentSize.height) + } else { + contentOrigin = CGPoint(x: max(16.0, layout.size.width - sideInset - contentSize.width), y: layout.size.height - 66.0 - layout.intrinsicInsets.bottom - contentSize.height) + } + + transition.updateFrame(node: self.contentContainerNode, frame: CGRect(origin: contentOrigin, size: contentSize)) + var nextY: CGFloat = 0.0 + for (itemNode, height, apply) in applyNodes { + transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: nextY), size: CGSize(width: contentSize.width, height: height))) + apply(contentSize.width) + nextY += height + } + } + + @objc private func dimTapGesture(_ recognizer: UITapGestureRecognizer) { + if case .ended = recognizer.state { + self.cancel() + } + } +} + +private func setAnchorPoint(anchorPoint: CGPoint, forView view: UIView) { + var newPoint = CGPoint(x: view.bounds.size.width * anchorPoint.x, + y: view.bounds.size.height * anchorPoint.y) + + + var oldPoint = CGPoint(x: view.bounds.size.width * view.layer.anchorPoint.x, + y: view.bounds.size.height * view.layer.anchorPoint.y) + + newPoint = newPoint.applying(view.transform) + oldPoint = oldPoint.applying(view.transform) + + var position = view.layer.position + position.x -= oldPoint.x + position.x += newPoint.x + + position.y -= oldPoint.y + position.y += newPoint.y + + view.layer.position = position + view.layer.anchorPoint = anchorPoint +} diff --git a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift index 27c2014190..3578b12212 100644 --- a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift +++ b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift @@ -95,6 +95,15 @@ public class ChatTitleActivityContentNode: ASDisplayNode { self.textNode.attributedText = text } + func makeCopy() -> ASDisplayNode { + let node = ASDisplayNode() + let textNode = self.textNode.makeCopy() + textNode.frame = self.textNode.frame + node.addSubnode(textNode) + node.frame = self.frame + return node + } + public func animateOut(to: ChatTitleActivityNodeState, style: ChatTitleActivityAnimationStyle, completion: @escaping () -> Void) { self.layer.animateAlpha(from: 1.0, to: 0.0, duration: transitionDuration, removeOnCompletion: false, completion: { _ in completion() diff --git a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift index c345f428bb..2ccf9a29f5 100644 --- a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift +++ b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift @@ -61,6 +61,15 @@ public class ChatTitleActivityNode: ASDisplayNode { super.init() } + public func makeCopy() -> ASDisplayNode { + let node = ASDisplayNode() + if let contentNode = self.contentNode { + node.addSubnode(contentNode.makeCopy()) + } + node.frame = self.frame + return node + } + public func transitionToState(_ state: ChatTitleActivityNodeState, animation: ChatTitleActivityAnimationStyle = .crossfade, completion: @escaping () -> Void = {}) -> Bool { if self.state != state { let currentState = self.state diff --git a/submodules/ComposePollUI/Sources/CreatePollController.swift b/submodules/ComposePollUI/Sources/CreatePollController.swift index 2659b26e3b..8fbcbab1ec 100644 --- a/submodules/ComposePollUI/Sources/CreatePollController.swift +++ b/submodules/ComposePollUI/Sources/CreatePollController.swift @@ -148,7 +148,7 @@ private func processPollText(_ text: String) -> String { private final class CreatePollControllerArguments { let updatePollText: (String) -> Void - let updateOptionText: (Int, String) -> Void + let updateOptionText: (Int, String, Bool) -> Void let moveToNextOption: (Int) -> Void let moveToPreviousOption: (Int) -> Void let removeOption: (Int, Bool) -> Void @@ -160,7 +160,7 @@ private final class CreatePollControllerArguments { let displayMultipleChoiceDisabled: () -> Void let updateQuiz: (Bool) -> Void - init(updatePollText: @escaping (String) -> Void, updateOptionText: @escaping (Int, String) -> Void, moveToNextOption: @escaping (Int) -> Void, moveToPreviousOption: @escaping (Int) -> Void, removeOption: @escaping (Int, Bool) -> Void, optionFocused: @escaping (Int, Bool) -> Void, setItemIdWithRevealedOptions: @escaping (Int?, Int?) -> Void, toggleOptionSelected: @escaping (Int) -> Void, updateAnonymous: @escaping (Bool) -> Void, updateMultipleChoice: @escaping (Bool) -> Void, displayMultipleChoiceDisabled: @escaping () -> Void, updateQuiz: @escaping (Bool) -> Void) { + init(updatePollText: @escaping (String) -> Void, updateOptionText: @escaping (Int, String, Bool) -> Void, moveToNextOption: @escaping (Int) -> Void, moveToPreviousOption: @escaping (Int) -> Void, removeOption: @escaping (Int, Bool) -> Void, optionFocused: @escaping (Int, Bool) -> Void, setItemIdWithRevealedOptions: @escaping (Int?, Int?) -> Void, toggleOptionSelected: @escaping (Int) -> Void, updateAnonymous: @escaping (Bool) -> Void, updateMultipleChoice: @escaping (Bool) -> Void, displayMultipleChoiceDisabled: @escaping () -> Void, updateQuiz: @escaping (Bool) -> Void) { self.updatePollText = updatePollText self.updateOptionText = updateOptionText self.moveToNextOption = moveToNextOption @@ -212,7 +212,7 @@ private enum CreatePollEntry: ItemListNodeEntry { case textHeader(String, ItemListSectionHeaderAccessoryText) case text(String, String, Int) case optionsHeader(String) - case option(id: Int, ordering: OrderedLinkedListItemOrdering, placeholder: String, text: String, revealed: Bool, hasNext: Bool, isLast: Bool, isSelected: Bool?) + case option(id: Int, ordering: OrderedLinkedListItemOrdering, placeholder: String, text: String, revealed: Bool, hasNext: Bool, isLast: Bool, canMove: Bool, isSelected: Bool?) case optionsInfo(String) case anonymousVotes(String, Bool) case multipleChoice(String, Bool, Bool) @@ -314,11 +314,11 @@ private enum CreatePollEntry: ItemListNodeEntry { }, tag: CreatePollEntryTag.text) case let .optionsHeader(text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) - case let .option(id, _, placeholder, text, revealed, hasNext, isLast, isSelected): + case let .option(id, _, placeholder, text, revealed, hasNext, isLast, canMove, isSelected): return CreatePollOptionItem(presentationData: presentationData, id: id, placeholder: placeholder, value: text, isSelected: isSelected, maxLength: maxOptionLength, editing: CreatePollOptionItemEditing(editable: true, hasActiveRevealControls: revealed), sectionId: self.section, setItemIdWithRevealedOptions: { id, fromId in arguments.setItemIdWithRevealedOptions(id, fromId) - }, updated: { value in - arguments.updateOptionText(id, value) + }, updated: { value, isFocused in + arguments.updateOptionText(id, value, isFocused) }, next: hasNext ? { arguments.moveToNextOption(id) } : nil, delete: { focused in @@ -328,6 +328,7 @@ private enum CreatePollEntry: ItemListNodeEntry { arguments.moveToPreviousOption(id) } }, canDelete: !isLast, + canMove: canMove, focused: { isFocused in arguments.optionFocused(id, isFocused) }, toggleSelected: { @@ -393,7 +394,7 @@ private func createPollControllerEntries(presentationData: PresentationData, pee let isSecondLast = state.options.count == 2 && i == 0 let isLast = i == state.options.count - 1 let option = state.options[i].item - entries.append(.option(id: option.id, ordering: state.options[i].ordering, placeholder: isLast ? presentationData.strings.CreatePoll_AddOption : presentationData.strings.CreatePoll_OptionPlaceholder, text: option.text, revealed: state.optionIdWithRevealControls == option.id, hasNext: i != 9, isLast: isLast || isSecondLast, isSelected: state.isQuiz ? option.isSelected : nil)) + entries.append(.option(id: option.id, ordering: state.options[i].ordering, placeholder: isLast ? presentationData.strings.CreatePoll_AddOption : presentationData.strings.CreatePoll_OptionPlaceholder, text: option.text, revealed: state.optionIdWithRevealControls == option.id, hasNext: i != 9, isLast: isLast || isSecondLast, canMove: !isLast || state.options.count == 10, isSelected: state.isQuiz ? option.isSelected : nil)) } if state.options.count < maxOptionCount { entries.append(.optionsInfo(presentationData.strings.CreatePoll_AddMoreOptions(Int32(maxOptionCount - state.options.count)))) @@ -456,13 +457,15 @@ public func createPollController(context: AccountContext, peer: Peer, isQuiz: Bo return state } ensureTextVisibleImpl?() - }, updateOptionText: { id, value in + }, updateOptionText: { id, value, isFocused in var ensureVisibleId = id updateState { state in var state = state for i in 0 ..< state.options.count { if state.options[i].item.id == id { - state.focusOptionId = id + if isFocused { + state.focusOptionId = id + } state.options.update(at: i, { option in option.text = value }) @@ -478,7 +481,9 @@ public func createPollController(context: AccountContext, peer: Peer, isQuiz: Bo } return state } - ensureOptionVisibleImpl?(ensureVisibleId) + if isFocused { + ensureOptionVisibleImpl?(ensureVisibleId) + } }, moveToNextOption: { id in var resetFocusOptionId: Int? updateState { state in diff --git a/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift b/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift index ad5046f164..026339a6b6 100644 --- a/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift +++ b/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift @@ -23,15 +23,16 @@ class CreatePollOptionItem: ListViewItem, ItemListItem { let editing: CreatePollOptionItemEditing let sectionId: ItemListSectionId let setItemIdWithRevealedOptions: (Int?, Int?) -> Void - let updated: (String) -> Void + let updated: (String, Bool) -> Void let next: (() -> Void)? let delete: (Bool) -> Void let canDelete: Bool + let canMove: Bool let focused: (Bool) -> Void let toggleSelected: () -> Void let tag: ItemListItemTag? - init(presentationData: ItemListPresentationData, id: Int, placeholder: String, value: String, isSelected: Bool?, maxLength: Int, editing: CreatePollOptionItemEditing, sectionId: ItemListSectionId, setItemIdWithRevealedOptions: @escaping (Int?, Int?) -> Void, updated: @escaping (String) -> Void, next: (() -> Void)?, delete: @escaping (Bool) -> Void, canDelete: Bool, focused: @escaping (Bool) -> Void, toggleSelected: @escaping () -> Void, tag: ItemListItemTag?) { + init(presentationData: ItemListPresentationData, id: Int, placeholder: String, value: String, isSelected: Bool?, maxLength: Int, editing: CreatePollOptionItemEditing, sectionId: ItemListSectionId, setItemIdWithRevealedOptions: @escaping (Int?, Int?) -> Void, updated: @escaping (String, Bool) -> Void, next: (() -> Void)?, delete: @escaping (Bool) -> Void, canDelete: Bool, canMove: Bool, focused: @escaping (Bool) -> Void, toggleSelected: @escaping () -> Void, tag: ItemListItemTag?) { self.presentationData = presentationData self.id = id self.placeholder = placeholder @@ -45,6 +46,7 @@ class CreatePollOptionItem: ListViewItem, ItemListItem { self.next = next self.delete = delete self.canDelete = canDelete + self.canMove = canMove self.focused = focused self.toggleSelected = toggleSelected self.tag = tag @@ -182,7 +184,7 @@ class CreatePollOptionItemNode: ItemListRevealOptionsItemNode, ItemListItemNode, } func editableTextNodeDidFinishEditing(_ editableTextNode: ASEditableTextNode) { - self.editableTextNodeDidUpdateText(editableTextNode) + self.internalEditableTextNodeDidUpdateText(editableTextNode, isLosingFocus: true) self.item?.focused(false) } @@ -213,6 +215,10 @@ class CreatePollOptionItemNode: ItemListRevealOptionsItemNode, ItemListItemNode, } func editableTextNodeDidUpdateText(_ editableTextNode: ASEditableTextNode) { + self.internalEditableTextNodeDidUpdateText(editableTextNode, isLosingFocus: false) + } + + private func internalEditableTextNodeDidUpdateText(_ editableTextNode: ASEditableTextNode, isLosingFocus: Bool) { if let item = self.item { let text = self.textNode.attributedText ?? NSAttributedString() @@ -226,11 +232,11 @@ class CreatePollOptionItemNode: ItemListRevealOptionsItemNode, ItemListItemNode, if text.string != updatedAttributedText.string { self.textNode.attributedText = updatedAttributedText } - item.updated(updatedText) + item.updated(updatedText, !isLosingFocus && editableTextNode.isFirstResponder()) if hadReturn { if let next = item.next { next() - } else { + } else if !isLosingFocus { editableTextNode.resignFirstResponder() } } @@ -322,7 +328,7 @@ class CreatePollOptionItemNode: ItemListRevealOptionsItemNode, ItemListItemNode, let _ = textApply() if let currentText = strongSelf.textNode.attributedText { - if currentText.string != attributedText.string { + if currentText.string != attributedText.string || updatedTheme != nil { strongSelf.textNode.attributedText = attributedText } } else { @@ -438,7 +444,7 @@ class CreatePollOptionItemNode: ItemListRevealOptionsItemNode, ItemListItemNode, let _ = reorderSizeAndApply.1(layout.contentSize.height, displayTextLimit, transition) let reorderControlFrame = CGRect(origin: CGPoint(x: params.width + revealOffset - params.rightInset - reorderSizeAndApply.0, y: 0.0), size: CGSize(width: reorderSizeAndApply.0, height: layout.contentSize.height)) strongSelf.reorderControlNode.frame = reorderControlFrame - strongSelf.reorderControlNode.isHidden = !item.canDelete + strongSelf.reorderControlNode.isHidden = !item.canMove let _ = textLimitApply() strongSelf.textLimitNode.frame = CGRect(origin: CGPoint(x: reorderControlFrame.minX + floor((reorderControlFrame.width - textLimitLayout.size.width) / 2.0) - 4.0 - UIScreenPixel, y: max(floor(reorderControlFrame.midY + 2.0), layout.contentSize.height - 15.0 - textLimitLayout.size.height)), size: textLimitLayout.size) diff --git a/submodules/ContactListUI/Sources/ContactsController.swift b/submodules/ContactListUI/Sources/ContactsController.swift index b65dfabfec..df65463730 100644 --- a/submodules/ContactListUI/Sources/ContactsController.swift +++ b/submodules/ContactListUI/Sources/ContactsController.swift @@ -535,7 +535,7 @@ public class ContactsController: ViewController { return } if let peer = peer { - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { (strongSelf.navigationController as? NavigationController)?.pushViewController(infoController) } } else { diff --git a/submodules/Display/Display/ContainedViewLayoutTransition.swift b/submodules/Display/Display/ContainedViewLayoutTransition.swift index 45510880e9..7635ad88ba 100644 --- a/submodules/Display/Display/ContainedViewLayoutTransition.swift +++ b/submodules/Display/Display/ContainedViewLayoutTransition.swift @@ -141,6 +141,27 @@ public extension ContainedViewLayoutTransition { } } + func updateFrameAdditiveToCenter(node: ASDisplayNode, frame: CGRect, force: Bool = false, completion: ((Bool) -> Void)? = nil) { + if node.frame.equalTo(frame) && !force { + completion?(true) + } else { + switch self { + case .immediate: + node.position = frame.center + node.bounds = CGRect(origin: node.bounds.origin, size: frame.size) + if let completion = completion { + completion(true) + } + case let .animated(duration, curve): + let previousBounds = node.bounds + let previousCenter = node.frame.center + node.position = frame.center + node.bounds = CGRect(origin: node.bounds.origin, size: frame.size) + self.animatePositionAdditive(node: node, offset: CGPoint(x: previousCenter.x - frame.midX, y: previousCenter.y - frame.midY)) + } + } + } + func updateBounds(node: ASDisplayNode, bounds: CGRect, force: Bool = false, completion: ((Bool) -> Void)? = nil) { if node.bounds.equalTo(bounds) && !force { completion?(true) @@ -330,7 +351,7 @@ public extension ContainedViewLayoutTransition { func animatePositionAdditive(node: ASDisplayNode, offset: CGFloat, removeOnCompletion: Bool = true, completion: @escaping (Bool) -> Void) { switch self { case .immediate: - break + completion(true) case let .animated(duration, curve): node.layer.animatePosition(from: CGPoint(x: 0.0, y: offset), to: CGPoint(), duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: completion) } @@ -339,7 +360,7 @@ public extension ContainedViewLayoutTransition { func animatePositionAdditive(layer: CALayer, offset: CGFloat, removeOnCompletion: Bool = true, completion: @escaping (Bool) -> Void) { switch self { case .immediate: - break + completion(true) case let .animated(duration, curve): layer.animatePosition(from: CGPoint(x: 0.0, y: offset), to: CGPoint(), duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: completion) } @@ -348,7 +369,7 @@ public extension ContainedViewLayoutTransition { func animatePositionAdditive(node: ASDisplayNode, offset: CGPoint, removeOnCompletion: Bool = true, completion: (() -> Void)? = nil) { switch self { case .immediate: - break + completion?() case let .animated(duration, curve): node.layer.animatePosition(from: offset, to: CGPoint(), duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: { _ in completion?() @@ -359,7 +380,7 @@ public extension ContainedViewLayoutTransition { func animatePositionAdditive(layer: CALayer, offset: CGPoint, to toOffset: CGPoint = CGPoint(), removeOnCompletion: Bool = true, completion: (() -> Void)? = nil) { switch self { case .immediate: - break + completion?() case let .animated(duration, curve): layer.animatePosition(from: offset, to: toOffset, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: { _ in completion?() @@ -546,6 +567,30 @@ public extension ContainedViewLayoutTransition { } } + func animateTransformScale(view: UIView, from fromScale: CGFloat, completion: ((Bool) -> Void)? = nil) { + let t = view.layer.transform + let currentScale = sqrt((t.m11 * t.m11) + (t.m12 * t.m12) + (t.m13 * t.m13)) + if currentScale.isEqual(to: fromScale) { + if let completion = completion { + completion(true) + } + return + } + + switch self { + case .immediate: + if let completion = completion { + completion(true) + } + case let .animated(duration, curve): + view.layer.animateScale(from: fromScale, to: currentScale, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, completion: { result in + if let completion = completion { + completion(result) + } + }) + } + } + func updateTransformScale(node: ASDisplayNode, scale: CGFloat, beginWithCurrentState: Bool = false, completion: ((Bool) -> Void)? = nil) { let t = node.layer.transform let currentScale = sqrt((t.m11 * t.m11) + (t.m12 * t.m12) + (t.m13 * t.m13)) @@ -637,6 +682,40 @@ public extension ContainedViewLayoutTransition { } } + func updateSublayerTransformScaleAdditive(node: ASDisplayNode, scale: CGFloat, completion: ((Bool) -> Void)? = nil) { + if !node.isNodeLoaded { + node.subnodeTransform = CATransform3DMakeScale(scale, scale, 1.0) + completion?(true) + return + } + let t = node.layer.sublayerTransform + let currentScale = sqrt((t.m11 * t.m11) + (t.m12 * t.m12) + (t.m13 * t.m13)) + if currentScale.isEqual(to: scale) { + if let completion = completion { + completion(true) + } + return + } + + switch self { + case .immediate: + node.layer.sublayerTransform = CATransform3DMakeScale(scale, scale, 1.0) + if let completion = completion { + completion(true) + } + case let .animated(duration, curve): + let t = node.layer.sublayerTransform + let currentScale = sqrt((t.m11 * t.m11) + (t.m12 * t.m12) + (t.m13 * t.m13)) + node.layer.sublayerTransform = CATransform3DMakeScale(scale, scale, 1.0) + node.layer.animate(from: -(scale - currentScale) as NSNumber, to: 0.0 as NSNumber, keyPath: "sublayerTransform.scale", timingFunction: curve.timingFunction, duration: duration, delay: 0.0, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: true, additive: true, completion: { + result in + if let completion = completion { + completion(result) + } + }) + } + } + func updateSublayerTransformScaleAndOffset(node: ASDisplayNode, scale: CGFloat, offset: CGPoint, beginWithCurrentState: Bool = false, completion: ((Bool) -> Void)? = nil) { if !node.isNodeLoaded { node.subnodeTransform = CATransform3DMakeScale(scale, scale, 1.0) diff --git a/submodules/Display/Display/GenerateImage.swift b/submodules/Display/Display/GenerateImage.swift index cabf6f5c54..4b7f38fbe9 100644 --- a/submodules/Display/Display/GenerateImage.swift +++ b/submodules/Display/Display/GenerateImage.swift @@ -238,6 +238,8 @@ public func generateStretchableFilledCircleImage(diameter: CGFloat, color: UICol let cap: Int if intDiameter == 3 { cap = 1 + } else if intDiameter == 2 { + cap = 3 } else if intRadius == 1 { cap = 2 } else { @@ -266,6 +268,35 @@ public func generateVerticallyStretchableFilledCircleImage(radius: CGFloat, colo })?.stretchableImage(withLeftCapWidth: Int(radius), topCapHeight: Int(radius)) } +public func generateSmallHorizontalStretchableFilledCircleImage(diameter: CGFloat, color: UIColor?, backgroundColor: UIColor? = nil) -> UIImage? { + return generateImage(CGSize(width: diameter + 1.0, height: diameter), contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + + if let subImage = generateImage(CGSize(width: diameter + 1.0, height: diameter), contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setFillColor(UIColor.black.cgColor) + context.fillEllipse(in: CGRect(origin: CGPoint(), size: CGSize(width: diameter, height: diameter))) + context.fill(CGRect(origin: CGPoint(x: diameter / 2.0, y: 0.0), size: CGSize(width: 1.0, height: diameter))) + context.fillEllipse(in: CGRect(origin: CGPoint(x: 1.0, y: 0.0), size: CGSize(width: diameter, height: diameter))) + }) { + if let backgroundColor = backgroundColor { + context.setFillColor(backgroundColor.cgColor) + context.fill(CGRect(origin: CGPoint(), size: size)) + } + + if let color = color { + context.setFillColor(color.cgColor) + } else { + context.setFillColor(UIColor.clear.cgColor) + context.setBlendMode(.copy) + } + + context.clip(to: CGRect(origin: CGPoint(), size: size), mask: subImage.cgImage!) + context.fill(CGRect(origin: CGPoint(), size: size)) + } + })?.stretchableImage(withLeftCapWidth: Int(diameter / 2), topCapHeight: Int(diameter / 2)) +} + public func generateTintedImage(image: UIImage?, color: UIColor, backgroundColor: UIColor? = nil) -> UIImage? { guard let image = image else { return nil diff --git a/submodules/Display/Display/ImageCorners.swift b/submodules/Display/Display/ImageCorners.swift index ce45a9565a..948a4d385d 100644 --- a/submodules/Display/Display/ImageCorners.swift +++ b/submodules/Display/Display/ImageCorners.swift @@ -109,7 +109,6 @@ private func ==(lhs: Tail, rhs: Tail) -> Bool { } private var cachedCorners = Atomic<[Corner: DrawingContext]>(value: [:]) -private var cachedTails = Atomic<[Tail: DrawingContext]>(value: [:]) private func cornerContext(_ corner: Corner) -> DrawingContext { let cached: DrawingContext? = cachedCorners.with { @@ -122,20 +121,22 @@ private func cornerContext(_ corner: Corner) -> DrawingContext { let context = DrawingContext(size: CGSize(width: CGFloat(corner.radius), height: CGFloat(corner.radius)), clear: true) context.withContext { c in - c.setBlendMode(.copy) + c.clear(CGRect(origin: CGPoint(), size: CGSize(width: CGFloat(corner.radius), height: CGFloat(corner.radius)))) c.setFillColor(UIColor.black.cgColor) - let rect: CGRect switch corner { - case let .TopLeft(radius): - rect = CGRect(origin: CGPoint(), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) - case let .TopRight(radius): - rect = CGRect(origin: CGPoint(x: -CGFloat(radius), y: 0.0), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) - case let .BottomLeft(radius): - rect = CGRect(origin: CGPoint(x: 0.0, y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) - case let .BottomRight(radius): - rect = CGRect(origin: CGPoint(x: -CGFloat(radius), y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) + case let .TopLeft(radius): + let rect = CGRect(origin: CGPoint(), size: CGSize(width: CGFloat(radius * 2), height: CGFloat(radius * 2))) + c.fillEllipse(in: rect) + case let .TopRight(radius): + let rect = CGRect(origin: CGPoint(x: -CGFloat(radius), y: 0.0), size: CGSize(width: CGFloat(radius * 2), height: CGFloat(radius * 2))) + c.fillEllipse(in: rect) + case let .BottomLeft(radius): + let rect = CGRect(origin: CGPoint(x: 0.0, y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius * 2), height: CGFloat(radius * 2))) + c.fillEllipse(in: rect) + case let .BottomRight(radius): + let rect = CGRect(origin: CGPoint(x: -CGFloat(radius), y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius * 2), height: CGFloat(radius * 2))) + c.fillEllipse(in: rect) } - c.fillEllipse(in: rect) } let _ = cachedCorners.modify { current in @@ -148,62 +149,6 @@ private func cornerContext(_ corner: Corner) -> DrawingContext { } } -private func tailContext(_ tail: Tail) -> DrawingContext { - let cached: DrawingContext? = cachedTails.with { - return $0[tail] - } - - if let cached = cached { - return cached - } else { - let context = DrawingContext(size: CGSize(width: CGFloat(tail.radius) + 3.0, height: CGFloat(tail.radius)), clear: true) - - context.withContext { c in - c.setBlendMode(.copy) - c.setFillColor(UIColor.black.cgColor) - let rect: CGRect - switch tail { - case let .BottomLeft(radius): - rect = CGRect(origin: CGPoint(x: 3.0, y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) - - c.move(to: CGPoint(x: 3.0, y: 1.0)) - c.addLine(to: CGPoint(x: 3.0, y: 11.0)) - c.addLine(to: CGPoint(x: 2.3, y: 13.0)) - c.addLine(to: CGPoint(x: 0.0, y: 16.6)) - c.addLine(to: CGPoint(x: 4.5, y: 15.5)) - c.addLine(to: CGPoint(x: 6.5, y: 14.3)) - c.addLine(to: CGPoint(x: 9.0, y: 12.5)) - c.closePath() - c.fillPath() - case let .BottomRight(radius): - rect = CGRect(origin: CGPoint(x: 3.0, y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) - - c.translateBy(x: context.size.width / 2.0, y: context.size.height / 2.0) - c.scaleBy(x: -1.0, y: 1.0) - c.translateBy(x: -context.size.width / 2.0, y: -context.size.height / 2.0) - - c.move(to: CGPoint(x: 3.0, y: 1.0)) - c.addLine(to: CGPoint(x: 3.0, y: 11.0)) - c.addLine(to: CGPoint(x: 2.3, y: 13.0)) - c.addLine(to: CGPoint(x: 0.0, y: 16.6)) - c.addLine(to: CGPoint(x: 4.5, y: 15.5)) - c.addLine(to: CGPoint(x: 6.5, y: 14.3)) - c.addLine(to: CGPoint(x: 9.0, y: 12.5)) - c.closePath() - c.fillPath() - } - c.fillEllipse(in: rect) - } - - let _ = cachedTails.modify { current in - var current = current - current[tail] = context - return current - } - return context - } -} - public func addCorners(_ context: DrawingContext, arguments: TransformImageArguments) { let corners = arguments.corners let drawingRect = arguments.drawingRect @@ -223,23 +168,24 @@ public func addCorners(_ context: DrawingContext, arguments: TransformImageArgum let corner = cornerContext(.BottomLeft(Int(radius))) context.blt(corner, at: CGPoint(x: drawingRect.minX, y: drawingRect.maxY - radius)) } - case let .Tail(radius, enabled): + case let .Tail(radius, image): if radius > CGFloat.ulpOfOne { - if enabled { - let tail = tailContext(.BottomLeft(Int(radius))) - let color = context.colorAt(CGPoint(x: drawingRect.minX, y: drawingRect.maxY - 1.0)) - context.withContext { c in - c.clear(CGRect(x: drawingRect.minX - 3.0, y: 0.0, width: 3.0, height: drawingRect.maxY - 6.0)) - c.setFillColor(color.cgColor) - c.fill(CGRect(x: 0.0, y: drawingRect.maxY - 6.0, width: 3.0, height: 6.0)) - } - context.blt(tail, at: CGPoint(x: drawingRect.minX - 3.0, y: drawingRect.maxY - radius)) - } else { - let corner = cornerContext(.BottomLeft(Int(radius))) - context.blt(corner, at: CGPoint(x: drawingRect.minX, y: drawingRect.maxY - radius)) + let color = context.colorAt(CGPoint(x: drawingRect.minX, y: drawingRect.maxY - 1.0)) + context.withContext { c in + c.clear(CGRect(x: drawingRect.minX - 4.0, y: 0.0, width: 4.0, height: drawingRect.maxY - 6.0)) + c.setFillColor(color.cgColor) + c.fill(CGRect(x: 0.0, y: drawingRect.maxY - 7.0, width: 4.0, height: 7.0)) + c.setBlendMode(.destinationIn) + let cornerRect = CGRect(origin: CGPoint(x: drawingRect.minX - 6.0, y: drawingRect.maxY - image.size.height), size: image.size) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) + c.draw(image.cgImage!, in: cornerRect) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) } } - } switch corners.bottomRight { @@ -248,20 +194,22 @@ public func addCorners(_ context: DrawingContext, arguments: TransformImageArgum let corner = cornerContext(.BottomRight(Int(radius))) context.blt(corner, at: CGPoint(x: drawingRect.maxX - radius, y: drawingRect.maxY - radius)) } - case let .Tail(radius, enabled): + case let .Tail(radius, image): if radius > CGFloat.ulpOfOne { - if enabled { - let tail = tailContext(.BottomRight(Int(radius))) - let color = context.colorAt(CGPoint(x: drawingRect.maxX - 1.0, y: drawingRect.maxY - 1.0)) - context.withContext { c in - c.clear(CGRect(x: drawingRect.maxX, y: 0.0, width: 3.0, height: drawingRect.maxY - 6.0)) - c.setFillColor(color.cgColor) - c.fill(CGRect(x: drawingRect.maxX, y: drawingRect.maxY - 6.0, width: 3.0, height: 6.0)) - } - context.blt(tail, at: CGPoint(x: drawingRect.maxX - radius, y: drawingRect.maxY - radius)) - } else { - let corner = cornerContext(.BottomRight(Int(radius))) - context.blt(corner, at: CGPoint(x: drawingRect.maxX - radius, y: drawingRect.maxY - radius)) + let color = context.colorAt(CGPoint(x: drawingRect.maxX - 1.0, y: drawingRect.maxY - 1.0)) + context.withContext { c in + c.clear(CGRect(x: drawingRect.maxX, y: 0.0, width: 4.0, height: drawingRect.maxY - image.size.height)) + c.setFillColor(color.cgColor) + c.fill(CGRect(x: drawingRect.maxX, y: drawingRect.maxY - 7.0, width: 5.0, height: 7.0)) + c.setBlendMode(.destinationIn) + let cornerRect = CGRect(origin: CGPoint(x: drawingRect.maxX - image.size.width + 6.0, y: drawingRect.maxY - image.size.height), size: image.size) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) + c.draw(image.cgImage!, in: cornerRect) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) } } } diff --git a/submodules/Display/Display/ImageNode.swift b/submodules/Display/Display/ImageNode.swift index 99192e4895..87422abbc6 100644 --- a/submodules/Display/Display/ImageNode.swift +++ b/submodules/Display/Display/ImageNode.swift @@ -8,12 +8,12 @@ private let dispatcher = displayLinkDispatcher public enum ImageCorner: Equatable { case Corner(CGFloat) - case Tail(CGFloat, Bool) + case Tail(CGFloat, UIImage) public var extendedInsets: CGSize { switch self { case .Tail: - return CGSize(width: 3.0, height: 0.0) + return CGSize(width: 4.0, height: 0.0) default: return CGSize() } @@ -36,15 +36,6 @@ public enum ImageCorner: Equatable { return radius } } - - public func scaledBy(_ scale: CGFloat) -> ImageCorner { - switch self { - case let .Corner(radius): - return .Corner(radius * scale) - case let .Tail(radius, enabled): - return .Tail(radius * scale, enabled) - } - } } public func ==(lhs: ImageCorner, rhs: ImageCorner) -> Bool { @@ -56,8 +47,8 @@ public func ==(lhs: ImageCorner, rhs: ImageCorner) -> Bool { default: return false } - case let .Tail(lhsRadius, lhsEnabled): - if case let .Tail(rhsRadius, rhsEnabled) = rhs, lhsRadius.isEqual(to: rhsRadius), lhsEnabled == rhsEnabled { + case let .Tail(lhsRadius, lhsImage): + if case let .Tail(rhsRadius, rhsImage) = rhs, lhsRadius.isEqual(to: rhsRadius), lhsImage === rhsImage { return true } else { return false @@ -124,10 +115,6 @@ public struct ImageCorners: Equatable { public func withRemovedTails() -> ImageCorners { return ImageCorners(topLeft: self.topLeft.withoutTail, topRight: self.topRight.withoutTail, bottomLeft: self.bottomLeft.withoutTail, bottomRight: self.bottomRight.withoutTail) } - - public func scaledBy(_ scale: CGFloat) -> ImageCorners { - return ImageCorners(topLeft: self.topLeft.scaledBy(scale), topRight: self.topRight.scaledBy(scale), bottomLeft: self.bottomLeft.scaledBy(scale), bottomRight: self.bottomRight.scaledBy(scale)) - } } public func ==(lhs: ImageCorners, rhs: ImageCorners) -> Bool { diff --git a/submodules/Display/Display/ImmediateTextNode.swift b/submodules/Display/Display/ImmediateTextNode.swift index c8c70cc94f..25d8fb69e7 100644 --- a/submodules/Display/Display/ImmediateTextNode.swift +++ b/submodules/Display/Display/ImmediateTextNode.swift @@ -34,6 +34,27 @@ public class ImmediateTextNode: TextNode { public var tapAttributeAction: (([NSAttributedString.Key: Any]) -> Void)? public var longTapAttributeAction: (([NSAttributedString.Key: Any]) -> Void)? + public func makeCopy() -> TextNode { + let node = TextNode() + node.cachedLayout = self.cachedLayout + node.frame = self.frame + if let subnodes = self.subnodes { + for subnode in subnodes { + if let subnode = subnode as? ASImageNode { + let copySubnode = ASImageNode() + copySubnode.isLayerBacked = subnode.isLayerBacked + copySubnode.image = subnode.image + copySubnode.displaysAsynchronously = false + copySubnode.displayWithoutProcessing = true + copySubnode.frame = subnode.frame + copySubnode.alpha = subnode.alpha + node.addSubnode(copySubnode) + } + } + } + return node + } + public func updateLayout(_ constrainedSize: CGSize) -> CGSize { let makeLayout = TextNode.asyncLayout(self) let (layout, apply) = makeLayout(TextNodeLayoutArguments(attributedString: self.attributedText, backgroundColor: nil, maximumNumberOfLines: self.maximumNumberOfLines, truncationType: self.truncationType, constrainedSize: constrainedSize, alignment: self.textAlignment, lineSpacing: self.lineSpacing, cutout: nil, insets: self.insets, textShadowColor: self.textShadowColor, textStroke: self.textStroke)) diff --git a/submodules/Display/Display/InteractiveTransitionGestureRecognizer.swift b/submodules/Display/Display/InteractiveTransitionGestureRecognizer.swift index 25b3a4db81..507899560a 100644 --- a/submodules/Display/Display/InteractiveTransitionGestureRecognizer.swift +++ b/submodules/Display/Display/InteractiveTransitionGestureRecognizer.swift @@ -5,6 +5,9 @@ private func hasHorizontalGestures(_ view: UIView, point: CGPoint?) -> Bool { if view.disablesInteractiveTransitionGestureRecognizer { return true } + if let disablesInteractiveTransitionGestureRecognizerNow = view.disablesInteractiveTransitionGestureRecognizerNow, disablesInteractiveTransitionGestureRecognizerNow() { + return true + } if let point = point, let test = view.interactiveTransitionGestureRecognizerTest, test(point) { return true diff --git a/submodules/Display/Display/ListView.swift b/submodules/Display/Display/ListView.swift index 964435ecb7..9e231040b7 100644 --- a/submodules/Display/Display/ListView.swift +++ b/submodules/Display/Display/ListView.swift @@ -60,6 +60,12 @@ public final class ListViewBackingView: UIView { override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { if !self.isHidden, let target = self.target { + if target.bounds.contains(point) { + if target.decelerationAnimator != nil { + target.decelerationAnimator?.isPaused = true + target.decelerationAnimator = nil + } + } if target.limitHitTestToNodes, !target.internalHitTest(point, with: event) { return nil } @@ -125,7 +131,7 @@ public enum GeneralScrollDirection { } open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGestureRecognizerDelegate { - final let scroller: ListViewScroller + public final let scroller: ListViewScroller private final var visibleSize: CGSize = CGSize() public private(set) final var insets = UIEdgeInsets() public final var visualInsets: UIEdgeInsets? @@ -230,6 +236,22 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture public final var synchronousNodes = false public final var debugInfo = false + public var enableExtractedBackgrounds: Bool = false { + didSet { + if self.enableExtractedBackgrounds != oldValue { + if self.enableExtractedBackgrounds { + let extractedBackgroundsContainerNode = ASDisplayNode() + self.extractedBackgroundsContainerNode = extractedBackgroundsContainerNode + self.insertSubnode(extractedBackgroundsContainerNode, at: 0) + } else if let extractedBackgroundsContainerNode = self.extractedBackgroundsContainerNode { + self.extractedBackgroundsContainerNode = nil + extractedBackgroundsContainerNode.removeFromSupernode() + } + } + } + } + private final var extractedBackgroundsContainerNode: ASDisplayNode? + private final var items: [ListViewItem] = [] private final var itemNodes: [ListViewItemNode] = [] private final var itemHeaderNodes: [Int64: ListViewItemHeaderNode] = [:] @@ -669,6 +691,48 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture } } + fileprivate var decelerationAnimator: ConstantDisplayLinkAnimator? + private var accumulatedTransferVelocityOffset: CGFloat = 0.0 + + public func transferVelocity(_ velocity: CGFloat) { + self.decelerationAnimator?.isPaused = true + let startTime = CACurrentMediaTime() + let decelerationRate: CGFloat = 0.998 + self.decelerationAnimator = ConstantDisplayLinkAnimator(update: { [weak self] in + guard let strongSelf = self else { + return + } + let t = CACurrentMediaTime() - startTime + var currentVelocity = velocity * 15.0 * CGFloat(pow(Double(decelerationRate), 1000.0 * t)) + strongSelf.accumulatedTransferVelocityOffset += currentVelocity + let signFactor: CGFloat = strongSelf.accumulatedTransferVelocityOffset >= 0.0 ? 1.0 : -1.0 + let remainder = abs(strongSelf.accumulatedTransferVelocityOffset).remainder(dividingBy: UIScreenPixel) + //print("accumulated \(strongSelf.accumulatedTransferVelocityOffset), \(remainder), resulting accumulated \(strongSelf.accumulatedTransferVelocityOffset - remainder * signFactor) add delta \(strongSelf.accumulatedTransferVelocityOffset - remainder * signFactor)") + var currentOffset = strongSelf.scroller.contentOffset + let addedDela = strongSelf.accumulatedTransferVelocityOffset - remainder * signFactor + currentOffset.y += addedDela + strongSelf.accumulatedTransferVelocityOffset -= addedDela + let maxOffset = strongSelf.scroller.contentSize.height - strongSelf.scroller.bounds.height + if currentOffset.y >= maxOffset { + currentOffset.y = maxOffset + currentVelocity = 0.0 + } + if currentOffset.y < 0.0 { + currentOffset.y = 0.0 + currentVelocity = 0.0 + } + + if abs(currentVelocity) < 0.1 { + strongSelf.decelerationAnimator?.isPaused = true + strongSelf.decelerationAnimator = nil + } + var contentOffset = strongSelf.scroller.contentOffset + contentOffset.y = floorToScreenPixels(currentOffset.y) + strongSelf.scroller.setContentOffset(contentOffset, animated: false) + }) + self.decelerationAnimator?.isPaused = false + } + public func scrollViewDidScroll(_ scrollView: UIScrollView) { self.updateScrollViewDidScroll(scrollView, synchronous: false) } @@ -1095,7 +1159,11 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture topItemOverscrollBackground = ListViewOverscrollBackgroundNode(color: value.color) topItemOverscrollBackground.isLayerBacked = true self.topItemOverscrollBackground = topItemOverscrollBackground - self.insertSubnode(topItemOverscrollBackground, at: 0) + if let extractedBackgroundsContainerNode = self.extractedBackgroundsContainerNode { + self.insertSubnode(topItemOverscrollBackground, aboveSubnode: extractedBackgroundsContainerNode) + } else { + self.insertSubnode(topItemOverscrollBackground, at: 0) + } } var topItemFound = false var topItemNodeIndex: Int? @@ -1203,7 +1271,11 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture bottomItemOverscrollBackground = ASDisplayNode() bottomItemOverscrollBackground.backgroundColor = color bottomItemOverscrollBackground.isLayerBacked = true - self.insertSubnode(bottomItemOverscrollBackground, at: 0) + if let extractedBackgroundsContainerNode = self.extractedBackgroundsContainerNode { + self.insertSubnode(bottomItemOverscrollBackground, aboveSubnode: extractedBackgroundsContainerNode) + } else { + self.insertSubnode(bottomItemOverscrollBackground, at: 0) + } self.bottomItemOverscrollBackground = bottomItemOverscrollBackground } @@ -2295,13 +2367,21 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture } else { self.addSubnode(node) } + if let extractedBackgroundsNode = node.extractedBackgroundNode { + self.extractedBackgroundsContainerNode?.addSubnode(extractedBackgroundsNode) + } } else { if animated { if let topItemOverscrollBackground = self.topItemOverscrollBackground { self.insertSubnode(node, aboveSubnode: topItemOverscrollBackground) + } else if let extractedBackgroundsContainerNode = self.extractedBackgroundsContainerNode { + self.insertSubnode(node, aboveSubnode: extractedBackgroundsContainerNode) } else { self.insertSubnode(node, at: 0) } + if let extractedBackgroundsNode = node.extractedBackgroundNode { + self.extractedBackgroundsContainerNode?.addSubnode(extractedBackgroundsNode) + } } else { if let itemNode = self.reorderNode?.itemNode, itemNode.supernode == self { self.insertSubnode(node, belowSubnode: itemNode) @@ -2312,6 +2392,9 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture } else { self.addSubnode(node) } + if let extractedBackgroundsNode = node.extractedBackgroundNode { + self.extractedBackgroundsContainerNode?.addSubnode(extractedBackgroundsNode) + } } } case let .InsertDisappearingPlaceholder(index, referenceNodeObject, offsetDirection): @@ -2340,6 +2423,9 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture } else { self.addSubnode(referenceNode) } + if let extractedBackgroundsNode = referenceNode.extractedBackgroundNode { + self.extractedBackgroundsContainerNode?.addSubnode(extractedBackgroundsNode) + } } } else { assertionFailure() @@ -2846,6 +2932,9 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture } else { self.addSubnode(itemNode) } + if let extractedBackgroundsNode = itemNode.extractedBackgroundNode { + self.extractedBackgroundsContainerNode?.addSubnode(extractedBackgroundsNode) + } } var temporaryHeaderNodes: [ListViewItemHeaderNode] = [] @@ -2945,6 +3034,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture animation.completion = { _ in for itemNode in temporaryPreviousNodes { itemNode.removeFromSupernode() + itemNode.extractedBackgroundNode?.removeFromSupernode() } for headerNode in temporaryHeaderNodes { headerNode.removeFromSupernode() @@ -3023,7 +3113,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture let node = self.itemNodes[index] self.itemNodes.remove(at: index) node.removeFromSupernode() - + node.extractedBackgroundNode?.removeFromSupernode() node.accessoryItemNode?.removeFromSupernode() node.setAccessoryItemNode(nil, leftInset: self.insets.left, rightInset: self.insets.right) node.headerAccessoryItemNode?.removeFromSupernode() diff --git a/submodules/Display/Display/ListViewItemNode.swift b/submodules/Display/Display/ListViewItemNode.swift index 608580a667..9ef0d00b25 100644 --- a/submodules/Display/Display/ListViewItemNode.swift +++ b/submodules/Display/Display/ListViewItemNode.swift @@ -110,6 +110,10 @@ open class ListViewItemNode: ASDisplayNode { } } + open var extractedBackgroundNode: ASDisplayNode? { + return nil + } + private final var spring: ListViewItemSpring? private final var animations: [(String, ListViewAnimation)] = [] @@ -555,12 +559,19 @@ open class ListViewItemNode: ASDisplayNode { public func updateFrame(_ frame: CGRect, within containerSize: CGSize) { self.frame = frame self.updateAbsoluteRect(frame, within: containerSize) + if let extractedBackgroundNode = self.extractedBackgroundNode { + extractedBackgroundNode.frame = frame.offsetBy(dx: 0.0, dy: -self.insets.top) + } } open func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) { } open func applyAbsoluteOffset(value: CGFloat, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) { + if let extractedBackgroundNode = self.extractedBackgroundNode { + let transition: ContainedViewLayoutTransition = .animated(duration: duration, curve: animationCurve) + transition.animatePositionAdditive(node: extractedBackgroundNode, offset: CGPoint(x: 0.0, y: -value)) + } } open func snapshotForReordering() -> UIView? { diff --git a/submodules/Display/Display/ListViewScroller.swift b/submodules/Display/Display/ListViewScroller.swift index 7e8921f718..c77b2207cb 100644 --- a/submodules/Display/Display/ListViewScroller.swift +++ b/submodules/Display/Display/ListViewScroller.swift @@ -1,29 +1,27 @@ import UIKit -class ListViewScroller: UIScrollView, UIGestureRecognizerDelegate { - override init(frame: CGRect) { +public final class ListViewScroller: UIScrollView, UIGestureRecognizerDelegate { + override public init(frame: CGRect) { super.init(frame: frame) - #if os(iOS) self.scrollsToTop = false if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.contentInsetAdjustmentBehavior = .never } - #endif } - required init?(coder aDecoder: NSCoder) { + required public init?(coder aDecoder: NSCoder) { fatalError("init(coder:) has not been implemented") } - @objc func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { + public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { if otherGestureRecognizer is ListViewTapGestureRecognizer { return true } return false } - override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { + override public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { if gestureRecognizer is UIPanGestureRecognizer, let gestureRecognizers = gestureRecognizer.view?.gestureRecognizers { for otherGestureRecognizer in gestureRecognizers { if otherGestureRecognizer !== gestureRecognizer, let panGestureRecognizer = otherGestureRecognizer as? UIPanGestureRecognizer, panGestureRecognizer.minimumNumberOfTouches == 2 { @@ -36,9 +34,7 @@ class ListViewScroller: UIScrollView, UIGestureRecognizerDelegate { } } - #if os(iOS) - override func touchesShouldCancel(in view: UIView) -> Bool { + override public func touchesShouldCancel(in view: UIView) -> Bool { return true } - #endif } diff --git a/submodules/Display/Display/Navigation/NavigationContainer.swift b/submodules/Display/Display/Navigation/NavigationContainer.swift index ec6f8803d5..282101e452 100644 --- a/submodules/Display/Display/Navigation/NavigationContainer.swift +++ b/submodules/Display/Display/Navigation/NavigationContainer.swift @@ -133,6 +133,13 @@ final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate { }*/ } + func hasNonReadyControllers() -> Bool { + if let pending = self.state.pending, !pending.isReady { + return true + } + return false + } + public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { return false } @@ -181,10 +188,21 @@ final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate { bottomController.viewWillAppear(true) let bottomNode = bottomController.displayNode - let navigationTransitionCoordinator = NavigationTransitionCoordinator(transition: .Pop, container: self, topNode: topNode, topNavigationBar: topController.navigationBar, bottomNode: bottomNode, bottomNavigationBar: bottomController.navigationBar, didUpdateProgress: { [weak self] progress, transition, topFrame, bottomFrame in + let navigationTransitionCoordinator = NavigationTransitionCoordinator(transition: .Pop, isInteractive: true, container: self, topNode: topNode, topNavigationBar: topController.navigationBar, bottomNode: bottomNode, bottomNavigationBar: bottomController.navigationBar, didUpdateProgress: { [weak self, weak bottomController] progress, transition, topFrame, bottomFrame in if let strongSelf = self { if let top = strongSelf.state.top { strongSelf.syncKeyboard(leftEdge: top.value.displayNode.frame.minX, transition: transition) + + var updatedStatusBarStyle = strongSelf.statusBarStyle + if let bottomController = bottomController, progress >= 0.3 { + updatedStatusBarStyle = bottomController.statusBar.statusBarStyle + } else { + updatedStatusBarStyle = top.value.statusBar.statusBarStyle + } + if strongSelf.statusBarStyle != updatedStatusBarStyle { + strongSelf.statusBarStyle = updatedStatusBarStyle + strongSelf.statusBarStyleUpdated?(.animated(duration: 0.3, curve: .easeInOut)) + } } } }) @@ -337,7 +355,24 @@ final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate { } } self.applyLayout(layout: updatedLayout, to: top, isMaster: true, transition: transition) - updatedStatusBarStyle = top.value.statusBar.statusBarStyle + if let childTransition = self.state.transition, childTransition.coordinator.isInteractive { + switch childTransition.type { + case .push: + if childTransition.coordinator.progress >= 0.3 { + updatedStatusBarStyle = top.value.statusBar.statusBarStyle + } else { + updatedStatusBarStyle = childTransition.previous.value.statusBar.statusBarStyle + } + case .pop: + if childTransition.coordinator.progress >= 0.3 { + updatedStatusBarStyle = childTransition.previous.value.statusBar.statusBarStyle + } else { + updatedStatusBarStyle = top.value.statusBar.statusBarStyle + } + } + } else { + updatedStatusBarStyle = top.value.statusBar.statusBarStyle + } } else { updatedStatusBarStyle = .Ignore } @@ -377,7 +412,7 @@ final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate { } toValue.value.setIgnoreAppearanceMethodInvocations(false) - let topTransition = TopTransition(type: transitionType, previous: fromValue, coordinator: NavigationTransitionCoordinator(transition: mappedTransitionType, container: self, topNode: topController.displayNode, topNavigationBar: topController.navigationBar, bottomNode: bottomController.displayNode, bottomNavigationBar: bottomController.navigationBar, didUpdateProgress: { [weak self] _, transition, topFrame, bottomFrame in + let topTransition = TopTransition(type: transitionType, previous: fromValue, coordinator: NavigationTransitionCoordinator(transition: mappedTransitionType, isInteractive: false, container: self, topNode: topController.displayNode, topNavigationBar: topController.navigationBar, bottomNode: bottomController.displayNode, bottomNavigationBar: bottomController.navigationBar, didUpdateProgress: { [weak self] _, transition, topFrame, bottomFrame in guard let strongSelf = self else { return } diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Display/Navigation/NavigationController.swift index 037b2fc65d..b709a8a5fd 100644 --- a/submodules/Display/Display/Navigation/NavigationController.swift +++ b/submodules/Display/Display/Navigation/NavigationController.swift @@ -274,6 +274,18 @@ open class NavigationController: UINavigationController, ContainableController, return true } } + if let rootContainer = self.rootContainer { + switch rootContainer { + case let .flat(container): + if container.hasNonReadyControllers() { + return true + } + case let .split(splitContainer): + if splitContainer.hasNonReadyControllers() { + return true + } + } + } return false } @@ -1001,27 +1013,8 @@ open class NavigationController: UINavigationController, ContainableController, } public func pushViewController(_ controller: ViewController, animated: Bool = true, completion: @escaping () -> Void) { - let navigateAction: () -> Void = { [weak self] in - guard let strongSelf = self else { - return - } - - if !controller.hasActiveInput { - //strongSelf.view.endEditing(true) - } - /*strongSelf.scheduleAfterLayout({ - guard let strongSelf = self else { - return - }*/ - strongSelf.pushViewController(controller, animated: animated) - completion() - //}) - } - - /*if let lastController = self.viewControllers.last as? ViewController, !lastController.attemptNavigation(navigateAction) { - } else {*/ - navigateAction() - //} + self.pushViewController(controller, animated: animated) + completion() } open override func pushViewController(_ viewController: UIViewController, animated: Bool) { diff --git a/submodules/Display/Display/Navigation/NavigationSplitContainer.swift b/submodules/Display/Display/Navigation/NavigationSplitContainer.swift index 155fd2a186..ac6c7772db 100644 --- a/submodules/Display/Display/Navigation/NavigationSplitContainer.swift +++ b/submodules/Display/Display/Navigation/NavigationSplitContainer.swift @@ -57,6 +57,16 @@ final class NavigationSplitContainer: ASDisplayNode { self.view.addSubview(self.detailScrollToTopView) } + func hasNonReadyControllers() -> Bool { + if self.masterContainer.hasNonReadyControllers() { + return true + } + if self.detailContainer.hasNonReadyControllers() { + return true + } + return false + } + func updateTheme(theme: NavigationControllerTheme) { self.separator.backgroundColor = theme.navigationBar.separatorColor } diff --git a/submodules/Display/Display/NavigationBar.swift b/submodules/Display/Display/NavigationBar.swift index e26a082850..ff66977045 100644 --- a/submodules/Display/Display/NavigationBar.swift +++ b/submodules/Display/Display/NavigationBar.swift @@ -111,6 +111,9 @@ open class NavigationBar: ASDisplayNode { public var backPressed: () -> () = { } + public var userInfo: Any? + public var makeCustomTransitionNode: ((NavigationBar, Bool) -> CustomNavigationTransitionNode?)? + private var collapsed: Bool { get { return self.frame.size.height.isLess(than: 44.0) @@ -243,6 +246,8 @@ open class NavigationBar: ASDisplayNode { } } + public var customBackButtonText: String? + private var title: String? { didSet { if let title = self.title { @@ -261,7 +266,7 @@ open class NavigationBar: ASDisplayNode { } } - private var titleView: UIView? { + public private(set) var titleView: UIView? { didSet { if let oldValue = oldValue { oldValue.removeFromSuperview() @@ -377,7 +382,9 @@ open class NavigationBar: ASDisplayNode { case let .item(itemValue): self.previousItemListenerKey = itemValue.addSetTitleListener { [weak self] _, _ in if let strongSelf = self, let previousItem = strongSelf.previousItem, case let .item(itemValue) = previousItem { - if let backBarButtonItem = itemValue.backBarButtonItem { + if let customBackButtonText = strongSelf.customBackButtonText { + strongSelf.backButtonNode.updateManualText(customBackButtonText) + } else if let backBarButtonItem = itemValue.backBarButtonItem { strongSelf.backButtonNode.updateManualText(backBarButtonItem.title ?? "") } else { strongSelf.backButtonNode.updateManualText(itemValue.title ?? "") @@ -389,7 +396,9 @@ open class NavigationBar: ASDisplayNode { self.previousItemBackListenerKey = itemValue.addSetBackBarButtonItemListener { [weak self] _, _, _ in if let strongSelf = self, let previousItem = strongSelf.previousItem, case let .item(itemValue) = previousItem { - if let backBarButtonItem = itemValue.backBarButtonItem { + if let customBackButtonText = strongSelf.customBackButtonText { + strongSelf.backButtonNode.updateManualText(customBackButtonText) + } else if let backBarButtonItem = itemValue.backBarButtonItem { strongSelf.backButtonNode.updateManualText(backBarButtonItem.title ?? "") } else { strongSelf.backButtonNode.updateManualText(itemValue.title ?? "") @@ -505,7 +514,9 @@ open class NavigationBar: ASDisplayNode { self.leftButtonNode.removeFromSupernode() var backTitle: String? - if let leftBarButtonItem = item.leftBarButtonItem, leftBarButtonItem.backButtonAppearance { + if let customBackButtonText = self.customBackButtonText { + backTitle = customBackButtonText + } else if let leftBarButtonItem = item.leftBarButtonItem, leftBarButtonItem.backButtonAppearance { backTitle = leftBarButtonItem.title } else if let previousItem = self.previousItem { switch previousItem { @@ -589,12 +600,11 @@ open class NavigationBar: ASDisplayNode { self.updateAccessibilityElements() } - private let backButtonNode: NavigationButtonNode - private let badgeNode: NavigationBarBadgeNode - private let backButtonArrow: ASImageNode - private let leftButtonNode: NavigationButtonNode - private let rightButtonNode: NavigationButtonNode - + public let backButtonNode: NavigationButtonNode + public let badgeNode: NavigationBarBadgeNode + public let backButtonArrow: ASImageNode + public let leftButtonNode: NavigationButtonNode + public let rightButtonNode: NavigationButtonNode private var _transitionState: NavigationBarTransitionState? var transitionState: NavigationBarTransitionState? { @@ -694,6 +704,7 @@ open class NavigationBar: ASDisplayNode { self.leftButtonNode.disabledColor = self.presentationData.theme.disabledButtonColor self.rightButtonNode.color = self.presentationData.theme.buttonColor self.rightButtonNode.disabledColor = self.presentationData.theme.disabledButtonColor + self.rightButtonNode.rippleColor = self.presentationData.theme.primaryTextColor.withAlphaComponent(0.05) self.backButtonArrow.image = backArrowImage(color: self.presentationData.theme.buttonColor) if let title = self.title { self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: self.presentationData.theme.primaryTextColor) @@ -768,6 +779,7 @@ open class NavigationBar: ASDisplayNode { self.leftButtonNode.disabledColor = self.presentationData.theme.disabledButtonColor self.rightButtonNode.color = self.presentationData.theme.buttonColor self.rightButtonNode.disabledColor = self.presentationData.theme.disabledButtonColor + self.rightButtonNode.rippleColor = self.presentationData.theme.primaryTextColor.withAlphaComponent(0.05) self.backButtonArrow.image = backArrowImage(color: self.presentationData.theme.buttonColor) if let title = self.title { self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: self.presentationData.theme.primaryTextColor) @@ -821,7 +833,7 @@ open class NavigationBar: ASDisplayNode { transition.updateFrame(node: self.stripeNode, frame: CGRect(x: 0.0, y: size.height, width: size.width, height: UIScreenPixel)) - let nominalHeight: CGFloat = self.collapsed ? 32.0 : defaultHeight + let nominalHeight: CGFloat = defaultHeight let contentVerticalOrigin = size.height - nominalHeight - expansionHeight var leftTitleInset: CGFloat = leftInset + 1.0 @@ -958,7 +970,7 @@ open class NavigationBar: ASDisplayNode { if let titleView = self.titleView { let titleSize = CGSize(width: max(1.0, size.width - max(leftTitleInset, rightTitleInset) * 2.0), height: nominalHeight) - let titleFrame = CGRect(origin: CGPoint(x: leftTitleInset, y: contentVerticalOrigin), size: titleSize) + let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: contentVerticalOrigin + floorToScreenPixels((nominalHeight - titleSize.height) / 2.0)), size: titleSize) titleView.frame = titleFrame if let titleView = titleView as? NavigationBarTitleView { @@ -996,7 +1008,7 @@ open class NavigationBar: ASDisplayNode { } } titleView.alpha = 1.0 - titleView.frame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: contentVerticalOrigin + floorToScreenPixels((nominalHeight - titleSize.height) / 2.0)), size: titleSize) + titleView.frame = titleFrame } } } @@ -1017,18 +1029,45 @@ open class NavigationBar: ASDisplayNode { } } - private func makeTransitionBackButtonNode(accentColor: UIColor) -> NavigationButtonNode? { + public func makeTransitionBackButtonNode(accentColor: UIColor) -> NavigationButtonNode? { if self.backButtonNode.supernode != nil { let node = NavigationButtonNode() node.updateManualText(self.backButtonNode.manualText) node.color = accentColor + if let (size, defaultHeight, _, _) = self.validLayout { + node.updateLayout(constrainedSize: CGSize(width: size.width, height: defaultHeight)) + node.frame = self.backButtonNode.frame + } return node } else { return nil } } - private func makeTransitionBackArrowNode(accentColor: UIColor) -> ASDisplayNode? { + public func makeTransitionRightButtonNode(accentColor: UIColor) -> NavigationButtonNode? { + if self.rightButtonNode.supernode != nil { + let node = NavigationButtonNode() + var items: [UIBarButtonItem] = [] + if let item = self.item { + if let rightBarButtonItems = item.rightBarButtonItems, !rightBarButtonItems.isEmpty { + items = rightBarButtonItems + } else if let rightBarButtonItem = item.rightBarButtonItem { + items = [rightBarButtonItem] + } + } + node.updateItems(items) + node.color = accentColor + if let (size, defaultHeight, _, _) = self.validLayout { + node.updateLayout(constrainedSize: CGSize(width: size.width, height: defaultHeight)) + node.frame = self.backButtonNode.frame + } + return node + } else { + return nil + } + } + + public func makeTransitionBackArrowNode(accentColor: UIColor) -> ASDisplayNode? { if self.backButtonArrow.supernode != nil { let node = ASImageNode() node.image = backArrowImage(color: accentColor) @@ -1041,7 +1080,7 @@ open class NavigationBar: ASDisplayNode { } } - private func makeTransitionBadgeNode() -> ASDisplayNode? { + public func makeTransitionBadgeNode() -> ASDisplayNode? { if self.badgeNode.supernode != nil && !self.badgeNode.isHidden { let node = NavigationBarBadgeNode(fillColor: self.presentationData.theme.badgeBackgroundColor, strokeColor: self.presentationData.theme.badgeStrokeColor, textColor: self.presentationData.theme.badgeTextColor) node.text = self.badgeNode.text @@ -1149,4 +1188,25 @@ open class NavigationBar: ASDisplayNode { } } } + + override open func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if self.bounds.contains(point) { + if self.backButtonNode.supernode != nil && !self.backButtonNode.isHidden { + let effectiveBackButtonRect = CGRect(origin: CGPoint(), size: CGSize(width: self.backButtonNode.frame.maxX + 20.0, height: self.bounds.height)) + if effectiveBackButtonRect.contains(point) { + return self.backButtonNode.internalHitTest(self.view.convert(point, to: self.backButtonNode.view), with: event) + } + } + } + + guard let result = super.hitTest(point, with: event) else { + return nil + } + + if result == self.view || result == self.clippingNode.view { + return nil + } + + return result + } } diff --git a/submodules/Display/Display/NavigationBarBadge.swift b/submodules/Display/Display/NavigationBarBadge.swift index 089b88b0e3..348ff085c5 100644 --- a/submodules/Display/Display/NavigationBarBadge.swift +++ b/submodules/Display/Display/NavigationBarBadge.swift @@ -2,7 +2,7 @@ import Foundation import UIKit import AsyncDisplayKit -final class NavigationBarBadgeNode: ASDisplayNode { +public final class NavigationBarBadgeNode: ASDisplayNode { private var fillColor: UIColor private var strokeColor: UIColor private var textColor: UIColor @@ -19,7 +19,7 @@ final class NavigationBarBadgeNode: ASDisplayNode { } } - init(fillColor: UIColor, strokeColor: UIColor, textColor: UIColor) { + public init(fillColor: UIColor, strokeColor: UIColor, textColor: UIColor) { self.fillColor = fillColor self.strokeColor = strokeColor self.textColor = textColor @@ -48,7 +48,7 @@ final class NavigationBarBadgeNode: ASDisplayNode { self.textNode.attributedText = NSAttributedString(string: self.text, font: self.font, textColor: self.textColor) } - override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize { + override public func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize { let badgeSize = self.textNode.measure(constrainedSize) let backgroundSize = CGSize(width: max(18.0, badgeSize.width + 10.0 + 1.0), height: 18.0) let backgroundFrame = CGRect(origin: CGPoint(), size: backgroundSize) diff --git a/submodules/Display/Display/NavigationButtonNode.swift b/submodules/Display/Display/NavigationButtonNode.swift index d246df1c1f..a21f37823f 100644 --- a/submodules/Display/Display/NavigationButtonNode.swift +++ b/submodules/Display/Display/NavigationButtonNode.swift @@ -53,6 +53,7 @@ private final class NavigationButtonItemNode: ASTextNode { } private var imageNode: ASImageNode? + private let imageRippleNode: ASImageNode private var _image: UIImage? public var image: UIImage? { @@ -61,18 +62,34 @@ private final class NavigationButtonItemNode: ASTextNode { } set(value) { _image = value - if let _ = value { + if let value = value { if self.imageNode == nil { let imageNode = ASImageNode() imageNode.displayWithoutProcessing = true imageNode.displaysAsynchronously = false self.imageNode = imageNode + if value.size == CGSize(width: 30.0, height: 30.0) { + if self.imageRippleNode.supernode == nil { + self.addSubnode(self.imageRippleNode) + self.imageRippleNode.image = generateFilledCircleImage(diameter: 30.0, color: self.rippleColor) + } + } else { + if self.imageRippleNode.supernode != nil { + self.imageRippleNode.image = nil + self.imageRippleNode.removeFromSupernode() + } + } + self.addSubnode(imageNode) } self.imageNode?.image = image } else if let imageNode = self.imageNode { imageNode.removeFromSupernode() self.imageNode = nil + if self.imageRippleNode.supernode != nil { + self.imageRippleNode.image = nil + self.imageRippleNode.removeFromSupernode() + } } self.invalidateCalculatedLayout() @@ -101,6 +118,14 @@ private final class NavigationButtonItemNode: ASTextNode { } } + public var rippleColor: UIColor = UIColor(rgb: 0x000000, alpha: 0.05) { + didSet { + if self.imageRippleNode.image != nil { + self.imageRippleNode.image = generateFilledCircleImage(diameter: 30.0, color: self.rippleColor) + } + } + } + public var disabledColor: UIColor = UIColor(rgb: 0xd0d0d0) { didSet { if let text = self._text { @@ -160,6 +185,11 @@ private final class NavigationButtonItemNode: ASTextNode { } override public init() { + self.imageRippleNode = ASImageNode() + self.imageRippleNode.displaysAsynchronously = false + self.imageRippleNode.displayWithoutProcessing = true + self.imageRippleNode.alpha = 0.0 + super.init() self.isAccessibilityElement = true @@ -183,7 +213,9 @@ private final class NavigationButtonItemNode: ASTextNode { } else if let imageNode = self.imageNode { let nodeSize = imageNode.image?.size ?? CGSize() let size = CGSize(width: max(nodeSize.width, superSize.width), height: max(nodeSize.height, superSize.height)) - imageNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - nodeSize.width) / 2.0) + 5.0, y: floorToScreenPixels((size.height - nodeSize.height) / 2.0)), size: nodeSize) + let imageFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - nodeSize.width) / 2.0) + 5.0, y: floorToScreenPixels((size.height - nodeSize.height) / 2.0)), size: nodeSize) + imageNode.frame = imageFrame + self.imageRippleNode.frame = imageFrame return size } return superSize @@ -209,7 +241,7 @@ private final class NavigationButtonItemNode: ASTextNode { public override func touchesMoved(_ touches: Set, with event: UIEvent?) { super.touchesMoved(touches, with: event) - self.updateHighlightedState(self.touchInsideApparentBounds(touches.first!), animated: true) + //self.updateHighlightedState(self.touchInsideApparentBounds(touches.first!), animated: true) } public override func touchesEnded(_ touches: Set, with event: UIEvent?) { @@ -219,7 +251,7 @@ private final class NavigationButtonItemNode: ASTextNode { let previousTouchCount = self.touchCount self.touchCount = max(0, self.touchCount - touches.count) - if previousTouchCount != 0 && self.touchCount == 0 && self.isEnabled && self.touchInsideApparentBounds(touches.first!) { + if previousTouchCount != 0 && self.touchCount == 0 && self.isEnabled { self.pressed() } } @@ -242,7 +274,15 @@ private final class NavigationButtonItemNode: ASTextNode { } if shouldChangeHighlight { - self.alpha = !self.isEnabled ? 1.0 : (highlighted ? 0.4 : 1.0) + if let imageNode = self.imageNode { + let previousAlpha = self.imageRippleNode.alpha + self.imageRippleNode.alpha = highlighted ? 1.0 : 0.0 + if !highlighted { + self.imageRippleNode.layer.animateAlpha(from: previousAlpha, to: self.imageRippleNode.alpha, duration: 0.25) + } + } else { + self.alpha = !self.isEnabled ? 1.0 : (highlighted ? 0.4 : 1.0) + } self.highlightChanged(highlighted) } } @@ -263,9 +303,16 @@ private final class NavigationButtonItemNode: ASTextNode { } -final class NavigationButtonNode: ASDisplayNode { +public final class NavigationButtonNode: ASDisplayNode { private var nodes: [NavigationButtonItemNode] = [] + public var singleCustomNode: ASDisplayNode? { + for node in self.nodes { + return node.node + } + return nil + } + public var pressed: (Int) -> () = { _ in } public var highlightChanged: (Int, Bool) -> () = { _, _ in } @@ -279,6 +326,16 @@ final class NavigationButtonNode: ASDisplayNode { } } + public var rippleColor: UIColor = UIColor(rgb: 0x000000, alpha: 0.05) { + didSet { + if !self.rippleColor.isEqual(oldValue) { + for node in self.nodes { + node.rippleColor = self.rippleColor + } + } + } + } + public var disabledColor: UIColor = UIColor(rgb: 0xd0d0d0) { didSet { if !self.disabledColor.isEqual(oldValue) { @@ -296,7 +353,7 @@ final class NavigationButtonNode: ASDisplayNode { } } - override init() { + override public init() { super.init() self.isAccessibilityElement = false @@ -313,6 +370,7 @@ final class NavigationButtonNode: ASDisplayNode { } else { node = NavigationButtonItemNode() node.color = self.color + node.rippleColor = self.rippleColor node.highlightChanged = { [weak node, weak self] value in if let strongSelf = self, let node = node { if let index = strongSelf.nodes.firstIndex(where: { $0 === node }) { @@ -353,6 +411,7 @@ final class NavigationButtonNode: ASDisplayNode { } else { node = NavigationButtonItemNode() node.color = self.color + node.rippleColor = self.rippleColor node.highlightChanged = { [weak node, weak self] value in if let strongSelf = self, let node = node { if let index = strongSelf.nodes.firstIndex(where: { $0 === node }) { @@ -385,7 +444,7 @@ final class NavigationButtonNode: ASDisplayNode { } } - func updateLayout(constrainedSize: CGSize) -> CGSize { + public func updateLayout(constrainedSize: CGSize) -> CGSize { var nodeOrigin = CGPoint() var totalSize = CGSize() for node in self.nodes { @@ -403,4 +462,12 @@ final class NavigationButtonNode: ASDisplayNode { } return totalSize } + + func internalHitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if self.nodes.count == 1 { + return self.nodes[0].view + } else { + return super.hitTest(point, with: event) + } + } } diff --git a/submodules/Display/Display/NavigationTransitionCoordinator.swift b/submodules/Display/Display/NavigationTransitionCoordinator.swift index a3ea0997c5..48aec470c2 100644 --- a/submodules/Display/Display/NavigationTransitionCoordinator.swift +++ b/submodules/Display/Display/NavigationTransitionCoordinator.swift @@ -15,12 +15,17 @@ private func generateShadow() -> UIImage? { context.setShadow(offset: CGSize(), blur: 16.0, color: UIColor(white: 0.0, alpha: 0.5).cgColor) context.fill(CGRect(origin: CGPoint(x: size.width, y: 0.0), size: CGSize(width: 16.0, height: 1.0))) }) - //return UIImage(named: "NavigationShadow", in: getAppBundle(), compatibleWith: nil)?.precomposed().resizableImage(withCapInsets: UIEdgeInsets(), resizingMode: .tile) } private let shadowImage = generateShadow() -class NavigationTransitionCoordinator { +public protocol CustomNavigationTransitionNode: ASDisplayNode { + func setup(topNavigationBar: NavigationBar, bottomNavigationBar: NavigationBar) + func update(containerSize: CGSize, fraction: CGFloat, transition: ContainedViewLayoutTransition) + func restore() +} + +final class NavigationTransitionCoordinator { private var _progress: CGFloat = 0.0 var progress: CGFloat { get { @@ -30,12 +35,14 @@ class NavigationTransitionCoordinator { private let container: ASDisplayNode private let transition: NavigationTransition + let isInteractive: Bool let topNode: ASDisplayNode let bottomNode: ASDisplayNode private let topNavigationBar: NavigationBar? private let bottomNavigationBar: NavigationBar? private let dimNode: ASDisplayNode private let shadowNode: ASImageNode + private let customTransitionNode: CustomNavigationTransitionNode? private let inlineNavigationBarTransition: Bool @@ -43,8 +50,9 @@ class NavigationTransitionCoordinator { private var currentCompletion: (() -> Void)? private var didUpdateProgress: ((CGFloat, ContainedViewLayoutTransition, CGRect, CGRect) -> Void)? - init(transition: NavigationTransition, container: ASDisplayNode, topNode: ASDisplayNode, topNavigationBar: NavigationBar?, bottomNode: ASDisplayNode, bottomNavigationBar: NavigationBar?, didUpdateProgress: ((CGFloat, ContainedViewLayoutTransition, CGRect, CGRect) -> Void)? = nil) { + init(transition: NavigationTransition, isInteractive: Bool, container: ASDisplayNode, topNode: ASDisplayNode, topNavigationBar: NavigationBar?, bottomNode: ASDisplayNode, bottomNavigationBar: NavigationBar?, didUpdateProgress: ((CGFloat, ContainedViewLayoutTransition, CGRect, CGRect) -> Void)? = nil) { self.transition = transition + self.isInteractive = isInteractive self.container = container self.didUpdateProgress = didUpdateProgress self.topNode = topNode @@ -58,25 +66,43 @@ class NavigationTransitionCoordinator { self.shadowNode.displayWithoutProcessing = true self.shadowNode.image = shadowImage - if let topNavigationBar = topNavigationBar, let bottomNavigationBar = bottomNavigationBar, !topNavigationBar.isHidden, !bottomNavigationBar.isHidden, topNavigationBar.canTransitionInline, bottomNavigationBar.canTransitionInline, topNavigationBar.item?.leftBarButtonItem == nil { - var topFrame = topNavigationBar.view.convert(topNavigationBar.bounds, to: container.view) - var bottomFrame = bottomNavigationBar.view.convert(bottomNavigationBar.bounds, to: container.view) - topFrame.origin.x = 0.0 - bottomFrame.origin.x = 0.0 - self.inlineNavigationBarTransition = true// topFrame.equalTo(bottomFrame) + if let topNavigationBar = topNavigationBar, let bottomNavigationBar = bottomNavigationBar { + if let customTransitionNode = topNavigationBar.makeCustomTransitionNode?(bottomNavigationBar, isInteractive) { + self.inlineNavigationBarTransition = false + customTransitionNode.setup(topNavigationBar: topNavigationBar, bottomNavigationBar: bottomNavigationBar) + self.customTransitionNode = customTransitionNode + } else if let customTransitionNode = bottomNavigationBar.makeCustomTransitionNode?(topNavigationBar, isInteractive) { + self.inlineNavigationBarTransition = false + customTransitionNode.setup(topNavigationBar: topNavigationBar, bottomNavigationBar: bottomNavigationBar) + self.customTransitionNode = customTransitionNode + } else if !topNavigationBar.isHidden, !bottomNavigationBar.isHidden, topNavigationBar.canTransitionInline, bottomNavigationBar.canTransitionInline, topNavigationBar.item?.leftBarButtonItem == nil { + var topFrame = topNavigationBar.view.convert(topNavigationBar.bounds, to: container.view) + var bottomFrame = bottomNavigationBar.view.convert(bottomNavigationBar.bounds, to: container.view) + topFrame.origin.x = 0.0 + bottomFrame.origin.x = 0.0 + self.inlineNavigationBarTransition = true + self.customTransitionNode = nil + } else { + self.inlineNavigationBarTransition = false + self.customTransitionNode = nil + } } else { self.inlineNavigationBarTransition = false + self.customTransitionNode = nil } switch transition { - case .Push: - self.container.addSubnode(topNode) - case .Pop: - self.container.insertSubnode(bottomNode, belowSubnode: topNode) + case .Push: + self.container.addSubnode(topNode) + case .Pop: + self.container.insertSubnode(bottomNode, belowSubnode: topNode) } self.container.insertSubnode(self.dimNode, belowSubnode: topNode) - self.container.insertSubnode(self.shadowNode, belowSubnode: dimNode) + self.container.insertSubnode(self.shadowNode, belowSubnode: self.dimNode) + if let customTransitionNode = self.customTransitionNode { + self.container.addSubnode(customTransitionNode) + } self.maybeCreateNavigationBarTransition() self.updateProgress(0.0, transition: .immediate, completion: {}) @@ -91,10 +117,10 @@ class NavigationTransitionCoordinator { let position: CGFloat switch self.transition { - case .Push: - position = 1.0 - progress - case .Pop: - position = progress + case .Push: + position = 1.0 - progress + case .Pop: + position = progress } var dimInset: CGFloat = 0.0 @@ -107,9 +133,16 @@ class NavigationTransitionCoordinator { let topFrame = CGRect(origin: CGPoint(x: floorToScreenPixels(position * containerSize.width), y: 0.0), size: containerSize) let bottomFrame = CGRect(origin: CGPoint(x: ((position - 1.0) * containerSize.width * 0.3), y: 0.0), size: containerSize) + var canInvokeCompletion = false + var hadEarlyCompletion = false transition.updateFrame(node: self.topNode, frame: topFrame, completion: { _ in - completion() + if canInvokeCompletion { + completion() + } else { + hadEarlyCompletion = true + } }) + canInvokeCompletion = true transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(x: 0.0, y: dimInset), size: CGSize(width: max(0.0, topFrame.minX), height: self.container.bounds.size.height - dimInset))) transition.updateFrame(node: self.shadowNode, frame: CGRect(origin: CGPoint(x: self.dimNode.frame.maxX - shadowWidth, y: dimInset), size: CGSize(width: shadowWidth, height: containerSize.height - dimInset))) transition.updateAlpha(node: self.dimNode, alpha: (1.0 - position) * 0.15) @@ -119,10 +152,19 @@ class NavigationTransitionCoordinator { self.updateNavigationBarTransition(transition: transition) + if let customTransitionNode = self.customTransitionNode { + customTransitionNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: containerSize.width, height: containerSize.height)) + customTransitionNode.update(containerSize: containerSize, fraction: position, transition: transition) + } + self.didUpdateProgress?(self.progress, transition, topFrame, bottomFrame) + + if hadEarlyCompletion { + completion() + } } - func updateNavigationBarTransition(transition: ContainedViewLayoutTransition) { + private func updateNavigationBarTransition(transition: ContainedViewLayoutTransition) { if let topNavigationBar = self.topNavigationBar, let bottomNavigationBar = self.bottomNavigationBar, self.inlineNavigationBarTransition { let position: CGFloat switch self.transition { @@ -178,6 +220,9 @@ class NavigationTransitionCoordinator { strongSelf.dimNode.removeFromSupernode() strongSelf.shadowNode.removeFromSupernode() + strongSelf.customTransitionNode?.restore() + strongSelf.customTransitionNode?.removeFromSupernode() + strongSelf.endNavigationBarTransition() if let currentCompletion = strongSelf.currentCompletion { @@ -195,6 +240,9 @@ class NavigationTransitionCoordinator { self.dimNode.removeFromSupernode() self.shadowNode.removeFromSupernode() + self.customTransitionNode?.restore() + self.customTransitionNode?.removeFromSupernode() + self.endNavigationBarTransition() if let currentCompletion = self.currentCompletion { @@ -209,6 +257,9 @@ class NavigationTransitionCoordinator { strongSelf.dimNode.removeFromSupernode() strongSelf.shadowNode.removeFromSupernode() + strongSelf.customTransitionNode?.restore() + strongSelf.customTransitionNode?.removeFromSupernode() + strongSelf.endNavigationBarTransition() if let currentCompletion = strongSelf.currentCompletion { @@ -228,6 +279,9 @@ class NavigationTransitionCoordinator { self.dimNode.removeFromSupernode() self.shadowNode.removeFromSupernode() + self.customTransitionNode?.restore() + self.customTransitionNode?.removeFromSupernode() + self.endNavigationBarTransition() if let currentCompletion = self.currentCompletion { diff --git a/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift b/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift index 62107686ed..35d1372542 100644 --- a/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift +++ b/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift @@ -68,6 +68,7 @@ public enum TapLongTapOrDoubleTapGestureRecognizerAction { case waitForSingleTap case waitForHold(timeout: Double, acceptTap: Bool) case fail + case keepWithSingleTap } public final class TapLongTapOrDoubleTapGestureRecognizer: UIGestureRecognizer, UIGestureRecognizerDelegate { @@ -206,6 +207,8 @@ public final class TapLongTapOrDoubleTapGestureRecognizer: UIGestureRecognizer, } switch tapAction { + case .keepWithSingleTap: + break case .waitForSingleTap, .waitForDoubleTap: self.timer?.invalidate() let timer = Timer(timeInterval: 0.3, target: TapLongTapOrDoubleTapGestureRecognizerTimerTarget(target: self), selector: #selector(TapLongTapOrDoubleTapGestureRecognizerTimerTarget.longTapEvent), userInfo: nil, repeats: false) @@ -284,7 +287,7 @@ public final class TapLongTapOrDoubleTapGestureRecognizer: UIGestureRecognizer, } switch tapAction { - case .waitForSingleTap: + case .waitForSingleTap, .keepWithSingleTap: if let (touchLocation, _) = self.touchLocationAndTimestamp { self.lastRecognizedGestureAndLocation = (.tap, touchLocation) } diff --git a/submodules/Display/Display/TextNode.swift b/submodules/Display/Display/TextNode.swift index 4f8d2a301e..1e7268cdde 100644 --- a/submodules/Display/Display/TextNode.swift +++ b/submodules/Display/Display/TextNode.swift @@ -771,7 +771,7 @@ public final class TextAccessibilityOverlayNode: ASDisplayNode { } public class TextNode: ASDisplayNode { - public private(set) var cachedLayout: TextNodeLayout? + public internal(set) var cachedLayout: TextNodeLayout? override public init() { super.init() diff --git a/submodules/Display/Display/ViewController.swift b/submodules/Display/Display/ViewController.swift index 392644c300..a8d2ca9516 100644 --- a/submodules/Display/Display/ViewController.swift +++ b/submodules/Display/Display/ViewController.swift @@ -93,6 +93,8 @@ public enum ViewControllerNavigationPresentation { } } + var blocksInteractionUntilReady: Bool = false + public final var isOpaqueWhenInOverlay: Bool = false public final var blocksBackgroundWhenInOverlay: Bool = false public final var automaticallyControlPresentationContextLayout: Bool = true diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift index 19514e85ee..cbf67d23e9 100644 --- a/submodules/Display/Display/WindowContent.swift +++ b/submodules/Display/Display/WindowContent.swift @@ -337,8 +337,17 @@ public class Window1 { self?.isInteractionBlocked = value } + let updateOpaqueOverlays: () -> Void = { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf._rootController?.displayNode.accessibilityElementsHidden = strongSelf.presentationContext.hasOpaqueOverlay || strongSelf.topPresentationContext.hasOpaqueOverlay + } self.presentationContext.updateHasOpaqueOverlay = { [weak self] value in - self?._rootController?.displayNode.accessibilityElementsHidden = value + updateOpaqueOverlays() + } + self.topPresentationContext.updateHasOpaqueOverlay = { [weak self] value in + updateOpaqueOverlays() } self.hostView.present = { [weak self] controller, level, blockInteraction, completion in diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift index e0acc9d09c..11e4215545 100644 --- a/submodules/GalleryUI/Sources/GalleryController.swift +++ b/submodules/GalleryUI/Sources/GalleryController.swift @@ -396,7 +396,7 @@ public class GalleryController: ViewController, StandalonePresentableController } else { namespaces = .not(Namespaces.Message.allScheduled) } - return context.account.postbox.aroundMessageHistoryViewForLocation(.peer(message!.id.peerId), anchor: .index(message!.index), count: 50, fixedCombinedReadStates: nil, topTaggedMessageIdNamespaces: [], tagMask: tags, namespaces: namespaces, orderStatistics: [.combinedLocation]) + return context.account.postbox.aroundMessageHistoryViewForLocation(.peer(message!.id.peerId), anchor: .index(message!.index), count: 50, clipHoles: false, fixedCombinedReadStates: nil, topTaggedMessageIdNamespaces: [], tagMask: tags, namespaces: namespaces, orderStatistics: [.combinedLocation]) |> mapToSignal { (view, _, _) -> Signal in let mapped = GalleryMessageHistoryView.view(view) return .single(mapped) diff --git a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift index 4a2df1e638..3c36aeaa18 100644 --- a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift +++ b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift @@ -122,6 +122,7 @@ private final class SecretMediaPreviewControllerNode: GalleryControllerNode { public final class SecretMediaPreviewController: ViewController { private let context: AccountContext + private let messageId: MessageId private let _ready = Promise() override public var ready: Promise { @@ -150,6 +151,7 @@ public final class SecretMediaPreviewController: ViewController { public init(context: AccountContext, messageId: MessageId) { self.context = context + self.messageId = messageId self.presentationData = context.sharedContext.currentPresentationData.with { $0 } super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: GalleryController.darkNavigationTheme, strings: NavigationBarStrings(presentationStrings: self.presentationData.strings))) @@ -159,8 +161,6 @@ public final class SecretMediaPreviewController: ViewController { self.statusBar.statusBarStyle = .White - - self.disposable.set((context.account.postbox.messageView(messageId) |> deliverOnMainQueue).start(next: { [weak self] view in if let strongSelf = self { strongSelf.messageView = view @@ -178,17 +178,6 @@ public final class SecretMediaPreviewController: ViewController { return nil } }) - - self.screenCaptureEventsDisposable = (screenCaptureEvents() - |> deliverOnMainQueue).start(next: { [weak self] _ in - if let strongSelf = self, strongSelf.traceVisibility() { - if messageId.peerId.namespace == Namespaces.Peer.CloudUser { - let _ = enqueueMessages(account: context.account, peerId: messageId.peerId, messages: [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.historyScreenshot)), replyToMessageId: nil, localGroupingKey: nil)]).start() - } else if messageId.peerId.namespace == Namespaces.Peer.SecretChat { - let _ = addSecretChatMessageScreenshot(account: context.account, peerId: messageId.peerId).start() - } - } - }) } required public init(coder aDecoder: NSCoder) { @@ -348,6 +337,19 @@ public final class SecretMediaPreviewController: ViewController { override public func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) + if self.screenCaptureEventsDisposable == nil { + self.screenCaptureEventsDisposable = (screenCaptureEvents() + |> deliverOnMainQueue).start(next: { [weak self] _ in + if let strongSelf = self, strongSelf.traceVisibility() { + if strongSelf.messageId.peerId.namespace == Namespaces.Peer.CloudUser { + let _ = enqueueMessages(account: strongSelf.context.account, peerId: strongSelf.messageId.peerId, messages: [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.historyScreenshot)), replyToMessageId: nil, localGroupingKey: nil)]).start() + } else if strongSelf.messageId.peerId.namespace == Namespaces.Peer.SecretChat { + let _ = addSecretChatMessageScreenshot(account: strongSelf.context.account, peerId: strongSelf.messageId.peerId).start() + } + } + }) + } + var nodeAnimatesItself = false if let centralItemNode = self.controllerNode.pager.centralItemNode(), let message = self.messageView?.message { diff --git a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift index c930ad926b..e15556a53a 100644 --- a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift @@ -1180,7 +1180,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { let _ = (strongSelf.context.account.postbox.loadedPeerWithId(peerId) |> deliverOnMainQueue).start(next: { peer in if let strongSelf = self { - if let controller = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let controller = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { strongSelf.getNavigationController()?.pushViewController(controller) } } diff --git a/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift b/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift index 9ad3ec1d6d..929a0d82ca 100644 --- a/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift +++ b/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift @@ -18,13 +18,14 @@ public final class ItemListAddressItem: ListViewItem, ItemListItem { let selected: Bool? public let sectionId: ItemListSectionId let style: ItemListStyle + let displayDecorations: Bool let action: (() -> Void)? let longTapAction: (() -> Void)? let linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? public let tag: Any? - public init(theme: PresentationTheme, label: String, text: String, imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?, selected: Bool? = nil, sectionId: ItemListSectionId, style: ItemListStyle, action: (() -> Void)?, longTapAction: (() -> Void)? = nil, linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil, tag: Any? = nil) { + public init(theme: PresentationTheme, label: String, text: String, imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?, selected: Bool? = nil, sectionId: ItemListSectionId, style: ItemListStyle, displayDecorations: Bool = true, action: (() -> Void)?, longTapAction: (() -> Void)? = nil, linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil, tag: Any? = nil) { self.theme = theme self.label = label self.text = text @@ -32,6 +33,7 @@ public final class ItemListAddressItem: ListViewItem, ItemListItem { self.selected = selected self.sectionId = sectionId self.style = style + self.displayDecorations = displayDecorations self.action = action self.longTapAction = longTapAction self.linkItemAction = linkItemAction @@ -157,7 +159,7 @@ public class ItemListAddressItemNode: ListViewItemNode { updatedTheme = item.theme } - let insets: UIEdgeInsets + var insets: UIEdgeInsets let leftInset: CGFloat = 16.0 + params.leftInset let rightInset: CGFloat = 8.0 + params.rightInset let separatorHeight = UIScreenPixel @@ -175,6 +177,10 @@ public class ItemListAddressItemNode: ListViewItemNode { insets = itemListNeighborsGroupedInsets(neighbors) } + if !item.displayDecorations { + insets = UIEdgeInsets() + } + var leftOffset: CGFloat = 0.0 var selectionNodeWidthAndApply: (CGFloat, (CGSize, Bool) -> ItemListSelectableControlNode)? if let selected = item.selected { @@ -226,6 +232,11 @@ public class ItemListAddressItemNode: ListViewItemNode { strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor } + strongSelf.topStripeNode.isHidden = !item.displayDecorations + strongSelf.bottomStripeNode.isHidden = !item.displayDecorations + strongSelf.backgroundNode.isHidden = !item.displayDecorations + strongSelf.highlightedBackgroundNode.isHidden = !item.displayDecorations + let _ = labelApply() let _ = textApply() let _ = imageApply() @@ -293,7 +304,7 @@ public class ItemListAddressItemNode: ListViewItemNode { case .sameSection(false): strongSelf.topStripeNode.isHidden = true default: - strongSelf.topStripeNode.isHidden = false + strongSelf.topStripeNode.isHidden = !item.displayDecorations } let bottomStripeInset: CGFloat let bottomStripeOffset: CGFloat diff --git a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift index 22666adab8..ce2f1c397a 100644 --- a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift +++ b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift @@ -334,8 +334,9 @@ public final class ItemListPeerItem: ListViewItem, ItemListItem { public let tag: ItemListItemTag? let header: ListViewItemHeader? let shimmering: ItemListPeerItemShimmering? + let displayDecorations: Bool - public init(presentationData: ItemListPresentationData, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, context: AccountContext, peer: Peer, height: ItemListPeerItemHeight = .peerList, aliasHandling: ItemListPeerItemAliasHandling = .standard, nameColor: ItemListPeerItemNameColor = .primary, nameStyle: ItemListPeerItemNameStyle = .distinctBold, presence: PeerPresence?, text: ItemListPeerItemText, label: ItemListPeerItemLabel, editing: ItemListPeerItemEditing, revealOptions: ItemListPeerItemRevealOptions? = nil, switchValue: ItemListPeerItemSwitch?, enabled: Bool, selectable: Bool, sectionId: ItemListSectionId, action: (() -> Void)?, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, removePeer: @escaping (PeerId) -> Void, toggleUpdated: ((Bool) -> Void)? = nil, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? = nil, hasTopStripe: Bool = true, hasTopGroupInset: Bool = true, noInsets: Bool = false, tag: ItemListItemTag? = nil, header: ListViewItemHeader? = nil, shimmering: ItemListPeerItemShimmering? = nil) { + public init(presentationData: ItemListPresentationData, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, context: AccountContext, peer: Peer, height: ItemListPeerItemHeight = .peerList, aliasHandling: ItemListPeerItemAliasHandling = .standard, nameColor: ItemListPeerItemNameColor = .primary, nameStyle: ItemListPeerItemNameStyle = .distinctBold, presence: PeerPresence?, text: ItemListPeerItemText, label: ItemListPeerItemLabel, editing: ItemListPeerItemEditing, revealOptions: ItemListPeerItemRevealOptions? = nil, switchValue: ItemListPeerItemSwitch?, enabled: Bool, selectable: Bool, sectionId: ItemListSectionId, action: (() -> Void)?, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, removePeer: @escaping (PeerId) -> Void, toggleUpdated: ((Bool) -> Void)? = nil, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? = nil, hasTopStripe: Bool = true, hasTopGroupInset: Bool = true, noInsets: Bool = false, tag: ItemListItemTag? = nil, header: ListViewItemHeader? = nil, shimmering: ItemListPeerItemShimmering? = nil, displayDecorations: Bool = true) { self.presentationData = presentationData self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder @@ -365,6 +366,7 @@ public final class ItemListPeerItem: ListViewItem, ItemListItem { self.tag = tag self.header = header self.shimmering = shimmering + self.displayDecorations = displayDecorations } public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { @@ -424,7 +426,7 @@ public final class ItemListPeerItem: ListViewItem, ItemListItem { } } -private let avatarFont = avatarPlaceholderFont(size: 15.0) +private let avatarFont = avatarPlaceholderFont(size: floor(40.0 * 16.0 / 37.0)) private let badgeFont = Font.regular(15.0) public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNode { @@ -932,7 +934,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo strongSelf.topStripeNode.isHidden = true default: hasTopCorners = true - strongSelf.topStripeNode.isHidden = hasCorners || !item.hasTopStripe + strongSelf.topStripeNode.isHidden = !item.displayDecorations || hasCorners || !item.hasTopStripe } let bottomStripeInset: CGFloat let bottomStripeOffset: CGFloat @@ -944,7 +946,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo bottomStripeInset = 0.0 bottomStripeOffset = 0.0 hasBottomCorners = true - strongSelf.bottomStripeNode.isHidden = hasCorners + strongSelf.bottomStripeNode.isHidden = hasCorners || !item.displayDecorations } strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil @@ -1087,6 +1089,9 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo shimmerNode.removeFromSupernode() } + strongSelf.backgroundNode.isHidden = !item.displayDecorations + strongSelf.highlightedBackgroundNode.isHidden = !item.displayDecorations + strongSelf.updateLayout(size: layout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset) strongSelf.setRevealOptions((left: [], right: peerRevealOptions)) @@ -1361,6 +1366,10 @@ public final class ItemListPeerItemHeaderNode: ListViewItemHeaderNode, ItemListH public func updateTheme(theme: PresentationTheme) { self.theme = theme + self.backgroundNode.backgroundColor = theme.list.blocksBackgroundColor + self.snappedBackgroundNode.backgroundColor = theme.rootController.navigationBar.backgroundColor + self.separatorNode.backgroundColor = theme.list.itemBlocksSeparatorColor + let titleFont = Font.regular(13.0) self.textNode.attributedText = NSAttributedString(string: self.textNode.attributedText?.string ?? "", font: titleFont, textColor: theme.list.sectionHeaderTextColor) diff --git a/submodules/LocalMediaResources/BUCK b/submodules/LocalMediaResources/BUCK index 6739a9b6cf..12b32376f0 100644 --- a/submodules/LocalMediaResources/BUCK +++ b/submodules/LocalMediaResources/BUCK @@ -15,6 +15,8 @@ static_library( frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", "$SDKROOT/System/Library/Frameworks/UIKit.framework", - "$SDKROOT/System/Library/Frameworks/Photos.framework", + ], + weak_frameworks = [ + "Photos", ], ) diff --git a/submodules/NotificationSoundSelectionUI/Sources/NotificationSoundSelection.swift b/submodules/NotificationSoundSelectionUI/Sources/NotificationSoundSelection.swift index 3e01be1a20..5a6806fcf7 100644 --- a/submodules/NotificationSoundSelectionUI/Sources/NotificationSoundSelection.swift +++ b/submodules/NotificationSoundSelectionUI/Sources/NotificationSoundSelection.swift @@ -304,6 +304,9 @@ public func notificationSoundSelectionController(context: AccountContext, isModa playSoundDisposable.dispose() }) controller.enableInteractiveDismiss = true + if isModal { + controller.navigationPresentation = .modal + } completeImpl = { [weak controller] in let sound = stateValue.with { state in diff --git a/submodules/PassportUI/Sources/SecureIdAuthController.swift b/submodules/PassportUI/Sources/SecureIdAuthController.swift index a21449e859..66ca2894ea 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthController.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthController.swift @@ -330,7 +330,7 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable guard let strongSelf = self else { return } - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { (strongSelf.navigationController as? NavigationController)?.pushViewController(infoController) } }) diff --git a/submodules/PeerAvatarGalleryUI/BUCK b/submodules/PeerAvatarGalleryUI/BUCK index bde6746427..f61fd2951b 100644 --- a/submodules/PeerAvatarGalleryUI/BUCK +++ b/submodules/PeerAvatarGalleryUI/BUCK @@ -26,6 +26,8 @@ static_library( "$SDKROOT/System/Library/Frameworks/Foundation.framework", "$SDKROOT/System/Library/Frameworks/UIKit.framework", "$SDKROOT/System/Library/Frameworks/QuickLook.framework", - "$SDKROOT/System/Library/Frameworks/Photos.framework", + ], + weak_frameworks = [ + "Photos", ], ) diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift index cb2f0a9d82..587f571e65 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift @@ -61,7 +61,7 @@ public final class AvatarGalleryControllerPresentationArguments { } } -private func initialAvatarGalleryEntries(peer: Peer) -> [AvatarGalleryEntry]{ +private func initialAvatarGalleryEntries(peer: Peer) -> [AvatarGalleryEntry] { var initialEntries: [AvatarGalleryEntry] = [] if !peer.profileImageRepresentations.isEmpty, let peerReference = PeerReference(peer) { initialEntries.append(.topImage(peer.profileImageRepresentations.map({ ImageRepresentationWithReference(representation: $0, reference: MediaResourceReference.avatar(peer: peerReference, resource: $0.resource)) }), nil)) @@ -70,26 +70,30 @@ private func initialAvatarGalleryEntries(peer: Peer) -> [AvatarGalleryEntry]{ } public func fetchedAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<[AvatarGalleryEntry], NoError> { - return requestPeerPhotos(account: account, peerId: peer.id) - |> map { photos -> [AvatarGalleryEntry] in - var result: [AvatarGalleryEntry] = [] - let initialEntries = initialAvatarGalleryEntries(peer: peer) - if photos.isEmpty { - result = initialEntries - } else { - var index: Int32 = 0 - for photo in photos { - let indexData = GalleryItemIndexData(position: index, totalCount: Int32(photos.count)) - if result.isEmpty, let first = initialEntries.first { - result.append(.image(photo.image.reference, first.representations, peer, photo.date, indexData, photo.messageId)) - } else { - result.append(.image(photo.image.reference, photo.image.representations.map({ ImageRepresentationWithReference(representation: $0, reference: MediaResourceReference.standalone(resource: $0.resource)) }), peer, photo.date, indexData, photo.messageId)) + let initialEntries = initialAvatarGalleryEntries(peer: peer) + return Signal<[AvatarGalleryEntry], NoError>.single(initialEntries) + |> then( + requestPeerPhotos(account: account, peerId: peer.id) + |> map { photos -> [AvatarGalleryEntry] in + var result: [AvatarGalleryEntry] = [] + let initialEntries = initialAvatarGalleryEntries(peer: peer) + if photos.isEmpty { + result = initialEntries + } else { + var index: Int32 = 0 + for photo in photos { + let indexData = GalleryItemIndexData(position: index, totalCount: Int32(photos.count)) + if result.isEmpty, let first = initialEntries.first { + result.append(.image(photo.image.reference, first.representations, peer, photo.date, indexData, photo.messageId)) + } else { + result.append(.image(photo.image.reference, photo.image.representations.map({ ImageRepresentationWithReference(representation: $0, reference: MediaResourceReference.standalone(resource: $0.resource)) }), peer, photo.date, indexData, photo.messageId)) + } + index += 1 } - index += 1 } + return result } - return result - } + ) } public class AvatarGalleryController: ViewController, StandalonePresentableController { diff --git a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift index 59a2a57ad7..0750e10edc 100644 --- a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift @@ -366,7 +366,7 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId) } items.append(ActionSheetButtonItem(title: presentationData.strings.GroupRemoved_ViewUserInfo, action: { [weak actionSheet] in actionSheet?.dismissAnimated() - if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: participant.peer, mode: .generic) { + if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: participant.peer, mode: .generic, avatarInitiallyExpanded: false) { pushControllerImpl?(infoController) } })) diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersController.swift b/submodules/PeerInfoUI/Sources/ChannelMembersController.swift index 85c6dce8d6..dc6dc37ef0 100644 --- a/submodules/PeerInfoUI/Sources/ChannelMembersController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelMembersController.swift @@ -450,7 +450,7 @@ public func channelMembersController(context: AccountContext, peerId: PeerId) -> } })) }, openPeer: { peer in - if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { pushControllerImpl?(controller) } }, inviteViaLink: { @@ -502,7 +502,7 @@ public func channelMembersController(context: AccountContext, peerId: PeerId) -> return state.withUpdatedSearchingMembers(false) } }, openPeer: { peer, _ in - if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { pushControllerImpl?(infoController) } }, pushController: { c in diff --git a/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift b/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift index 7615d720b0..85d9837112 100644 --- a/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift @@ -335,7 +335,7 @@ func compactStringForGroupPermission(strings: PresentationStrings, right: Telegr } } -let allGroupPermissionList: [(TelegramChatBannedRightsFlags, TelegramChannelPermission)] = [ +public let allGroupPermissionList: [(TelegramChatBannedRightsFlags, TelegramChannelPermission)] = [ (.banSendMessages, .sendMessages), (.banSendMedia, .sendMessages), (.banSendGifs, .sendMessages), @@ -666,7 +666,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina }), ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) }) }, openPeerInfo: { peer in - if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { pushControllerImpl?(controller) } }, openKicked: { diff --git a/submodules/PeerInfoUI/Sources/GroupInfoController.swift b/submodules/PeerInfoUI/Sources/GroupInfoController.swift index c5c90866b8..8e3288a0aa 100644 --- a/submodules/PeerInfoUI/Sources/GroupInfoController.swift +++ b/submodules/PeerInfoUI/Sources/GroupInfoController.swift @@ -599,7 +599,7 @@ private enum GroupInfoEntry: ItemListNodeEntry { })) } return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer, presence: presence, text: .presence, label: label == nil ? .none : .text(label!, .standard), editing: editing, revealOptions: ItemListPeerItemRevealOptions(options: options), switchValue: nil, enabled: enabled, selectable: selectable, sectionId: self.section, action: { - if let infoController = arguments.context.sharedContext.makePeerInfoController(context: arguments.context, peer: peer, mode: .generic), selectable { + if let infoController = arguments.context.sharedContext.makePeerInfoController(context: arguments.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false), selectable { arguments.pushController(infoController) } }, setPeerIdWithRevealedOptions: { peerId, fromPeerId in @@ -2342,7 +2342,7 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId: return state.withUpdatedSearchingMembers(false) } }, openPeer: { peer, _ in - if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { arguments.pushController(infoController) } }, pushController: { c in diff --git a/submodules/PeerInfoUI/Sources/PeerInfoController.swift b/submodules/PeerInfoUI/Sources/PeerInfoController.swift index f34ef9a845..62e5703def 100644 --- a/submodules/PeerInfoUI/Sources/PeerInfoController.swift +++ b/submodules/PeerInfoUI/Sources/PeerInfoController.swift @@ -7,17 +7,3 @@ import TelegramCore import SyncCore import AccountContext -public func peerInfoControllerImpl(context: AccountContext, peer: Peer, mode: PeerInfoControllerMode) -> ViewController? { - if let _ = peer as? TelegramGroup { - return groupInfoController(context: context, peerId: peer.id) - } else if let channel = peer as? TelegramChannel { - if case .group = channel.info { - return groupInfoController(context: context, peerId: peer.id) - } else { - return channelInfoController(context: context, peerId: peer.id) - } - } else if peer is TelegramUser || peer is TelegramSecretChat { - return userInfoController(context: context, peerId: peer.id, mode: mode) - } - return nil -} diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift index 32b5157750..b6f056e465 100644 --- a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift +++ b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift @@ -596,7 +596,7 @@ public func peersNearbyController(context: AccountContext) -> ViewController { controller?.clearItemNodesHighlight(animated: true) } navigateToProfileImpl = { [weak controller] peer in - if let navigationController = controller?.navigationController as? NavigationController, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let navigationController = controller?.navigationController as? NavigationController, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: true) { (navigationController as? NavigationController)?.pushViewController(controller) } } diff --git a/submodules/PhotoResources/Sources/PhotoResources.swift b/submodules/PhotoResources/Sources/PhotoResources.swift index f7e0f13037..5aa2304795 100644 --- a/submodules/PhotoResources/Sources/PhotoResources.swift +++ b/submodules/PhotoResources/Sources/PhotoResources.swift @@ -2020,10 +2020,10 @@ public func instantPageImageFile(account: Account, fileReference: FileMediaRefer } } -private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], autoFetchFullSize: Bool = false) -> Signal, NoError> { +private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], autoFetchFullSize: Bool = false, attemptSynchronously: Bool = false) -> Signal, NoError> { if let smallestRepresentation = smallestImageRepresentation(representations.map({ $0.representation })), let largestRepresentation = largestImageRepresentation(representations.map({ $0.representation })), let smallestIndex = representations.firstIndex(where: { $0.representation == smallestRepresentation }), let largestIndex = representations.firstIndex(where: { $0.representation == largestRepresentation }) { - let maybeFullSize = account.postbox.mediaBox.resourceData(largestRepresentation.resource) + let maybeFullSize = account.postbox.mediaBox.resourceData(largestRepresentation.resource, attemptSynchronously: attemptSynchronously) let signal = maybeFullSize |> take(1) @@ -2037,7 +2037,7 @@ private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaR let thumbnail = Signal { subscriber in let fetchedDisposable = fetchedThumbnail.start() - let thumbnailDisposable = account.postbox.mediaBox.resourceData(smallestRepresentation.resource).start(next: { next in + let thumbnailDisposable = account.postbox.mediaBox.resourceData(smallestRepresentation.resource, attemptSynchronously: attemptSynchronously).start(next: { next in subscriber.putNext(next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: [])) }, error: subscriber.putError, completed: subscriber.putCompletion) @@ -2052,7 +2052,7 @@ private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaR if autoFetchFullSize { fullSizeData = Signal, NoError> { subscriber in let fetchedFullSizeDisposable = fetchedFullSize.start() - let fullSizeDisposable = account.postbox.mediaBox.resourceData(largestRepresentation.resource).start(next: { next in + let fullSizeDisposable = account.postbox.mediaBox.resourceData(largestRepresentation.resource, attemptSynchronously: attemptSynchronously).start(next: { next in subscriber.putNext(Tuple(next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []), next.complete)) }, error: subscriber.putError, completed: subscriber.putCompletion) @@ -2082,8 +2082,8 @@ private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaR } } -public func chatAvatarGalleryPhoto(account: Account, representations: [ImageRepresentationWithReference], autoFetchFullSize: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { - let signal = avatarGalleryPhotoDatas(account: account, representations: representations, autoFetchFullSize: autoFetchFullSize) +public func chatAvatarGalleryPhoto(account: Account, representations: [ImageRepresentationWithReference], autoFetchFullSize: Bool = false, attemptSynchronously: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { + let signal = avatarGalleryPhotoDatas(account: account, representations: representations, autoFetchFullSize: autoFetchFullSize, attemptSynchronously: attemptSynchronously) return signal |> map { value in diff --git a/submodules/Postbox/Sources/AllChatListHolesView.swift b/submodules/Postbox/Sources/AllChatListHolesView.swift new file mode 100644 index 0000000000..6f40b007c8 --- /dev/null +++ b/submodules/Postbox/Sources/AllChatListHolesView.swift @@ -0,0 +1,63 @@ +import Foundation + +final class MutableAllChatListHolesView: MutablePostboxView { + fileprivate let groupId: PeerGroupId + private var holes = Set() + fileprivate var latestHole: ChatListHole? + + init(postbox: Postbox, groupId: PeerGroupId) { + self.groupId = groupId + self.holes = Set(postbox.chatListTable.allHoles(groupId: groupId)) + self.latestHole = self.holes.max(by: { $0.index < $1.index }) + } + + func replay(postbox: Postbox, transaction: PostboxTransaction) -> Bool { + if let operations = transaction.chatListOperations[self.groupId] { + var updated = false + for operation in operations { + switch operation { + case let .InsertHole(hole): + if !self.holes.contains(hole) { + self.holes.insert(hole) + updated = true + } + case let .RemoveHoles(indices): + for index in indices { + if self.holes.contains(ChatListHole(index: index.messageIndex)) { + self.holes.remove(ChatListHole(index: index.messageIndex)) + updated = true + } + } + default: + break + } + } + + if updated { + let updatedLatestHole = self.holes.max(by: { $0.index < $1.index }) + if updatedLatestHole != self.latestHole { + self.latestHole = updatedLatestHole + return true + } else { + return false + } + } else { + return false + } + } else { + return false + } + } + + func immutableView() -> PostboxView { + return AllChatListHolesView(self) + } +} + +public final class AllChatListHolesView: PostboxView { + public let latestHole: ChatListHole? + + init(_ view: MutableAllChatListHolesView) { + self.latestHole = view.latestHole + } +} diff --git a/submodules/Postbox/Sources/ChatListIndexTable.swift b/submodules/Postbox/Sources/ChatListIndexTable.swift index 3d12b9b25a..1a66b80bd7 100644 --- a/submodules/Postbox/Sources/ChatListIndexTable.swift +++ b/submodules/Postbox/Sources/ChatListIndexTable.swift @@ -570,13 +570,10 @@ final class ChatListIndexTable: Table { func debugReindexUnreadCounts(postbox: Postbox) -> (ChatListTotalUnreadState, [PeerGroupId: PeerGroupUnreadCountersCombinedSummary]) { var peerIds: [PeerId] = [] - self.valueBox.scanInt64(self.table, values: { key, _ in - let peerId = PeerId(key) - if peerId.namespace != Int32.max { - peerIds.append(peerId) - } - return true - }) + for groupId in postbox.chatListTable.existingGroups() + [.root] { + let groupPeerIds = postbox.chatListTable.allPeerIds(groupId: groupId) + peerIds.append(contentsOf: groupPeerIds) + } var rootState = ChatListTotalUnreadState(absoluteCounters: [:], filteredCounters: [:]) var summaries: [PeerGroupId: PeerGroupUnreadCountersCombinedSummary] = [:] for peerId in peerIds { diff --git a/submodules/Postbox/Sources/ChatListTable.swift b/submodules/Postbox/Sources/ChatListTable.swift index 6b9682e432..b44e99fc82 100644 --- a/submodules/Postbox/Sources/ChatListTable.swift +++ b/submodules/Postbox/Sources/ChatListTable.swift @@ -381,7 +381,7 @@ final class ChatListTable: Table { self.valueBox.remove(self.table, key: self.key(groupId: groupId, index: ChatListIndex(pinningIndex: nil, messageIndex: index), type: .hole), secure: false) } - func entriesAround(groupId: PeerGroupId, index: ChatListIndex, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int) -> (entries: [ChatListIntermediateEntry], lower: ChatListIntermediateEntry?, upper: ChatListIntermediateEntry?) { + func entriesAround(groupId: PeerGroupId, index: ChatListIndex, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int, predicate: ((ChatListIntermediateEntry) -> Bool)?) -> (entries: [ChatListIntermediateEntry], lower: ChatListIntermediateEntry?, upper: ChatListIntermediateEntry?) { self.ensureInitialized(groupId: groupId) var lowerEntries: [ChatListIntermediateEntry] = [] @@ -389,18 +389,38 @@ final class ChatListTable: Table { var lower: ChatListIntermediateEntry? var upper: ChatListIntermediateEntry? - self.valueBox.range(self.table, start: self.key(groupId: groupId, index: index, type: .message), end: self.lowerBound(groupId: groupId), values: { key, value in - lowerEntries.append(readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)) - return true + self.valueBox.filteredRange(self.table, start: self.key(groupId: groupId, index: index, type: .message), end: self.lowerBound(groupId: groupId), values: { key, value in + let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value) + if let predicate = predicate { + if predicate(entry) { + lowerEntries.append(entry) + return .accept + } else { + return .skip + } + } else { + lowerEntries.append(entry) + return .accept + } }, limit: count / 2 + 1) if lowerEntries.count >= count / 2 + 1 { lower = lowerEntries.last lowerEntries.removeLast() } - self.valueBox.range(self.table, start: self.key(groupId: groupId, index: index, type: .message).predecessor, end: self.upperBound(groupId: groupId), values: { key, value in - upperEntries.append(readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)) - return true + self.valueBox.filteredRange(self.table, start: self.key(groupId: groupId, index: index, type: .message).predecessor, end: self.upperBound(groupId: groupId), values: { key, value in + let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value) + if let predicate = predicate { + if predicate(entry) { + upperEntries.append(entry) + return .accept + } else { + return .skip + } + } else { + upperEntries.append(entry) + return .accept + } }, limit: count - lowerEntries.count + 1) if upperEntries.count >= count - lowerEntries.count + 1 { upper = upperEntries.last @@ -415,12 +435,20 @@ final class ChatListTable: Table { startEntryType = .message case .hole: startEntryType = .hole - /*case .groupReference: - startEntryType = .groupReference*/ } - self.valueBox.range(self.table, start: self.key(groupId: groupId, index: lowerEntries.last!.index, type: startEntryType), end: self.lowerBound(groupId: groupId), values: { key, value in - additionalLowerEntries.append(readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)) - return true + self.valueBox.filteredRange(self.table, start: self.key(groupId: groupId, index: lowerEntries.last!.index, type: startEntryType), end: self.lowerBound(groupId: groupId), values: { key, value in + let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value) + if let predicate = predicate { + if predicate(entry) { + additionalLowerEntries.append(entry) + return .accept + } else { + return .skip + } + } else { + additionalLowerEntries.append(entry) + return .accept + } }, limit: count - lowerEntries.count - upperEntries.count + 1) if additionalLowerEntries.count >= count - lowerEntries.count + upperEntries.count + 1 { lower = additionalLowerEntries.last @@ -502,7 +530,7 @@ final class ChatListTable: Table { return result } - func earlierEntries(groupId: PeerGroupId, index: (ChatListIndex, Bool)?, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int) -> [ChatListIntermediateEntry] { + func earlierEntries(groupId: PeerGroupId, index: (ChatListIndex, Bool)?, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int, predicate: ((ChatListIntermediateEntry) -> Bool)?) -> [ChatListIntermediateEntry] { self.ensureInitialized(groupId: groupId) var entries: [ChatListIntermediateEntry] = [] @@ -513,9 +541,19 @@ final class ChatListTable: Table { key = self.upperBound(groupId: groupId) } - self.valueBox.range(self.table, start: key, end: self.lowerBound(groupId: groupId), values: { key, value in - entries.append(readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)) - return true + self.valueBox.filteredRange(self.table, start: key, end: self.lowerBound(groupId: groupId), values: { key, value in + let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value) + if let predicate = predicate { + if predicate(entry) { + entries.append(entry) + return .accept + } else { + return .skip + } + } else { + entries.append(entry) + return .accept + } }, limit: count) return entries } @@ -556,7 +594,7 @@ final class ChatListTable: Table { return entries } - func laterEntries(groupId: PeerGroupId, index: (ChatListIndex, Bool)?, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int) -> [ChatListIntermediateEntry] { + func laterEntries(groupId: PeerGroupId, index: (ChatListIndex, Bool)?, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int, predicate: ((ChatListIntermediateEntry) -> Bool)?) -> [ChatListIntermediateEntry] { self.ensureInitialized(groupId: groupId) var entries: [ChatListIntermediateEntry] = [] @@ -567,9 +605,19 @@ final class ChatListTable: Table { key = self.lowerBound(groupId: groupId) } - self.valueBox.range(self.table, start: key, end: self.upperBound(groupId: groupId), values: { key, value in - entries.append(readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)) - return true + self.valueBox.filteredRange(self.table, start: key, end: self.upperBound(groupId: groupId), values: { key, value in + let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value) + if let predicate = predicate { + if predicate(entry) { + entries.append(entry) + return .accept + } else { + return .skip + } + } else { + entries.append(entry) + return .accept + } }, limit: count) return entries } @@ -590,6 +638,19 @@ final class ChatListTable: Table { return nil } + func getEntry(groupId: PeerGroupId, peerId: PeerId, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable) -> ChatListIntermediateEntry? { + if let (peerGroupId, index) = self.getPeerChatListIndex(peerId: peerId), peerGroupId == groupId { + let key = self.key(groupId: groupId, index: index, type: .message) + if let value = self.valueBox.get(self.table, key: key) { + return readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value) + } else { + return nil + } + } else { + return nil + } + } + func allEntries(groupId: PeerGroupId) -> [ChatListEntryInfo] { var entries: [ChatListEntryInfo] = [] self.valueBox.range(self.table, start: self.upperBound(groupId: groupId), end: self.lowerBound(groupId: groupId), values: { key, value in @@ -619,6 +680,35 @@ final class ChatListTable: Table { return entries } + func allPeerIds(groupId: PeerGroupId) -> [PeerId] { + var peerIds: [PeerId] = [] + self.valueBox.range(self.table, start: self.upperBound(groupId: groupId), end: self.lowerBound(groupId: groupId), keys: { key in + let (keyGroupId, pinningIndex, messageIndex, type) = extractKey(key) + assert(groupId == keyGroupId) + + let index = ChatListIndex(pinningIndex: pinningIndex, messageIndex: messageIndex) + if type == ChatListEntryType.message.rawValue { + peerIds.append(messageIndex.id.peerId) + } + return true + }, limit: 0) + return peerIds + } + + func allHoles(groupId: PeerGroupId) -> [ChatListHole] { + var entries: [ChatListHole] = [] + self.valueBox.range(self.table, start: self.upperBound(groupId: groupId), end: self.lowerBound(groupId: groupId), keys: { key in + let (keyGroupId, pinningIndex, messageIndex, type) = extractKey(key) + assert(groupId == keyGroupId) + if type == ChatListEntryType.hole.rawValue { + let index = ChatListIndex(pinningIndex: pinningIndex, messageIndex: messageIndex) + entries.append(ChatListHole(index: index.messageIndex)) + } + return true + }, limit: 0) + return entries + } + func entriesInRange(groupId: PeerGroupId, upperBound: ChatListIndex, lowerBound: ChatListIndex) -> [ChatListEntryInfo] { var entries: [ChatListEntryInfo] = [] let upperBoundKey: ValueBoxKey @@ -710,7 +800,7 @@ final class ChatListTable: Table { } func debugList(groupId: PeerGroupId, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable) -> [ChatListIntermediateEntry] { - return self.laterEntries(groupId: groupId, index: (ChatListIndex.absoluteLowerBound, true), messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, count: 1000) + return self.laterEntries(groupId: groupId, index: (ChatListIndex.absoluteLowerBound, true), messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, count: 1000, predicate: nil) } func getNamespaceEntries(groupId: PeerGroupId, namespace: MessageId.Namespace, summaryTag: MessageTags?, messageIndexTable: MessageHistoryIndexTable, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, readStateTable: MessageHistoryReadStateTable, summaryTable: MessageHistoryTagsSummaryTable) -> [ChatListNamespaceEntry] { diff --git a/submodules/Postbox/Sources/ChatListView.swift b/submodules/Postbox/Sources/ChatListView.swift index e8b09b758e..920d88b95b 100644 --- a/submodules/Postbox/Sources/ChatListView.swift +++ b/submodules/Postbox/Sources/ChatListView.swift @@ -297,6 +297,7 @@ private func updatedRenderedPeer(_ renderedPeer: RenderedPeer, updatedPeers: [Pe final class MutableChatListView { let groupId: PeerGroupId + let filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)? private let summaryComponents: ChatListEntrySummaryComponents fileprivate var additionalItemIds: Set fileprivate var additionalItemEntries: [MutableChatListEntry] @@ -306,8 +307,11 @@ final class MutableChatListView { fileprivate var groupEntries: [ChatListGroupReferenceEntry] private var count: Int - init(postbox: Postbox, groupId: PeerGroupId, earlier: MutableChatListEntry?, entries: [MutableChatListEntry], later: MutableChatListEntry?, count: Int, summaryComponents: ChatListEntrySummaryComponents) { + init(postbox: Postbox, groupId: PeerGroupId, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)?, aroundIndex: ChatListIndex, count: Int, summaryComponents: ChatListEntrySummaryComponents) { + let (entries, earlier, later) = postbox.fetchAroundChatEntries(groupId: groupId, index: aroundIndex, count: count, filterPredicate: filterPredicate) + self.groupId = groupId + self.filterPredicate = filterPredicate self.earlier = earlier self.entries = entries self.later = later @@ -405,7 +409,7 @@ final class MutableChatListView { index = self.entries[self.entries.count / 2].index } - let (entries, earlier, later) = postbox.fetchAroundChatEntries(groupId: self.groupId, index: index, count: self.count) + let (entries, earlier, later) = postbox.fetchAroundChatEntries(groupId: self.groupId, index: index, count: self.count, filterPredicate: self.filterPredicate) let currentGroupEntries = self.groupEntries self.reloadGroups(postbox: postbox) @@ -426,7 +430,7 @@ final class MutableChatListView { return updated } - func replay(postbox: Postbox, operations: [PeerGroupId: [ChatListOperation]], updatedPeerNotificationSettings: [PeerId: PeerNotificationSettings], updatedPeers: [PeerId: Peer], updatedPeerPresences: [PeerId: PeerPresence], transaction: PostboxTransaction, context: MutableChatListViewReplayContext) -> Bool { + func replay(postbox: Postbox, operations: [PeerGroupId: [ChatListOperation]], updatedPeerNotificationSettings: [PeerId: (PeerNotificationSettings?, PeerNotificationSettings)], updatedPeers: [PeerId: Peer], updatedPeerPresences: [PeerId: PeerPresence], transaction: PostboxTransaction, context: MutableChatListViewReplayContext) -> Bool { var hasChanges = false if let groupOperations = operations[self.groupId] { @@ -489,6 +493,44 @@ final class MutableChatListView { } if !updatedPeerNotificationSettings.isEmpty { + if let filterPredicate = self.filterPredicate { + for (peerId, settingsChange) in updatedPeerNotificationSettings { + if let peer = postbox.peerTable.get(peerId) { + let isUnread = postbox.readStateTable.getCombinedState(peerId)?.isUnread ?? false + let wasIncluded = filterPredicate(peer, settingsChange.0, isUnread) + let isIncluded = filterPredicate(peer, settingsChange.1, isUnread) + if wasIncluded != isIncluded { + if isIncluded { + if let entry = postbox.chatListTable.getEntry(groupId: self.groupId, peerId: peerId, messageHistoryTable: postbox.messageHistoryTable, peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable) { + switch entry { + case let .message(index, message, embeddedState): + let combinedReadState = postbox.readStateTable.getCombinedState(index.messageIndex.id.peerId) + if self.add(.IntermediateMessageEntry(entry.index, message, combinedReadState, embeddedState), postbox: postbox) { + hasChanges = true + } + default: + break + } + } + } else { + loop: for i in 0 ..< self.entries.count { + switch self.entries[i] { + case .MessageEntry(let index, _, _, _, _, _, _, _, _), .IntermediateMessageEntry(let index, _, _, _): + if index.messageIndex.id.peerId == peerId { + self.entries.remove(at: i) + hasChanges = true + break loop + } + default: + break + } + } + } + } + } + } + } + for i in 0 ..< self.entries.count { switch self.entries[i] { case let .MessageEntry(index, message, readState, _, embeddedState, peer, peerPresence, summaryInfo, hasFailed): @@ -496,7 +538,7 @@ final class MutableChatListView { if let peer = peer.peers[peer.peerId], let associatedPeerId = peer.associatedPeerId { notificationSettingsPeerId = associatedPeerId } - if let settings = updatedPeerNotificationSettings[notificationSettingsPeerId] { + if let (_, settings) = updatedPeerNotificationSettings[notificationSettingsPeerId] { self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed) hasChanges = true } @@ -619,7 +661,25 @@ final class MutableChatListView { } func add(_ initialEntry: MutableChatListEntry, postbox: Postbox) -> Bool { + if let filterPredicate = self.filterPredicate { + switch initialEntry { + case .IntermediateMessageEntry(let index, _, _, _), .MessageEntry(let index, _, _, _, _, _, _, _, _): + if let peer = postbox.peerTable.get(index.messageIndex.id.peerId) { + let isUnread = postbox.readStateTable.getCombinedState(index.messageIndex.id.peerId)?.isUnread ?? false + if !filterPredicate(peer, postbox.peerNotificationSettingsTable.getEffective(index.messageIndex.id.peerId), isUnread) { + return false + } + } else { + return false + } + break + default: + break + } + } + let entry = processedChatListEntry(initialEntry, cachedDataTable: postbox.cachedPeerDataTable, readStateTable: postbox.readStateTable, messageHistoryTable: postbox.messageHistoryTable) + if self.entries.count == 0 { self.entries.append(entry) return true @@ -756,10 +816,10 @@ final class MutableChatListView { } if let later = self.later { - addedEntries += postbox.fetchLaterChatEntries(groupId: self.groupId, index: later.index.predecessor, count: self.count) + addedEntries += postbox.fetchLaterChatEntries(groupId: self.groupId, index: later.index.predecessor, count: self.count, filterPredicate: filterPredicate) } if let earlier = self.earlier { - addedEntries += postbox.fetchEarlierChatEntries(groupId: self.groupId, index: earlier.index.successor, count: self.count) + addedEntries += postbox.fetchEarlierChatEntries(groupId: self.groupId, index: earlier.index.successor, count: self.count, filterPredicate: filterPredicate) } addedEntries += self.entries @@ -808,7 +868,7 @@ final class MutableChatListView { earlyId = self.entries[i].index } - let earlierEntries = postbox.fetchEarlierChatEntries(groupId: self.groupId, index: earlyId, count: 1) + let earlierEntries = postbox.fetchEarlierChatEntries(groupId: self.groupId, index: earlyId, count: 1, filterPredicate: self.filterPredicate) self.earlier = earlierEntries.first } @@ -819,7 +879,7 @@ final class MutableChatListView { laterId = self.entries[i].index } - let laterEntries = postbox.fetchLaterChatEntries(groupId: self.groupId, index: laterId, count: 1) + let laterEntries = postbox.fetchLaterChatEntries(groupId: self.groupId, index: laterId, count: 1, filterPredicate: self.filterPredicate) self.later = laterEntries.first } } diff --git a/submodules/Postbox/Sources/Coding.swift b/submodules/Postbox/Sources/Coding.swift index 0e73649666..e25c870781 100644 --- a/submodules/Postbox/Sources/Coding.swift +++ b/submodules/Postbox/Sources/Coding.swift @@ -77,7 +77,7 @@ public class MemoryBuffer: Equatable, CustomStringConvertible { data.copyBytes(to: self.memory.assumingMemoryBound(to: UInt8.self), count: data.count) self.capacity = data.count self.length = data.count - self.freeWhenDone = false + self.freeWhenDone = true } } diff --git a/submodules/Postbox/Sources/HistoryTagInfoView.swift b/submodules/Postbox/Sources/HistoryTagInfoView.swift new file mode 100644 index 0000000000..4b145600b2 --- /dev/null +++ b/submodules/Postbox/Sources/HistoryTagInfoView.swift @@ -0,0 +1,76 @@ +import Foundation + +final class MutableHistoryTagInfoView: MutablePostboxView { + fileprivate let peerId: PeerId + fileprivate let tag: MessageTags + + fileprivate var currentIndex: MessageIndex? + + init(postbox: Postbox, peerId: PeerId, tag: MessageTags) { + self.peerId = peerId + self.tag = tag + for namespace in postbox.messageHistoryIndexTable.existingNamespaces(peerId: self.peerId) { + if let index = postbox.messageHistoryTagsTable.latestIndex(tag: self.tag, peerId: self.peerId, namespace: namespace) { + self.currentIndex = index + break + } + } + } + + func replay(postbox: Postbox, transaction: PostboxTransaction) -> Bool { + if let operations = transaction.currentOperationsByPeerId[self.peerId] { + var updated = false + var refresh = false + for operation in operations { + switch operation { + case let .InsertMessage(message): + if self.currentIndex == nil { + if message.tags.contains(self.tag) { + self.currentIndex = message.index + updated = true + } + } + case let .Remove(indicesAndTags): + if self.currentIndex != nil { + for (index, tags) in indicesAndTags { + if tags.contains(self.tag) { + if index == self.currentIndex { + self.currentIndex = nil + updated = true + refresh = true + } + } + } + } + default: + break + } + } + + if refresh { + for namespace in postbox.messageHistoryIndexTable.existingNamespaces(peerId: self.peerId) { + if let index = postbox.messageHistoryTagsTable.latestIndex(tag: self.tag, peerId: self.peerId, namespace: namespace) { + self.currentIndex = index + break + } + } + } + + return updated + } else { + return false + } + } + + func immutableView() -> PostboxView { + return HistoryTagInfoView(self) + } +} + +public final class HistoryTagInfoView: PostboxView { + public let isEmpty: Bool + + init(_ view: MutableHistoryTagInfoView) { + self.isEmpty = view.currentIndex == nil + } +} diff --git a/submodules/Postbox/Sources/MessageHistoryTagsTable.swift b/submodules/Postbox/Sources/MessageHistoryTagsTable.swift index 0f4c7f6570..2af930855d 100644 --- a/submodules/Postbox/Sources/MessageHistoryTagsTable.swift +++ b/submodules/Postbox/Sources/MessageHistoryTagsTable.swift @@ -132,6 +132,15 @@ class MessageHistoryTagsTable: Table { return Int(self.valueBox.count(self.table, start: lowerBoundKey, end: upperBoundKey)) } + func latestIndex(tag: MessageTags, peerId: PeerId, namespace: MessageId.Namespace) -> MessageIndex? { + var result: MessageIndex? + self.valueBox.range(self.table, start: self.lowerBound(tag: tag, peerId: peerId, namespace: namespace), end: self.upperBound(tag: tag, peerId: peerId, namespace: namespace), keys: { key in + result = extractKey(key) + return true + }, limit: 1) + return result + } + func findRandomIndex(peerId: PeerId, namespace: MessageId.Namespace, tag: MessageTags, ignoreIds: ([MessageId], Set), isMessage: (MessageIndex) -> Bool) -> MessageIndex? { var indices: [MessageIndex] = [] self.valueBox.range(self.table, start: self.lowerBound(tag: tag, peerId: peerId, namespace: namespace), end: self.upperBound(tag: tag, peerId: peerId, namespace: namespace), keys: { key in diff --git a/submodules/Postbox/Sources/MessageHistoryView.swift b/submodules/Postbox/Sources/MessageHistoryView.swift index bc62626fe2..615ef4082c 100644 --- a/submodules/Postbox/Sources/MessageHistoryView.swift +++ b/submodules/Postbox/Sources/MessageHistoryView.swift @@ -258,6 +258,7 @@ final class MutableMessageHistoryView { let tag: MessageTags? let namespaces: MessageIdNamespaces private let orderStatistics: MessageHistoryViewOrderStatistics + private let clipHoles: Bool private let anchor: HistoryViewInputAnchor fileprivate var combinedReadStates: MessageHistoryViewReadState? @@ -271,10 +272,11 @@ final class MutableMessageHistoryView { fileprivate(set) var sampledState: HistoryViewSample - init(postbox: Postbox, orderStatistics: MessageHistoryViewOrderStatistics, peerIds: MessageHistoryViewPeerIds, anchor inputAnchor: HistoryViewInputAnchor, combinedReadStates: MessageHistoryViewReadState?, transientReadStates: MessageHistoryViewReadState?, tag: MessageTags?, namespaces: MessageIdNamespaces, count: Int, topTaggedMessages: [MessageId.Namespace: MessageHistoryTopTaggedMessage?], additionalDatas: [AdditionalMessageHistoryViewDataEntry], getMessageCountInRange: (MessageIndex, MessageIndex) -> Int32) { + init(postbox: Postbox, orderStatistics: MessageHistoryViewOrderStatistics, clipHoles: Bool, peerIds: MessageHistoryViewPeerIds, anchor inputAnchor: HistoryViewInputAnchor, combinedReadStates: MessageHistoryViewReadState?, transientReadStates: MessageHistoryViewReadState?, tag: MessageTags?, namespaces: MessageIdNamespaces, count: Int, topTaggedMessages: [MessageId.Namespace: MessageHistoryTopTaggedMessage?], additionalDatas: [AdditionalMessageHistoryViewDataEntry], getMessageCountInRange: (MessageIndex, MessageIndex) -> Int32) { self.anchor = inputAnchor self.orderStatistics = orderStatistics + self.clipHoles = clipHoles self.peerIds = peerIds self.combinedReadStates = combinedReadStates self.transientReadStates = transientReadStates @@ -290,12 +292,12 @@ final class MutableMessageHistoryView { switch sampledState { case let .ready(anchor, holes): self.state = .loaded(HistoryViewLoadedState(anchor: anchor, tag: tag, namespaces: namespaces, statistics: self.orderStatistics, halfLimit: count + 1, locations: peerIds, postbox: postbox, holes: holes)) - self.sampledState = self.state.sample(postbox: postbox) + self.sampledState = self.state.sample(postbox: postbox, clipHoles: self.clipHoles) case .loadHole: break } } - self.sampledState = self.state.sample(postbox: postbox) + self.sampledState = self.state.sample(postbox: postbox, clipHoles: self.clipHoles) self.render(postbox: postbox) } @@ -320,7 +322,7 @@ final class MutableMessageHistoryView { break } } - self.sampledState = self.state.sample(postbox: postbox) + self.sampledState = self.state.sample(postbox: postbox, clipHoles: self.clipHoles) } func refreshDueToExternalTransaction(postbox: Postbox) -> Bool { @@ -509,7 +511,7 @@ final class MutableMessageHistoryView { break } } - self.sampledState = self.state.sample(postbox: postbox) + self.sampledState = self.state.sample(postbox: postbox, clipHoles: self.clipHoles) } for operationSet in operations { diff --git a/submodules/Postbox/Sources/MessageHistoryViewState.swift b/submodules/Postbox/Sources/MessageHistoryViewState.swift index 3ca9492b0c..731a0d4263 100644 --- a/submodules/Postbox/Sources/MessageHistoryViewState.swift +++ b/submodules/Postbox/Sources/MessageHistoryViewState.swift @@ -1,8 +1,13 @@ import Foundation -struct PeerIdAndNamespace: Hashable { - let peerId: PeerId - let namespace: MessageId.Namespace +public struct PeerIdAndNamespace: Hashable { + public let peerId: PeerId + public let namespace: MessageId.Namespace + + public init(peerId: PeerId, namespace: MessageId.Namespace) { + self.peerId = peerId + self.namespace = namespace + } } private func canContainHoles(_ peerIdAndNamespace: PeerIdAndNamespace, seedConfiguration: SeedConfiguration) -> Bool { @@ -1134,7 +1139,7 @@ final class HistoryViewLoadedState { return updated } - func completeAndSample(postbox: Postbox) -> HistoryViewLoadedSample { + func completeAndSample(postbox: Postbox, clipHoles: Bool) -> HistoryViewLoadedSample { if !self.spacesWithRemovals.isEmpty { for space in self.spacesWithRemovals { self.fillSpace(space: space, postbox: postbox) @@ -1165,7 +1170,7 @@ final class HistoryViewLoadedState { entry = self.orderedEntriesBySpace[space]!.higherThanAnchor[index] } - if !clipRanges.isEmpty { + if clipHoles && !clipRanges.isEmpty { let entryIndex = entry.index for range in clipRanges { if range.contains(entryIndex) { @@ -1373,12 +1378,12 @@ enum HistoryViewState { } } - func sample(postbox: Postbox) -> HistoryViewSample { + func sample(postbox: Postbox, clipHoles: Bool) -> HistoryViewSample { switch self { - case let .loading(loadingState): - return .loading(loadingState.checkAndSample(postbox: postbox)) - case let .loaded(loadedState): - return .loaded(loadedState.completeAndSample(postbox: postbox)) + case let .loading(loadingState): + return .loading(loadingState.checkAndSample(postbox: postbox)) + case let .loaded(loadedState): + return .loaded(loadedState.completeAndSample(postbox: postbox, clipHoles: clipHoles)) } } } diff --git a/submodules/Postbox/Sources/MessageOfInterestHolesView.swift b/submodules/Postbox/Sources/MessageOfInterestHolesView.swift index efa86ca1ec..caa7f03362 100644 --- a/submodules/Postbox/Sources/MessageOfInterestHolesView.swift +++ b/submodules/Postbox/Sources/MessageOfInterestHolesView.swift @@ -60,7 +60,7 @@ final class MutableMessageOfInterestHolesView: MutablePostboxView { } } self.anchor = anchor - self.wrappedView = MutableMessageHistoryView(postbox: postbox, orderStatistics: [], peerIds: peerIds, anchor: self.anchor, combinedReadStates: nil, transientReadStates: nil, tag: nil, namespaces: .all, count: self.count, topTaggedMessages: [:], additionalDatas: [], getMessageCountInRange: { _, _ in return 0}) + self.wrappedView = MutableMessageHistoryView(postbox: postbox, orderStatistics: [], clipHoles: true, peerIds: peerIds, anchor: self.anchor, combinedReadStates: nil, transientReadStates: nil, tag: nil, namespaces: .all, count: self.count, topTaggedMessages: [:], additionalDatas: [], getMessageCountInRange: { _, _ in return 0}) let _ = self.updateFromView() } @@ -132,7 +132,7 @@ final class MutableMessageOfInterestHolesView: MutablePostboxView { case let .peer(id): peerIds = postbox.peerIdsForLocation(.peer(id), tagMask: nil) } - self.wrappedView = MutableMessageHistoryView(postbox: postbox, orderStatistics: [], peerIds: peerIds, anchor: self.anchor, combinedReadStates: nil, transientReadStates: nil, tag: nil, namespaces: .all, count: self.count, topTaggedMessages: [:], additionalDatas: [], getMessageCountInRange: { _, _ in return 0}) + self.wrappedView = MutableMessageHistoryView(postbox: postbox, orderStatistics: [], clipHoles: true, peerIds: peerIds, anchor: self.anchor, combinedReadStates: nil, transientReadStates: nil, tag: nil, namespaces: .all, count: self.count, topTaggedMessages: [:], additionalDatas: [], getMessageCountInRange: { _, _ in return 0}) return self.updateFromView() } else if self.wrappedView.replay(postbox: postbox, transaction: transaction) { var reloadView = false @@ -160,7 +160,7 @@ final class MutableMessageOfInterestHolesView: MutablePostboxView { case let .peer(id): peerIds = postbox.peerIdsForLocation(.peer(id), tagMask: nil) } - self.wrappedView = MutableMessageHistoryView(postbox: postbox, orderStatistics: [], peerIds: peerIds, anchor: self.anchor, combinedReadStates: nil, transientReadStates: nil, tag: nil, namespaces: .all, count: self.count, topTaggedMessages: [:], additionalDatas: [], getMessageCountInRange: { _, _ in return 0}) + self.wrappedView = MutableMessageHistoryView(postbox: postbox, orderStatistics: [], clipHoles: true, peerIds: peerIds, anchor: self.anchor, combinedReadStates: nil, transientReadStates: nil, tag: nil, namespaces: .all, count: self.count, topTaggedMessages: [:], additionalDatas: [], getMessageCountInRange: { _, _ in return 0}) } return self.updateFromView() diff --git a/submodules/Postbox/Sources/PeerNotificationSettingsTable.swift b/submodules/Postbox/Sources/PeerNotificationSettingsTable.swift index 2d45e0e054..7fea4ea0d4 100644 --- a/submodules/Postbox/Sources/PeerNotificationSettingsTable.swift +++ b/submodules/Postbox/Sources/PeerNotificationSettingsTable.swift @@ -225,7 +225,7 @@ final class PeerNotificationSettingsTable: Table { return (added, removed) } - func resetAll(to settings: PeerNotificationSettings, updatedSettings: inout Set, updatedTimestamps: inout [PeerId: PeerNotificationSettingsBehaviorTimestamp]) -> [PeerId] { + func resetAll(to settings: PeerNotificationSettings, updatedSettings: inout Set, updatedTimestamps: inout [PeerId: PeerNotificationSettingsBehaviorTimestamp]) -> [PeerId: PeerNotificationSettings?] { let lowerBound = ValueBoxKey(length: 8) lowerBound.setInt64(0, value: 0) let upperBound = ValueBoxKey(length: 8) @@ -236,17 +236,17 @@ final class PeerNotificationSettingsTable: Table { return true }, limit: 0) - var updatedPeerIds: [PeerId] = [] + var updatedPeers: [PeerId: PeerNotificationSettings?] = [:] for peerId in peerIds { let entry = self.getEntry(peerId) if let current = entry.current, !current.isEqual(to: settings) || entry.pending != nil { let _ = self.setCurrent(id: peerId, settings: settings, updatedTimestamps: &updatedTimestamps) let _ = self.setPending(id: peerId, settings: nil, updatedSettings: &updatedSettings) - updatedPeerIds.append(peerId) + updatedPeers[peerId] = entry.effective } } - return updatedPeerIds + return updatedPeers } override func beforeCommit() { diff --git a/submodules/Postbox/Sources/PeerNotificationSettingsView.swift b/submodules/Postbox/Sources/PeerNotificationSettingsView.swift index c22d0b4a93..22a0825d02 100644 --- a/submodules/Postbox/Sources/PeerNotificationSettingsView.swift +++ b/submodules/Postbox/Sources/PeerNotificationSettingsView.swift @@ -26,7 +26,7 @@ final class MutablePeerNotificationSettingsView: MutablePostboxView { if let peer = postbox.peerTable.get(peerId), let associatedPeerId = peer.associatedPeerId { notificationPeerId = associatedPeerId } - if let settings = transaction.currentUpdatedPeerNotificationSettings[notificationPeerId] { + if let (_, settings) = transaction.currentUpdatedPeerNotificationSettings[notificationPeerId] { self.notificationSettings[peerId] = settings updated = true } diff --git a/submodules/Postbox/Sources/PeerView.swift b/submodules/Postbox/Sources/PeerView.swift index fd389a7fa5..0c5d610e2f 100644 --- a/submodules/Postbox/Sources/PeerView.swift +++ b/submodules/Postbox/Sources/PeerView.swift @@ -214,12 +214,12 @@ final class MutablePeerView: MutablePostboxView { if let peer = self.peers[self.peerId] { if let associatedPeerId = peer.associatedPeerId { - if let notificationSettings = updatedNotificationSettings[associatedPeerId] { + if let (_, notificationSettings) = updatedNotificationSettings[associatedPeerId] { self.notificationSettings = notificationSettings updated = true } } else { - if let notificationSettings = updatedNotificationSettings[peer.id] { + if let (_, notificationSettings) = updatedNotificationSettings[peer.id] { self.notificationSettings = notificationSettings updated = true } diff --git a/submodules/Postbox/Sources/Postbox.swift b/submodules/Postbox/Sources/Postbox.swift index fc19228729..31548f7f4f 100644 --- a/submodules/Postbox/Sources/Postbox.swift +++ b/submodules/Postbox/Sources/Postbox.swift @@ -1077,7 +1077,7 @@ public final class Postbox { private var currentPeerHoleOperations: [MessageHistoryIndexHoleOperationKey: [MessageHistoryIndexHoleOperation]] = [:] private var currentUpdatedPeers: [PeerId: Peer] = [:] - private var currentUpdatedPeerNotificationSettings: [PeerId: PeerNotificationSettings] = [:] + private var currentUpdatedPeerNotificationSettings: [PeerId: (PeerNotificationSettings?, PeerNotificationSettings)] = [:] private var currentUpdatedPeerNotificationBehaviorTimestamps: [PeerId: PeerNotificationSettingsBehaviorTimestamp] = [:] private var currentUpdatedCachedPeerData: [PeerId: CachedPeerData] = [:] private var currentUpdatedPeerPresences: [PeerId: PeerPresence] = [:] @@ -1362,11 +1362,14 @@ public final class Postbox { print("(Postbox initialization took \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms") let _ = self.transaction({ transaction -> Void in - let reindexUnreadVersion: Int32 = 1 + let reindexUnreadVersion: Int32 = 2 if self.messageHistoryMetadataTable.getShouldReindexUnreadCountsState() != reindexUnreadVersion { self.messageHistoryMetadataTable.setShouldReindexUnreadCounts(value: true) self.messageHistoryMetadataTable.setShouldReindexUnreadCountsState(value: reindexUnreadVersion) } + #if DEBUG + self.messageHistoryMetadataTable.setShouldReindexUnreadCounts(value: true) + #endif if self.messageHistoryMetadataTable.shouldReindexUnreadCounts() { self.groupMessageStatsTable.removeAll() @@ -1650,8 +1653,29 @@ public final class Postbox { self.synchronizeGroupMessageStatsTable.set(groupId: groupId, namespace: namespace, needsValidation: false, operations: &self.currentUpdatedGroupSummarySynchronizeOperations) } - func fetchAroundChatEntries(groupId: PeerGroupId, index: ChatListIndex, count: Int) -> (entries: [MutableChatListEntry], earlier: MutableChatListEntry?, later: MutableChatListEntry?) { - let (intermediateEntries, intermediateLower, intermediateUpper) = self.chatListTable.entriesAround(groupId: groupId, index: index, messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count) + private func mappedChatListFilterPredicate(_ predicate: @escaping (Peer, PeerNotificationSettings?, Bool) -> Bool) -> (ChatListIntermediateEntry) -> Bool { + return { entry in + switch entry { + case let .message(index, _, _): + if let peer = self.peerTable.get(index.messageIndex.id.peerId) { + let isUnread = self.readStateTable.getCombinedState(index.messageIndex.id.peerId)?.isUnread ?? false + if predicate(peer, self.peerNotificationSettingsTable.getEffective(index.messageIndex.id.peerId), isUnread) { + return true + } else { + return false + } + } else { + return false + } + case .hole: + return true + } + } + } + + func fetchAroundChatEntries(groupId: PeerGroupId, index: ChatListIndex, count: Int, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)?) -> (entries: [MutableChatListEntry], earlier: MutableChatListEntry?, later: MutableChatListEntry?) { + let mappedPredicate = filterPredicate.flatMap(self.mappedChatListFilterPredicate) + let (intermediateEntries, intermediateLower, intermediateUpper) = self.chatListTable.entriesAround(groupId: groupId, index: index, messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count, predicate: mappedPredicate) let entries: [MutableChatListEntry] = intermediateEntries.map { entry in return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable) } @@ -1665,16 +1689,18 @@ public final class Postbox { return (entries, lower, upper) } - func fetchEarlierChatEntries(groupId: PeerGroupId, index: ChatListIndex?, count: Int) -> [MutableChatListEntry] { - let intermediateEntries = self.chatListTable.earlierEntries(groupId: groupId, index: index.flatMap({ ($0, true) }), messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count) + func fetchEarlierChatEntries(groupId: PeerGroupId, index: ChatListIndex?, count: Int, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)?) -> [MutableChatListEntry] { + let mappedPredicate = filterPredicate.flatMap(self.mappedChatListFilterPredicate) + let intermediateEntries = self.chatListTable.earlierEntries(groupId: groupId, index: index.flatMap({ ($0, true) }), messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count, predicate: mappedPredicate) let entries: [MutableChatListEntry] = intermediateEntries.map { entry in return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable) } return entries } - func fetchLaterChatEntries(groupId: PeerGroupId, index: ChatListIndex?, count: Int) -> [MutableChatListEntry] { - let intermediateEntries = self.chatListTable.laterEntries(groupId: groupId, index: index.flatMap({ ($0, true) }), messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count) + func fetchLaterChatEntries(groupId: PeerGroupId, index: ChatListIndex?, count: Int, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)?) -> [MutableChatListEntry] { + let mappedPredicate = filterPredicate.flatMap(self.mappedChatListFilterPredicate) + let intermediateEntries = self.chatListTable.laterEntries(groupId: groupId, index: index.flatMap({ ($0, true) }), messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count, predicate: mappedPredicate) let entries: [MutableChatListEntry] = intermediateEntries.map { entry in return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable) } @@ -1891,21 +1917,33 @@ public final class Postbox { fileprivate func updateCurrentPeerNotificationSettings(_ notificationSettings: [PeerId: PeerNotificationSettings]) { for (peerId, settings) in notificationSettings { + let previous: PeerNotificationSettings? + if let (value, _) = self.currentUpdatedPeerNotificationSettings[peerId] { + previous = value + } else { + previous = self.peerNotificationSettingsTable.getEffective(peerId) + } if let updated = self.peerNotificationSettingsTable.setCurrent(id: peerId, settings: settings, updatedTimestamps: &self.currentUpdatedPeerNotificationBehaviorTimestamps) { - self.currentUpdatedPeerNotificationSettings[peerId] = updated + self.currentUpdatedPeerNotificationSettings[peerId] = (previous, updated) } } } fileprivate func updatePendingPeerNotificationSettings(peerId: PeerId, settings: PeerNotificationSettings?) { + let previous: PeerNotificationSettings? + if let (value, _) = self.currentUpdatedPeerNotificationSettings[peerId] { + previous = value + } else { + previous = self.peerNotificationSettingsTable.getEffective(peerId) + } if let updated = self.peerNotificationSettingsTable.setPending(id: peerId, settings: settings, updatedSettings: &self.currentUpdatedPendingPeerNotificationSettings) { - self.currentUpdatedPeerNotificationSettings[peerId] = updated + self.currentUpdatedPeerNotificationSettings[peerId] = (previous, updated) } } fileprivate func resetAllPeerNotificationSettings(_ notificationSettings: PeerNotificationSettings) { - for peerId in self.peerNotificationSettingsTable.resetAll(to: notificationSettings, updatedSettings: &self.currentUpdatedPendingPeerNotificationSettings, updatedTimestamps: &self.currentUpdatedPeerNotificationBehaviorTimestamps) { - self.currentUpdatedPeerNotificationSettings[peerId] = notificationSettings + for (peerId, previous) in self.peerNotificationSettingsTable.resetAll(to: notificationSettings, updatedSettings: &self.currentUpdatedPendingPeerNotificationSettings, updatedTimestamps: &self.currentUpdatedPeerNotificationBehaviorTimestamps) { + self.currentUpdatedPeerNotificationSettings[peerId] = (previous, notificationSettings) } } @@ -2266,7 +2304,7 @@ public final class Postbox { return peerIds } - public func aroundMessageOfInterestHistoryViewForChatLocation(_ chatLocation: ChatLocation, count: Int, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData]) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { + public func aroundMessageOfInterestHistoryViewForChatLocation(_ chatLocation: ChatLocation, count: Int, clipHoles: Bool = true, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData]) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { return self.transactionSignal(userInteractive: true, { subscriber, transaction in let peerIds = self.peerIdsForLocation(chatLocation, tagMask: tagMask) @@ -2312,26 +2350,26 @@ public final class Postbox { } } } - return self.syncAroundMessageHistoryViewForPeerId(subscriber: subscriber, peerIds: peerIds, count: count, anchor: anchor, fixedCombinedReadStates: nil, topTaggedMessageIdNamespaces: topTaggedMessageIdNamespaces, tagMask: tagMask, namespaces: namespaces, orderStatistics: orderStatistics, additionalData: additionalData) + return self.syncAroundMessageHistoryViewForPeerId(subscriber: subscriber, peerIds: peerIds, count: count, clipHoles: clipHoles, anchor: anchor, fixedCombinedReadStates: nil, topTaggedMessageIdNamespaces: topTaggedMessageIdNamespaces, tagMask: tagMask, namespaces: namespaces, orderStatistics: orderStatistics, additionalData: additionalData) }) } - public func aroundIdMessageHistoryViewForLocation(_ chatLocation: ChatLocation, count: Int, messageId: MessageId, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { + public func aroundIdMessageHistoryViewForLocation(_ chatLocation: ChatLocation, count: Int, clipHoles: Bool = true, messageId: MessageId, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { return self.transactionSignal { subscriber, transaction in let peerIds = self.peerIdsForLocation(chatLocation, tagMask: tagMask) - return self.syncAroundMessageHistoryViewForPeerId(subscriber: subscriber, peerIds: peerIds, count: count, anchor: .message(messageId), fixedCombinedReadStates: nil, topTaggedMessageIdNamespaces: topTaggedMessageIdNamespaces, tagMask: tagMask, namespaces: namespaces, orderStatistics: orderStatistics, additionalData: additionalData) + return self.syncAroundMessageHistoryViewForPeerId(subscriber: subscriber, peerIds: peerIds, count: count, clipHoles: clipHoles, anchor: .message(messageId), fixedCombinedReadStates: nil, topTaggedMessageIdNamespaces: topTaggedMessageIdNamespaces, tagMask: tagMask, namespaces: namespaces, orderStatistics: orderStatistics, additionalData: additionalData) } } - public func aroundMessageHistoryViewForLocation(_ chatLocation: ChatLocation, anchor: HistoryViewInputAnchor, count: Int, fixedCombinedReadStates: MessageHistoryViewReadState?, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { + public func aroundMessageHistoryViewForLocation(_ chatLocation: ChatLocation, anchor: HistoryViewInputAnchor, count: Int, clipHoles: Bool = true, fixedCombinedReadStates: MessageHistoryViewReadState?, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { return self.transactionSignal { subscriber, transaction in let peerIds = self.peerIdsForLocation(chatLocation, tagMask: tagMask) - return self.syncAroundMessageHistoryViewForPeerId(subscriber: subscriber, peerIds: peerIds, count: count, anchor: anchor, fixedCombinedReadStates: fixedCombinedReadStates, topTaggedMessageIdNamespaces: topTaggedMessageIdNamespaces, tagMask: tagMask, namespaces: namespaces, orderStatistics: orderStatistics, additionalData: additionalData) + return self.syncAroundMessageHistoryViewForPeerId(subscriber: subscriber, peerIds: peerIds, count: count, clipHoles: clipHoles, anchor: anchor, fixedCombinedReadStates: fixedCombinedReadStates, topTaggedMessageIdNamespaces: topTaggedMessageIdNamespaces, tagMask: tagMask, namespaces: namespaces, orderStatistics: orderStatistics, additionalData: additionalData) } } - private func syncAroundMessageHistoryViewForPeerId(subscriber: Subscriber<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError>, peerIds: MessageHistoryViewPeerIds, count: Int, anchor: HistoryViewInputAnchor, fixedCombinedReadStates: MessageHistoryViewReadState?, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData]) -> Disposable { + private func syncAroundMessageHistoryViewForPeerId(subscriber: Subscriber<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError>, peerIds: MessageHistoryViewPeerIds, count: Int, clipHoles: Bool, anchor: HistoryViewInputAnchor, fixedCombinedReadStates: MessageHistoryViewReadState?, topTaggedMessageIdNamespaces: Set, tagMask: MessageTags?, namespaces: MessageIdNamespaces, orderStatistics: MessageHistoryViewOrderStatistics, additionalData: [AdditionalMessageHistoryViewData]) -> Disposable { var topTaggedMessages: [MessageId.Namespace: MessageHistoryTopTaggedMessage?] = [:] var mainPeerId: PeerId? switch peerIds { @@ -2420,7 +2458,7 @@ public final class Postbox { readStates = transientReadStates } - let mutableView = MutableMessageHistoryView(postbox: self, orderStatistics: orderStatistics, peerIds: peerIds, anchor: anchor, combinedReadStates: readStates, transientReadStates: transientReadStates, tag: tagMask, namespaces: namespaces, count: count, topTaggedMessages: topTaggedMessages, additionalDatas: additionalDataEntries, getMessageCountInRange: { lowerBound, upperBound in + let mutableView = MutableMessageHistoryView(postbox: self, orderStatistics: orderStatistics, clipHoles: clipHoles, peerIds: peerIds, anchor: anchor, combinedReadStates: readStates, transientReadStates: transientReadStates, tag: tagMask, namespaces: namespaces, count: count, topTaggedMessages: topTaggedMessages, additionalDatas: additionalDataEntries, getMessageCountInRange: { lowerBound, upperBound in if let tagMask = tagMask { return Int32(self.messageHistoryTable.getMessageCountInRange(peerId: lowerBound.id.peerId, namespace: lowerBound.id.namespace, tag: tagMask, lowerBound: lowerBound, upperBound: upperBound)) } else { @@ -2508,15 +2546,13 @@ public final class Postbox { |> switchToLatest } - public func tailChatListView(groupId: PeerGroupId, count: Int, summaryComponents: ChatListEntrySummaryComponents) -> Signal<(ChatListView, ViewUpdateType), NoError> { - return self.aroundChatListView(groupId: groupId, index: ChatListIndex.absoluteUpperBound, count: count, summaryComponents: summaryComponents, userInteractive: true) + public func tailChatListView(groupId: PeerGroupId, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)? = nil, count: Int, summaryComponents: ChatListEntrySummaryComponents) -> Signal<(ChatListView, ViewUpdateType), NoError> { + return self.aroundChatListView(groupId: groupId, filterPredicate: filterPredicate, index: ChatListIndex.absoluteUpperBound, count: count, summaryComponents: summaryComponents, userInteractive: true) } - public func aroundChatListView(groupId: PeerGroupId, index: ChatListIndex, count: Int, summaryComponents: ChatListEntrySummaryComponents, userInteractive: Bool = false) -> Signal<(ChatListView, ViewUpdateType), NoError> { + public func aroundChatListView(groupId: PeerGroupId, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)? = nil, index: ChatListIndex, count: Int, summaryComponents: ChatListEntrySummaryComponents, userInteractive: Bool = false) -> Signal<(ChatListView, ViewUpdateType), NoError> { return self.transactionSignal(userInteractive: userInteractive, { subscriber, transaction in - let (entries, earlier, later) = self.fetchAroundChatEntries(groupId: groupId, index: index, count: count) - - let mutableView = MutableChatListView(postbox: self, groupId: groupId, earlier: earlier, entries: entries, later: later, count: count, summaryComponents: summaryComponents) + let mutableView = MutableChatListView(postbox: self, groupId: groupId, filterPredicate: filterPredicate, aroundIndex: index, count: count, summaryComponents: summaryComponents) mutableView.render(postbox: self, renderMessage: self.renderIntermediateMessage, getPeer: { id in return self.peerTable.get(id) }, getPeerNotificationSettings: { self.peerNotificationSettingsTable.getEffective($0) }, getPeerPresence: { self.peerPresenceTable.get($0) }) diff --git a/submodules/Postbox/Sources/PostboxTransaction.swift b/submodules/Postbox/Sources/PostboxTransaction.swift index ab12fb1cb1..207ed2a45a 100644 --- a/submodules/Postbox/Sources/PostboxTransaction.swift +++ b/submodules/Postbox/Sources/PostboxTransaction.swift @@ -7,7 +7,7 @@ final class PostboxTransaction { let chatListOperations: [PeerGroupId: [ChatListOperation]] let currentUpdatedChatListInclusions: [PeerId: PeerChatListInclusion] let currentUpdatedPeers: [PeerId: Peer] - let currentUpdatedPeerNotificationSettings: [PeerId: PeerNotificationSettings] + let currentUpdatedPeerNotificationSettings: [PeerId: (PeerNotificationSettings?, PeerNotificationSettings)] let currentUpdatedPeerNotificationBehaviorTimestamps: [PeerId: PeerNotificationSettingsBehaviorTimestamp] let currentUpdatedCachedPeerData: [PeerId: CachedPeerData] let currentUpdatedPeerPresences: [PeerId: PeerPresence] @@ -172,7 +172,7 @@ final class PostboxTransaction { return true } - init(currentUpdatedState: PostboxCoding?, currentPeerHoleOperations: [MessageHistoryIndexHoleOperationKey: [MessageHistoryIndexHoleOperation]] = [:], currentOperationsByPeerId: [PeerId: [MessageHistoryOperation]], chatListOperations: [PeerGroupId: [ChatListOperation]], currentUpdatedChatListInclusions: [PeerId: PeerChatListInclusion], currentUpdatedPeers: [PeerId: Peer], currentUpdatedPeerNotificationSettings: [PeerId: PeerNotificationSettings], currentUpdatedPeerNotificationBehaviorTimestamps: [PeerId: PeerNotificationSettingsBehaviorTimestamp], currentUpdatedCachedPeerData: [PeerId: CachedPeerData], currentUpdatedPeerPresences: [PeerId: PeerPresence], currentUpdatedPeerChatListEmbeddedStates: [PeerId: PeerChatListEmbeddedInterfaceState?], currentUpdatedTotalUnreadState: ChatListTotalUnreadState?, currentUpdatedTotalUnreadSummaries: [PeerGroupId: PeerGroupUnreadCountersCombinedSummary], alteredInitialPeerCombinedReadStates: [PeerId: CombinedPeerReadState], currentPeerMergedOperationLogOperations: [PeerMergedOperationLogOperation], currentTimestampBasedMessageAttributesOperations: [TimestampBasedMessageAttributesOperation], unsentMessageOperations: [IntermediateMessageHistoryUnsentOperation], updatedSynchronizePeerReadStateOperations: [PeerId: PeerReadStateSynchronizationOperation?], currentUpdatedGroupSummarySynchronizeOperations: [PeerGroupAndNamespace: Bool], currentPreferencesOperations: [PreferencesOperation], currentOrderedItemListOperations: [Int32: [OrderedItemListOperation]], currentItemCollectionItemsOperations: [ItemCollectionId: [ItemCollectionItemsOperation]], currentItemCollectionInfosOperations: [ItemCollectionInfosOperation], currentUpdatedPeerChatStates: Set, currentGlobalTagsOperations: [GlobalMessageHistoryTagsOperation], currentLocalTagsOperations: [IntermediateMessageHistoryLocalTagsOperation], updatedMedia: [MediaId: Media?], replaceRemoteContactCount: Int32?, replaceContactPeerIds: Set?, currentPendingMessageActionsOperations: [PendingMessageActionsOperation], currentUpdatedMessageActionsSummaries: [PendingMessageActionsSummaryKey: Int32], currentUpdatedMessageTagSummaries: [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], currentInvalidateMessageTagSummaries: [InvalidatedMessageHistoryTagsSummaryEntryOperation], currentUpdatedPendingPeerNotificationSettings: Set, replacedAdditionalChatListItems: [PeerId]?, updatedNoticeEntryKeys: Set, updatedCacheEntryKeys: Set, currentUpdatedMasterClientId: Int64?, updatedFailedMessagePeerIds: Set, updatedFailedMessageIds: Set) { + init(currentUpdatedState: PostboxCoding?, currentPeerHoleOperations: [MessageHistoryIndexHoleOperationKey: [MessageHistoryIndexHoleOperation]] = [:], currentOperationsByPeerId: [PeerId: [MessageHistoryOperation]], chatListOperations: [PeerGroupId: [ChatListOperation]], currentUpdatedChatListInclusions: [PeerId: PeerChatListInclusion], currentUpdatedPeers: [PeerId: Peer], currentUpdatedPeerNotificationSettings: [PeerId: (PeerNotificationSettings?, PeerNotificationSettings)], currentUpdatedPeerNotificationBehaviorTimestamps: [PeerId: PeerNotificationSettingsBehaviorTimestamp], currentUpdatedCachedPeerData: [PeerId: CachedPeerData], currentUpdatedPeerPresences: [PeerId: PeerPresence], currentUpdatedPeerChatListEmbeddedStates: [PeerId: PeerChatListEmbeddedInterfaceState?], currentUpdatedTotalUnreadState: ChatListTotalUnreadState?, currentUpdatedTotalUnreadSummaries: [PeerGroupId: PeerGroupUnreadCountersCombinedSummary], alteredInitialPeerCombinedReadStates: [PeerId: CombinedPeerReadState], currentPeerMergedOperationLogOperations: [PeerMergedOperationLogOperation], currentTimestampBasedMessageAttributesOperations: [TimestampBasedMessageAttributesOperation], unsentMessageOperations: [IntermediateMessageHistoryUnsentOperation], updatedSynchronizePeerReadStateOperations: [PeerId: PeerReadStateSynchronizationOperation?], currentUpdatedGroupSummarySynchronizeOperations: [PeerGroupAndNamespace: Bool], currentPreferencesOperations: [PreferencesOperation], currentOrderedItemListOperations: [Int32: [OrderedItemListOperation]], currentItemCollectionItemsOperations: [ItemCollectionId: [ItemCollectionItemsOperation]], currentItemCollectionInfosOperations: [ItemCollectionInfosOperation], currentUpdatedPeerChatStates: Set, currentGlobalTagsOperations: [GlobalMessageHistoryTagsOperation], currentLocalTagsOperations: [IntermediateMessageHistoryLocalTagsOperation], updatedMedia: [MediaId: Media?], replaceRemoteContactCount: Int32?, replaceContactPeerIds: Set?, currentPendingMessageActionsOperations: [PendingMessageActionsOperation], currentUpdatedMessageActionsSummaries: [PendingMessageActionsSummaryKey: Int32], currentUpdatedMessageTagSummaries: [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], currentInvalidateMessageTagSummaries: [InvalidatedMessageHistoryTagsSummaryEntryOperation], currentUpdatedPendingPeerNotificationSettings: Set, replacedAdditionalChatListItems: [PeerId]?, updatedNoticeEntryKeys: Set, updatedCacheEntryKeys: Set, currentUpdatedMasterClientId: Int64?, updatedFailedMessagePeerIds: Set, updatedFailedMessageIds: Set) { self.currentUpdatedState = currentUpdatedState self.currentPeerHoleOperations = currentPeerHoleOperations self.currentOperationsByPeerId = currentOperationsByPeerId diff --git a/submodules/Postbox/Sources/SqliteValueBox.swift b/submodules/Postbox/Sources/SqliteValueBox.swift index dcaa340bb2..70b3e5661d 100644 --- a/submodules/Postbox/Sources/SqliteValueBox.swift +++ b/submodules/Postbox/Sources/SqliteValueBox.swift @@ -1498,6 +1498,38 @@ public final class SqliteValueBox: ValueBox { withExtendedLifetime(end, {}) } + public func filteredRange(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, values: (ValueBoxKey, ReadBuffer) -> ValueBoxFilterResult, limit: Int) { + var currentStart = start + var acceptedCount = 0 + while acceptedCount < limit { + var hadStop = false + var lastKey: ValueBoxKey? + self.range(table, start: currentStart, end: end, values: { key, value in + lastKey = key + let result = values(key, value) + switch result { + case .accept: + acceptedCount += 1 + return true + case .skip: + return true + case .stop: + hadStop = true + return false + } + return true + }, limit: limit) + if let lastKey = lastKey { + currentStart = lastKey + } else { + break + } + if hadStop { + break + } + } + } + public func range(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, keys: (ValueBoxKey) -> Bool, limit: Int) { precondition(self.queue.isCurrent()) if let _ = self.tables[table.id] { diff --git a/submodules/Postbox/Sources/ValueBox.swift b/submodules/Postbox/Sources/ValueBox.swift index 00297c3708..08396740e6 100644 --- a/submodules/Postbox/Sources/ValueBox.swift +++ b/submodules/Postbox/Sources/ValueBox.swift @@ -57,6 +57,12 @@ public struct ValueBoxEncryptionParameters { } } +public enum ValueBoxFilterResult { + case accept + case skip + case stop +} + public protocol ValueBox { func begin() func commit() @@ -66,6 +72,7 @@ public protocol ValueBox { func endStats() func range(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, values: (ValueBoxKey, ReadBuffer) -> Bool, limit: Int) + func filteredRange(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, values: (ValueBoxKey, ReadBuffer) -> ValueBoxFilterResult, limit: Int) func range(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, keys: (ValueBoxKey) -> Bool, limit: Int) func scan(_ table: ValueBoxTable, values: (ValueBoxKey, ReadBuffer) -> Bool) func scan(_ table: ValueBoxTable, keys: (ValueBoxKey) -> Bool) diff --git a/submodules/Postbox/Sources/Views.swift b/submodules/Postbox/Sources/Views.swift index 86e870ac6b..c593c746e7 100644 --- a/submodules/Postbox/Sources/Views.swift +++ b/submodules/Postbox/Sources/Views.swift @@ -27,279 +27,301 @@ public enum PostboxViewKey: Hashable { case peerNotificationSettingsBehaviorTimestampView case peerChatInclusion(PeerId) case basicPeer(PeerId) + case allChatListHoles(PeerGroupId) + case historyTagInfo(peerId: PeerId, tag: MessageTags) public var hashValue: Int { switch self { - case .itemCollectionInfos: - return 0 - case .itemCollectionIds: - return 1 - case let .peerChatState(peerId): - return peerId.hashValue - case let .itemCollectionInfo(id): - return id.hashValue - case let .orderedItemList(id): - return id.hashValue - case .preferences: - return 3 - case .globalMessageTags: - return 4 - case let .peer(peerId, _): - return peerId.hashValue - case let .pendingMessageActions(type): - return type.hashValue - case let .invalidatedMessageHistoryTagSummaries(tagMask, namespace): - return tagMask.rawValue.hashValue ^ namespace.hashValue - case let .pendingMessageActionsSummary(type, peerId, namespace): - return type.hashValue ^ peerId.hashValue ^ namespace.hashValue - case let .historyTagSummaryView(tag, peerId, namespace): - return tag.rawValue.hashValue ^ peerId.hashValue ^ namespace.hashValue - case let .cachedPeerData(peerId): - return peerId.hashValue - case .unreadCounts: - return 5 - case .peerNotificationSettings: - return 6 - case .pendingPeerNotificationSettings: - return 7 - case let .messageOfInterestHole(location, namespace, count): - return 8 &+ 31 &* location.hashValue &+ 31 &* namespace.hashValue &+ 31 &* count.hashValue - case let .localMessageTag(tag): - return tag.hashValue - case .messages: - return 10 - case .additionalChatListItems: - return 11 - case let .cachedItem(id): - return id.hashValue - case .peerPresences: - return 13 - case .synchronizeGroupMessageStats: - return 14 - case .peerNotificationSettingsBehaviorTimestampView: - return 15 - case let .peerChatInclusion(peerId): - return peerId.hashValue - case let .basicPeer(peerId): - return peerId.hashValue + case .itemCollectionInfos: + return 0 + case .itemCollectionIds: + return 1 + case let .peerChatState(peerId): + return peerId.hashValue + case let .itemCollectionInfo(id): + return id.hashValue + case let .orderedItemList(id): + return id.hashValue + case .preferences: + return 3 + case .globalMessageTags: + return 4 + case let .peer(peerId, _): + return peerId.hashValue + case let .pendingMessageActions(type): + return type.hashValue + case let .invalidatedMessageHistoryTagSummaries(tagMask, namespace): + return tagMask.rawValue.hashValue ^ namespace.hashValue + case let .pendingMessageActionsSummary(type, peerId, namespace): + return type.hashValue ^ peerId.hashValue ^ namespace.hashValue + case let .historyTagSummaryView(tag, peerId, namespace): + return tag.rawValue.hashValue ^ peerId.hashValue ^ namespace.hashValue + case let .cachedPeerData(peerId): + return peerId.hashValue + case .unreadCounts: + return 5 + case .peerNotificationSettings: + return 6 + case .pendingPeerNotificationSettings: + return 7 + case let .messageOfInterestHole(location, namespace, count): + return 8 &+ 31 &* location.hashValue &+ 31 &* namespace.hashValue &+ 31 &* count.hashValue + case let .localMessageTag(tag): + return tag.hashValue + case .messages: + return 10 + case .additionalChatListItems: + return 11 + case let .cachedItem(id): + return id.hashValue + case .peerPresences: + return 13 + case .synchronizeGroupMessageStats: + return 14 + case .peerNotificationSettingsBehaviorTimestampView: + return 15 + case let .peerChatInclusion(peerId): + return peerId.hashValue + case let .basicPeer(peerId): + return peerId.hashValue + case let .allChatListHoles(groupId): + return groupId.hashValue + case let .historyTagInfo(peerId, tag): + return peerId.hashValue ^ tag.hashValue } } public static func ==(lhs: PostboxViewKey, rhs: PostboxViewKey) -> Bool { switch lhs { - case let .itemCollectionInfos(lhsNamespaces): - if case let .itemCollectionInfos(rhsNamespaces) = rhs, lhsNamespaces == rhsNamespaces { - return true - } else { - return false - } - case let .itemCollectionIds(lhsNamespaces): - if case let .itemCollectionIds(rhsNamespaces) = rhs, lhsNamespaces == rhsNamespaces { - return true - } else { - return false - } - case let .itemCollectionInfo(id): - if case .itemCollectionInfo(id) = rhs { - return true - } else { - return false - } - case let .peerChatState(peerId): - if case .peerChatState(peerId) = rhs { - return true - } else { - return false - } - case let .orderedItemList(id): - if case .orderedItemList(id) = rhs { - return true - } else { - return false - } - case let .preferences(lhsKeys): - if case let .preferences(rhsKeys) = rhs, lhsKeys == rhsKeys { - return true - } else { - return false - } - case let .globalMessageTags(globalTag, position, count, _): - if case .globalMessageTags(globalTag, position, count, _) = rhs { - return true - } else { - return false - } - case let .peer(peerId, components): - if case .peer(peerId, components) = rhs { - return true - } else { - return false - } - case let .pendingMessageActions(type): - if case .pendingMessageActions(type) = rhs { - return true - } else { - return false - } - case .invalidatedMessageHistoryTagSummaries: - if case .invalidatedMessageHistoryTagSummaries = rhs { - return true - } else { - return false - } - case let .pendingMessageActionsSummary(type, peerId, namespace): - if case .pendingMessageActionsSummary(type, peerId, namespace) = rhs { - return true - } else { - return false - } - case let .historyTagSummaryView(tag, peerId, namespace): - if case .historyTagSummaryView(tag, peerId, namespace) = rhs { - return true - } else { - return false - } - case let .cachedPeerData(peerId): - if case .cachedPeerData(peerId) = rhs { - return true - } else { - return false - } - case let .unreadCounts(lhsItems): - if case let .unreadCounts(rhsItems) = rhs, lhsItems == rhsItems { - return true - } else { - return false - } - case let .peerNotificationSettings(peerIds): - if case .peerNotificationSettings(peerIds) = rhs { - return true - } else { - return false - } - case .pendingPeerNotificationSettings: - if case .pendingPeerNotificationSettings = rhs { - return true - } else { - return false - } - case let .messageOfInterestHole(peerId, namespace, count): - if case .messageOfInterestHole(peerId, namespace, count) = rhs { - return true - } else { - return false - } - case let .localMessageTag(tag): - if case .localMessageTag(tag) = rhs { - return true - } else { - return false - } - case let .messages(ids): - if case .messages(ids) = rhs { - return true - } else { - return false - } - case .additionalChatListItems: - if case .additionalChatListItems = rhs { - return true - } else { - return false - } - case let .cachedItem(id): - if case .cachedItem(id) = rhs { - return true - } else { - return false - } - case let .peerPresences(ids): - if case .peerPresences(ids) = rhs { - return true - } else { - return false - } - case .synchronizeGroupMessageStats: - if case .synchronizeGroupMessageStats = rhs { - return true - } else { - return false - } - case .peerNotificationSettingsBehaviorTimestampView: - if case .peerNotificationSettingsBehaviorTimestampView = rhs { - return true - } else { - return false - } - case let .peerChatInclusion(id): - if case .peerChatInclusion(id) = rhs { - return true - } else { - return false - } - case let .basicPeer(id): - if case .basicPeer(id) = rhs { - return true - } else { - return false - } + case let .itemCollectionInfos(lhsNamespaces): + if case let .itemCollectionInfos(rhsNamespaces) = rhs, lhsNamespaces == rhsNamespaces { + return true + } else { + return false + } + case let .itemCollectionIds(lhsNamespaces): + if case let .itemCollectionIds(rhsNamespaces) = rhs, lhsNamespaces == rhsNamespaces { + return true + } else { + return false + } + case let .itemCollectionInfo(id): + if case .itemCollectionInfo(id) = rhs { + return true + } else { + return false + } + case let .peerChatState(peerId): + if case .peerChatState(peerId) = rhs { + return true + } else { + return false + } + case let .orderedItemList(id): + if case .orderedItemList(id) = rhs { + return true + } else { + return false + } + case let .preferences(lhsKeys): + if case let .preferences(rhsKeys) = rhs, lhsKeys == rhsKeys { + return true + } else { + return false + } + case let .globalMessageTags(globalTag, position, count, _): + if case .globalMessageTags(globalTag, position, count, _) = rhs { + return true + } else { + return false + } + case let .peer(peerId, components): + if case .peer(peerId, components) = rhs { + return true + } else { + return false + } + case let .pendingMessageActions(type): + if case .pendingMessageActions(type) = rhs { + return true + } else { + return false + } + case .invalidatedMessageHistoryTagSummaries: + if case .invalidatedMessageHistoryTagSummaries = rhs { + return true + } else { + return false + } + case let .pendingMessageActionsSummary(type, peerId, namespace): + if case .pendingMessageActionsSummary(type, peerId, namespace) = rhs { + return true + } else { + return false + } + case let .historyTagSummaryView(tag, peerId, namespace): + if case .historyTagSummaryView(tag, peerId, namespace) = rhs { + return true + } else { + return false + } + case let .cachedPeerData(peerId): + if case .cachedPeerData(peerId) = rhs { + return true + } else { + return false + } + case let .unreadCounts(lhsItems): + if case let .unreadCounts(rhsItems) = rhs, lhsItems == rhsItems { + return true + } else { + return false + } + case let .peerNotificationSettings(peerIds): + if case .peerNotificationSettings(peerIds) = rhs { + return true + } else { + return false + } + case .pendingPeerNotificationSettings: + if case .pendingPeerNotificationSettings = rhs { + return true + } else { + return false + } + case let .messageOfInterestHole(peerId, namespace, count): + if case .messageOfInterestHole(peerId, namespace, count) = rhs { + return true + } else { + return false + } + case let .localMessageTag(tag): + if case .localMessageTag(tag) = rhs { + return true + } else { + return false + } + case let .messages(ids): + if case .messages(ids) = rhs { + return true + } else { + return false + } + case .additionalChatListItems: + if case .additionalChatListItems = rhs { + return true + } else { + return false + } + case let .cachedItem(id): + if case .cachedItem(id) = rhs { + return true + } else { + return false + } + case let .peerPresences(ids): + if case .peerPresences(ids) = rhs { + return true + } else { + return false + } + case .synchronizeGroupMessageStats: + if case .synchronizeGroupMessageStats = rhs { + return true + } else { + return false + } + case .peerNotificationSettingsBehaviorTimestampView: + if case .peerNotificationSettingsBehaviorTimestampView = rhs { + return true + } else { + return false + } + case let .peerChatInclusion(id): + if case .peerChatInclusion(id) = rhs { + return true + } else { + return false + } + case let .basicPeer(id): + if case .basicPeer(id) = rhs { + return true + } else { + return false + } + case let .allChatListHoles(groupId): + if case .allChatListHoles(groupId) = rhs { + return true + } else { + return false + } + case let .historyTagInfo(peerId, tag): + if case .historyTagInfo(peerId, tag) = rhs { + return true + } else { + return false + } } } } func postboxViewForKey(postbox: Postbox, key: PostboxViewKey) -> MutablePostboxView { switch key { - case let .itemCollectionInfos(namespaces): - return MutableItemCollectionInfosView(postbox: postbox, namespaces: namespaces) - case let .itemCollectionIds(namespaces): - return MutableItemCollectionIdsView(postbox: postbox, namespaces: namespaces) - case let .itemCollectionInfo(id): - return MutableItemCollectionInfoView(postbox: postbox, id: id) - case let .peerChatState(peerId): - return MutablePeerChatStateView(postbox: postbox, peerId: peerId) - case let .orderedItemList(id): - return MutableOrderedItemListView(postbox: postbox, collectionId: id) - case let .preferences(keys): - return MutablePreferencesView(postbox: postbox, keys: keys) - case let .globalMessageTags(globalTag, position, count, groupingPredicate): - return MutableGlobalMessageTagsView(postbox: postbox, globalTag: globalTag, position: position, count: count, groupingPredicate: groupingPredicate) - case let .peer(peerId, components): - return MutablePeerView(postbox: postbox, peerId: peerId, components: components) - case let .pendingMessageActions(type): - return MutablePendingMessageActionsView(postbox: postbox, type: type) - case let .invalidatedMessageHistoryTagSummaries(tagMask, namespace): - return MutableInvalidatedMessageHistoryTagSummariesView(postbox: postbox, tagMask: tagMask, namespace: namespace) - case let .pendingMessageActionsSummary(type, peerId, namespace): - return MutablePendingMessageActionsSummaryView(postbox: postbox, type: type, peerId: peerId, namespace: namespace) - case let .historyTagSummaryView(tag, peerId, namespace): - return MutableMessageHistoryTagSummaryView(postbox: postbox, tag: tag, peerId: peerId, namespace: namespace) - case let .cachedPeerData(peerId): - return MutableCachedPeerDataView(postbox: postbox, peerId: peerId) - case let .unreadCounts(items): - return MutableUnreadMessageCountsView(postbox: postbox, items: items) - case let .peerNotificationSettings(peerIds): - return MutablePeerNotificationSettingsView(postbox: postbox, peerIds: peerIds) - case .pendingPeerNotificationSettings: - return MutablePendingPeerNotificationSettingsView(postbox: postbox) - case let .messageOfInterestHole(location, namespace, count): - return MutableMessageOfInterestHolesView(postbox: postbox, location: location, namespace: namespace, count: count) - case let .localMessageTag(tag): - return MutableLocalMessageTagsView(postbox: postbox, tag: tag) - case let .messages(ids): - return MutableMessagesView(postbox: postbox, ids: ids) - case .additionalChatListItems: - return MutableAdditionalChatListItemsView(postbox: postbox) - case let .cachedItem(id): - return MutableCachedItemView(postbox: postbox, id: id) - case let .peerPresences(ids): - return MutablePeerPresencesView(postbox: postbox, ids: ids) - case .synchronizeGroupMessageStats: - return MutableSynchronizeGroupMessageStatsView(postbox: postbox) - case .peerNotificationSettingsBehaviorTimestampView: - return MutablePeerNotificationSettingsBehaviorTimestampView(postbox: postbox) - case let .peerChatInclusion(peerId): - return MutablePeerChatInclusionView(postbox: postbox, peerId: peerId) - case let .basicPeer(peerId): - return MutableBasicPeerView(postbox: postbox, peerId: peerId) + case let .itemCollectionInfos(namespaces): + return MutableItemCollectionInfosView(postbox: postbox, namespaces: namespaces) + case let .itemCollectionIds(namespaces): + return MutableItemCollectionIdsView(postbox: postbox, namespaces: namespaces) + case let .itemCollectionInfo(id): + return MutableItemCollectionInfoView(postbox: postbox, id: id) + case let .peerChatState(peerId): + return MutablePeerChatStateView(postbox: postbox, peerId: peerId) + case let .orderedItemList(id): + return MutableOrderedItemListView(postbox: postbox, collectionId: id) + case let .preferences(keys): + return MutablePreferencesView(postbox: postbox, keys: keys) + case let .globalMessageTags(globalTag, position, count, groupingPredicate): + return MutableGlobalMessageTagsView(postbox: postbox, globalTag: globalTag, position: position, count: count, groupingPredicate: groupingPredicate) + case let .peer(peerId, components): + return MutablePeerView(postbox: postbox, peerId: peerId, components: components) + case let .pendingMessageActions(type): + return MutablePendingMessageActionsView(postbox: postbox, type: type) + case let .invalidatedMessageHistoryTagSummaries(tagMask, namespace): + return MutableInvalidatedMessageHistoryTagSummariesView(postbox: postbox, tagMask: tagMask, namespace: namespace) + case let .pendingMessageActionsSummary(type, peerId, namespace): + return MutablePendingMessageActionsSummaryView(postbox: postbox, type: type, peerId: peerId, namespace: namespace) + case let .historyTagSummaryView(tag, peerId, namespace): + return MutableMessageHistoryTagSummaryView(postbox: postbox, tag: tag, peerId: peerId, namespace: namespace) + case let .cachedPeerData(peerId): + return MutableCachedPeerDataView(postbox: postbox, peerId: peerId) + case let .unreadCounts(items): + return MutableUnreadMessageCountsView(postbox: postbox, items: items) + case let .peerNotificationSettings(peerIds): + return MutablePeerNotificationSettingsView(postbox: postbox, peerIds: peerIds) + case .pendingPeerNotificationSettings: + return MutablePendingPeerNotificationSettingsView(postbox: postbox) + case let .messageOfInterestHole(location, namespace, count): + return MutableMessageOfInterestHolesView(postbox: postbox, location: location, namespace: namespace, count: count) + case let .localMessageTag(tag): + return MutableLocalMessageTagsView(postbox: postbox, tag: tag) + case let .messages(ids): + return MutableMessagesView(postbox: postbox, ids: ids) + case .additionalChatListItems: + return MutableAdditionalChatListItemsView(postbox: postbox) + case let .cachedItem(id): + return MutableCachedItemView(postbox: postbox, id: id) + case let .peerPresences(ids): + return MutablePeerPresencesView(postbox: postbox, ids: ids) + case .synchronizeGroupMessageStats: + return MutableSynchronizeGroupMessageStatsView(postbox: postbox) + case .peerNotificationSettingsBehaviorTimestampView: + return MutablePeerNotificationSettingsBehaviorTimestampView(postbox: postbox) + case let .peerChatInclusion(peerId): + return MutablePeerChatInclusionView(postbox: postbox, peerId: peerId) + case let .basicPeer(peerId): + return MutableBasicPeerView(postbox: postbox, peerId: peerId) + case let .allChatListHoles(groupId): + return MutableAllChatListHolesView(postbox: postbox, groupId: groupId) + case let .historyTagInfo(peerId, tag): + return MutableHistoryTagInfoView(postbox: postbox, peerId: peerId, tag: tag) } } diff --git a/submodules/SaveToCameraRoll/BUCK b/submodules/SaveToCameraRoll/BUCK index d594ecc651..b75130a540 100644 --- a/submodules/SaveToCameraRoll/BUCK +++ b/submodules/SaveToCameraRoll/BUCK @@ -18,6 +18,8 @@ static_library( "$SDKROOT/System/Library/Frameworks/Foundation.framework", "$SDKROOT/System/Library/Frameworks/UIKit.framework", "$SDKROOT/System/Library/Frameworks/MobileCoreServices.framework", - "$SDKROOT/System/Library/Frameworks/Photos.framework", + ], + weak_frameworks = [ + "Photos", ], ) diff --git a/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift b/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift index 0c35661804..26f6bfba5b 100644 --- a/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift +++ b/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift @@ -75,3 +75,50 @@ public func screenCaptureEvents() -> Signal { } |> runOn(Queue.mainQueue()) } + +public final class ScreenCaptureDetectionManager { + private var observer: NSObjectProtocol? + private var screenRecordingDisposable: Disposable? + private var screenRecordingCheckTimer: SwiftSignalKit.Timer? + + public init(check: @escaping () -> Bool) { + self.observer = NotificationCenter.default.addObserver(forName: UIApplication.userDidTakeScreenshotNotification, object: nil, queue: .main, using: { [weak self] _ in + guard let strongSelf = self else { + return + } + check() + }) + + self.screenRecordingDisposable = screenRecordingActive().start(next: { [weak self] value in + Queue.mainQueue().async { + guard let strongSelf = self else { + return + } + if value { + if strongSelf.screenRecordingCheckTimer == nil { + strongSelf.screenRecordingCheckTimer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { + guard let strongSelf = self else { + return + } + if check() { + strongSelf.screenRecordingCheckTimer?.invalidate() + strongSelf.screenRecordingCheckTimer = nil + } + }, queue: Queue.mainQueue()) + strongSelf.screenRecordingCheckTimer?.start() + } + } else if strongSelf.screenRecordingCheckTimer != nil { + strongSelf.screenRecordingCheckTimer?.invalidate() + strongSelf.screenRecordingCheckTimer = nil + } + } + }) + } + + deinit { + NotificationCenter.default.removeObserver(self.observer) + self.screenRecordingDisposable?.dispose() + self.screenRecordingCheckTimer?.invalidate() + self.screenRecordingCheckTimer = nil + } +} diff --git a/submodules/SearchUI/Sources/SearchDisplayController.swift b/submodules/SearchUI/Sources/SearchDisplayController.swift index fa86bdf81f..d3c6254589 100644 --- a/submodules/SearchUI/Sources/SearchDisplayController.swift +++ b/submodules/SearchUI/Sources/SearchDisplayController.swift @@ -22,7 +22,7 @@ public final class SearchDisplayController { private var isSearchingDisposable: Disposable? - public init(presentationData: PresentationData, mode: SearchDisplayControllerMode = .navigation, contentNode: SearchDisplayControllerContentNode, cancel: @escaping () -> Void) { + public init(presentationData: PresentationData, mode: SearchDisplayControllerMode = .navigation, placeholder: String? = nil, contentNode: SearchDisplayControllerContentNode, cancel: @escaping () -> Void) { self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: presentationData.theme, hasSeparator: false), strings: presentationData.strings, fieldStyle: .modern) self.mode = mode self.contentNode = contentNode @@ -48,6 +48,9 @@ public final class SearchDisplayController { self?.searchBar.prefixString = prefix self?.searchBar.text = query } + if let placeholder = placeholder { + self.searchBar.placeholderString = NSAttributedString(string: placeholder, font: Font.regular(17.0), textColor: presentationData.theme.rootController.navigationSearchBar.inputPlaceholderTextColor) + } self.contentNode.setPlaceholder = { [weak self] string in guard string != self?.searchBar.placeholderString?.string else { return @@ -99,7 +102,7 @@ public final class SearchDisplayController { self.contentNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarFrame.maxY, transition: transition) } - public func activate(insertSubnode: (ASDisplayNode, Bool) -> Void, placeholder: SearchBarPlaceholderNode) { + public func activate(insertSubnode: (ASDisplayNode, Bool) -> Void, placeholder: SearchBarPlaceholderNode?) { guard let (layout, navigationBarHeight) = self.containerLayout else { return } @@ -110,19 +113,20 @@ public final class SearchDisplayController { self.contentNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), navigationBarHeight: navigationBarHeight, transition: .immediate) - let initialTextBackgroundFrame = placeholder.convert(placeholder.backgroundNode.frame, to: nil) - - let contentNodePosition = self.contentNode.layer.position - var contentNavigationBarHeight = navigationBarHeight if layout.statusBarHeight == nil { contentNavigationBarHeight += 28.0 } - self.contentNode.layer.animatePosition(from: CGPoint(x: contentNodePosition.x, y: contentNodePosition.y + (initialTextBackgroundFrame.maxY + 8.0 - contentNavigationBarHeight)), to: contentNodePosition, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) - self.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue) - - self.searchBar.placeholderString = placeholder.placeholderString + if let placeholder = placeholder { + let initialTextBackgroundFrame = placeholder.convert(placeholder.backgroundNode.frame, to: nil) + + let contentNodePosition = self.contentNode.layer.position + + self.contentNode.layer.animatePosition(from: CGPoint(x: contentNodePosition.x, y: contentNodePosition.y + (initialTextBackgroundFrame.maxY + 8.0 - contentNavigationBarHeight)), to: contentNodePosition, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) + self.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue) + self.searchBar.placeholderString = placeholder.placeholderString + } let navigationBarFrame: CGRect switch self.mode { @@ -149,18 +153,27 @@ public final class SearchDisplayController { self.searchBar.layout() self.searchBar.activate() - self.searchBar.animateIn(from: placeholder, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) + if let placeholder = placeholder { + self.searchBar.animateIn(from: placeholder, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) + } else { + self.searchBar.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue) + self.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue) + } } public func deactivate(placeholder: SearchBarPlaceholderNode?, animated: Bool = true) { self.searchBar.deactivate() + let searchBar = self.searchBar if let placeholder = placeholder { - let searchBar = self.searchBar searchBar.transitionOut(to: placeholder, transition: animated ? .animated(duration: 0.5, curve: .spring) : .immediate, completion: { [weak searchBar] in searchBar?.removeFromSupernode() }) + } else { + searchBar.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak searchBar] _ in + searchBar?.removeFromSupernode() + }) } let contentNode = self.contentNode diff --git a/submodules/SettingsUI/BUCK b/submodules/SettingsUI/BUCK index df9f9d6aa7..49fcfda198 100644 --- a/submodules/SettingsUI/BUCK +++ b/submodules/SettingsUI/BUCK @@ -92,8 +92,10 @@ static_library( "$SDKROOT/System/Library/Frameworks/UIKit.framework", "$SDKROOT/System/Library/Frameworks/MessageUI.framework", "$SDKROOT/System/Library/Frameworks/LocalAuthentication.framework", - "$SDKROOT/System/Library/Frameworks/Photos.framework", "$SDKROOT/System/Library/Frameworks/QuickLook.framework", "$SDKROOT/System/Library/Frameworks/CoreTelephony.framework", ], + weak_frameworks = [ + "Photos", + ], ) diff --git a/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift new file mode 100644 index 0000000000..dc1129ff5b --- /dev/null +++ b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift @@ -0,0 +1,549 @@ +import Foundation +import UIKit +import Display +import Postbox +import SwiftSignalKit +import AsyncDisplayKit +import TelegramCore +import SyncCore +import TelegramPresentationData +import TelegramUIPreferences +import AccountContext +import ChatListUI +import WallpaperResources +import LegacyComponents +import ItemListUI + +private func generateMaskImage(color: UIColor) -> UIImage? { + return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in + let bounds = CGRect(origin: CGPoint(), size: size) + context.clear(bounds) + + let gradientColors = [color.withAlphaComponent(0.0).cgColor, color.cgColor, color.cgColor] as CFArray + + var locations: [CGFloat] = [0.0, 0.75, 1.0] + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + + context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: 80.0), options: CGGradientDrawingOptions()) + }) +} + +private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDelegate { + private let context: AccountContext + private var presentationThemeSettings: PresentationThemeSettings + private var presentationData: PresentationData + + private let referenceTimestamp: Int32 + + private let scrollNode: ASScrollNode + + private let maskNode: ASImageNode + private let chatBackgroundNode: WallpaperBackgroundNode + private let messagesContainerNode: ASDisplayNode + private var dateHeaderNode: ListViewItemHeaderNode? + private var messageNodes: [ListViewItemNode]? + private let toolbarNode: BubbleSettingsToolbarNode + + private var validLayout: (ContainerViewLayout, CGFloat)? + + init(context: AccountContext, presentationThemeSettings: PresentationThemeSettings, dismiss: @escaping () -> Void, apply: @escaping (PresentationChatBubbleSettings) -> Void) { + self.context = context + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + self.presentationThemeSettings = presentationThemeSettings + + let calendar = Calendar(identifier: .gregorian) + var components = calendar.dateComponents(Set([.era, .year, .month, .day, .hour, .minute, .second]), from: Date()) + components.hour = 13 + components.minute = 0 + components.second = 0 + self.referenceTimestamp = Int32(calendar.date(from: components)?.timeIntervalSince1970 ?? 0.0) + + self.scrollNode = ASScrollNode() + + self.chatBackgroundNode = WallpaperBackgroundNode() + self.chatBackgroundNode.displaysAsynchronously = false + + self.messagesContainerNode = ASDisplayNode() + self.messagesContainerNode.clipsToBounds = true + self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0) + + self.chatBackgroundNode.image = chatControllerBackgroundImage(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false) + self.chatBackgroundNode.motionEnabled = self.presentationData.chatWallpaper.settings?.motion ?? false + if case .gradient = self.presentationData.chatWallpaper { + self.chatBackgroundNode.imageContentMode = .scaleToFill + } + + self.toolbarNode = BubbleSettingsToolbarNode(presentationThemeSettings: self.presentationThemeSettings, presentationData: self.presentationData) + + self.maskNode = ASImageNode() + self.maskNode.displaysAsynchronously = false + self.maskNode.displayWithoutProcessing = true + self.maskNode.contentMode = .scaleToFill + + + super.init() + + self.setViewBlock({ + return UITracingLayerView() + }) + + self.backgroundColor = self.presentationData.theme.list.plainBackgroundColor + + self.maskNode.image = generateMaskImage(color: self.presentationData.theme.chatList.backgroundColor) + + self.addSubnode(self.scrollNode) + self.addSubnode(self.toolbarNode) + + self.scrollNode.addSubnode(self.chatBackgroundNode) + self.scrollNode.addSubnode(self.messagesContainerNode) + + self.toolbarNode.cancel = { + dismiss() + } + var dismissed = false + self.toolbarNode.done = { [weak self] in + guard let strongSelf = self else { + return + } + if !dismissed { + dismissed = true + apply(strongSelf.presentationThemeSettings.chatBubbleSettings) + } + } + self.toolbarNode.updateMergeBubbleCorners = { [weak self] value in + guard let strongSelf = self else { + return + } + strongSelf.presentationThemeSettings.chatBubbleSettings.mergeBubbleCorners = value + strongSelf.updatePresentationThemeSettings(strongSelf.presentationThemeSettings) + } + self.toolbarNode.updateCornerRadius = { [weak self] value in + guard let strongSelf = self else { + return + } + strongSelf.presentationThemeSettings.chatBubbleSettings.mainRadius = Int32(value) + strongSelf.presentationThemeSettings.chatBubbleSettings.auxiliaryRadius = Int32(value / 2) + strongSelf.updatePresentationThemeSettings(strongSelf.presentationThemeSettings) + } + } + + override func didLoad() { + super.didLoad() + + self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true + self.scrollNode.view.showsHorizontalScrollIndicator = false + self.scrollNode.view.isPagingEnabled = true + self.scrollNode.view.delegate = self + self.scrollNode.view.alwaysBounceHorizontal = false + } + + func scrollViewDidScroll(_ scrollView: UIScrollView) { + } + + func animateIn(completion: (() -> Void)? = nil) { + if let (layout, _) = self.validLayout, case .compact = layout.metrics.widthClass { + self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) + } + } + + func animateOut(completion: (() -> Void)? = nil) { + if let (layout, _) = self.validLayout, case .compact = layout.metrics.widthClass { + self.layer.animatePosition(from: self.layer.position, to: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), duration: 0.2, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, completion: { _ in + completion?() + }) + } else { + completion?() + } + } + + private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + + var items: [ListViewItem] = [] + let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) + let otherPeerId = self.context.account.peerId + var peers = SimpleDictionary() + var messages = SimpleDictionary() + peers[peerId] = TelegramUser(id: peerId, accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_Chat_2_ReplyName, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) + peers[otherPeerId] = TelegramUser(id: otherPeerId, accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_Chat_2_ReplyName, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) + + let replyMessageId = MessageId(peerId: peerId, namespace: 0, id: 3) + messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) + + let message1 = Message(stableId: 4, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 4), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66003, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + + let message2 = Message(stableId: 3, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 3), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66002, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_2_Text, attributes: [ReplyMessageAttribute(messageId: replyMessageId)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + + let waveformBase64 = "DAAOAAkACQAGAAwADwAMABAADQAPABsAGAALAA0AGAAfABoAHgATABgAGQAYABQADAAVABEAHwANAA0ACQAWABkACQAOAAwACQAfAAAAGQAVAAAAEwATAAAACAAfAAAAHAAAABwAHwAAABcAGQAAABQADgAAABQAHwAAAB8AHwAAAAwADwAAAB8AEwAAABoAFwAAAB8AFAAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAA=" + let voiceAttributes: [TelegramMediaFileAttribute] = [.Audio(isVoice: true, duration: 23, title: nil, performer: nil, waveform: MemoryBuffer(data: Data(base64Encoded: waveformBase64)!))] + let voiceMedia = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: 0, attributes: voiceAttributes) + + let message3 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: "", attributes: [], media: [voiceMedia], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message3, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil)) + + let message4 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message4, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + + let width: CGFloat + if case .regular = layout.metrics.widthClass { + width = layout.size.width + } else { + width = layout.size.width + } + + let params = ListViewItemLayoutParams(width: width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height) + if let messageNodes = self.messageNodes { + for i in 0 ..< items.count { + let itemNode = messageNodes[i] + items[i].updateNode(async: { $0() }, node: { + return itemNode + }, params: params, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], animation: .None, completion: { (layout, apply) in + let nodeFrame = CGRect(origin: itemNode.frame.origin, size: CGSize(width: width, height: layout.size.height)) + + itemNode.contentSize = layout.contentSize + itemNode.insets = layout.insets + itemNode.frame = nodeFrame + itemNode.isUserInteractionEnabled = false + + apply(ListViewItemApply(isOnScreen: true)) + }) + } + } else { + var messageNodes: [ListViewItemNode] = [] + for i in 0 ..< items.count { + var itemNode: ListViewItemNode? + items[i].nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: false, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], completion: { node, apply in + itemNode = node + apply().1(ListViewItemApply(isOnScreen: true)) + }) + itemNode!.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0) + itemNode!.isUserInteractionEnabled = false + messageNodes.append(itemNode!) + self.messagesContainerNode.addSubnode(itemNode!) + if let extractedBackgroundNode = itemNode!.extractedBackgroundNode { + extractedBackgroundNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0) + self.messagesContainerNode.insertSubnode(extractedBackgroundNode, at: 0) + } + } + self.messageNodes = messageNodes + } + + var bottomOffset: CGFloat = 9.0 + bottomInset + if let messageNodes = self.messageNodes { + for itemNode in messageNodes { + transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: bottomOffset), size: itemNode.frame.size)) + if let extractedBackgroundNode = itemNode.extractedBackgroundNode { + transition.updateFrame(node: extractedBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: bottomOffset), size: itemNode.frame.size)) + } + bottomOffset += itemNode.frame.height + itemNode.updateFrame(itemNode.frame, within: layout.size) + } + } + + let dateHeaderNode: ListViewItemHeaderNode + if let currentDateHeaderNode = self.dateHeaderNode { + dateHeaderNode = currentDateHeaderNode + headerItem.updateNode(dateHeaderNode, previous: nil, next: headerItem) + } else { + dateHeaderNode = headerItem.node() + dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0) + self.messagesContainerNode.addSubnode(dateHeaderNode) + self.dateHeaderNode = dateHeaderNode + } + + transition.updateFrame(node: dateHeaderNode, frame: CGRect(origin: CGPoint(x: 0.0, y: bottomOffset), size: CGSize(width: layout.size.width, height: headerItem.height))) + dateHeaderNode.updateLayout(size: self.messagesContainerNode.frame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right) + } + + func updatePresentationThemeSettings(_ presentationThemeSettings: PresentationThemeSettings) { + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(presentationThemeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(presentationThemeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: presentationThemeSettings.chatBubbleSettings.mergeBubbleCorners) + + self.presentationData = self.presentationData.withChatBubbleCorners(chatBubbleCorners) + self.toolbarNode.updatePresentationData(presentationData: self.presentationData) + self.toolbarNode.updatePresentationThemeSettings(presentationThemeSettings: self.presentationThemeSettings) + if let (layout, navigationBarHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate) + self.recursivelyEnsureDisplaySynchronously(true) + } + } + + func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + self.validLayout = (layout, navigationBarHeight) + + let bounds = CGRect(origin: CGPoint(), size: layout.size) + self.scrollNode.frame = bounds + + let toolbarHeight = self.toolbarNode.updateLayout(width: layout.size.width, bottomInset: layout.intrinsicInsets.bottom, layout: layout, transition: transition) + + var chatFrame = CGRect(x: 0.0, y: 0.0, width: bounds.width, height: bounds.height) + + let bottomInset: CGFloat + chatFrame = CGRect(x: 0.0, y: 0.0, width: bounds.width, height: bounds.height) + self.scrollNode.view.contentSize = CGSize(width: bounds.width, height: bounds.height) + + bottomInset = 37.0 + + self.chatBackgroundNode.frame = chatFrame + self.chatBackgroundNode.updateLayout(size: chatFrame.size, transition: transition) + self.messagesContainerNode.frame = chatFrame + + transition.updateFrame(node: self.toolbarNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - toolbarHeight), size: CGSize(width: layout.size.width, height: toolbarHeight + layout.intrinsicInsets.bottom))) + + self.updateMessagesLayout(layout: layout, bottomInset: toolbarHeight + bottomInset, transition: transition) + + transition.updateFrame(node: self.maskNode, frame: CGRect(x: 0.0, y: layout.size.height - toolbarHeight - 80.0, width: bounds.width, height: 80.0)) + } +} + +final class BubbleSettingsController: ViewController { + private let context: AccountContext + + private var controllerNode: BubbleSettingsControllerNode { + return self.displayNode as! BubbleSettingsControllerNode + } + + private var didPlayPresentationAnimation = false + + private var presentationData: PresentationData + private var presentationDataDisposable: Disposable? + + private var presentationThemeSettings: PresentationThemeSettings + private var presentationThemeSettingsDisposable: Disposable? + + private var disposable: Disposable? + private var applyDisposable = MetaDisposable() + + public init(context: AccountContext, presentationThemeSettings: PresentationThemeSettings) { + self.context = context + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + self.presentationThemeSettings = presentationThemeSettings + + super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationTheme: self.presentationData.theme, presentationStrings: self.presentationData.strings)) + + self.blocksBackgroundWhenInOverlay = true + self.navigationPresentation = .modal + + self.navigationItem.title = self.presentationData.strings.Appearance_BubbleCorners_Title + self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: UIView()) + + self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style + self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) + + self.presentationDataDisposable = (context.sharedContext.presentationData + |> deliverOnMainQueue).start(next: { [weak self] presentationData in + if let strongSelf = self { + strongSelf.presentationData = presentationData + } + }) + } + + required public init(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + deinit { + self.presentationDataDisposable?.dispose() + self.presentationThemeSettingsDisposable?.dispose() + self.disposable?.dispose() + self.applyDisposable.dispose() + } + + override public func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + if let presentationArguments = self.presentationArguments as? ViewControllerPresentationArguments, !self.didPlayPresentationAnimation { + self.didPlayPresentationAnimation = true + if case .modalSheet = presentationArguments.presentationAnimation { + self.controllerNode.animateIn() + } + } + } + + override public func loadDisplayNode() { + super.loadDisplayNode() + + self.displayNode = BubbleSettingsControllerNode(context: self.context, presentationThemeSettings: self.presentationThemeSettings, dismiss: { [weak self] in + if let strongSelf = self { + strongSelf.dismiss() + } + }, apply: { [weak self] chatBubbleSettings in + if let strongSelf = self { + strongSelf.apply(chatBubbleSettings: chatBubbleSettings) + } + }) + self.displayNodeDidLoad() + } + + private func apply(chatBubbleSettings: PresentationChatBubbleSettings) { + let _ = (updatePresentationThemeSettingsInteractively(accountManager: self.context.sharedContext.accountManager, { current in + var current = current + current.chatBubbleSettings = chatBubbleSettings + return current + }) + |> deliverOnMainQueue).start(completed: { [weak self] in + self?.dismiss() + }) + } + + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition) + } +} + +private enum TextSelectionCustomMode { + case list + case chat +} + +private final class BubbleSettingsToolbarNode: ASDisplayNode { + private var presentationThemeSettings: PresentationThemeSettings + private var presentationData: PresentationData + + private let cancelButton = HighlightableButtonNode() + private let doneButton = HighlightableButtonNode() + private let separatorNode = ASDisplayNode() + private let topSeparatorNode = ASDisplayNode() + + private var switchItemNode: ItemListSwitchItemNode + private var cornerRadiusItemNode: BubbleSettingsRadiusItemNode + + private(set) var customMode: TextSelectionCustomMode = .chat + + var cancel: (() -> Void)? + var done: (() -> Void)? + + var updateMergeBubbleCorners: ((Bool) -> Void)? + var updateCornerRadius: ((Int32) -> Void)? + + init(presentationThemeSettings: PresentationThemeSettings, presentationData: PresentationData) { + self.presentationThemeSettings = presentationThemeSettings + self.presentationData = presentationData + + self.switchItemNode = ItemListSwitchItemNode(type: .regular) + self.cornerRadiusItemNode = BubbleSettingsRadiusItemNode() + + super.init() + + self.addSubnode(self.switchItemNode) + self.addSubnode(self.cornerRadiusItemNode) + self.addSubnode(self.cancelButton) + self.addSubnode(self.doneButton) + self.addSubnode(self.separatorNode) + self.addSubnode(self.topSeparatorNode) + + self.updatePresentationData(presentationData: self.presentationData) + + self.cancelButton.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.cancelButton.backgroundColor = strongSelf.presentationData.theme.list.itemHighlightedBackgroundColor + } else { + UIView.animate(withDuration: 0.3, animations: { + strongSelf.cancelButton.backgroundColor = .clear + }) + } + } + } + + self.doneButton.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.doneButton.backgroundColor = strongSelf.presentationData.theme.list.itemHighlightedBackgroundColor + } else { + UIView.animate(withDuration: 0.3, animations: { + strongSelf.doneButton.backgroundColor = .clear + }) + } + } + } + + self.cancelButton.addTarget(self, action: #selector(self.cancelPressed), forControlEvents: .touchUpInside) + self.doneButton.addTarget(self, action: #selector(self.donePressed), forControlEvents: .touchUpInside) + } + + func setDoneEnabled(_ enabled: Bool) { + self.doneButton.alpha = enabled ? 1.0 : 0.4 + self.doneButton.isUserInteractionEnabled = enabled + } + + func setCustomMode(_ customMode: TextSelectionCustomMode) { + self.customMode = customMode + } + + func updatePresentationData(presentationData: PresentationData) { + self.backgroundColor = presentationData.theme.rootController.tabBar.backgroundColor + self.separatorNode.backgroundColor = presentationData.theme.rootController.tabBar.separatorColor + self.topSeparatorNode.backgroundColor = presentationData.theme.rootController.tabBar.separatorColor + + self.cancelButton.setTitle(presentationData.strings.Common_Cancel, with: Font.regular(17.0), with: presentationData.theme.list.itemPrimaryTextColor, for: []) + self.doneButton.setTitle(presentationData.strings.Wallpaper_Set, with: Font.regular(17.0), with: presentationData.theme.list.itemPrimaryTextColor, for: []) + } + + func updatePresentationThemeSettings(presentationThemeSettings: PresentationThemeSettings) { + self.presentationThemeSettings = presentationThemeSettings + } + + func updateLayout(width: CGFloat, bottomInset: CGFloat, layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) -> CGFloat { + var contentHeight: CGFloat = 0.0 + + let switchItem = ItemListSwitchItem(presentationData: ItemListPresentationData(self.presentationData), title: self.presentationData.strings.Appearance_BubbleCorners_AdjustAdjacent, value: self.presentationThemeSettings.chatBubbleSettings.mergeBubbleCorners, disableLeadingInset: true, sectionId: 0, style: .blocks, updated: { [weak self] value in + self?.updateMergeBubbleCorners?(value) + }) + let cornerRadiusItem = BubbleSettingsRadiusItem(theme: self.presentationData.theme, value: Int(self.presentationData.chatBubbleCorners.mainRadius), enabled: true, disableLeadingInset: false, displayIcons: false, force: false, sectionId: 0, updated: { [weak self] value in + self?.updateCornerRadius?(Int32(max(8, min(16, value)))) + }) + + /*switchItem.updateNode(async: { f in + f() + }, node: { + return self.switchItemNode + }, params: ListViewItemLayoutParams(width: width, leftInset: layout.intrinsicInsets.left, rightInset: layout.intrinsicInsets.right, availableHeight: 1000.0), previousItem: nil, nextItem: cornerRadiusItem, animation: .None, completion: { layout, apply in + self.switchItemNode.contentSize = layout.contentSize + self.switchItemNode.insets = layout.insets + transition.updateFrame(node: self.switchItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: layout.contentSize)) + contentHeight += layout.contentSize.height + apply(ListViewItemApply(isOnScreen: true)) + })*/ + + cornerRadiusItem.updateNode(async: { f in + f() + }, node: { + return self.cornerRadiusItemNode + }, params: ListViewItemLayoutParams(width: width, leftInset: layout.intrinsicInsets.left, rightInset: layout.intrinsicInsets.right, availableHeight: 1000.0), previousItem: switchItem, nextItem: nil, animation: .None, completion: { layout, apply in + self.cornerRadiusItemNode.contentSize = layout.contentSize + self.cornerRadiusItemNode.insets = layout.insets + transition.updateFrame(node: self.cornerRadiusItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: layout.contentSize)) + contentHeight += layout.contentSize.height + apply(ListViewItemApply(isOnScreen: true)) + }) + + self.cancelButton.frame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: floor(width / 2.0), height: 49.0)) + self.doneButton.frame = CGRect(origin: CGPoint(x: floor(width / 2.0), y: contentHeight), size: CGSize(width: width - floor(width / 2.0), height: 49.0)) + + contentHeight += 49.0 + + self.topSeparatorNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: UIScreenPixel)) + + let resultHeight = contentHeight + bottomInset + + self.separatorNode.frame = CGRect(origin: CGPoint(x: floor(width / 2.0), y: self.cancelButton.frame.minY), size: CGSize(width: UIScreenPixel, height: resultHeight - self.cancelButton.frame.minY)) + + return resultHeight + } + + @objc func cancelPressed() { + self.cancel?() + } + + @objc func donePressed() { + self.doneButton.isUserInteractionEnabled = false + self.done?() + } +} diff --git a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift index 3db7091c49..f2ece41feb 100644 --- a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift +++ b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift @@ -17,6 +17,49 @@ import TelegramNotices import NotificationSoundSelectionUI import TelegramStringFormatting +private struct CounterTagSettings: OptionSet { + var rawValue: Int32 + + init(rawValue: Int32) { + self.rawValue = rawValue + } + + init(summaryTags: PeerSummaryCounterTags) { + var result = CounterTagSettings() + if summaryTags.contains(.privateChat) { + result.insert(.regularChatsAndPrivateGroups) + } + if summaryTags.contains(.channel) { + result.insert(.channels) + } + if summaryTags.contains(.publicGroup) { + result.insert(.publicGroups) + } + self = result + } + + func toSumaryTags() -> PeerSummaryCounterTags { + var result = PeerSummaryCounterTags() + if self.contains(.regularChatsAndPrivateGroups) { + result.insert(.privateChat) + result.insert(.secretChat) + result.insert(.bot) + result.insert(.privateGroup) + } + if self.contains(.publicGroups) { + result.insert(.publicGroup) + } + if self.contains(.channels) { + result.insert(.channel) + } + return result + } + + static let regularChatsAndPrivateGroups = CounterTagSettings(rawValue: 1 << 0) + static let publicGroups = CounterTagSettings(rawValue: 1 << 1) + static let channels = CounterTagSettings(rawValue: 1 << 2) +} + private final class NotificationsAndSoundsArguments { let context: AccountContext let presentController: (ViewController, ViewControllerPresentationArguments?) -> Void @@ -43,7 +86,7 @@ private final class NotificationsAndSoundsArguments { let updateInAppPreviews: (Bool) -> Void let updateDisplayNameOnLockscreen: (Bool) -> Void - let updateIncludeTag: (PeerSummaryCounterTags, Bool) -> Void + let updateIncludeTag: (CounterTagSettings, Bool) -> Void let updateTotalUnreadCountCategory: (Bool) -> Void let updateJoinedNotifications: (Bool) -> Void @@ -56,7 +99,7 @@ private final class NotificationsAndSoundsArguments { let updateNotificationsFromAllAccounts: (Bool) -> Void - init(context: AccountContext, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping(ViewController)->Void, soundSelectionDisposable: MetaDisposable, authorizeNotifications: @escaping () -> Void, suppressWarning: @escaping () -> Void, updateMessageAlerts: @escaping (Bool) -> Void, updateMessagePreviews: @escaping (Bool) -> Void, updateMessageSound: @escaping (PeerMessageSound) -> Void, updateGroupAlerts: @escaping (Bool) -> Void, updateGroupPreviews: @escaping (Bool) -> Void, updateGroupSound: @escaping (PeerMessageSound) -> Void, updateChannelAlerts: @escaping (Bool) -> Void, updateChannelPreviews: @escaping (Bool) -> Void, updateChannelSound: @escaping (PeerMessageSound) -> Void, updateInAppSounds: @escaping (Bool) -> Void, updateInAppVibration: @escaping (Bool) -> Void, updateInAppPreviews: @escaping (Bool) -> Void, updateDisplayNameOnLockscreen: @escaping (Bool) -> Void, updateIncludeTag: @escaping (PeerSummaryCounterTags, Bool) -> Void, updateTotalUnreadCountCategory: @escaping (Bool) -> Void, resetNotifications: @escaping () -> Void, updatedExceptionMode: @escaping(NotificationExceptionMode) -> Void, openAppSettings: @escaping () -> Void, updateJoinedNotifications: @escaping (Bool) -> Void, updateNotificationsFromAllAccounts: @escaping (Bool) -> Void) { + init(context: AccountContext, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping(ViewController)->Void, soundSelectionDisposable: MetaDisposable, authorizeNotifications: @escaping () -> Void, suppressWarning: @escaping () -> Void, updateMessageAlerts: @escaping (Bool) -> Void, updateMessagePreviews: @escaping (Bool) -> Void, updateMessageSound: @escaping (PeerMessageSound) -> Void, updateGroupAlerts: @escaping (Bool) -> Void, updateGroupPreviews: @escaping (Bool) -> Void, updateGroupSound: @escaping (PeerMessageSound) -> Void, updateChannelAlerts: @escaping (Bool) -> Void, updateChannelPreviews: @escaping (Bool) -> Void, updateChannelSound: @escaping (PeerMessageSound) -> Void, updateInAppSounds: @escaping (Bool) -> Void, updateInAppVibration: @escaping (Bool) -> Void, updateInAppPreviews: @escaping (Bool) -> Void, updateDisplayNameOnLockscreen: @escaping (Bool) -> Void, updateIncludeTag: @escaping (CounterTagSettings, Bool) -> Void, updateTotalUnreadCountCategory: @escaping (Bool) -> Void, resetNotifications: @escaping () -> Void, updatedExceptionMode: @escaping(NotificationExceptionMode) -> Void, openAppSettings: @escaping () -> Void, updateJoinedNotifications: @escaping (Bool) -> Void, updateNotificationsFromAllAccounts: @escaping (Bool) -> Void) { self.context = context self.presentController = presentController self.pushController = pushController @@ -779,8 +822,11 @@ private func notificationsAndSoundsEntries(authorizationStatus: AccessType, warn entries.append(.displayNamesOnLockscreenInfo(presentationData.theme, presentationData.strings.Notifications_DisplayNamesOnLockScreenInfoWithLink)) entries.append(.badgeHeader(presentationData.theme, presentationData.strings.Notifications_Badge.uppercased())) - entries.append(.includePublicGroups(presentationData.theme, presentationData.strings.Notifications_Badge_IncludePublicGroups, inAppSettings.totalUnreadCountIncludeTags.contains(.publicGroups))) - entries.append(.includeChannels(presentationData.theme, presentationData.strings.Notifications_Badge_IncludeChannels, inAppSettings.totalUnreadCountIncludeTags.contains(.channels))) + + let counterTagSettings = CounterTagSettings(summaryTags: inAppSettings.totalUnreadCountIncludeTags) + + entries.append(.includePublicGroups(presentationData.theme, presentationData.strings.Notifications_Badge_IncludePublicGroups, counterTagSettings.contains(.publicGroups))) + entries.append(.includeChannels(presentationData.theme, presentationData.strings.Notifications_Badge_IncludeChannels, counterTagSettings.contains(.channels))) entries.append(.unreadCountCategory(presentationData.theme, presentationData.strings.Notifications_Badge_CountUnreadMessages, inAppSettings.totalUnreadCountDisplayCategory == .messages)) entries.append(.unreadCountCategoryInfo(presentationData.theme, inAppSettings.totalUnreadCountDisplayCategory == .chats ? presentationData.strings.Notifications_Badge_CountUnreadMessages_InfoOff : presentationData.strings.Notifications_Badge_CountUnreadMessages_InfoOn)) entries.append(.joinedNotifications(presentationData.theme, presentationData.strings.NotificationSettings_ContactJoined, globalSettings.contactsJoined)) @@ -911,12 +957,14 @@ public func notificationsAndSoundsController(context: AccountContext, exceptions }).start() }, updateIncludeTag: { tag, value in let _ = updateInAppNotificationSettingsInteractively(accountManager: context.sharedContext.accountManager, { settings in - var settings = settings + var currentSettings = CounterTagSettings(summaryTags: settings.totalUnreadCountIncludeTags) if !value { - settings.totalUnreadCountIncludeTags.remove(tag) + currentSettings.remove(tag) } else { - settings.totalUnreadCountIncludeTags.insert(tag) + currentSettings.insert(tag) } + var settings = settings + settings.totalUnreadCountIncludeTags = currentSettings.toSumaryTags() return settings }).start() }, updateTotalUnreadCountCategory: { value in diff --git a/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift b/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift index d81c161b2f..b59ad0429d 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift @@ -259,7 +259,7 @@ public func blockedPeersController(context: AccountContext, blockedPeersContext: } })) }, openPeer: { peer in - if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { pushControllerImpl?(controller) } }) diff --git a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift index dfdba0d1ea..ccc324d7ef 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift @@ -18,6 +18,7 @@ class ForwardPrivacyChatPreviewItem: ListViewItem, ItemListItem { let strings: PresentationStrings let sectionId: ItemListSectionId let fontSize: PresentationFontSize + let chatBubbleCorners: PresentationChatBubbleCorners let wallpaper: TelegramWallpaper let dateTimeFormat: PresentationDateTimeFormat let nameDisplayOrder: PresentationPersonNameOrder @@ -25,12 +26,13 @@ class ForwardPrivacyChatPreviewItem: ListViewItem, ItemListItem { let linkEnabled: Bool let tooltipText: String - init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, peerName: String, linkEnabled: Bool, tooltipText: String) { + init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, peerName: String, linkEnabled: Bool, tooltipText: String) { self.context = context self.theme = theme self.strings = strings self.sectionId = sectionId self.fontSize = fontSize + self.chatBubbleCorners = chatBubbleCorners self.wallpaper = wallpaper self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder @@ -157,7 +159,7 @@ class ForwardPrivacyChatPreviewItemNode: ListViewItemNode { let forwardInfo = MessageForwardInfo(author: item.linkEnabled ? peers[peerId] : nil, source: nil, sourceMessageId: nil, date: 0, authorSignature: item.linkEnabled ? nil : item.peerName) - let messageItem = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), theme: item.theme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil) + let messageItem = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), theme: item.theme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil) var node: ListViewItemNode? if let current = currentNode { diff --git a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift index d889d5aac4..802c7bac02 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift @@ -112,7 +112,7 @@ class ItemListWebsiteItemNode: ItemListRevealOptionsItemNode { private var disabledOverlayNode: ASDisplayNode? private let maskNode: ASImageNode - private let avatarNode: AvatarNode + let avatarNode: AvatarNode private let titleNode: TextNode private let appNode: TextNode private let locationNode: TextNode diff --git a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift index 1a89bcca3c..3c7774bcc4 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift @@ -87,7 +87,7 @@ private func stringForUserCount(_ peers: [PeerId: SelectivePrivacyPeer], strings private enum SelectivePrivacySettingsEntry: ItemListNodeEntry { case forwardsPreviewHeader(PresentationTheme, String) - case forwardsPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, String, Bool, String) + case forwardsPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationChatBubbleCorners, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, String, Bool, String) case settingHeader(PresentationTheme, String) case everybody(PresentationTheme, String, Bool) case contacts(PresentationTheme, String, Bool) @@ -194,8 +194,8 @@ private enum SelectivePrivacySettingsEntry: ItemListNodeEntry { } else { return false } - case let .forwardsPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsPeerName, lhsLinkEnabled, lhsTooltipText): - if case let .forwardsPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsPeerName, rhsLinkEnabled, rhsTooltipText) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsPeerName == rhsPeerName, lhsLinkEnabled == rhsLinkEnabled, lhsTooltipText == rhsTooltipText { + case let .forwardsPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsChatBubbleCorners, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsPeerName, lhsLinkEnabled, lhsTooltipText): + if case let .forwardsPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsChatBubbleCorners, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsPeerName, rhsLinkEnabled, rhsTooltipText) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsChatBubbleCorners == rhsChatBubbleCorners, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsPeerName == rhsPeerName, lhsLinkEnabled == rhsLinkEnabled, lhsTooltipText == rhsTooltipText { return true } else { return false @@ -350,8 +350,8 @@ private enum SelectivePrivacySettingsEntry: ItemListNodeEntry { switch self { case let .forwardsPreviewHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, multiline: true, sectionId: self.section) - case let .forwardsPreview(theme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, peerName, linkEnabled, tooltipText): - return ForwardPrivacyChatPreviewItem(context: arguments.context, theme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, peerName: peerName, linkEnabled: linkEnabled, tooltipText: tooltipText) + case let .forwardsPreview(theme, wallpaper, fontSize, chatBubbleCorners, strings, dateTimeFormat, nameDisplayOrder, peerName, linkEnabled, tooltipText): + return ForwardPrivacyChatPreviewItem(context: arguments.context, theme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, chatBubbleCorners: chatBubbleCorners, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, peerName: peerName, linkEnabled: linkEnabled, tooltipText: tooltipText) case let .settingHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, multiline: true, sectionId: self.section) case let .everybody(theme, text, value): @@ -591,7 +591,7 @@ private func selectivePrivacySettingsControllerEntries(presentationData: Present linkEnabled = false } entries.append(.forwardsPreviewHeader(presentationData.theme, presentationData.strings.Privacy_Forwards_Preview)) - entries.append(.forwardsPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, peerName, linkEnabled, tootipText)) + entries.append(.forwardsPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.chatBubbleCorners, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, peerName, linkEnabled, tootipText)) } entries.append(.settingHeader(presentationData.theme, settingTitle)) diff --git a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift index 627b6c3af5..130a649729 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift @@ -341,7 +341,7 @@ public func selectivePrivacyPeersController(context: AccountContext, title: Stri return transaction.getPeer(peerId) } |> deliverOnMainQueue).start(next: { peer in - guard let peer = peer, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) else { + guard let peer = peer, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) else { return } pushControllerImpl?(controller) diff --git a/submodules/SettingsUI/Sources/SettingsController.swift b/submodules/SettingsUI/Sources/SettingsController.swift index e304b7390c..f47f5b7acb 100644 --- a/submodules/SettingsUI/Sources/SettingsController.swift +++ b/submodules/SettingsUI/Sources/SettingsController.swift @@ -1480,7 +1480,8 @@ public func settingsController(context: AccountContext, accountManager: AccountM let inset: CGFloat = 3.0 if let signal = peerAvatarImage(account: primary.0, peerReference: PeerReference(primary.1), authorOfMessage: nil, representation: primary.1.profileImageRepresentations.first, displayDimensions: size, inset: 3.0, emptyColor: nil, synchronousLoad: false) { return signal - |> map { image -> (UIImage, UIImage)? in + |> map { imageVersions -> (UIImage, UIImage)? in + let image = imageVersions?.0 if let image = image, let selectedImage = generateImage(size, rotatedContext: { size, context in context.clear(CGRect(origin: CGPoint(), size: size)) context.translateBy(x: size.width / 2.0, y: size.height / 2.0) diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift index 20a23a462b..675dc81df5 100644 --- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift +++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift @@ -303,7 +303,7 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView } private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { - let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) var items: [ListViewItem] = [] let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) @@ -317,20 +317,20 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) let message1 = Message(stableId: 4, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 4), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66003, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let message2 = Message(stableId: 3, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 3), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66002, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_2_Text, attributes: [ReplyMessageAttribute(messageId: replyMessageId)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let waveformBase64 = "DAAOAAkACQAGAAwADwAMABAADQAPABsAGAALAA0AGAAfABoAHgATABgAGQAYABQADAAVABEAHwANAA0ACQAWABkACQAOAAwACQAfAAAAGQAVAAAAEwATAAAACAAfAAAAHAAAABwAHwAAABcAGQAAABQADgAAABQAHwAAAB8AHwAAAAwADwAAAB8AEwAAABoAFwAAAB8AFAAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAA=" let voiceAttributes: [TelegramMediaFileAttribute] = [.Audio(isVoice: true, duration: 23, title: nil, performer: nil, waveform: MemoryBuffer(data: Data(base64Encoded: waveformBase64)!))] let voiceMedia = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: 0, attributes: voiceAttributes) let message3 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: "", attributes: [], media: [voiceMedia], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message3, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message3, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil)) let message4 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message4, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message4, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let width: CGFloat if case .regular = layout.metrics.widthClass { diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift new file mode 100644 index 0000000000..d714a7a6bc --- /dev/null +++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift @@ -0,0 +1,302 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import SwiftSignalKit +import TelegramCore +import SyncCore +import TelegramPresentationData +import TelegramUIPreferences +import LegacyComponents +import ItemListUI +import PresentationDataUtils +import AppBundle + +class BubbleSettingsRadiusItem: ListViewItem, ItemListItem { + let theme: PresentationTheme + let value: Int + let disableLeadingInset: Bool + let displayIcons: Bool + let force: Bool + let enabled: Bool + let sectionId: ItemListSectionId + let updated: (Int) -> Void + let tag: ItemListItemTag? + + init(theme: PresentationTheme, value: Int, enabled: Bool = true, disableLeadingInset: Bool = false, displayIcons: Bool = true, force: Bool = false, sectionId: ItemListSectionId, updated: @escaping (Int) -> Void, tag: ItemListItemTag? = nil) { + self.theme = theme + self.value = value + self.enabled = enabled + self.disableLeadingInset = disableLeadingInset + self.displayIcons = displayIcons + self.force = force + self.sectionId = sectionId + self.updated = updated + self.tag = tag + } + + func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { + async { + let node = BubbleSettingsRadiusItemNode() + let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + + node.contentSize = layout.contentSize + node.insets = layout.insets + + Queue.mainQueue().async { + completion(node, { + return (nil, { _ in apply() }) + }) + } + } + } + + func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) { + Queue.mainQueue().async { + if let nodeValue = node() as? BubbleSettingsRadiusItemNode { + let makeLayout = nodeValue.asyncLayout() + + async { + let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + Queue.mainQueue().async { + completion(layout, { _ in + apply() + }) + } + } + } + } + } +} + +private func generateKnobImage() -> UIImage? { + return generateImage(CGSize(width: 40.0, height: 40.0), rotatedContext: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setShadow(offset: CGSize(width: 0.0, height: -1.0), blur: 3.5, color: UIColor(white: 0.0, alpha: 0.25).cgColor) + context.setFillColor(UIColor.white.cgColor) + context.fillEllipse(in: CGRect(origin: CGPoint(x: 6.0, y: 6.0), size: CGSize(width: 28.0, height: 28.0))) + }) +} + +class BubbleSettingsRadiusItemNode: ListViewItemNode, ItemListItemNode { + private let backgroundNode: ASDisplayNode + private let topStripeNode: ASDisplayNode + private let bottomStripeNode: ASDisplayNode + private let maskNode: ASImageNode + + private var sliderView: TGPhotoEditorSliderView? + private let leftIconNode: ASImageNode + private let rightIconNode: ASImageNode + private let disabledOverlayNode: ASDisplayNode + + private var item: BubbleSettingsRadiusItem? + private var layoutParams: ListViewItemLayoutParams? + + var tag: ItemListItemTag? { + return self.item?.tag + } + + init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + + self.topStripeNode = ASDisplayNode() + self.topStripeNode.isLayerBacked = true + + self.bottomStripeNode = ASDisplayNode() + self.bottomStripeNode.isLayerBacked = true + + self.maskNode = ASImageNode() + + self.leftIconNode = ASImageNode() + self.leftIconNode.displaysAsynchronously = false + self.leftIconNode.displayWithoutProcessing = true + + self.rightIconNode = ASImageNode() + self.rightIconNode.displaysAsynchronously = false + self.rightIconNode.displayWithoutProcessing = true + + self.disabledOverlayNode = ASDisplayNode() + + super.init(layerBacked: false, dynamicBounce: false) + + self.addSubnode(self.leftIconNode) + self.addSubnode(self.rightIconNode) + + self.addSubnode(self.disabledOverlayNode) + } + + override func didLoad() { + super.didLoad() + + let sliderView = TGPhotoEditorSliderView() + sliderView.enablePanHandling = true + sliderView.enablePanHandling = true + sliderView.trackCornerRadius = 1.0 + sliderView.lineSize = 2.0 + sliderView.dotSize = 5.0 + sliderView.minimumValue = 0.0 + sliderView.maximumValue = 4.0 + sliderView.startValue = 0.0 + sliderView.positionsCount = 5 + sliderView.disablesInteractiveTransitionGestureRecognizer = true + if let item = self.item, let params = self.layoutParams { + sliderView.isUserInteractionEnabled = item.enabled + + sliderView.value = CGFloat((item.value - 8) / 2) + sliderView.backgroundColor = item.theme.list.itemBlocksBackgroundColor + sliderView.backColor = item.theme.list.disclosureArrowColor + sliderView.trackColor = item.enabled ? item.theme.list.itemAccentColor : item.theme.list.itemDisabledTextColor + sliderView.knobImage = generateKnobImage() + + let sliderInset: CGFloat = item.displayIcons ? 38.0 : 16.0 + + sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + sliderInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - sliderInset * 2.0, height: 44.0)) + } + self.view.insertSubview(sliderView, belowSubview: self.disabledOverlayNode.view) + sliderView.addTarget(self, action: #selector(self.sliderValueChanged), for: .valueChanged) + self.sliderView = sliderView + } + + func asyncLayout() -> (_ item: BubbleSettingsRadiusItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + let currentItem = self.item + + return { item, params, neighbors in + var updatedLeftIcon: UIImage? + var updatedRightIcon: UIImage? + + var themeUpdated = false + if currentItem?.theme !== item.theme { + themeUpdated = true + + updatedLeftIcon = generateTintedImage(image: UIImage(bundleImageName: "Instant View/SettingsFontMinIcon"), color: item.theme.list.itemPrimaryTextColor) + updatedRightIcon = generateTintedImage(image: UIImage(bundleImageName: "Instant View/SettingsFontMaxIcon"), color: item.theme.list.itemPrimaryTextColor) + } + + let contentSize: CGSize + var insets: UIEdgeInsets + let separatorHeight = UIScreenPixel + + contentSize = CGSize(width: params.width, height: 60.0) + insets = itemListNeighborsGroupedInsets(neighbors) + + if item.disableLeadingInset { + insets.top = 0.0 + insets.bottom = 0.0 + } + + let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) + let layoutSize = layout.size + + return (layout, { [weak self] in + if let strongSelf = self { + let firstTime = strongSelf.item == nil || item.force + strongSelf.item = item + strongSelf.layoutParams = params + + strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor + strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor + + strongSelf.disabledOverlayNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4) + strongSelf.disabledOverlayNode.isHidden = item.enabled + strongSelf.disabledOverlayNode.frame = CGRect(origin: CGPoint(x: params.leftInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset, height: 44.0)) + + if strongSelf.backgroundNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0) + } + if strongSelf.topStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1) + } + if strongSelf.bottomStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2) + } + if strongSelf.maskNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.maskNode, at: 3) + } + + let hasCorners = itemListHasRoundedBlockLayout(params) + var hasTopCorners = false + var hasBottomCorners = false + switch neighbors.top { + case .sameSection(false): + strongSelf.topStripeNode.isHidden = true + default: + hasTopCorners = true + strongSelf.topStripeNode.isHidden = hasCorners + } + let bottomStripeInset: CGFloat + let bottomStripeOffset: CGFloat + switch neighbors.bottom { + case .sameSection(false): + bottomStripeInset = params.leftInset + 16.0 + bottomStripeOffset = -separatorHeight + default: + bottomStripeInset = 0.0 + bottomStripeOffset = 0.0 + hasBottomCorners = true + strongSelf.bottomStripeNode.isHidden = hasCorners + } + + strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil + + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight))) + strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0) + strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight)) + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight)) + + if let updatedLeftIcon = updatedLeftIcon { + strongSelf.leftIconNode.image = updatedLeftIcon + } + if let image = strongSelf.leftIconNode.image { + strongSelf.leftIconNode.frame = CGRect(origin: CGPoint(x: params.leftInset + 18.0, y: 25.0), size: CGSize(width: image.size.width, height: image.size.height)) + } + if let updatedRightIcon = updatedRightIcon { + strongSelf.rightIconNode.image = updatedRightIcon + } + if let image = strongSelf.rightIconNode.image { + strongSelf.rightIconNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 14.0 - image.size.width, y: 21.0), size: CGSize(width: image.size.width, height: image.size.height)) + } + + strongSelf.leftIconNode.isHidden = !item.displayIcons + strongSelf.rightIconNode.isHidden = !item.displayIcons + + if let sliderView = strongSelf.sliderView { + sliderView.isUserInteractionEnabled = item.enabled + sliderView.trackColor = item.enabled ? item.theme.list.itemAccentColor : item.theme.list.itemDisabledTextColor + + if themeUpdated { + sliderView.backgroundColor = item.theme.list.itemBlocksBackgroundColor + sliderView.backColor = item.theme.list.disclosureArrowColor + sliderView.knobImage = generateKnobImage() + } + + let value: CGFloat = CGFloat((item.value - 8) / 2) + if firstTime { + sliderView.value = value + } + + let sliderInset: CGFloat = item.displayIcons ? 38.0 : 16.0 + sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + sliderInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - sliderInset * 2.0, height: 44.0)) + } + } + }) + } + } + + override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4) + } + + override func animateRemoved(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) + } + + @objc func sliderValueChanged() { + guard let sliderView = self.sliderView else { + return + } + let value = Int(sliderView.value) * 2 + 8 + self.item?.updated(value) + } +} diff --git a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift index b918e65d1a..f85e96e5ce 100644 --- a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift +++ b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift @@ -53,7 +53,7 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { case slug(PresentationTheme, PresentationStrings, String, String, Bool) case slugInfo(PresentationTheme, String) case chatPreviewHeader(PresentationTheme, String) - case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) + case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationChatBubbleCorners, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) case changeColors(PresentationTheme, String) case uploadTheme(PresentationTheme, String) case uploadInfo(PresentationTheme, String) @@ -114,8 +114,8 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { } else { return false } - case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): - if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { + case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsChatBubbleCorners, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): + if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsChatBubbleCorners, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsChatBubbleCorners == rhsChatBubbleCorners, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { return true } else { return false @@ -172,8 +172,8 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section) case let .chatPreviewHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) - case let .chatPreview(theme, componentTheme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, items): - return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) + case let .chatPreview(theme, componentTheme, wallpaper, fontSize, chatBubbleCorners, strings, dateTimeFormat, nameDisplayOrder, items): + return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, chatBubbleCorners: chatBubbleCorners, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) case let .changeColors(theme, text): return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { arguments.openColors() @@ -253,7 +253,7 @@ private func editThemeControllerEntries(presentationData: PresentationData, stat entries.append(.slugInfo(presentationData.theme, infoText)) entries.append(.chatPreviewHeader(presentationData.theme, presentationData.strings.EditTheme_Preview.uppercased())) - entries.append(.chatPreview(presentationData.theme, previewTheme, previewTheme.chat.defaultWallpaper, presentationData.chatFontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (previewIncomingReplyName, previewIncomingReplyText), text: previewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: previewOutgoingText)])) + entries.append(.chatPreview(presentationData.theme, previewTheme, previewTheme.chat.defaultWallpaper, presentationData.chatFontSize, presentationData.chatBubbleCorners, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (previewIncomingReplyName, previewIncomingReplyText), text: previewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: previewOutgoingText)])) entries.append(.changeColors(presentationData.theme, presentationData.strings.EditTheme_ChangeColors)) if !hasSettings { @@ -556,7 +556,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers themeSpecificChatWallpapers[themeReference.index] = nil - return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> deliverOnMainQueue).start(completed: { if !hasCustomFile { saveThemeTemplateFile(state.title, themeResource, { @@ -590,7 +590,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers themeSpecificChatWallpapers[themeReference.index] = nil - return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> deliverOnMainQueue).start(completed: { if let themeResource = themeResource, !hasCustomFile { saveThemeTemplateFile(state.title, themeResource, { diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift index 503d9005d3..21c9950124 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift @@ -276,7 +276,7 @@ final class ThemeAccentColorController: ViewController { var themeSpecificAccentColors = current.themeSpecificAccentColors themeSpecificAccentColors[baseThemeReference.index] = PresentationThemeAccentColor(themeIndex: themeReference.index) - return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> castError(CreateThemeError.self) } else { @@ -305,7 +305,7 @@ final class ThemeAccentColorController: ViewController { var themeSpecificAccentColors = current.themeSpecificAccentColors themeSpecificAccentColors[baseThemeReference.index] = PresentationThemeAccentColor(themeIndex: themeReference.index) - return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> castError(CreateThemeError.self) } else { diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift index beef472dec..57916acc46 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift @@ -226,6 +226,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.presentationData = context.sharedContext.currentPresentationData.with { $0 } self.theme = theme self.wallpaper = self.presentationData.chatWallpaper + let bubbleCorners = self.presentationData.chatBubbleCorners self.ready = ready @@ -498,7 +499,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate updatedTheme = theme } - let _ = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: updatedTheme!, wallpaper: wallpaper) + let _ = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: updatedTheme!, wallpaper: wallpaper, bubbleCorners: bubbleCorners) } else { updatedTheme = nil } @@ -836,7 +837,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate } private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { - let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) var items: [ListViewItem] = [] let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) @@ -878,7 +879,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate sampleMessages.append(message8) items = sampleMessages.reversed().map { message in - let item = self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: { [weak self] message in + let item = self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: { [weak self] message in if message.flags.contains(.Incoming) { self?.updateSection(.accent) self?.requestSectionUpdate?(.accent) diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift index b4b5cbaf2f..469477a0d6 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift @@ -442,7 +442,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { } private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { - let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) var items: [ListViewItem] = [] let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) @@ -484,7 +484,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { sampleMessages.append(message8) items = sampleMessages.reversed().map { message in - self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.previewTheme.chat.defaultWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: nil, clickThroughMessage: nil) + self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.previewTheme.chat.defaultWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: nil, clickThroughMessage: nil) } let width: CGFloat diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift index 4a2a1361ad..47b4bbda37 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift @@ -40,18 +40,20 @@ class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem { let strings: PresentationStrings let sectionId: ItemListSectionId let fontSize: PresentationFontSize + let chatBubbleCorners: PresentationChatBubbleCorners let wallpaper: TelegramWallpaper let dateTimeFormat: PresentationDateTimeFormat let nameDisplayOrder: PresentationPersonNameOrder let messageItems: [ChatPreviewMessageItem] - init(context: AccountContext, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, messageItems: [ChatPreviewMessageItem]) { + init(context: AccountContext, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, messageItems: [ChatPreviewMessageItem]) { self.context = context self.theme = theme self.componentTheme = componentTheme self.strings = strings self.sectionId = sectionId self.fontSize = fontSize + self.chatBubbleCorners = chatBubbleCorners self.wallpaper = wallpaper self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder @@ -163,7 +165,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { } let message = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: messageItem.outgoing ? otherPeerId : peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: messageItem.outgoing ? [] : [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: messageItem.outgoing ? TelegramUser(id: otherPeerId, accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) : nil, text: messageItem.text, attributes: messageItem.reply != nil ? [ReplyMessageAttribute(messageId: replyMessageId)] : [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: message, theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: message, theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) } var nodes: [ListViewItemNode] = [] diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift index d45c21762c..6f8357dfba 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift @@ -76,6 +76,7 @@ private final class ThemeSettingsControllerArguments { let openAccentColorPicker: (PresentationThemeReference, Bool) -> Void let openAutoNightTheme: () -> Void let openTextSize: () -> Void + let openBubbleSettings: () -> Void let toggleLargeEmoji: (Bool) -> Void let disableAnimations: (Bool) -> Void let selectAppIcon: (String) -> Void @@ -83,7 +84,7 @@ private final class ThemeSettingsControllerArguments { let themeContextAction: (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void let colorContextAction: (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void - init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference, Bool) -> Void, openAutoNightTheme: @escaping () -> Void, openTextSize: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void, editTheme: @escaping (PresentationCloudTheme) -> Void, themeContextAction: @escaping (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void, colorContextAction: @escaping (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void) { + init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference, Bool) -> Void, openAutoNightTheme: @escaping () -> Void, openTextSize: @escaping () -> Void, openBubbleSettings: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void, editTheme: @escaping (PresentationCloudTheme) -> Void, themeContextAction: @escaping (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void, colorContextAction: @escaping (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void) { self.context = context self.selectTheme = selectTheme self.selectFontSize = selectFontSize @@ -92,6 +93,7 @@ private final class ThemeSettingsControllerArguments { self.openAccentColorPicker = openAccentColorPicker self.openAutoNightTheme = openAutoNightTheme self.openTextSize = openTextSize + self.openBubbleSettings = openBubbleSettings self.toggleLargeEmoji = toggleLargeEmoji self.disableAnimations = disableAnimations self.selectAppIcon = selectAppIcon @@ -131,11 +133,12 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { case themeListHeader(PresentationTheme, String) case fontSizeHeader(PresentationTheme, String) case fontSize(PresentationTheme, PresentationFontSize) - case chatPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) + case chatPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationChatBubbleCorners, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) case wallpaper(PresentationTheme, String) case accentColor(PresentationTheme, PresentationThemeReference, PresentationThemeReference, [PresentationThemeReference], ThemeSettingsColorOption?) case autoNightTheme(PresentationTheme, String, String) case textSize(PresentationTheme, String, String) + case bubbleSettings(PresentationTheme, String, String) case themeItem(PresentationTheme, PresentationStrings, [PresentationThemeReference], [PresentationThemeReference], PresentationThemeReference, [Int64: PresentationThemeAccentColor], [Int64: TelegramWallpaper], PresentationThemeAccentColor?) case iconHeader(PresentationTheme, String) case iconItem(PresentationTheme, PresentationStrings, [PresentationAppIcon], String?) @@ -150,7 +153,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ThemeSettingsControllerSection.chatPreview.rawValue case .fontSizeHeader, .fontSize: return ThemeSettingsControllerSection.fontSize.rawValue - case .wallpaper, .autoNightTheme, .textSize: + case .wallpaper, .autoNightTheme, .textSize, .bubbleSettings: return ThemeSettingsControllerSection.background.rawValue case .iconHeader, .iconItem: return ThemeSettingsControllerSection.icon.rawValue @@ -175,29 +178,31 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return 6 case .textSize: return 7 - case .fontSizeHeader: + case .bubbleSettings: return 8 - case .fontSize: + case .fontSizeHeader: return 9 - case .iconHeader: + case .fontSize: return 10 - case .iconItem: + case .iconHeader: return 11 - case .otherHeader: + case .iconItem: return 12 - case .largeEmoji: + case .otherHeader: return 13 - case .animations: + case .largeEmoji: return 14 - case .animationsInfo: + case .animations: return 15 + case .animationsInfo: + return 16 } } static func ==(lhs: ThemeSettingsControllerEntry, rhs: ThemeSettingsControllerEntry) -> Bool { switch lhs { - case let .chatPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): - if case let .chatPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { + case let .chatPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsChatBubbleCorners, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): + if case let .chatPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsChatBubbleCorners, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsChatBubbleCorners == rhsChatBubbleCorners, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { return true } else { return false @@ -226,6 +231,12 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { } else { return false } + case let .bubbleSettings(lhsTheme, lhsText, lhsValue): + if case let .bubbleSettings(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue { + return true + } else { + return false + } case let .themeListHeader(lhsTheme, lhsText): if case let .themeListHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { return true @@ -302,8 +313,8 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ThemeSettingsFontSizeItem(theme: theme, fontSize: fontSize, sectionId: self.section, updated: { value in arguments.selectFontSize(value) }, tag: ThemeSettingsEntryTag.fontSize) - case let .chatPreview(theme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, items): - return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) + case let .chatPreview(theme, wallpaper, fontSize, chatBubbleCorners, strings, dateTimeFormat, nameDisplayOrder, items): + return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, chatBubbleCorners: chatBubbleCorners, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) case let .wallpaper(theme, text): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: "", sectionId: self.section, style: .blocks, action: { arguments.openWallpaperSettings() @@ -387,6 +398,10 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ItemListDisclosureItem(presentationData: presentationData, icon: nil, title: text, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { arguments.openTextSize() }) + case let .bubbleSettings(theme, text, value): + return ItemListDisclosureItem(presentationData: presentationData, icon: nil, title: text, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { + arguments.openBubbleSettings() + }) case let .themeListHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) case let .themeItem(theme, strings, themes, allThemes, currentTheme, themeSpecificAccentColors, themeSpecificChatWallpapers, _): @@ -429,7 +444,7 @@ private func themeSettingsControllerEntries(presentationData: PresentationData, let strings = presentationData.strings let title = presentationData.autoNightModeTriggered ? strings.Appearance_ColorThemeNight.uppercased() : strings.Appearance_ColorTheme.uppercased() entries.append(.themeListHeader(presentationData.theme, title)) - entries.append(.chatPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (presentationData.strings.Appearance_PreviewReplyAuthor, presentationData.strings.Appearance_PreviewReplyText), text: presentationData.strings.Appearance_PreviewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: presentationData.strings.Appearance_PreviewOutgoingText)])) + entries.append(.chatPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.chatBubbleCorners, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (presentationData.strings.Appearance_PreviewReplyAuthor, presentationData.strings.Appearance_PreviewReplyText), text: presentationData.strings.Appearance_PreviewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: presentationData.strings.Appearance_PreviewOutgoingText)])) let generalThemes: [PresentationThemeReference] = availableThemes.filter { reference in if case let .cloud(theme) = reference { @@ -497,6 +512,7 @@ private func themeSettingsControllerEntries(presentationData: PresentationData, } } entries.append(.textSize(presentationData.theme, strings.Appearance_TextSizeSetting, textSizeValue)) + entries.append(.bubbleSettings(presentationData.theme, strings.Appearance_BubbleCornersSetting, "")) if !availableAppIcons.isEmpty { entries.append(.iconHeader(presentationData.theme, strings.Appearance_AppIcon.uppercased())) @@ -570,6 +586,13 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The let settings = (view.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings pushControllerImpl?(TextSizeSelectionController(context: context, presentationThemeSettings: settings)) }) + }, openBubbleSettings: { + let _ = (context.sharedContext.accountManager.sharedData(keys: Set([ApplicationSpecificSharedDataKeys.presentationThemeSettings])) + |> take(1) + |> deliverOnMainQueue).start(next: { view in + let settings = (view.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings + pushControllerImpl?(BubbleSettingsController(context: context, presentationThemeSettings: settings)) + }) }, toggleLargeEmoji: { largeEmoji in let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in return current.withUpdatedLargeEmoji(largeEmoji) @@ -1272,7 +1295,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The } } - return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }).start() presentCrossfadeControllerImpl?(true) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift index b409c93e4b..61b07eabff 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift @@ -16,17 +16,19 @@ class ThemeSettingsFontSizeItem: ListViewItem, ItemListItem { let theme: PresentationTheme let fontSize: PresentationFontSize let disableLeadingInset: Bool + let displayIcons: Bool let force: Bool let enabled: Bool let sectionId: ItemListSectionId let updated: (PresentationFontSize) -> Void let tag: ItemListItemTag? - init(theme: PresentationTheme, fontSize: PresentationFontSize, enabled: Bool = true, disableLeadingInset: Bool = false, force: Bool = false, sectionId: ItemListSectionId, updated: @escaping (PresentationFontSize) -> Void, tag: ItemListItemTag? = nil) { + init(theme: PresentationTheme, fontSize: PresentationFontSize, enabled: Bool = true, disableLeadingInset: Bool = false, displayIcons: Bool = true, force: Bool = false, sectionId: ItemListSectionId, updated: @escaping (PresentationFontSize) -> Void, tag: ItemListItemTag? = nil) { self.theme = theme self.fontSize = fontSize self.enabled = enabled self.disableLeadingInset = disableLeadingInset + self.displayIcons = displayIcons self.force = force self.sectionId = sectionId self.updated = updated @@ -164,7 +166,9 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { sliderView.trackColor = item.enabled ? item.theme.list.itemAccentColor : item.theme.list.itemDisabledTextColor sliderView.knobImage = generateKnobImage() - sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + 38.0, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - 38.0 * 2.0, height: 44.0)) + let sliderInset: CGFloat = item.displayIcons ? 38.0 : 16.0 + + sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + sliderInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - sliderInset * 2.0, height: 44.0)) } self.view.insertSubview(sliderView, belowSubview: self.disabledOverlayNode.view) sliderView.addTarget(self, action: #selector(self.sliderValueChanged), for: .valueChanged) @@ -271,6 +275,9 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { strongSelf.rightIconNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 14.0 - image.size.width, y: 21.0), size: CGSize(width: image.size.width, height: image.size.height)) } + strongSelf.leftIconNode.isHidden = !item.displayIcons + strongSelf.rightIconNode.isHidden = !item.displayIcons + if let sliderView = strongSelf.sliderView { sliderView.isUserInteractionEnabled = item.enabled sliderView.trackColor = item.enabled ? item.theme.list.itemAccentColor : item.theme.list.itemDisabledTextColor @@ -302,7 +309,8 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { sliderView.value = value } - sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + 38.0, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - 38.0 * 2.0, height: 44.0)) + let sliderInset: CGFloat = item.displayIcons ? 38.0 : 16.0 + sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + sliderInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - sliderInset * 2.0, height: 44.0)) } } }) diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift index 9453bc392c..a159690102 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift @@ -832,10 +832,10 @@ final class WallpaperGalleryItemNode: GalleryItemNode { let theme = self.presentationData.theme.withUpdated(preview: true) let message1 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: bottomMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let message2 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: topMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height) if let messageNodes = self.messageNodes { diff --git a/submodules/SyncCore/Sources/Namespaces.swift b/submodules/SyncCore/Sources/Namespaces.swift index 96db1f9af2..76d058ee03 100644 --- a/submodules/SyncCore/Sources/Namespaces.swift +++ b/submodules/SyncCore/Sources/Namespaces.swift @@ -139,10 +139,44 @@ public struct OperationLogTags { public static let SynchronizeEmojiKeywords = PeerOperationLogTag(value: 19) } +public struct LegacyPeerSummaryCounterTags: OptionSet, Sequence, Hashable { + public var rawValue: Int32 + + public init(rawValue: Int32) { + self.rawValue = rawValue + } + + public static let regularChatsAndPrivateGroups = LegacyPeerSummaryCounterTags(rawValue: 1 << 0) + public static let publicGroups = LegacyPeerSummaryCounterTags(rawValue: 1 << 1) + public static let channels = LegacyPeerSummaryCounterTags(rawValue: 1 << 2) + + public func makeIterator() -> AnyIterator { + var index = 0 + return AnyIterator { () -> LegacyPeerSummaryCounterTags? in + while index < 31 { + let currentTags = self.rawValue >> UInt32(index) + let tag = LegacyPeerSummaryCounterTags(rawValue: 1 << UInt32(index)) + index += 1 + if currentTags == 0 { + break + } + + if (currentTags & 1) != 0 { + return tag + } + } + return nil + } + } +} + public extension PeerSummaryCounterTags { - static let regularChatsAndPrivateGroups = PeerSummaryCounterTags(rawValue: 1 << 0) - static let publicGroups = PeerSummaryCounterTags(rawValue: 1 << 1) - static let channels = PeerSummaryCounterTags(rawValue: 1 << 2) + static let privateChat = PeerSummaryCounterTags(rawValue: 1 << 3) + static let secretChat = PeerSummaryCounterTags(rawValue: 1 << 4) + static let privateGroup = PeerSummaryCounterTags(rawValue: 1 << 5) + static let bot = PeerSummaryCounterTags(rawValue: 1 << 6) + static let channel = PeerSummaryCounterTags(rawValue: 1 << 7) + static let publicGroup = PeerSummaryCounterTags(rawValue: 1 << 8) } private enum PreferencesKeyValues: Int32 { @@ -162,6 +196,7 @@ private enum PreferencesKeyValues: Int32 { case secretChatSettings = 17 case walletCollection = 18 case contentSettings = 19 + case chatListFilters = 20 } public func applicationSpecificPreferencesKey(_ value: Int32) -> ValueBoxKey { @@ -272,6 +307,12 @@ public struct PreferencesKeys { key.setInt32(0, value: PreferencesKeyValues.contentSettings.rawValue) return key }() + + public static let chatListFilters: ValueBoxKey = { + let key = ValueBoxKey(length: 4) + key.setInt32(0, value: PreferencesKeyValues.chatListFilters.rawValue) + return key + }() } private enum SharedDataKeyValues: Int32 { diff --git a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift index 93d625cb33..443881967e 100644 --- a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift +++ b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift @@ -19,19 +19,30 @@ public let telegramPostboxSeedConfiguration: SeedConfiguration = { } return SeedConfiguration(globalMessageIdsPeerIdNamespaces: globalMessageIdsPeerIdNamespaces, initializeChatListWithHole: (topLevel: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1)), groups: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1))), messageHoles: messageHoles, existingMessageTags: MessageTags.all, messageTagsWithSummary: MessageTags.unseenPersonalMessage, existingGlobalMessageTags: GlobalMessageTags.all, peerNamespacesRequiringMessageTextIndex: [Namespaces.Peer.SecretChat], peerSummaryCounterTags: { peer in - if let peer = peer as? TelegramChannel { - switch peer.info { - case .group: - if let addressName = peer.username, !addressName.isEmpty { - return [.publicGroups] - } else { - return [.regularChatsAndPrivateGroups] - } - case .broadcast: - return [.channels] + if let peer = peer as? TelegramUser { + if peer.botInfo != nil { + return .bot + } else { + return .privateChat + } + } else if let _ = peer as? TelegramGroup { + return .privateGroup + } else if let _ = peer as? TelegramSecretChat { + return .secretChat + } else if let channel = peer as? TelegramChannel { + switch channel.info { + case .broadcast: + return .channel + case .group: + if channel.username != nil { + return .publicGroup + } else { + return .privateGroup + } } } else { - return [.regularChatsAndPrivateGroups] + assertionFailure() + return .privateChat } }, additionalChatListIndexNamespace: Namespaces.Message.Cloud, messageNamespacesRequiringGroupStatsValidation: [Namespaces.Message.Cloud], defaultMessageNamespaceReadStates: [Namespaces.Message.Local: .idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false)], chatMessagesNamespaces: Set([Namespaces.Message.Cloud, Namespaces.Message.Local, Namespaces.Message.SecretIncoming])) }() diff --git a/submodules/SyncCore/Sources/TelegramMediaPoll.swift b/submodules/SyncCore/Sources/TelegramMediaPoll.swift index 942f1ba8fd..f01ba73c87 100644 --- a/submodules/SyncCore/Sources/TelegramMediaPoll.swift +++ b/submodules/SyncCore/Sources/TelegramMediaPoll.swift @@ -229,6 +229,8 @@ public final class TelegramMediaPoll: Media, Equatable { updatedResults = TelegramMediaPollResults(voters: updatedVoters.map({ voters in return TelegramMediaPollOptionVoters(selected: selectedOpaqueIdentifiers.contains(voters.opaqueIdentifier), opaqueIdentifier: voters.opaqueIdentifier, count: voters.count, isCorrect: correctOpaqueIdentifiers.contains(voters.opaqueIdentifier)) }), totalVoters: results.totalVoters, recentVoters: results.recentVoters) + } else if let updatedVoters = results.voters { + updatedResults = TelegramMediaPollResults(voters: updatedVoters, totalVoters: results.totalVoters, recentVoters: results.recentVoters) } else { updatedResults = TelegramMediaPollResults(voters: self.results.voters, totalVoters: results.totalVoters, recentVoters: results.recentVoters) } diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift index be3e05a869..d5464fef60 100644 --- a/submodules/TelegramApi/Sources/Api0.swift +++ b/submodules/TelegramApi/Sources/Api0.swift @@ -247,6 +247,9 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-2027964103] = { return Api.Update.parse_updateGeoLiveViewed($0) } dict[1448076945] = { return Api.Update.parse_updateLoginToken($0) } dict[1123585836] = { return Api.Update.parse_updateMessagePollVote($0) } + dict[654302845] = { return Api.Update.parse_updateDialogFilter($0) } + dict[-1512627963] = { return Api.Update.parse_updateDialogFilterOrder($0) } + dict[889491791] = { return Api.Update.parse_updateDialogFilters($0) } dict[136574537] = { return Api.messages.VotesList.parse_votesList($0) } dict[1558266229] = { return Api.PopularContact.parse_popularContact($0) } dict[-373643672] = { return Api.FolderPeer.parse_folderPeer($0) } @@ -596,6 +599,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1551583367] = { return Api.ReceivedNotifyMessage.parse_receivedNotifyMessage($0) } dict[-57668565] = { return Api.ChatParticipants.parse_chatParticipantsForbidden($0) } dict[1061556205] = { return Api.ChatParticipants.parse_chatParticipants($0) } + dict[351868460] = { return Api.DialogFilter.parse_dialogFilter($0) } dict[-1056001329] = { return Api.InputPaymentCredentials.parse_inputPaymentCredentialsSaved($0) } dict[873977640] = { return Api.InputPaymentCredentials.parse_inputPaymentCredentials($0) } dict[178373535] = { return Api.InputPaymentCredentials.parse_inputPaymentCredentialsApplePay($0) } @@ -615,7 +619,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[1421174295] = { return Api.WebPageAttribute.parse_webPageAttributeTheme($0) } dict[82699215] = { return Api.messages.FeaturedStickers.parse_featuredStickersNotModified($0) } dict[-123893531] = { return Api.messages.FeaturedStickers.parse_featuredStickers($0) } - dict[1375940666] = { return Api.auth.LoginTokenInfo.parse_loginTokenInfo($0) } dict[-2048646399] = { return Api.PhoneCallDiscardReason.parse_phoneCallDiscardReasonMissed($0) } dict[-527056480] = { return Api.PhoneCallDiscardReason.parse_phoneCallDiscardReasonDisconnect($0) } dict[1471006352] = { return Api.PhoneCallDiscardReason.parse_phoneCallDiscardReasonHangup($0) } @@ -686,6 +689,8 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-395967805] = { return Api.messages.AllStickers.parse_allStickersNotModified($0) } dict[-302170017] = { return Api.messages.AllStickers.parse_allStickers($0) } dict[-1655957568] = { return Api.PhoneConnection.parse_phoneConnection($0) } + dict[-206688531] = { return Api.help.UserInfo.parse_userInfoEmpty($0) } + dict[32192344] = { return Api.help.UserInfo.parse_userInfo($0) } dict[-1194283041] = { return Api.AccountDaysTTL.parse_accountDaysTTL($0) } dict[-1658158621] = { return Api.SecureValueType.parse_secureValueTypePersonalDetails($0) } dict[1034709504] = { return Api.SecureValueType.parse_secureValueTypePassport($0) } @@ -752,7 +757,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[1363483106] = { return Api.DialogPeer.parse_dialogPeerFolder($0) } dict[-104284986] = { return Api.WebDocument.parse_webDocumentNoProxy($0) } dict[475467473] = { return Api.WebDocument.parse_webDocument($0) } - dict[1211967244] = { return Api.Theme.parse_themeDocumentNotModified($0) } dict[42930452] = { return Api.Theme.parse_theme($0) } dict[-1290580579] = { return Api.contacts.Found.parse_found($0) } dict[-368018716] = { return Api.ChannelAdminLogEventsFilter.parse_channelAdminLogEventsFilter($0) } @@ -1272,6 +1276,8 @@ public struct Api { _1.serialize(buffer, boxed) case let _1 as Api.ChatParticipants: _1.serialize(buffer, boxed) + case let _1 as Api.DialogFilter: + _1.serialize(buffer, boxed) case let _1 as Api.InputPaymentCredentials: _1.serialize(buffer, boxed) case let _1 as Api.ShippingOption: @@ -1294,8 +1300,6 @@ public struct Api { _1.serialize(buffer, boxed) case let _1 as Api.messages.FeaturedStickers: _1.serialize(buffer, boxed) - case let _1 as Api.auth.LoginTokenInfo: - _1.serialize(buffer, boxed) case let _1 as Api.PhoneCallDiscardReason: _1.serialize(buffer, boxed) case let _1 as Api.NearestDc: @@ -1354,6 +1358,8 @@ public struct Api { _1.serialize(buffer, boxed) case let _1 as Api.PhoneConnection: _1.serialize(buffer, boxed) + case let _1 as Api.help.UserInfo: + _1.serialize(buffer, boxed) case let _1 as Api.AccountDaysTTL: _1.serialize(buffer, boxed) case let _1 as Api.SecureValueType: diff --git a/submodules/TelegramApi/Sources/Api1.swift b/submodules/TelegramApi/Sources/Api1.swift index 09dc6c09b6..6382732af6 100644 --- a/submodules/TelegramApi/Sources/Api1.swift +++ b/submodules/TelegramApi/Sources/Api1.swift @@ -5861,6 +5861,9 @@ public extension Api { case updateGeoLiveViewed(peer: Api.Peer, msgId: Int32) case updateLoginToken case updateMessagePollVote(pollId: Int64, userId: Int32, options: [Buffer]) + case updateDialogFilter(flags: Int32, id: Int32, filter: Api.DialogFilter?) + case updateDialogFilterOrder(order: [Int32]) + case updateDialogFilters public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -6509,6 +6512,30 @@ public extension Api { for item in options { serializeBytes(item, buffer: buffer, boxed: false) } + break + case .updateDialogFilter(let flags, let id, let filter): + if boxed { + buffer.appendInt32(654302845) + } + serializeInt32(flags, buffer: buffer, boxed: false) + serializeInt32(id, buffer: buffer, boxed: false) + if Int(flags) & Int(1 << 0) != 0 {filter!.serialize(buffer, true)} + break + case .updateDialogFilterOrder(let order): + if boxed { + buffer.appendInt32(-1512627963) + } + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(order.count)) + for item in order { + serializeInt32(item, buffer: buffer, boxed: false) + } + break + case .updateDialogFilters: + if boxed { + buffer.appendInt32(889491791) + } + break } } @@ -6669,6 +6696,12 @@ public extension Api { return ("updateLoginToken", []) case .updateMessagePollVote(let pollId, let userId, let options): return ("updateMessagePollVote", [("pollId", pollId), ("userId", userId), ("options", options)]) + case .updateDialogFilter(let flags, let id, let filter): + return ("updateDialogFilter", [("flags", flags), ("id", id), ("filter", filter)]) + case .updateDialogFilterOrder(let order): + return ("updateDialogFilterOrder", [("order", order)]) + case .updateDialogFilters: + return ("updateDialogFilters", []) } } @@ -7965,6 +7998,41 @@ public extension Api { return nil } } + public static func parse_updateDialogFilter(_ reader: BufferReader) -> Update? { + var _1: Int32? + _1 = reader.readInt32() + var _2: Int32? + _2 = reader.readInt32() + var _3: Api.DialogFilter? + if Int(_1!) & Int(1 << 0) != 0 {if let signature = reader.readInt32() { + _3 = Api.parse(reader, signature: signature) as? Api.DialogFilter + } } + let _c1 = _1 != nil + let _c2 = _2 != nil + let _c3 = (Int(_1!) & Int(1 << 0) == 0) || _3 != nil + if _c1 && _c2 && _c3 { + return Api.Update.updateDialogFilter(flags: _1!, id: _2!, filter: _3) + } + else { + return nil + } + } + public static func parse_updateDialogFilterOrder(_ reader: BufferReader) -> Update? { + var _1: [Int32]? + if let _ = reader.readInt32() { + _1 = Api.parseVector(reader, elementSignature: -1471112230, elementType: Int32.self) + } + let _c1 = _1 != nil + if _c1 { + return Api.Update.updateDialogFilterOrder(order: _1!) + } + else { + return nil + } + } + public static func parse_updateDialogFilters(_ reader: BufferReader) -> Update? { + return Api.Update.updateDialogFilters + } } public enum PopularContact: TypeConstructorDescription { @@ -17004,6 +17072,58 @@ public extension Api { } } + } + public enum DialogFilter: TypeConstructorDescription { + case dialogFilter(flags: Int32, id: Int32, title: String, includePeers: [Api.InputPeer]) + + public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { + switch self { + case .dialogFilter(let flags, let id, let title, let includePeers): + if boxed { + buffer.appendInt32(351868460) + } + serializeInt32(flags, buffer: buffer, boxed: false) + serializeInt32(id, buffer: buffer, boxed: false) + serializeString(title, buffer: buffer, boxed: false) + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(includePeers.count)) + for item in includePeers { + item.serialize(buffer, true) + } + break + } + } + + public func descriptionFields() -> (String, [(String, Any)]) { + switch self { + case .dialogFilter(let flags, let id, let title, let includePeers): + return ("dialogFilter", [("flags", flags), ("id", id), ("title", title), ("includePeers", includePeers)]) + } + } + + public static func parse_dialogFilter(_ reader: BufferReader) -> DialogFilter? { + var _1: Int32? + _1 = reader.readInt32() + var _2: Int32? + _2 = reader.readInt32() + var _3: String? + _3 = parseString(reader) + var _4: [Api.InputPeer]? + if let _ = reader.readInt32() { + _4 = Api.parseVector(reader, elementSignature: 0, elementType: Api.InputPeer.self) + } + let _c1 = _1 != nil + let _c2 = _2 != nil + let _c3 = _3 != nil + let _c4 = _4 != nil + if _c1 && _c2 && _c3 && _c4 { + return Api.DialogFilter.dialogFilter(flags: _1!, id: _2!, title: _3!, includePeers: _4!) + } + else { + return nil + } + } + } public enum InputPaymentCredentials: TypeConstructorDescription { case inputPaymentCredentialsSaved(id: String, tmpPassword: Buffer) @@ -20638,17 +20758,10 @@ public extension Api { } public enum Theme: TypeConstructorDescription { - case themeDocumentNotModified case theme(flags: Int32, id: Int64, accessHash: Int64, slug: String, title: String, document: Api.Document?, settings: Api.ThemeSettings?, installsCount: Int32) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { - case .themeDocumentNotModified: - if boxed { - buffer.appendInt32(1211967244) - } - - break case .theme(let flags, let id, let accessHash, let slug, let title, let document, let settings, let installsCount): if boxed { buffer.appendInt32(42930452) @@ -20667,16 +20780,11 @@ public extension Api { public func descriptionFields() -> (String, [(String, Any)]) { switch self { - case .themeDocumentNotModified: - return ("themeDocumentNotModified", []) case .theme(let flags, let id, let accessHash, let slug, let title, let document, let settings, let installsCount): return ("theme", [("flags", flags), ("id", id), ("accessHash", accessHash), ("slug", slug), ("title", title), ("document", document), ("settings", settings), ("installsCount", installsCount)]) } } - public static func parse_themeDocumentNotModified(_ reader: BufferReader) -> Theme? { - return Api.Theme.themeDocumentNotModified - } public static func parse_theme(_ reader: BufferReader) -> Theme? { var _1: Int32? _1 = reader.readInt32() diff --git a/submodules/TelegramApi/Sources/Api2.swift b/submodules/TelegramApi/Sources/Api2.swift index 4f499c6615..261dc2d312 100644 --- a/submodules/TelegramApi/Sources/Api2.swift +++ b/submodules/TelegramApi/Sources/Api2.swift @@ -1029,76 +1029,6 @@ public struct auth { return Api.auth.CodeType.codeTypeFlashCall } - } - public enum LoginTokenInfo: TypeConstructorDescription { - case loginTokenInfo(dcId: Int32, authKeyId: Int64, deviceModel: String, platform: String, systemVersion: String, apiId: Int32, appName: String, appVersion: String, ip: String, region: String) - - public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { - switch self { - case .loginTokenInfo(let dcId, let authKeyId, let deviceModel, let platform, let systemVersion, let apiId, let appName, let appVersion, let ip, let region): - if boxed { - buffer.appendInt32(1375940666) - } - serializeInt32(dcId, buffer: buffer, boxed: false) - serializeInt64(authKeyId, buffer: buffer, boxed: false) - serializeString(deviceModel, buffer: buffer, boxed: false) - serializeString(platform, buffer: buffer, boxed: false) - serializeString(systemVersion, buffer: buffer, boxed: false) - serializeInt32(apiId, buffer: buffer, boxed: false) - serializeString(appName, buffer: buffer, boxed: false) - serializeString(appVersion, buffer: buffer, boxed: false) - serializeString(ip, buffer: buffer, boxed: false) - serializeString(region, buffer: buffer, boxed: false) - break - } - } - - public func descriptionFields() -> (String, [(String, Any)]) { - switch self { - case .loginTokenInfo(let dcId, let authKeyId, let deviceModel, let platform, let systemVersion, let apiId, let appName, let appVersion, let ip, let region): - return ("loginTokenInfo", [("dcId", dcId), ("authKeyId", authKeyId), ("deviceModel", deviceModel), ("platform", platform), ("systemVersion", systemVersion), ("apiId", apiId), ("appName", appName), ("appVersion", appVersion), ("ip", ip), ("region", region)]) - } - } - - public static func parse_loginTokenInfo(_ reader: BufferReader) -> LoginTokenInfo? { - var _1: Int32? - _1 = reader.readInt32() - var _2: Int64? - _2 = reader.readInt64() - var _3: String? - _3 = parseString(reader) - var _4: String? - _4 = parseString(reader) - var _5: String? - _5 = parseString(reader) - var _6: Int32? - _6 = reader.readInt32() - var _7: String? - _7 = parseString(reader) - var _8: String? - _8 = parseString(reader) - var _9: String? - _9 = parseString(reader) - var _10: String? - _10 = parseString(reader) - let _c1 = _1 != nil - let _c2 = _2 != nil - let _c3 = _3 != nil - let _c4 = _4 != nil - let _c5 = _5 != nil - let _c6 = _6 != nil - let _c7 = _7 != nil - let _c8 = _8 != nil - let _c9 = _9 != nil - let _c10 = _10 != nil - if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 { - return Api.auth.LoginTokenInfo.loginTokenInfo(dcId: _1!, authKeyId: _2!, deviceModel: _3!, platform: _4!, systemVersion: _5!, apiId: _6!, appName: _7!, appVersion: _8!, ip: _9!, region: _10!) - } - else { - return nil - } - } - } public enum SentCodeType: TypeConstructorDescription { case sentCodeTypeApp(length: Int32) @@ -2099,6 +2029,70 @@ public struct help { } } + } + public enum UserInfo: TypeConstructorDescription { + case userInfoEmpty + case userInfo(message: String, entities: [Api.MessageEntity], author: String, date: Int32) + + public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { + switch self { + case .userInfoEmpty: + if boxed { + buffer.appendInt32(-206688531) + } + + break + case .userInfo(let message, let entities, let author, let date): + if boxed { + buffer.appendInt32(32192344) + } + serializeString(message, buffer: buffer, boxed: false) + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(entities.count)) + for item in entities { + item.serialize(buffer, true) + } + serializeString(author, buffer: buffer, boxed: false) + serializeInt32(date, buffer: buffer, boxed: false) + break + } + } + + public func descriptionFields() -> (String, [(String, Any)]) { + switch self { + case .userInfoEmpty: + return ("userInfoEmpty", []) + case .userInfo(let message, let entities, let author, let date): + return ("userInfo", [("message", message), ("entities", entities), ("author", author), ("date", date)]) + } + } + + public static func parse_userInfoEmpty(_ reader: BufferReader) -> UserInfo? { + return Api.help.UserInfo.userInfoEmpty + } + public static func parse_userInfo(_ reader: BufferReader) -> UserInfo? { + var _1: String? + _1 = parseString(reader) + var _2: [Api.MessageEntity]? + if let _ = reader.readInt32() { + _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.MessageEntity.self) + } + var _3: String? + _3 = parseString(reader) + var _4: Int32? + _4 = reader.readInt32() + let _c1 = _1 != nil + let _c2 = _2 != nil + let _c3 = _3 != nil + let _c4 = _4 != nil + if _c1 && _c2 && _c3 && _c4 { + return Api.help.UserInfo.userInfo(message: _1!, entities: _2!, author: _3!, date: _4!) + } + else { + return nil + } + } + } public enum TermsOfServiceUpdate: TypeConstructorDescription { case termsOfServiceUpdateEmpty(expires: Int32) diff --git a/submodules/TelegramApi/Sources/Api3.swift b/submodules/TelegramApi/Sources/Api3.swift index aee22f1e04..106c437be6 100644 --- a/submodules/TelegramApi/Sources/Api3.swift +++ b/submodules/TelegramApi/Sources/Api3.swift @@ -3196,25 +3196,6 @@ public extension Api { }) } - public static func toggleStickerSets(flags: Int32, stickersets: [Api.InputStickerSet]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { - let buffer = Buffer() - buffer.appendInt32(-1257951254) - serializeInt32(flags, buffer: buffer, boxed: false) - buffer.appendInt32(481674261) - buffer.appendInt32(Int32(stickersets.count)) - for item in stickersets { - item.serialize(buffer, true) - } - return (FunctionDescription(name: "messages.toggleStickerSets", parameters: [("flags", flags), ("stickersets", stickersets)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in - let reader = BufferReader(buffer) - var result: Api.Bool? - if let signature = reader.readInt32() { - result = Api.parse(reader, signature: signature) as? Api.Bool - } - return result - }) - } - public static func getPollVotes(flags: Int32, peer: Api.InputPeer, id: Int32, option: Buffer?, offset: String?, limit: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { let buffer = Buffer() buffer.appendInt32(-1200736242) @@ -3233,6 +3214,54 @@ public extension Api { return result }) } + + public static func getDialogFilters() -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Api.DialogFilter]>) { + let buffer = Buffer() + buffer.appendInt32(-241247891) + + return (FunctionDescription(name: "messages.getDialogFilters", parameters: []), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> [Api.DialogFilter]? in + let reader = BufferReader(buffer) + var result: [Api.DialogFilter]? + if let _ = reader.readInt32() { + result = Api.parseVector(reader, elementSignature: 0, elementType: Api.DialogFilter.self) + } + return result + }) + } + + public static func updateDialogFilter(flags: Int32, id: Int32, filter: Api.DialogFilter?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(450142282) + serializeInt32(flags, buffer: buffer, boxed: false) + serializeInt32(id, buffer: buffer, boxed: false) + if Int(flags) & Int(1 << 0) != 0 {filter!.serialize(buffer, true)} + return (FunctionDescription(name: "messages.updateDialogFilter", parameters: [("flags", flags), ("id", id), ("filter", filter)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in + let reader = BufferReader(buffer) + var result: Api.Bool? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.Bool + } + return result + }) + } + + public static func updateDialogFiltersOrder(order: [Int32]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(-983318044) + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(order.count)) + for item in order { + serializeInt32(item, buffer: buffer, boxed: false) + } + return (FunctionDescription(name: "messages.updateDialogFiltersOrder", parameters: [("order", order)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in + let reader = BufferReader(buffer) + var result: Api.Bool? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.Bool + } + return result + }) + } } public struct channels { public static func readHistory(channel: Api.InputChannel, maxId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { @@ -4880,6 +4909,40 @@ public extension Api { return result }) } + + public static func editUserInfo(userId: Api.InputUser, message: String, entities: [Api.MessageEntity]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(1723407216) + userId.serialize(buffer, true) + serializeString(message, buffer: buffer, boxed: false) + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(entities.count)) + for item in entities { + item.serialize(buffer, true) + } + return (FunctionDescription(name: "help.editUserInfo", parameters: [("userId", userId), ("message", message), ("entities", entities)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.help.UserInfo? in + let reader = BufferReader(buffer) + var result: Api.help.UserInfo? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.help.UserInfo + } + return result + }) + } + + public static func getUserInfo(userId: Api.InputUser) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(59377875) + userId.serialize(buffer, true) + return (FunctionDescription(name: "help.getUserInfo", parameters: [("userId", userId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.help.UserInfo? in + let reader = BufferReader(buffer) + var result: Api.help.UserInfo? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.help.UserInfo + } + return result + }) + } } public struct updates { public static func getState() -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { diff --git a/submodules/TelegramCore/Sources/Account.swift b/submodules/TelegramCore/Sources/Account.swift index 65f1145eae..cec053cf33 100644 --- a/submodules/TelegramCore/Sources/Account.swift +++ b/submodules/TelegramCore/Sources/Account.swift @@ -1044,6 +1044,7 @@ public class Account { self.managedOperationsDisposable.add(managedApplyPendingMessageReactionsActions(postbox: self.postbox, network: self.network, stateManager: self.stateManager).start()) self.managedOperationsDisposable.add(managedSynchronizeEmojiKeywordsOperations(postbox: self.postbox, network: self.network).start()) self.managedOperationsDisposable.add(managedApplyPendingScheduledMessagesActions(postbox: self.postbox, network: self.network, stateManager: self.stateManager).start()) + self.managedOperationsDisposable.add(managedChatListFilters(postbox: self.postbox, network: self.network).start()) let importantBackgroundOperations: [Signal] = [ managedSynchronizeChatInputStateOperations(postbox: self.postbox, network: self.network) |> map { $0 ? AccountRunningImportantTasks.other : [] }, diff --git a/submodules/TelegramCore/Sources/AccountManager.swift b/submodules/TelegramCore/Sources/AccountManager.swift index f4e0043af9..eb61eb0fec 100644 --- a/submodules/TelegramCore/Sources/AccountManager.swift +++ b/submodules/TelegramCore/Sources/AccountManager.swift @@ -152,6 +152,7 @@ private var declaredEncodables: Void = { declareEncodable(EmbeddedMediaStickersMessageAttribute.self, f: { EmbeddedMediaStickersMessageAttribute(decoder: $0) }) declareEncodable(TelegramMediaWebpageAttribute.self, f: { TelegramMediaWebpageAttribute(decoder: $0) }) declareEncodable(CachedPollOptionResult.self, f: { CachedPollOptionResult(decoder: $0) }) + declareEncodable(ChatListFiltersState.self, f: { ChatListFiltersState(decoder: $0) }) return }() diff --git a/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift b/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift index 4e870b88ce..6dd6553c6f 100644 --- a/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift +++ b/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift @@ -2349,29 +2349,28 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP case let .UpdateMessagePoll(pollId, apiPoll, results): if let poll = transaction.getMedia(pollId) as? TelegramMediaPoll { var updatedPoll = poll - if let apiPoll = apiPoll { - switch apiPoll { - case let .poll(id, flags, question, answers): - let publicity: TelegramMediaPollPublicity - if (flags & (1 << 1)) != 0 { - publicity = .public - } else { - publicity = .anonymous - } - let kind: TelegramMediaPollKind - if (flags & (1 << 3)) != 0 { - kind = .quiz - } else { - kind = .poll(multipleAnswers: (flags & (1 << 2)) != 0) - } - updatedPoll = TelegramMediaPoll(pollId: MediaId(namespace: Namespaces.Media.CloudPoll, id: id), publicity: publicity, kind: kind, text: question, options: answers.map(TelegramMediaPollOption.init(apiOption:)), correctAnswers: nil, results: TelegramMediaPollResults(apiResults: results), isClosed: (flags & (1 << 0)) != 0) - } - } - let resultsMin: Bool switch results { - case let .pollResults(pollResults): - resultsMin = (pollResults.flags & (1 << 0)) != 0 + case let .pollResults(pollResults): + resultsMin = (pollResults.flags & (1 << 0)) != 0 + } + if let apiPoll = apiPoll { + switch apiPoll { + case let .poll(id, flags, question, answers): + let publicity: TelegramMediaPollPublicity + if (flags & (1 << 1)) != 0 { + publicity = .public + } else { + publicity = .anonymous + } + let kind: TelegramMediaPollKind + if (flags & (1 << 3)) != 0 { + kind = .quiz + } else { + kind = .poll(multipleAnswers: (flags & (1 << 2)) != 0) + } + updatedPoll = TelegramMediaPoll(pollId: MediaId(namespace: Namespaces.Media.CloudPoll, id: id), publicity: publicity, kind: kind, text: question, options: answers.map(TelegramMediaPollOption.init(apiOption:)), correctAnswers: nil, results: poll.results, isClosed: (flags & (1 << 0)) != 0) + } } updatedPoll = updatedPoll.withUpdatedResults(TelegramMediaPollResults(apiResults: results), min: resultsMin) updateMessageMedia(transaction: transaction, id: pollId, media: updatedPoll) diff --git a/submodules/TelegramCore/Sources/AccountViewTracker.swift b/submodules/TelegramCore/Sources/AccountViewTracker.swift index 94913597d1..77d5c28d65 100644 --- a/submodules/TelegramCore/Sources/AccountViewTracker.swift +++ b/submodules/TelegramCore/Sources/AccountViewTracker.swift @@ -1064,7 +1064,7 @@ public final class AccountViewTracker { } } - public func aroundMessageHistoryViewForLocation(_ chatLocation: ChatLocation, index: MessageHistoryAnchorIndex, anchorIndex: MessageHistoryAnchorIndex, count: Int, fixedCombinedReadStates: MessageHistoryViewReadState?, tagMask: MessageTags? = nil, orderStatistics: MessageHistoryViewOrderStatistics = [], additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { + public func aroundMessageHistoryViewForLocation(_ chatLocation: ChatLocation, index: MessageHistoryAnchorIndex, anchorIndex: MessageHistoryAnchorIndex, count: Int, clipHoles: Bool = true, fixedCombinedReadStates: MessageHistoryViewReadState?, tagMask: MessageTags? = nil, orderStatistics: MessageHistoryViewOrderStatistics = [], additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { if let account = self.account { let inputAnchor: HistoryViewInputAnchor switch index { @@ -1075,7 +1075,7 @@ public final class AccountViewTracker { case let .message(index): inputAnchor = .index(index) } - let signal = account.postbox.aroundMessageHistoryViewForLocation(chatLocation, anchor: inputAnchor, count: count, fixedCombinedReadStates: fixedCombinedReadStates, topTaggedMessageIdNamespaces: [Namespaces.Message.Cloud], tagMask: tagMask, namespaces: .not(Namespaces.Message.allScheduled), orderStatistics: orderStatistics, additionalData: wrappedHistoryViewAdditionalData(chatLocation: chatLocation, additionalData: additionalData)) + let signal = account.postbox.aroundMessageHistoryViewForLocation(chatLocation, anchor: inputAnchor, count: count, clipHoles: clipHoles, fixedCombinedReadStates: fixedCombinedReadStates, topTaggedMessageIdNamespaces: [Namespaces.Message.Cloud], tagMask: tagMask, namespaces: .not(Namespaces.Message.allScheduled), orderStatistics: orderStatistics, additionalData: wrappedHistoryViewAdditionalData(chatLocation: chatLocation, additionalData: additionalData)) return wrappedMessageHistorySignal(chatLocation: chatLocation, signal: signal, addHoleIfNeeded: false) } else { return .never() @@ -1330,17 +1330,17 @@ public final class AccountViewTracker { }) } - public func tailChatListView(groupId: PeerGroupId, count: Int) -> Signal<(ChatListView, ViewUpdateType), NoError> { + public func tailChatListView(groupId: PeerGroupId, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)? = nil, count: Int) -> Signal<(ChatListView, ViewUpdateType), NoError> { if let account = self.account { - return self.wrappedChatListView(signal: account.postbox.tailChatListView(groupId: groupId, count: count, summaryComponents: ChatListEntrySummaryComponents(tagSummary: ChatListEntryMessageTagSummaryComponent(tag: .unseenPersonalMessage, namespace: Namespaces.Message.Cloud), actionsSummary: ChatListEntryPendingMessageActionsSummaryComponent(type: PendingMessageActionType.consumeUnseenPersonalMessage, namespace: Namespaces.Message.Cloud)))) + return self.wrappedChatListView(signal: account.postbox.tailChatListView(groupId: groupId, filterPredicate: filterPredicate, count: count, summaryComponents: ChatListEntrySummaryComponents(tagSummary: ChatListEntryMessageTagSummaryComponent(tag: .unseenPersonalMessage, namespace: Namespaces.Message.Cloud), actionsSummary: ChatListEntryPendingMessageActionsSummaryComponent(type: PendingMessageActionType.consumeUnseenPersonalMessage, namespace: Namespaces.Message.Cloud)))) } else { return .never() } } - public func aroundChatListView(groupId: PeerGroupId, index: ChatListIndex, count: Int) -> Signal<(ChatListView, ViewUpdateType), NoError> { + public func aroundChatListView(groupId: PeerGroupId, filterPredicate: ((Peer, PeerNotificationSettings?, Bool) -> Bool)? = nil, index: ChatListIndex, count: Int) -> Signal<(ChatListView, ViewUpdateType), NoError> { if let account = self.account { - return self.wrappedChatListView(signal: account.postbox.aroundChatListView(groupId: groupId, index: index, count: count, summaryComponents: ChatListEntrySummaryComponents(tagSummary: ChatListEntryMessageTagSummaryComponent(tag: .unseenPersonalMessage, namespace: Namespaces.Message.Cloud), actionsSummary: ChatListEntryPendingMessageActionsSummaryComponent(type: PendingMessageActionType.consumeUnseenPersonalMessage, namespace: Namespaces.Message.Cloud)))) + return self.wrappedChatListView(signal: account.postbox.aroundChatListView(groupId: groupId, filterPredicate: filterPredicate, index: index, count: count, summaryComponents: ChatListEntrySummaryComponents(tagSummary: ChatListEntryMessageTagSummaryComponent(tag: .unseenPersonalMessage, namespace: Namespaces.Message.Cloud), actionsSummary: ChatListEntryPendingMessageActionsSummaryComponent(type: PendingMessageActionType.consumeUnseenPersonalMessage, namespace: Namespaces.Message.Cloud)))) } else { return .never() } diff --git a/submodules/TelegramCore/Sources/ChatListFiltering.swift b/submodules/TelegramCore/Sources/ChatListFiltering.swift new file mode 100644 index 0000000000..1e01e92c02 --- /dev/null +++ b/submodules/TelegramCore/Sources/ChatListFiltering.swift @@ -0,0 +1,378 @@ +import Foundation +import Postbox +import SwiftSignalKit +import TelegramApi + +import SyncCore + +public struct ChatListFilterPeerCategories: OptionSet { + public var rawValue: Int32 + + public init(rawValue: Int32) { + self.rawValue = rawValue + } + + public static let privateChats = ChatListFilterPeerCategories(rawValue: 1 << 0) + public static let secretChats = ChatListFilterPeerCategories(rawValue: 1 << 1) + public static let privateGroups = ChatListFilterPeerCategories(rawValue: 1 << 2) + public static let bots = ChatListFilterPeerCategories(rawValue: 1 << 3) + public static let publicGroups = ChatListFilterPeerCategories(rawValue: 1 << 4) + public static let channels = ChatListFilterPeerCategories(rawValue: 1 << 5) + + public static let all: ChatListFilterPeerCategories = [ + .privateChats, + .secretChats, + .privateGroups, + .bots, + .publicGroups, + .channels + ] +} + +private struct ChatListFilterPeerApiCategories: OptionSet { + var rawValue: Int32 + + init(rawValue: Int32) { + self.rawValue = rawValue + } + + static let privateChats = ChatListFilterPeerApiCategories(rawValue: 1 << 0) + static let secretChats = ChatListFilterPeerApiCategories(rawValue: 1 << 1) + static let privateGroups = ChatListFilterPeerApiCategories(rawValue: 1 << 2) + static let publicGroups = ChatListFilterPeerApiCategories(rawValue: 1 << 3) + static let channels = ChatListFilterPeerApiCategories(rawValue: 1 << 4) + static let bots = ChatListFilterPeerApiCategories(rawValue: 1 << 5) +} + +extension ChatListFilterPeerCategories { + init(apiFlags: Int32) { + let flags = ChatListFilterPeerApiCategories(rawValue: apiFlags) + var result: ChatListFilterPeerCategories = [] + if flags.contains(.privateChats) { + result.insert(.privateChats) + } + if flags.contains(.secretChats) { + result.insert(.secretChats) + } + if flags.contains(.privateGroups) { + result.insert(.privateGroups) + } + if flags.contains(.publicGroups) { + result.insert(.publicGroups) + } + if flags.contains(.channels) { + result.insert(.channels) + } + if flags.contains(.bots) { + result.insert(.bots) + } + self = result + } + + var apiFlags: Int32 { + var result: ChatListFilterPeerApiCategories = [] + if self.contains(.privateChats) { + result.insert(.privateChats) + } + if self.contains(.secretChats) { + result.insert(.secretChats) + } + if self.contains(.privateGroups) { + result.insert(.privateGroups) + } + if self.contains(.publicGroups) { + result.insert(.publicGroups) + } + if self.contains(.channels) { + result.insert(.channels) + } + if self.contains(.bots) { + result.insert(.bots) + } + return result.rawValue + } +} + +public struct ChatListFilter: PostboxCoding, Equatable { + public var id: Int32 + public var title: String? + public var categories: ChatListFilterPeerCategories + public var excludeMuted: Bool + public var excludeRead: Bool + public var includePeers: [PeerId] + + public init( + id: Int32, + title: String?, + categories: ChatListFilterPeerCategories, + excludeMuted: Bool, + excludeRead: Bool, + includePeers: [PeerId] + ) { + self.id = id + self.title = title + self.categories = categories + self.excludeMuted = excludeMuted + self.excludeRead = excludeRead + self.includePeers = includePeers + } + + public init(decoder: PostboxDecoder) { + self.id = decoder.decodeInt32ForKey("id", orElse: 0) + self.title = decoder.decodeOptionalStringForKey("title") + self.categories = ChatListFilterPeerCategories(rawValue: decoder.decodeInt32ForKey("categories", orElse: 0)) + self.excludeMuted = decoder.decodeInt32ForKey("excludeMuted", orElse: 0) != 0 + self.excludeRead = decoder.decodeInt32ForKey("excludeRead", orElse: 0) != 0 + self.includePeers = decoder.decodeInt64ArrayForKey("includePeers").map(PeerId.init) + } + + public func encode(_ encoder: PostboxEncoder) { + encoder.encodeInt32(self.id, forKey: "id") + if let title = self.title { + encoder.encodeString(title, forKey: "title") + } else { + encoder.encodeNil(forKey: "title") + } + encoder.encodeInt32(self.categories.rawValue, forKey: "categories") + encoder.encodeInt32(self.excludeMuted ? 1 : 0, forKey: "excludeMuted") + encoder.encodeInt32(self.excludeRead ? 1 : 0, forKey: "excludeRead") + encoder.encodeInt64Array(self.includePeers.map { $0.toInt64() }, forKey: "includePeers") + } +} + +extension ChatListFilter { + init(apiFilter: Api.DialogFilter) { + switch apiFilter { + case let .dialogFilter(flags, id, title, includePeers): + self.init( + id: id, + title: title.isEmpty ? nil : title, + categories: ChatListFilterPeerCategories(apiFlags: flags), + excludeMuted: (flags & (1 << 11)) != 0, + excludeRead: (flags & (1 << 12)) != 0, + includePeers: includePeers.compactMap { peer -> PeerId? in + switch peer { + case let .inputPeerUser(userId, _): + return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId) + case let .inputPeerChat(chatId): + return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId) + case let .inputPeerChannel(channelId, _): + return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId) + default: + return nil + } + } + ) + } + } + + func apiFilter(transaction: Transaction) -> Api.DialogFilter { + var flags: Int32 = 0 + if self.excludeMuted { + flags |= 1 << 11 + } + if self.excludeRead { + flags |= 1 << 12 + } + flags |= self.categories.apiFlags + return .dialogFilter(flags: flags, id: self.id, title: self.title ?? "", includePeers: self.includePeers.compactMap { peerId -> Api.InputPeer? in + return transaction.getPeer(peerId).flatMap(apiInputPeer) + }) + } +} + +public enum RequestUpdateChatListFilterError { + case generic +} + +public func requestUpdateChatListFilter(account: Account, id: Int32, filter: ChatListFilter?) -> Signal { + return account.postbox.transaction { transaction -> Api.DialogFilter? in + return filter?.apiFilter(transaction: transaction) + } + |> castError(RequestUpdateChatListFilterError.self) + |> mapToSignal { inputFilter -> Signal in + var flags: Int32 = 0 + if inputFilter != nil { + flags |= 1 << 0 + } + return account.network.request(Api.functions.messages.updateDialogFilter(flags: flags, id: id, filter: inputFilter)) + |> mapError { _ -> RequestUpdateChatListFilterError in + return .generic + } + |> mapToSignal { _ -> Signal in + return .complete() + } + } +} + +public enum RequestUpdateChatListFilterOrderError { + case generic +} + +public func requestUpdateChatListFilterOrder(account: Account, ids: [Int32]) -> Signal { + return account.network.request(Api.functions.messages.updateDialogFiltersOrder(order: ids)) + |> mapError { _ -> RequestUpdateChatListFilterOrderError in + return .generic + } + |> mapToSignal { _ -> Signal in + return .complete() + } +} + +private enum RequestChatListFiltersError { + case generic +} + +private func requestChatListFilters(postbox: Postbox, network: Network) -> Signal<[ChatListFilter], RequestChatListFiltersError> { + return network.request(Api.functions.messages.getDialogFilters()) + |> mapError { _ -> RequestChatListFiltersError in + return .generic + } + |> mapToSignal { result -> Signal<[ChatListFilter], RequestChatListFiltersError> in + return postbox.transaction { transaction -> ([ChatListFilter], [Api.InputPeer]) in + var filters: [ChatListFilter] = [] + var missingPeers: [Api.InputPeer] = [] + var missingPeerIds = Set() + for apiFilter in result { + let filter = ChatListFilter(apiFilter: apiFilter) + filters.append(filter) + switch apiFilter { + case let .dialogFilter(_, _, _, includePeers): + for peer in includePeers { + var peerId: PeerId? + switch peer { + case let .inputPeerUser(userId, _): + peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId) + case let .inputPeerChat(chatId): + peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId) + case let .inputPeerChannel(channelId, _): + peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId) + default: + break + } + if let peerId = peerId { + if transaction.getPeer(peerId) == nil && !missingPeerIds.contains(peerId) { + missingPeerIds.insert(peerId) + missingPeers.append(peer) + } + } + } + } + } + return (filters, missingPeers) + } + |> castError(RequestChatListFiltersError.self) + |> mapToSignal { filtersAndMissingPeers -> Signal<[ChatListFilter], RequestChatListFiltersError> in + let (filters, missingPeers) = filtersAndMissingPeers + return .single(filters) + } + } +} + +func managedChatListFilters(postbox: Postbox, network: Network) -> Signal { + return requestChatListFilters(postbox: postbox, network: network) + |> `catch` { _ -> Signal<[ChatListFilter], NoError> in + return .complete() + } + |> mapToSignal { filters -> Signal in + return postbox.transaction { transaction in + transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFilters, { entry in + var settings = entry as? ChatListFiltersState ?? ChatListFiltersState.default + settings.filters = filters + return settings + }) + } + |> ignoreValues + } +} + +public func replaceRemoteChatListFilters(account: Account) -> Signal { + return requestChatListFilters(postbox: account.postbox, network: account.network) + |> `catch` { _ -> Signal<[ChatListFilter], NoError> in + return .complete() + } + |> mapToSignal { remoteFilters -> Signal in + var deleteSignals: [Signal] = [] + for filter in remoteFilters { + deleteSignals.append(requestUpdateChatListFilter(account: account, id: filter.id, filter: nil) + |> `catch` { _ -> Signal in + return .complete() + } + |> ignoreValues) + } + + let addFilters = account.postbox.transaction { transaction -> [(Int32, ChatListFilter)] in + let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default + return settings.filters.map { filter -> (Int32, ChatListFilter) in + return (filter.id, filter) + } + } + |> mapToSignal { filters -> Signal in + var signals: [Signal] = [] + for (id, filter) in filters { + signals.append(requestUpdateChatListFilter(account: account, id: id, filter: filter) + |> `catch` { _ -> Signal in + return .complete() + } + |> ignoreValues) + } + return combineLatest(signals) + |> ignoreValues + } + + return combineLatest( + deleteSignals + ) + |> ignoreValues + |> then( + addFilters + ) + } +} + +public struct ChatListFiltersState: PreferencesEntry, Equatable { + public var filters: [ChatListFilter] + public var remoteFilters: [ChatListFilter]? + + public static var `default` = ChatListFiltersState(filters: [], remoteFilters: nil) + + public init(filters: [ChatListFilter], remoteFilters: [ChatListFilter]?) { + self.filters = filters + self.remoteFilters = remoteFilters + } + + public init(decoder: PostboxDecoder) { + self.filters = decoder.decodeObjectArrayWithDecoderForKey("filters") + self.remoteFilters = decoder.decodeOptionalObjectArrayWithDecoderForKey("remoteFilters") + } + + public func encode(_ encoder: PostboxEncoder) { + encoder.encodeObjectArray(self.filters, forKey: "filters") + if let remoteFilters = self.remoteFilters { + encoder.encodeObjectArray(remoteFilters, forKey: "remoteFilters") + } else { + encoder.encodeNil(forKey: "remoteFilters") + } + } + + public func isEqual(to: PreferencesEntry) -> Bool { + if let to = to as? ChatListFiltersState, self == to { + return true + } else { + return false + } + } +} + +public func updateChatListFilterSettingsInteractively(postbox: Postbox, _ f: @escaping (ChatListFiltersState) -> ChatListFiltersState) -> Signal { + return postbox.transaction { transaction -> ChatListFiltersState in + var result: ChatListFiltersState? + transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFilters, { entry in + var settings = entry as? ChatListFiltersState ?? ChatListFiltersState.default + let updated = f(settings) + result = updated + return updated + }) + return result ?? .default + } +} diff --git a/submodules/TelegramCore/Sources/ManagedChatListHoles.swift b/submodules/TelegramCore/Sources/ManagedChatListHoles.swift index 8dbe238d06..4783619e83 100644 --- a/submodules/TelegramCore/Sources/ManagedChatListHoles.swift +++ b/submodules/TelegramCore/Sources/ManagedChatListHoles.swift @@ -4,6 +4,7 @@ import SwiftSignalKit private final class ManagedChatListHolesState { private var holeDisposables: [ChatListHolesEntry: Disposable] = [:] + private var additionalLatestHoleDisposable: (ChatListHole, Disposable)? func clearDisposables() -> [Disposable] { let disposables = Array(self.holeDisposables.values) @@ -11,7 +12,7 @@ private final class ManagedChatListHolesState { return disposables } - func update(entries: Set) -> (removed: [Disposable], added: [ChatListHolesEntry: MetaDisposable]) { + func update(entries: Set, additionalLatestHole: ChatListHole?) -> (removed: [Disposable], added: [ChatListHolesEntry: MetaDisposable], addedAdditionalLatestHole: (ChatListHole, MetaDisposable)?) { var removed: [Disposable] = [] var added: [ChatListHolesEntry: MetaDisposable] = [:] @@ -30,7 +31,21 @@ private final class ManagedChatListHolesState { } } - return (removed, added) + var addedAdditionalLatestHole: (ChatListHole, MetaDisposable)? + if self.holeDisposables.isEmpty { + if self.additionalLatestHoleDisposable?.0 != additionalLatestHole { + if let (_, disposable) = self.additionalLatestHoleDisposable { + removed.append(disposable) + } + if let additionalLatestHole = additionalLatestHole { + let disposable = MetaDisposable() + self.additionalLatestHoleDisposable = (additionalLatestHole, disposable) + addedAdditionalLatestHole = (additionalLatestHole, disposable) + } + } + } + + return (removed, added, addedAdditionalLatestHole) } } @@ -38,9 +53,17 @@ func managedChatListHoles(network: Network, postbox: Postbox, accountPeerId: Pee return Signal { _ in let state = Atomic(value: ManagedChatListHolesState()) - let disposable = postbox.chatListHolesView().start(next: { view in - let (removed, added) = state.with { state -> (removed: [Disposable], added: [ChatListHolesEntry: MetaDisposable]) in - return state.update(entries: view.entries) + let topRootHoleKey = PostboxViewKey.allChatListHoles(.root) + let topRootHole = postbox.combinedView(keys: [topRootHoleKey]) + + let disposable = combineLatest(postbox.chatListHolesView(), topRootHole).start(next: { view, topRootHoleView in + var additionalLatestHole: ChatListHole? + if let topRootHole = topRootHoleView.views[topRootHoleKey] as? AllChatListHolesView { + additionalLatestHole = topRootHole.latestHole + } + + let (removed, added, addedAdditionalLatestHole) = state.with { state in + return state.update(entries: view.entries, additionalLatestHole: additionalLatestHole) } for disposable in removed { @@ -50,6 +73,10 @@ func managedChatListHoles(network: Network, postbox: Postbox, accountPeerId: Pee for (entry, disposable) in added { disposable.set(fetchChatListHole(postbox: postbox, network: network, accountPeerId: accountPeerId, groupId: entry.groupId, hole: entry.hole).start()) } + + if let (hole, disposable) = addedAdditionalLatestHole { + disposable.set(fetchChatListHole(postbox: postbox, network: network, accountPeerId: accountPeerId, groupId: .root, hole: hole).start()) + } }) return ActionDisposable { diff --git a/submodules/TelegramCore/Sources/PendingMessageManager.swift b/submodules/TelegramCore/Sources/PendingMessageManager.swift index 3a4a3054b7..9cb6459e60 100644 --- a/submodules/TelegramCore/Sources/PendingMessageManager.swift +++ b/submodules/TelegramCore/Sources/PendingMessageManager.swift @@ -355,6 +355,8 @@ public final class PendingMessageManager { strongSelf.collectUploadingInfo(messageContext: messageContext, message: message) } + var messagesToUpload: [(PendingMessageContext, Message, PendingMessageUploadedContentType, Signal)] = [] + var messagesToForward: [PeerIdAndNamespace: [(PendingMessageContext, Message, ForwardSourceInfoAttribute)]] = [:] for (messageContext, _) in strongSelf.messageContexts.values.compactMap({ messageContext -> (PendingMessageContext, Message)? in if case let .collectingInfo(message) = messageContext.state { return (messageContext, message) @@ -365,16 +367,58 @@ public final class PendingMessageManager { return lhs.1.index < rhs.1.index }) { if case let .collectingInfo(message) = messageContext.state { - let (contentUploadSignal, contentType) = messageContentToUpload(network: strongSelf.network, postbox: strongSelf.postbox, auxiliaryMethods: strongSelf.auxiliaryMethods, transformOutgoingMessageMedia: strongSelf.transformOutgoingMessageMedia, messageMediaPreuploadManager: strongSelf.messageMediaPreuploadManager, revalidationContext: strongSelf.revalidationContext, forceReupload: messageContext.forcedReuploadOnce, isGrouped: message.groupingKey != nil, message: message) - messageContext.contentType = contentType - - if strongSelf.canBeginUploadingMessage(id: message.id, type: contentType) { - strongSelf.beginUploadingMessage(messageContext: messageContext, id: message.id, groupId: message.groupingKey, uploadSignal: contentUploadSignal) - } else { - messageContext.state = .waitingForUploadToStart(groupId: message.groupingKey, upload: contentUploadSignal) + let contentToUpload = messageContentToUpload(network: strongSelf.network, postbox: strongSelf.postbox, auxiliaryMethods: strongSelf.auxiliaryMethods, transformOutgoingMessageMedia: strongSelf.transformOutgoingMessageMedia, messageMediaPreuploadManager: strongSelf.messageMediaPreuploadManager, revalidationContext: strongSelf.revalidationContext, forceReupload: messageContext.forcedReuploadOnce, isGrouped: message.groupingKey != nil, message: message) + messageContext.contentType = contentToUpload.type + switch contentToUpload { + case let .immediate(result, type): + var isForward = false + switch result { + case let .content(content): + switch content.content { + case let .forward(forwardInfo): + isForward = true + let peerIdAndNamespace = PeerIdAndNamespace(peerId: message.id.peerId, namespace: message.id.namespace) + if messagesToForward[peerIdAndNamespace] == nil { + messagesToForward[peerIdAndNamespace] = [] + } + messagesToForward[peerIdAndNamespace]!.append((messageContext, message, forwardInfo)) + default: + break + } + default: + break + } + if !isForward { + messagesToUpload.append((messageContext, message, type, .single(result))) + } + case let .signal(signal, type): + messagesToUpload.append((messageContext, message, type, signal)) } } } + + for (messageContext, message, type, contentUploadSignal) in messagesToUpload { + if strongSelf.canBeginUploadingMessage(id: message.id, type: type) { + strongSelf.beginUploadingMessage(messageContext: messageContext, id: message.id, groupId: message.groupingKey, uploadSignal: contentUploadSignal) + } else { + messageContext.state = .waitingForUploadToStart(groupId: message.groupingKey, upload: contentUploadSignal) + } + } + + for (_, messages) in messagesToForward { + for (context, _, _) in messages { + context.state = .sending(groupId: nil) + } + let sendMessage: Signal = strongSelf.sendGroupMessagesContent(network: strongSelf.network, postbox: strongSelf.postbox, stateManager: strongSelf.stateManager, group: messages.map { data in + let (_, message, forwardInfo) = data + return (message.id, PendingMessageUploadedContentAndReuploadInfo(content: .forward(forwardInfo), reuploadInfo: nil)) + }) + |> map { next -> PendingMessageResult in + return .progress(1.0) + } + messages[0].0.sendDisposable.set((sendMessage + |> deliverOn(strongSelf.queue)).start()) + } } })) } @@ -502,7 +546,8 @@ public final class PendingMessageManager { } } return .complete() - }).start(next: { [weak self] next in + } + |> deliverOn(queue)).start(next: { [weak self] next in if let strongSelf = self { assert(strongSelf.queue.isCurrent()) @@ -630,7 +675,9 @@ public final class PendingMessageManager { let sendMessageRequest: Signal if isForward { - flags |= (1 << 9) + if !messages.contains(where: { $0.0.groupingKey == nil }) { + flags |= (1 << 9) + } var forwardIds: [(MessageId, Int64)] = [] for (message, content) in messages { diff --git a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift index 6715783a15..e808ed503f 100644 --- a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift +++ b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift @@ -38,11 +38,25 @@ enum PendingMessageUploadError { case generic } -func messageContentToUpload(network: Network, postbox: Postbox, auxiliaryMethods: AccountAuxiliaryMethods, transformOutgoingMessageMedia: TransformOutgoingMessageMedia?, messageMediaPreuploadManager: MessageMediaPreuploadManager, revalidationContext: MediaReferenceRevalidationContext, forceReupload: Bool, isGrouped: Bool, message: Message) -> (Signal, PendingMessageUploadedContentType) { +enum MessageContentToUpload { + case signal(Signal, PendingMessageUploadedContentType) + case immediate(PendingMessageUploadedContentResult, PendingMessageUploadedContentType) + + var type: PendingMessageUploadedContentType { + switch self { + case let .signal(_, type): + return type + case let .immediate(_, type): + return type + } + } +} + +func messageContentToUpload(network: Network, postbox: Postbox, auxiliaryMethods: AccountAuxiliaryMethods, transformOutgoingMessageMedia: TransformOutgoingMessageMedia?, messageMediaPreuploadManager: MessageMediaPreuploadManager, revalidationContext: MediaReferenceRevalidationContext, forceReupload: Bool, isGrouped: Bool, message: Message) -> MessageContentToUpload { return messageContentToUpload(network: network, postbox: postbox, auxiliaryMethods: auxiliaryMethods, transformOutgoingMessageMedia: transformOutgoingMessageMedia, messageMediaPreuploadManager: messageMediaPreuploadManager, revalidationContext: revalidationContext, forceReupload: forceReupload, isGrouped: isGrouped, peerId: message.id.peerId, messageId: message.id, attributes: message.attributes, text: message.text, media: message.media) } -func messageContentToUpload(network: Network, postbox: Postbox, auxiliaryMethods: AccountAuxiliaryMethods, transformOutgoingMessageMedia: TransformOutgoingMessageMedia?, messageMediaPreuploadManager: MessageMediaPreuploadManager, revalidationContext: MediaReferenceRevalidationContext, forceReupload: Bool, isGrouped: Bool, peerId: PeerId, messageId: MessageId?, attributes: [MessageAttribute], text: String, media: [Media]) -> (Signal, PendingMessageUploadedContentType) { +func messageContentToUpload(network: Network, postbox: Postbox, auxiliaryMethods: AccountAuxiliaryMethods, transformOutgoingMessageMedia: TransformOutgoingMessageMedia?, messageMediaPreuploadManager: MessageMediaPreuploadManager, revalidationContext: MediaReferenceRevalidationContext, forceReupload: Bool, isGrouped: Bool, peerId: PeerId, messageId: MessageId?, attributes: [MessageAttribute], text: String, media: [Media]) -> MessageContentToUpload { var contextResult: OutgoingChatContextResultMessageAttribute? var autoremoveAttribute: AutoremoveTimeoutMessageAttribute? for attribute in attributes { @@ -65,15 +79,15 @@ func messageContentToUpload(network: Network, postbox: Postbox, auxiliaryMethods } if let media = media.first as? TelegramMediaAction, media.action == .historyScreenshot { - return (.single(.content(PendingMessageUploadedContentAndReuploadInfo(content: .messageScreenshot, reuploadInfo: nil))), .none) + return .immediate(.content(PendingMessageUploadedContentAndReuploadInfo(content: .messageScreenshot, reuploadInfo: nil)), .none) } else if let forwardInfo = forwardInfo { - return (.single(.content(PendingMessageUploadedContentAndReuploadInfo(content: .forward(forwardInfo), reuploadInfo: nil))), .text) + return .immediate(.content(PendingMessageUploadedContentAndReuploadInfo(content: .forward(forwardInfo), reuploadInfo: nil)), .text) } else if let contextResult = contextResult { - return (.single(.content(PendingMessageUploadedContentAndReuploadInfo(content: .chatContextResult(contextResult), reuploadInfo: nil))), .text) + return .immediate(.content(PendingMessageUploadedContentAndReuploadInfo(content: .chatContextResult(contextResult), reuploadInfo: nil)), .text) } else if let media = media.first, let mediaResult = mediaContentToUpload(network: network, postbox: postbox, auxiliaryMethods: auxiliaryMethods, transformOutgoingMessageMedia: transformOutgoingMessageMedia, messageMediaPreuploadManager: messageMediaPreuploadManager, revalidationContext: revalidationContext, forceReupload: forceReupload, isGrouped: isGrouped, peerId: peerId, media: media, text: text, autoremoveAttribute: autoremoveAttribute, messageId: messageId, attributes: attributes) { - return (mediaResult, .media) + return .signal(mediaResult, .media) } else { - return (.single(.content(PendingMessageUploadedContentAndReuploadInfo(content: .text(text), reuploadInfo: nil))), .text) + return .signal(.single(.content(PendingMessageUploadedContentAndReuploadInfo(content: .text(text), reuploadInfo: nil))), .text) } } diff --git a/submodules/TelegramCore/Sources/Polls.swift b/submodules/TelegramCore/Sources/Polls.swift index 19aeb100ec..803323a618 100644 --- a/submodules/TelegramCore/Sources/Polls.swift +++ b/submodules/TelegramCore/Sources/Polls.swift @@ -196,7 +196,7 @@ private final class PollResultsOptionContext { self.count = count self.isLoadingMore = true - self.disposable.set((account.postbox.transaction { transaction -> [RenderedPeer]? in + self.disposable.set((account.postbox.transaction { transaction -> (peers: [RenderedPeer], canLoadMore: Bool)? in let cachedResult = transaction.retrieveItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPollResults, key: CachedPollOptionResult.key(pollId: pollId, optionOpaqueIdentifier: opaqueIdentifier))) as? CachedPollOptionResult if let cachedResult = cachedResult, Int(cachedResult.count) == count { var result: [RenderedPeer] = [] @@ -207,19 +207,20 @@ private final class PollResultsOptionContext { return nil } } - return result + return (result, Int(cachedResult.count) > result.count) } else { return nil } } - |> deliverOn(self.queue)).start(next: { [weak self] cachedPeers in + |> deliverOn(self.queue)).start(next: { [weak self] cachedPeersAndCanLoadMore in guard let strongSelf = self else { return } strongSelf.isLoadingMore = false - if let cachedPeers = cachedPeers { + if let (cachedPeers, canLoadMore) = cachedPeersAndCanLoadMore { strongSelf.results = cachedPeers strongSelf.hasLoadedOnce = true + strongSelf.canLoadMore = canLoadMore } strongSelf.loadMore() })) diff --git a/submodules/TelegramIntents/Sources/TelegramIntents.swift b/submodules/TelegramIntents/Sources/TelegramIntents.swift index 3cf79eb5d8..a06109c8d2 100644 --- a/submodules/TelegramIntents/Sources/TelegramIntents.swift +++ b/submodules/TelegramIntents/Sources/TelegramIntents.swift @@ -135,7 +135,8 @@ public func donateSendMessageIntent(account: Account, sharedContext: SharedAccou signals.append(.single((peer, subject, savedMessagesAvatar))) } else { let peerAndAvatar = (peerAvatarImage(account: account, peerReference: PeerReference(peer), authorOfMessage: nil, representation: peer.smallProfileImage, round: false) ?? .single(nil)) - |> map { avatarImage in + |> map { imageVersions -> (Peer, SendMessageIntentSubject, UIImage?) in + let avatarImage = imageVersions?.0 return (peer, subject, avatarImage) } signals.append(peerAndAvatar) diff --git a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift index 4ae705e92f..ef0d6dc6b7 100644 --- a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift +++ b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift @@ -26,116 +26,332 @@ public func messageSingleBubbleLikeImage(fillColor: UIColor, strokeColor: UIColo })!.stretchableImage(withLeftCapWidth: Int(diameter / 2.0), topCapHeight: Int(diameter / 2.0)) } -public func messageBubbleImage(incoming: Bool, fillColor: UIColor, strokeColor: UIColor, neighbors: MessageBubbleImageNeighbors, theme: PresentationThemeChat, wallpaper: TelegramWallpaper, knockout knockoutValue: Bool, mask: Bool = false, extendedEdges: Bool = false, onlyOutline: Bool = false) -> UIImage { - let diameter: CGFloat = 36.0 - let corner: CGFloat = 7.0 +private let minRadiusForFullTailCorner: CGFloat = 14.0 + +func mediaBubbleCornerImage(incoming: Bool, radius: CGFloat, inset: CGFloat) -> UIImage { + let imageSize = CGSize(width: radius + 7.0, height: 8.0) + let fixedMainDiameter: CGFloat = 33.0 + + let formContext = DrawingContext(size: imageSize) + formContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: imageSize)) + context.translateBy(x: imageSize.width / 2.0, y: imageSize.height / 2.0) + context.scaleBy(x: incoming ? -1.0 : 1.0, y: -1.0) + context.translateBy(x: -imageSize.width / 2.0, y: -imageSize.height / 2.0) + + context.setFillColor(UIColor.black.cgColor) + + let bottomEllipse = CGRect(origin: CGPoint(x: 24.0, y: 16.0), size: CGSize(width: 27.0, height: 17.0)).insetBy(dx: inset, dy: inset).offsetBy(dx: inset, dy: inset) + let topEllipse = CGRect(origin: CGPoint(x: 33.0, y: 14.0), size: CGSize(width: 23.0, height: 21.0)).insetBy(dx: -inset, dy: -inset).offsetBy(dx: inset, dy: inset) + + context.translateBy(x: -fixedMainDiameter + imageSize.width - 6.0, y: -fixedMainDiameter + imageSize.height) + + let topLeftRadius: CGFloat = 2.0 + let topRightRadius: CGFloat = 2.0 + let bottomLeftRadius: CGFloat = 2.0 + let bottomRightRadius: CGFloat = radius + + context.move(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: 0.0), tangent2End: CGPoint(x: topLeftRadius, y: 0.0), radius: topLeftRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius, y: 0.0)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: 0.0), tangent2End: CGPoint(x: fixedMainDiameter, y: topRightRadius), radius: topRightRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter - bottomRightRadius)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius, y: fixedMainDiameter), radius: bottomRightRadius) + context.addLine(to: CGPoint(x: bottomLeftRadius, y: fixedMainDiameter)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: fixedMainDiameter), tangent2End: CGPoint(x: 0.0, y: fixedMainDiameter - bottomLeftRadius), radius: bottomLeftRadius) + context.addLine(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.fillPath() + + if radius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.midX, y: bottomEllipse.maxY), control: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.midY), control: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.maxY)) + context.fillPath() + } else { + context.fill(CGRect(origin: CGPoint(x: bottomEllipse.minX - 5.0, y: bottomEllipse.midY), size: CGSize(width: bottomEllipse.width + 5.0, height: bottomEllipse.height / 2.0))) + } + context.fill(CGRect(origin: CGPoint(x: fixedMainDiameter / 2.0, y: floor(fixedMainDiameter / 2.0)), size: CGSize(width: fixedMainDiameter / 2.0, height: ceil(bottomEllipse.midY) - floor(fixedMainDiameter / 2.0)))) + context.setFillColor(UIColor.clear.cgColor) + context.setBlendMode(.copy) + context.fillEllipse(in: topEllipse) + } + + return formContext.generateImage()! +} + +public func messageBubbleImage(maxCornerRadius: CGFloat, minCornerRadius: CGFloat, incoming: Bool, fillColor: UIColor, strokeColor: UIColor, neighbors: MessageBubbleImageNeighbors, theme: PresentationThemeChat, wallpaper: TelegramWallpaper, knockout knockoutValue: Bool, mask: Bool = false, extendedEdges: Bool = false, onlyOutline: Bool = false, onlyShadow: Bool = false) -> UIImage { + let topLeftRadius: CGFloat + let topRightRadius: CGFloat + let bottomLeftRadius: CGFloat + let bottomRightRadius: CGFloat + let drawTail: Bool + + switch neighbors { + case .none: + topLeftRadius = maxCornerRadius + topRightRadius = maxCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = maxCornerRadius + drawTail = true + case .both: + topLeftRadius = maxCornerRadius + topRightRadius = minCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = minCornerRadius + drawTail = false + case .bottom: + topLeftRadius = maxCornerRadius + topRightRadius = minCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = maxCornerRadius + drawTail = true + case .side: + topLeftRadius = maxCornerRadius + topRightRadius = maxCornerRadius + bottomLeftRadius = minCornerRadius + bottomRightRadius = minCornerRadius + drawTail = false + case let .top(side): + topLeftRadius = maxCornerRadius + topRightRadius = maxCornerRadius + bottomLeftRadius = side ? minCornerRadius : maxCornerRadius + bottomRightRadius = minCornerRadius + drawTail = false + } + + let fixedMainDiameter: CGFloat = 33.0 + let innerSize = CGSize(width: fixedMainDiameter + 6.0, height: fixedMainDiameter) + let strokeInset: CGFloat = 1.0 + let sourceRawSize = CGSize(width: innerSize.width + strokeInset * 2.0, height: innerSize.height + strokeInset * 2.0) + let additionalInset: CGFloat = onlyShadow ? 10.0 : 1.0 + let imageSize = CGSize(width: sourceRawSize.width + additionalInset * 2.0, height: sourceRawSize.height + additionalInset * 2.0) + let outgoingStretchPoint: (x: Int, y: Int) = (Int(additionalInset + strokeInset + round(fixedMainDiameter / 2.0)) - 1, Int(additionalInset + strokeInset + round(fixedMainDiameter / 2.0))) + let incomingStretchPoint: (x: Int, y: Int) = (Int(sourceRawSize.width) - outgoingStretchPoint.x + Int(additionalInset), outgoingStretchPoint.y) + let knockout = knockoutValue && !mask - let inset: CGFloat = 1.0 + let rawSize = imageSize - return generateImage(CGSize(width: 42.0 + inset * 2.0, height: diameter + inset * 2.0), contextGenerator: { rawSize, context in - var drawWithClearColor = false + let bottomEllipse = CGRect(origin: CGPoint(x: 24.0, y: 16.0), size: CGSize(width: 27.0, height: 17.0)) + let topEllipse = CGRect(origin: CGPoint(x: 33.0, y: 14.0), size: CGSize(width: 23.0, height: 21.0)) + + let formContext = DrawingContext(size: imageSize) + formContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) - if knockout { - drawWithClearColor = !mask - if case let .color(color) = wallpaper { - context.setFillColor(UIColor(rgb: UInt32(color)).cgColor) + context.setFillColor(UIColor.black.cgColor) + + context.move(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: 0.0), tangent2End: CGPoint(x: topLeftRadius, y: 0.0), radius: topLeftRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius, y: 0.0)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: 0.0), tangent2End: CGPoint(x: fixedMainDiameter, y: topRightRadius), radius: topRightRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter - bottomRightRadius)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius, y: fixedMainDiameter), radius: bottomRightRadius) + context.addLine(to: CGPoint(x: bottomLeftRadius, y: fixedMainDiameter)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: fixedMainDiameter), tangent2End: CGPoint(x: 0.0, y: fixedMainDiameter - bottomLeftRadius), radius: bottomLeftRadius) + context.addLine(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.fillPath() + + if drawTail { + if maxCornerRadius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.midX, y: bottomEllipse.maxY), control: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.midY), control: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.maxY)) + context.fillPath() + } else { + context.fill(CGRect(origin: CGPoint(x: bottomEllipse.minX - 2.0, y: bottomEllipse.midY), size: CGSize(width: bottomEllipse.width + 2.0, height: bottomEllipse.height / 2.0))) + } + context.fill(CGRect(origin: CGPoint(x: fixedMainDiameter / 2.0, y: floor(fixedMainDiameter / 2.0)), size: CGSize(width: fixedMainDiameter / 2.0, height: ceil(bottomEllipse.midY) - floor(fixedMainDiameter / 2.0)))) + context.setFillColor(UIColor.clear.cgColor) + context.setBlendMode(.copy) + context.fillEllipse(in: topEllipse) + } + } + let formImage = formContext.generateImage()! + + let outlineContext = DrawingContext(size: imageSize) + outlineContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) + + context.setStrokeColor(UIColor.black.cgColor) + let borderWidth: CGFloat + let borderOffset: CGFloat + + let innerExtension: CGFloat + if knockout && !mask { + innerExtension = 0.25 + } else { + innerExtension = 0.25 + } + + if abs(UIScreenPixel - 0.5) < CGFloat.ulpOfOne { + borderWidth = UIScreenPixel + innerExtension + borderOffset = -innerExtension / 2.0 + UIScreenPixel / 2.0 + } else { + borderWidth = UIScreenPixel * 2.0 + innerExtension + borderOffset = -innerExtension / 2.0 + UIScreenPixel * 2.0 / 2.0 + } + context.setLineWidth(borderWidth) + + context.move(to: CGPoint(x: -borderOffset, y: topLeftRadius + borderOffset)) + context.addArc(tangent1End: CGPoint(x: -borderOffset, y: -borderOffset), tangent2End: CGPoint(x: topLeftRadius + borderOffset, y: -borderOffset), radius: topLeftRadius + borderOffset * 2.0) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius - borderOffset, y: -borderOffset)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter + borderOffset, y: -borderOffset), tangent2End: CGPoint(x: fixedMainDiameter + borderOffset, y: topRightRadius + borderOffset), radius: topRightRadius + borderOffset * 2.0) + context.addLine(to: CGPoint(x: fixedMainDiameter + borderOffset, y: fixedMainDiameter - bottomRightRadius - borderOffset)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter + borderOffset, y: fixedMainDiameter + borderOffset), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius - borderOffset, y: fixedMainDiameter + borderOffset), radius: bottomRightRadius + borderOffset * 2.0) + context.addLine(to: CGPoint(x: bottomLeftRadius + borderOffset, y: fixedMainDiameter + borderOffset)) + context.addArc(tangent1End: CGPoint(x: -borderOffset, y: fixedMainDiameter + borderOffset), tangent2End: CGPoint(x: -borderOffset, y: fixedMainDiameter - bottomLeftRadius - borderOffset), radius: bottomLeftRadius + borderOffset * 2.0) + context.closePath() + context.strokePath() + + if drawTail { + let outlineBottomEllipse = bottomEllipse.insetBy(dx: -borderOffset, dy: -borderOffset) + let outlineInnerTopEllipse = topEllipse.insetBy(dx: borderOffset, dy: borderOffset) + let outlineTopEllipse = topEllipse.insetBy(dx: -borderOffset, dy: -borderOffset) + + context.setBlendMode(.copy) + context.setFillColor(UIColor.clear.cgColor) + + if maxCornerRadius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.midX, y: bottomEllipse.maxY), control: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.midY), control: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.maxY)) + context.fillPath() + } else { + context.fill(CGRect(origin: CGPoint(x: bottomEllipse.minX - 2.0, y: floor(bottomEllipse.midY)), size: CGSize(width: bottomEllipse.width + 2.0, height: ceil(bottomEllipse.height / 2.0)))) + } + context.fill(CGRect(origin: CGPoint(x: floor(fixedMainDiameter / 2.0), y: fixedMainDiameter / 2.0), size: CGSize(width: fixedMainDiameter / 2.0 + borderWidth, height: ceil(bottomEllipse.midY) - floor(fixedMainDiameter / 2.0)))) + + context.setBlendMode(.normal) + context.move(to: CGPoint(x: fixedMainDiameter + borderOffset, y: fixedMainDiameter / 2.0)) + context.addLine(to: CGPoint(x: fixedMainDiameter + borderOffset, y: outlineBottomEllipse.midY)) + context.strokePath() + + let bubbleTailContext = DrawingContext(size: imageSize) + bubbleTailContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) + + context.setStrokeColor(UIColor.black.cgColor) + context.setLineWidth(borderWidth) + + if maxCornerRadius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: outlineBottomEllipse.minX, y: outlineBottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: outlineBottomEllipse.midX, y: outlineBottomEllipse.maxY), control: CGPoint(x: outlineBottomEllipse.minX, y: outlineBottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: outlineBottomEllipse.maxX, y: outlineBottomEllipse.midY), control: CGPoint(x: outlineBottomEllipse.maxX, y: outlineBottomEllipse.maxY)) + } else { + context.move(to: CGPoint(x: outlineBottomEllipse.minX - 2.0, y: outlineBottomEllipse.maxY)) + context.addLine(to: CGPoint(x: outlineBottomEllipse.minX, y: outlineBottomEllipse.maxY)) + context.addLine(to: CGPoint(x: outlineBottomEllipse.maxX, y: outlineBottomEllipse.maxY)) + } + context.strokePath() + context.setFillColor(UIColor.clear.cgColor) + context.setBlendMode(.copy) + context.fillEllipse(in: outlineInnerTopEllipse) + + context.move(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: 0.0), tangent2End: CGPoint(x: topLeftRadius, y: 0.0), radius: topLeftRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius, y: 0.0)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: 0.0), tangent2End: CGPoint(x: fixedMainDiameter, y: topRightRadius), radius: topRightRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter - bottomRightRadius)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius, y: fixedMainDiameter), radius: bottomRightRadius) + context.addLine(to: CGPoint(x: bottomLeftRadius, y: fixedMainDiameter)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: fixedMainDiameter), tangent2End: CGPoint(x: 0.0, y: fixedMainDiameter - bottomLeftRadius), radius: bottomLeftRadius) + context.addLine(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.fillPath() + + let bottomEllipseMask = generateImage(bottomEllipse.insetBy(dx: -1.0, dy: -1.0).size, contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setFillColor(UIColor.black.cgColor) + if maxCornerRadius >= minRadiusForFullTailCorner { + context.fillEllipse(in: CGRect(origin: CGPoint(x: 1.0 - borderOffset, y: 1.0 - borderOffset), size: CGSize(width: outlineBottomEllipse.width, height: outlineBottomEllipse.height))) + } else { + context.fill(CGRect(origin: CGPoint(x: 1.0 - borderOffset, y: 1.0 - borderOffset), size: CGSize(width: outlineBottomEllipse.width, height: outlineBottomEllipse.height))) + } + context.clear(CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height / 2.0))) + })! + + context.clip(to: bottomEllipse.insetBy(dx: -1.0, dy: -1.0), mask: bottomEllipseMask.cgImage!) + context.strokeEllipse(in: outlineInnerTopEllipse) + context.resetClip() + } + + context.translateBy(x: -(additionalInset + strokeInset), y: -(additionalInset + strokeInset)) + context.draw(bubbleTailContext.generateImage()!.cgImage!, in: CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) + } + } + let outlineImage = generateImage(outlineContext.size, contextGenerator: { size, context in + context.setBlendMode(.copy) + let image = outlineContext.generateImage()! + context.draw(image.cgImage!, in: CGRect(origin: CGPoint(), size: size)) + })! + + let drawingContext = DrawingContext(size: imageSize) + drawingContext.withFlippedContext { context in + if onlyShadow { + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + + let bubbleColors = incoming ? theme.message.incoming : theme.message.outgoing + + if let shadow = bubbleColors.bubble.withWallpaper.shadow { + context.translateBy(x: rawSize.width / 2.0, y: rawSize.height / 2.0) + context.scaleBy(x: incoming ? -1.0 : 1.0, y: -1.0) + context.translateBy(x: -rawSize.width / 2.0, y: -rawSize.height / 2.0) + + context.setShadow(offset: CGSize(width: 0.0, height: -shadow.verticalOffset), blur: shadow.radius, color: shadow.color.cgColor) + context.draw(formImage.cgImage!, in: CGRect(origin: CGPoint(), size: rawSize)) + + context.setBlendMode(.copy) + context.setFillColor(UIColor.clear.cgColor) + context.clip(to: CGRect(origin: CGPoint(), size: rawSize), mask: formImage.cgImage!) context.fill(CGRect(origin: CGPoint(), size: rawSize)) + } + } else { + var drawWithClearColor = false + + if knockout { + drawWithClearColor = !mask + if case let .color(color) = wallpaper { + context.setFillColor(UIColor(rgb: UInt32(color)).cgColor) + context.fill(CGRect(origin: CGPoint(), size: rawSize)) + } else { + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + } } else { context.clear(CGRect(origin: CGPoint(), size: rawSize)) } - } else { - context.clear(CGRect(origin: CGPoint(), size: rawSize)) - } - - let additionalOffset: CGFloat - switch neighbors { - case .none, .bottom: - additionalOffset = 0.0 - case .both, .side, .top: - additionalOffset = 6.0 - } - - context.translateBy(x: rawSize.width / 2.0, y: rawSize.height / 2.0) - context.scaleBy(x: incoming ? 1.0 : -1.0, y: -1.0) - context.translateBy(x: -rawSize.width / 2.0, y: -rawSize.height / 2.0) - - context.translateBy(x: additionalOffset + 0.5, y: 0.5) - - let size = CGSize(width: rawSize.width - inset * 2.0, height: rawSize.height - inset * 2.0) - context.translateBy(x: inset, y: inset) - - var lineWidth: CGFloat = 1.0 - - if drawWithClearColor { - context.setBlendMode(.copy) - context.setFillColor(UIColor.clear.cgColor) - context.setStrokeColor(UIColor.clear.cgColor) - } else { - context.setFillColor(fillColor.cgColor) - context.setLineWidth(lineWidth) - context.setStrokeColor(strokeColor.cgColor) - } - - if onlyOutline { - if knockout { - lineWidth = max(UIScreenPixel, 1.0 - 0.5) - } - context.setLineWidth(lineWidth) - context.setStrokeColor(strokeColor.cgColor) - } - - switch neighbors { - case .none: - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M6,17.5 C6,7.83289181 13.8350169,0 23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41102995e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.strokePath() + + if drawWithClearColor { + context.setBlendMode(.copy) + context.setFillColor(UIColor.clear.cgColor) } else { - let _ = try? drawSvgPath(context, path: "M6,17.5 C6,7.83289181 13.8350169,0 23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41102995e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.fillPath() + context.setBlendMode(.normal) + context.setFillColor(fillColor.cgColor) } - case .side: - if onlyOutline { - context.strokeEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: 35.0, height: 35.0))) + + context.saveGState() + + context.translateBy(x: rawSize.width / 2.0, y: rawSize.height / 2.0) + context.scaleBy(x: incoming ? -1.0 : 1.0, y: -1.0) + context.translateBy(x: -rawSize.width / 2.0, y: -rawSize.height / 2.0) + + if !onlyOutline { + context.clip(to: CGRect(origin: CGPoint(), size: rawSize), mask: formImage.cgImage!) + context.fill(CGRect(origin: CGPoint(), size: rawSize)) } else { - context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: 35.0, height: 35.0))) - } - case let .top(side): - if side { - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M17.5,0 L17.5,0 C27.1649831,-1.7754286e-15 35,7.83501688 35,17.5 L35,29 C35,32.3137085 32.3137085,35 29,35 L6,35 C2.6862915,35 4.05812251e-16,32.3137085 0,29 L0,17.5 C-1.18361906e-15,7.83501688 7.83501688,1.7754286e-15 17.5,0 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M17.5,0 L17.5,0 C27.1649831,-1.7754286e-15 35,7.83501688 35,17.5 L35,29 C35,32.3137085 32.3137085,35 29,35 L6,35 C2.6862915,35 4.05812251e-16,32.3137085 0,29 L0,17.5 C-1.18361906e-15,7.83501688 7.83501688,1.7754286e-15 17.5,0 ") - context.fillPath() - } - } else { - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L17.5,0 C7.83501688,0 0,7.83289181 0,17.5 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L17.5,0 C7.83501688,0 0,7.83289181 0,17.5 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.fillPath() - } - } - case .bottom: - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M6,17.5 L6,5.99681848 C6,2.6882755 8.68486709,0 11.9968185,0 L23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41103066e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M6,17.5 L6,5.99681848 C6,2.6882755 8.68486709,0 11.9968185,0 L23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41103066e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.fillPath() - } - case .both: - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L5.99681848,0 C2.68486709,0 0,2.6882755 0,5.99681848 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L5.99681848,0 C2.68486709,0 0,2.6882755 0,5.99681848 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.fillPath() + context.setFillColor(strokeColor.cgColor) + context.clip(to: CGRect(origin: CGPoint(), size: rawSize), mask: outlineImage.cgImage!) + context.fill(CGRect(origin: CGPoint(), size: rawSize)) } + + context.restoreGState() } - })!.stretchableImage(withLeftCapWidth: incoming ? Int(inset + corner + diameter / 2.0 - 1.0) : Int(inset + diameter / 2.0), topCapHeight: Int(inset + diameter / 2.0)) + } + + return drawingContext.generateImage()!.stretchableImage(withLeftCapWidth: incoming ? incomingStretchPoint.x : outgoingStretchPoint.x, topCapHeight: incoming ? incomingStretchPoint.y : outgoingStretchPoint.y) } public enum MessageBubbleActionButtonPosition { @@ -145,14 +361,14 @@ public enum MessageBubbleActionButtonPosition { case bottomSingle } -public func messageBubbleActionButtonImage(color: UIColor, strokeColor: UIColor, position: MessageBubbleActionButtonPosition) -> UIImage { - let largeRadius: CGFloat = 17.0 - let smallRadius: CGFloat = 6.0 +public func messageBubbleActionButtonImage(color: UIColor, strokeColor: UIColor, position: MessageBubbleActionButtonPosition, bubbleCorners: PresentationChatBubbleCorners) -> UIImage { + let largeRadius: CGFloat = bubbleCorners.mainRadius + let smallRadius: CGFloat = (bubbleCorners.mergeBubbleCorners && largeRadius >= 10.0) ? bubbleCorners.auxiliaryRadius : bubbleCorners.mainRadius let size: CGSize if case .middle = position { size = CGSize(width: smallRadius + smallRadius, height: smallRadius + smallRadius) } else { - size = CGSize(width: 35.0, height: 35.0) + size = CGSize(width: largeRadius + largeRadius, height: largeRadius + largeRadius) } return generateImage(size, contextGenerator: { size, context in context.clear(CGRect(origin: CGPoint(), size: size)) diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index e1be4c62bf..0814168886 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -147,7 +147,14 @@ public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, edit polls: chat.message.incoming.polls.withUpdated( radioProgress: accentColor, highlight: accentColor?.withAlphaComponent(0.12), - bar: accentColor + bar: accentColor, + barIconForeground: accentColor.flatMap { accentColor -> UIColor in + if accentColor.rgb == 0xffffff { + return .clear + } else { + return .white + } + } ), textSelectionColor: accentColor?.withAlphaComponent(0.2), textSelectionKnobColor: accentColor @@ -387,9 +394,9 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati ) 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: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.4), mediaControlInnerBackgroundColor: UIColor(rgb: 0x262628), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff, alpha: 0.12), separator: UIColor(rgb: 0x000000), bar: UIColor(rgb: 0xffffff), barIconForeground: .white, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), 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)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)), - outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x313131), gradientFill: UIColor(rgb: 0x313131), highlightedFill: UIColor(rgb: 0x464646), stroke: UIColor(rgb: 0x313131)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x313131), gradientFill: UIColor(rgb: 0x313131), highlightedFill: UIColor(rgb: 0x464646), stroke: UIColor(rgb: 0x313131))), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaControlInnerBackgroundColor: UIColor(rgb: 0x313131), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xffffff), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff).withAlphaComponent(0.12), separator: UIColor(rgb: 0xffffff, alpha: 0.5), bar: UIColor(rgb: 0xffffff), barIconForeground: .clear, barPositive: UIColor(rgb: 0xffffff), barNegative: UIColor(rgb: 0xffffff)), 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)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: 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))), + incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628), shadow: nil)), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.4), mediaControlInnerBackgroundColor: UIColor(rgb: 0x262628), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff, alpha: 0.12), separator: UIColor(rgb: 0x000000), bar: UIColor(rgb: 0xffffff), barIconForeground: .clear, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), 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)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)), + outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x313131), gradientFill: UIColor(rgb: 0x313131), highlightedFill: UIColor(rgb: 0x464646), stroke: UIColor(rgb: 0x313131), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x313131), gradientFill: UIColor(rgb: 0x313131), highlightedFill: UIColor(rgb: 0x464646), stroke: UIColor(rgb: 0x313131), shadow: nil)), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaControlInnerBackgroundColor: UIColor(rgb: 0x313131), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xffffff), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff).withAlphaComponent(0.12), separator: UIColor(rgb: 0xffffff, alpha: 0.5), bar: UIColor(rgb: 0xffffff), barIconForeground: .clear, barPositive: UIColor(rgb: 0xffffff), barNegative: UIColor(rgb: 0xffffff)), 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)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)), + freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f), shadow: nil)), infoPrimaryTextColor: UIColor(rgb: 0xffffff), infoLinkTextColor: UIColor(rgb: 0xffffff), outgoingCheckColor: UIColor(rgb: 0xffffff), diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift index 850da9400b..0781eba55a 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift @@ -643,9 +643,9 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres 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: UIColor(rgb: 0xff6767), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, accentControlDisabledColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.5), mediaControlInnerBackgroundColor: mainBackgroundColor, 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, barIconForeground: .white, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor), - outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, gradientFill: outgoingBubbleFillGradientColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleFillColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, gradientFill: outgoingBubbleFillGradientColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleFillColor)), primaryTextColor: outgoingPrimaryTextColor, secondaryTextColor: outgoingSecondaryTextColor, linkTextColor: outgoingLinkTextColor, linkHighlightColor: UIColor.white.withAlphaComponent(0.5), scamColor: outgoingScamColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: outgoingPrimaryTextColor, accentControlColor: outgoingPrimaryTextColor, accentControlDisabledColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaActiveControlColor: outgoingPrimaryTextColor, mediaInactiveControlColor: outgoingSecondaryTextColor, mediaControlInnerBackgroundColor: outgoingBubbleFillColor, pendingActivityColor: outgoingSecondaryTextColor, fileTitleColor: outgoingPrimaryTextColor, fileDescriptionColor: outgoingSecondaryTextColor, fileDurationColor: outgoingSecondaryTextColor, mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.804, brightness: 0.51), polls: PresentationThemeChatBubblePolls(radioButton: outgoingPrimaryTextColor, 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: outgoingPrimaryTextColor, barIconForeground: .clear, barPositive: outgoingPrimaryTextColor, barNegative: outgoingPrimaryTextColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: UIColor.white.withAlphaComponent(0.2), textSelectionKnobColor: UIColor.white), - freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor)), + incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: UIColor(rgb: 0xff6767), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, accentControlDisabledColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.5), mediaControlInnerBackgroundColor: mainBackgroundColor, 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, barIconForeground: .white, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor), + outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, gradientFill: outgoingBubbleFillGradientColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleFillColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, gradientFill: outgoingBubbleFillGradientColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleFillColor, shadow: nil)), primaryTextColor: outgoingPrimaryTextColor, secondaryTextColor: outgoingSecondaryTextColor, linkTextColor: outgoingLinkTextColor, linkHighlightColor: UIColor.white.withAlphaComponent(0.5), scamColor: outgoingScamColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: outgoingPrimaryTextColor, accentControlColor: outgoingPrimaryTextColor, accentControlDisabledColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaActiveControlColor: outgoingPrimaryTextColor, mediaInactiveControlColor: outgoingSecondaryTextColor, mediaControlInnerBackgroundColor: outgoingBubbleFillColor, pendingActivityColor: outgoingSecondaryTextColor, fileTitleColor: outgoingPrimaryTextColor, fileDescriptionColor: outgoingSecondaryTextColor, fileDurationColor: outgoingSecondaryTextColor, mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.804, brightness: 0.51), polls: PresentationThemeChatBubblePolls(radioButton: outgoingPrimaryTextColor, 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: outgoingPrimaryTextColor, barIconForeground: .clear, barPositive: outgoingPrimaryTextColor, barNegative: outgoingPrimaryTextColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: UIColor.white.withAlphaComponent(0.2), textSelectionKnobColor: UIColor.white), + freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil)), infoPrimaryTextColor: UIColor(rgb: 0xffffff), infoLinkTextColor: accentColor, outgoingCheckColor: outgoingCheckColor, diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index ce28633511..d18947cb4d 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -487,7 +487,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio let message = PresentationThemeChatMessage( incoming: PresentationThemePartedColors( - bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: bubbleStrokeColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: bubbleStrokeColor)), + bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: bubbleStrokeColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: bubbleStrokeColor, shadow: nil)), primaryTextColor: UIColor(rgb: 0x000000), secondaryTextColor: UIColor(rgb: 0x525252, alpha: 0.6), linkTextColor: UIColor(rgb: 0x004bad), @@ -509,7 +509,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0x596e89, alpha: 0.35)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: .clear), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor(rgb: 0x007ee5, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0x007ee5)), outgoing: PresentationThemePartedColors( - bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe1ffc7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: bubbleStrokeColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe1ffc7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: bubbleStrokeColor)), + bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe1ffc7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: bubbleStrokeColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe1ffc7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: bubbleStrokeColor, shadow: nil)), primaryTextColor: UIColor(rgb: 0x000000), secondaryTextColor: UIColor(rgb: 0x008c09, alpha: 0.8), linkTextColor: UIColor(rgb: 0x004bad), @@ -533,7 +533,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor(rgb: 0xbbde9f), textSelectionKnobColor: UIColor(rgb: 0x3fc33b)), - freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5))), + freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5), shadow: nil)), infoPrimaryTextColor: UIColor(rgb: 0x000000), infoLinkTextColor: UIColor(rgb: 0x004bad), outgoingCheckColor: UIColor(rgb: 0x19c700), @@ -550,7 +550,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio let messageDay = PresentationThemeChatMessage( incoming: PresentationThemePartedColors( - bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xffffff)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xf1f1f4), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xf1f1f4))), + bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xffffff), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xf1f1f4), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xf1f1f4), shadow: nil)), primaryTextColor: UIColor(rgb: 0x000000), secondaryTextColor: UIColor(rgb: 0x525252, alpha: 0.6), linkTextColor: UIColor(rgb: 0x004bad), @@ -575,7 +575,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio textSelectionColor: UIColor(rgb: 0x007ee5, alpha: 0.3), textSelectionKnobColor: UIColor(rgb: 0x007ee5)), outgoing: PresentationThemePartedColors( - bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x57b2e0), gradientFill: UIColor(rgb: 0x007ee5), highlightedFill: UIColor(rgb: 0x57b2e0).withMultipliedBrightnessBy(0.7), stroke: .clear), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x57b2e0), gradientFill: UIColor(rgb: 0x007ee5), highlightedFill: UIColor(rgb: 0x57b2e0).withMultipliedBrightnessBy(0.7), stroke: .clear)), + bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x57b2e0), gradientFill: UIColor(rgb: 0x007ee5), highlightedFill: UIColor(rgb: 0x57b2e0).withMultipliedBrightnessBy(0.7), stroke: .clear, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x57b2e0), gradientFill: UIColor(rgb: 0x007ee5), highlightedFill: UIColor(rgb: 0x57b2e0).withMultipliedBrightnessBy(0.7), stroke: .clear, shadow: nil)), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.65), linkTextColor: UIColor(rgb: 0xffffff), @@ -599,7 +599,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio actionButtonsTextColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0xffffff), withoutWallpaper: UIColor(rgb: 0x007ee5)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)), - freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe5e5ea), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xe5e5ea)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe5e5ea), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xe5e5ea))), + freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe5e5ea), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xe5e5ea), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe5e5ea), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xe5e5ea), shadow: nil)), infoPrimaryTextColor: UIColor(rgb: 0x000000), infoLinkTextColor: UIColor(rgb: 0x004bad), outgoingCheckColor: UIColor(rgb: 0xffffff), diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift index c8e271e5cd..f33079da79 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationData.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift @@ -48,12 +48,25 @@ public enum PresentationDateFormat { case dayFirst } +public struct PresentationChatBubbleCorners: Equatable, Hashable { + public var mainRadius: CGFloat + public var auxiliaryRadius: CGFloat + public var mergeBubbleCorners: Bool + + public init(mainRadius: CGFloat, auxiliaryRadius: CGFloat, mergeBubbleCorners: Bool) { + self.mainRadius = mainRadius + self.auxiliaryRadius = auxiliaryRadius + self.mergeBubbleCorners = mergeBubbleCorners + } +} + public final class PresentationData: Equatable { public let strings: PresentationStrings public let theme: PresentationTheme public let autoNightModeTriggered: Bool public let chatWallpaper: TelegramWallpaper public let chatFontSize: PresentationFontSize + public let chatBubbleCorners: PresentationChatBubbleCorners public let listsFontSize: PresentationFontSize public let dateTimeFormat: PresentationDateTimeFormat public let nameDisplayOrder: PresentationPersonNameOrder @@ -61,12 +74,13 @@ public final class PresentationData: Equatable { public let disableAnimations: Bool public let largeEmoji: Bool - public init(strings: PresentationStrings, theme: PresentationTheme, autoNightModeTriggered: Bool, chatWallpaper: TelegramWallpaper, chatFontSize: PresentationFontSize, listsFontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool) { + public init(strings: PresentationStrings, theme: PresentationTheme, autoNightModeTriggered: Bool, chatWallpaper: TelegramWallpaper, chatFontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, listsFontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool) { self.strings = strings self.theme = theme self.autoNightModeTriggered = autoNightModeTriggered self.chatWallpaper = chatWallpaper self.chatFontSize = chatFontSize + self.chatBubbleCorners = chatBubbleCorners self.listsFontSize = listsFontSize self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder @@ -76,7 +90,7 @@ public final class PresentationData: Equatable { } public static func ==(lhs: PresentationData, rhs: PresentationData) -> Bool { - return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.autoNightModeTriggered == rhs.autoNightModeTriggered && lhs.chatWallpaper == rhs.chatWallpaper && lhs.chatFontSize == rhs.chatFontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.disableAnimations == rhs.disableAnimations && lhs.largeEmoji == rhs.largeEmoji + return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.autoNightModeTriggered == rhs.autoNightModeTriggered && lhs.chatWallpaper == rhs.chatWallpaper && lhs.chatFontSize == rhs.chatFontSize && lhs.chatBubbleCorners == rhs.chatBubbleCorners && lhs.listsFontSize == rhs.listsFontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.disableAnimations == rhs.disableAnimations && lhs.largeEmoji == rhs.largeEmoji } } @@ -268,7 +282,9 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager, s let (chatFontSize, listsFontSize) = resolveFontSize(settings: themeSettings) - return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: theme, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, autodownloadSettings: autodownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings) + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners) + + return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: theme, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, autodownloadSettings: autodownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings) } } @@ -601,7 +617,9 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI let (chatFontSize, listsFontSize) = resolveFontSize(settings: themeSettings) - return PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners) + + return PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) } } else { return .complete() @@ -634,15 +652,21 @@ public func defaultPresentationData() -> PresentationData { let (chatFontSize, listsFontSize) = resolveFontSize(settings: themeSettings) - return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, autoNightModeTriggered: false, chatWallpaper: .builtin(WallpaperSettings()), chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners) + + return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, autoNightModeTriggered: false, chatWallpaper: .builtin(WallpaperSettings()), chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) } public extension PresentationData { func withFontSizes(chatFontSize: PresentationFontSize, listsFontSize: PresentationFontSize) -> PresentationData { - return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) + return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: self.chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) + } + + func withChatBubbleCorners(_ chatBubbleCorners: PresentationChatBubbleCorners) -> PresentationData { + return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) } func withStrings(_ strings: PresentationStrings) -> PresentationData { - return PresentationData(strings: strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) + return PresentationData(strings: strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) } } diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 188fb8bab7..e8cef3ecce 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -239,5081 +239,5104 @@ public final class PresentationStrings: Equatable { public func MediaPicker_Nof(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[49]!, self._r[49]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[50]! } - public var AutoDownloadSettings_MediaTypes: String { return self._s[52]! } - public var Watch_GroupInfo_Title: String { return self._s[53]! } - public var Passport_Identity_AddPersonalDetails: String { return self._s[54]! } - public var Channel_Info_Members: String { return self._s[55]! } - public var LoginPassword_InvalidPasswordError: String { return self._s[57]! } - public var Conversation_LiveLocation: String { return self._s[58]! } - public var Wallet_Month_ShortNovember: String { return self._s[59]! } - public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[60]! } - public var NetworkUsageSettings_BytesReceived: String { return self._s[62]! } - public var Stickers_Search: String { return self._s[64]! } - public var NotificationsSound_Synth: String { return self._s[65]! } - public var LogoutOptions_LogOutInfo: String { return self._s[66]! } + public var ChatState_ConnectingToProxy: String { return self._s[50]! } + public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[51]! } + public var AutoDownloadSettings_MediaTypes: String { return self._s[53]! } + public var Watch_GroupInfo_Title: String { return self._s[54]! } + public var Passport_Identity_AddPersonalDetails: String { return self._s[55]! } + public var Channel_Info_Members: String { return self._s[56]! } + public var LoginPassword_InvalidPasswordError: String { return self._s[58]! } + public var Conversation_LiveLocation: String { return self._s[59]! } + public var Wallet_Month_ShortNovember: String { return self._s[60]! } + public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[61]! } + public var NetworkUsageSettings_BytesReceived: String { return self._s[63]! } + public var Stickers_Search: String { return self._s[65]! } + public var NotificationsSound_Synth: String { return self._s[66]! } + public var LogoutOptions_LogOutInfo: String { return self._s[67]! } public func VoiceOver_Chat_ForwardedFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[68]!, self._r[68]!, [_0]) + return formatWithArgumentRanges(self._s[69]!, self._r[69]!, [_0]) } - public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[69]! } - public var ChatList_Context_HideArchive: String { return self._s[71]! } - public var AutoNightTheme_UseSunsetSunrise: String { return self._s[72]! } - public var FastTwoStepSetup_Title: String { return self._s[73]! } - public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[74]! } - public var Channel_Info_BlackList: String { return self._s[75]! } - public var Channel_AdminLog_InfoPanelTitle: String { return self._s[76]! } - public var Conversation_OpenFile: String { return self._s[78]! } - public var SecretTimer_ImageDescription: String { return self._s[79]! } - public var StickerSettings_ContextInfo: String { return self._s[80]! } - public var TwoStepAuth_GenericHelp: String { return self._s[82]! } - public var AutoDownloadSettings_Unlimited: String { return self._s[83]! } - public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[84]! } - public var AutoDownloadSettings_DataUsageHigh: String { return self._s[85]! } + public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[70]! } + public var ChatList_Context_HideArchive: String { return self._s[72]! } + public var AutoNightTheme_UseSunsetSunrise: String { return self._s[73]! } + public var FastTwoStepSetup_Title: String { return self._s[74]! } + public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[75]! } + public var Channel_Info_BlackList: String { return self._s[76]! } + public var Channel_AdminLog_InfoPanelTitle: String { return self._s[77]! } + public var Conversation_OpenFile: String { return self._s[79]! } + public var SecretTimer_ImageDescription: String { return self._s[80]! } + public var StickerSettings_ContextInfo: String { return self._s[81]! } + public var TwoStepAuth_GenericHelp: String { return self._s[83]! } + public var AutoDownloadSettings_Unlimited: String { return self._s[84]! } + public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[85]! } + public var AutoDownloadSettings_DataUsageHigh: String { return self._s[86]! } public func PUSH_CHAT_MESSAGE_VIDEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[86]!, self._r[86]!, [_1, _2]) + return formatWithArgumentRanges(self._s[87]!, self._r[87]!, [_1, _2]) } - public var AuthSessions_AddDevice_ScanInfo: String { return self._s[87]! } - public var Notifications_AddExceptionTitle: String { return self._s[88]! } - public var Watch_MessageView_Reply: String { return self._s[89]! } - public var Tour_Text6: String { return self._s[90]! } - public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[91]! } + public var AuthSessions_AddDevice_ScanInfo: String { return self._s[88]! } + public var Notifications_AddExceptionTitle: String { return self._s[89]! } + public var Watch_MessageView_Reply: String { return self._s[90]! } + public var Tour_Text6: String { return self._s[91]! } + public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[92]! } public func Notification_PinnedAnimationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[92]!, self._r[92]!, [_0]) - } - public func ShareFileTip_Text(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[93]!, self._r[93]!, [_0]) } - public var Wallet_Configuration_BlockchainIdPlaceholder: String { return self._s[94]! } - public var AccessDenied_LocationDenied: String { return self._s[95]! } - public var CallSettings_RecentCalls: String { return self._s[96]! } - public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[97]! } - public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[99]! } - public var Passport_Authorize: String { return self._s[100]! } - public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[101]! } - public var AutoDownloadSettings_Videos: String { return self._s[102]! } - public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[103]! } - public var Wallet_Info_Send: String { return self._s[104]! } - public var AuthSessions_AddDevice_UrlLoginHint: String { return self._s[105]! } - public var Wallet_TransactionInfo_SendGrams: String { return self._s[106]! } - public var Tour_StartButton: String { return self._s[107]! } - public var Watch_AppName: String { return self._s[109]! } - public var StickerPack_ErrorNotFound: String { return self._s[110]! } - public var Channel_Info_Subscribers: String { return self._s[111]! } - public func Channel_AdminLog_MessageGroupPreHistoryVisible(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[112]!, self._r[112]!, [_0]) + public func ShareFileTip_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[94]!, self._r[94]!, [_0]) } - public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Wallet_Configuration_BlockchainIdPlaceholder: String { return self._s[95]! } + public var AccessDenied_LocationDenied: String { return self._s[96]! } + public var CallSettings_RecentCalls: String { return self._s[97]! } + public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[98]! } + public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[100]! } + public var Passport_Authorize: String { return self._s[101]! } + public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[102]! } + public var AutoDownloadSettings_Videos: String { return self._s[103]! } + public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[104]! } + public var Wallet_Info_Send: String { return self._s[105]! } + public var AuthSessions_AddDevice_UrlLoginHint: String { return self._s[106]! } + public var Wallet_TransactionInfo_SendGrams: String { return self._s[107]! } + public var Tour_StartButton: String { return self._s[108]! } + public var Watch_AppName: String { return self._s[110]! } + public var StickerPack_ErrorNotFound: String { return self._s[111]! } + public var Channel_Info_Subscribers: String { return self._s[112]! } + public func Channel_AdminLog_MessageGroupPreHistoryVisible(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[113]!, self._r[113]!, [_0]) } - public var Appearance_RemoveTheme: String { return self._s[114]! } + public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[114]!, self._r[114]!, [_0]) + } + public var Appearance_RemoveTheme: String { return self._s[115]! } public func Wallet_Info_TransactionBlockchainFee(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[115]!, self._r[115]!, [_0]) + return formatWithArgumentRanges(self._s[116]!, self._r[116]!, [_0]) } - public var Conversation_StopLiveLocation: String { return self._s[118]! } - public var Channel_AdminLogFilter_EventsAll: String { return self._s[119]! } - public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[121]! } - public var Username_LinkCopied: String { return self._s[123]! } - public var GroupRemoved_Title: String { return self._s[124]! } - public var SecretVideo_Title: String { return self._s[125]! } + public var Conversation_StopLiveLocation: String { return self._s[119]! } + public var Channel_AdminLogFilter_EventsAll: String { return self._s[120]! } + public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[122]! } + public var Username_LinkCopied: String { return self._s[124]! } + public var GroupRemoved_Title: String { return self._s[125]! } + public var SecretVideo_Title: String { return self._s[126]! } public func PUSH_PINNED_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[126]!, self._r[126]!, [_1]) + return formatWithArgumentRanges(self._s[127]!, self._r[127]!, [_1]) } - public var AccessDenied_PhotosAndVideos: String { return self._s[127]! } - public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[128]! } + public var AccessDenied_PhotosAndVideos: String { return self._s[128]! } + public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[129]! } public func PUSH_CHANNEL_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[130]!, self._r[130]!, [_1]) + return formatWithArgumentRanges(self._s[131]!, self._r[131]!, [_1]) } - public var Map_OpenInGoogleMaps: String { return self._s[132]! } + public var Map_OpenInGoogleMaps: String { return self._s[133]! } public func Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[133]!, self._r[133]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[134]!, self._r[134]!, [_1, _2, _3]) } public func Channel_AdminLog_MessageKickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[134]!, self._r[134]!, [_1, _2]) + return formatWithArgumentRanges(self._s[135]!, self._r[135]!, [_1, _2]) } - public var Call_StatusRinging: String { return self._s[135]! } - public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[136]! } - public var Group_Username_InvalidStartsWithNumber: String { return self._s[137]! } - public var UserInfo_NotificationsEnabled: String { return self._s[138]! } - public var PeopleNearby_MakeVisibleDescription: String { return self._s[139]! } - public var Map_Search: String { return self._s[140]! } - public var ClearCache_StorageFree: String { return self._s[142]! } - public var Login_TermsOfServiceHeader: String { return self._s[143]! } + public var Call_StatusRinging: String { return self._s[136]! } + public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[137]! } + public var Group_Username_InvalidStartsWithNumber: String { return self._s[138]! } + public var UserInfo_NotificationsEnabled: String { return self._s[139]! } + public var PeopleNearby_MakeVisibleDescription: String { return self._s[140]! } + public var Map_Search: String { return self._s[141]! } + public var ClearCache_StorageFree: String { return self._s[143]! } + public var Login_TermsOfServiceHeader: String { return self._s[144]! } public func Notification_PinnedVideoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[144]!, self._r[144]!, [_0]) + return formatWithArgumentRanges(self._s[145]!, self._r[145]!, [_0]) } public func Channel_AdminLog_MessageToggleSignaturesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[146]!, self._r[146]!, [_0]) + return formatWithArgumentRanges(self._s[147]!, self._r[147]!, [_0]) } - public var Wallet_Sent_Title: String { return self._s[147]! } - public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[148]! } - public var Weekday_Today: String { return self._s[149]! } + public var Wallet_Sent_Title: String { return self._s[148]! } + public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[149]! } + public var Weekday_Today: String { return self._s[150]! } public func InstantPage_AuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[151]!, self._r[151]!, [_1, _2]) + return formatWithArgumentRanges(self._s[152]!, self._r[152]!, [_1, _2]) } public func Conversation_MessageDialogRetryAll(_ _1: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[152]!, self._r[152]!, ["\(_1)"]) + return formatWithArgumentRanges(self._s[153]!, self._r[153]!, ["\(_1)"]) } - public var Notification_PassportValuePersonalDetails: String { return self._s[154]! } - public var Channel_AdminLog_MessagePreviousLink: String { return self._s[155]! } - public var ChangePhoneNumberNumber_NewNumber: String { return self._s[156]! } - public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[157]! } - public var TwoStepAuth_ChangePasswordDescription: String { return self._s[158]! } - public var PhotoEditor_BlurToolLinear: String { return self._s[159]! } - public var Contacts_PermissionsAllowInSettings: String { return self._s[160]! } - public var Weekday_ShortMonday: String { return self._s[161]! } - public var Cache_KeepMedia: String { return self._s[162]! } - public var Passport_FieldIdentitySelfieHelp: String { return self._s[163]! } + public var Notification_PassportValuePersonalDetails: String { return self._s[155]! } + public var Channel_AdminLog_MessagePreviousLink: String { return self._s[156]! } + public var ChangePhoneNumberNumber_NewNumber: String { return self._s[157]! } + public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[158]! } + public var TwoStepAuth_ChangePasswordDescription: String { return self._s[159]! } + public var PhotoEditor_BlurToolLinear: String { return self._s[160]! } + public var Contacts_PermissionsAllowInSettings: String { return self._s[161]! } + public var Weekday_ShortMonday: String { return self._s[162]! } + public var Cache_KeepMedia: String { return self._s[163]! } + public var Passport_FieldIdentitySelfieHelp: String { return self._s[164]! } public func PUSH_PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[164]!, self._r[164]!, [_1, _2]) + return formatWithArgumentRanges(self._s[165]!, self._r[165]!, [_1, _2]) } public func Chat_SlowmodeTooltip(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[165]!, self._r[165]!, [_0]) + return formatWithArgumentRanges(self._s[166]!, self._r[166]!, [_0]) } - public var Wallet_Receive_ShareUrlInfo: String { return self._s[166]! } - public var Conversation_ClousStorageInfo_Description4: String { return self._s[167]! } - public var Wallet_RestoreFailed_Title: String { return self._s[168]! } - public var Passport_Language_ru: String { return self._s[169]! } + public var Wallet_Receive_ShareUrlInfo: String { return self._s[167]! } + public var Conversation_ClousStorageInfo_Description4: String { return self._s[168]! } + public var Wallet_RestoreFailed_Title: String { return self._s[169]! } + public var Passport_Language_ru: String { return self._s[170]! } public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[170]!, self._r[170]!, [_0, _1]) + return formatWithArgumentRanges(self._s[171]!, self._r[171]!, [_0, _1]) } - public var WallpaperPreview_PatternIntensity: String { return self._s[171]! } - public var WebBrowser_InAppSafari: String { return self._s[174]! } - public var TwoStepAuth_RecoveryUnavailable: String { return self._s[175]! } - public var EnterPasscode_TouchId: String { return self._s[176]! } - public var PhotoEditor_QualityVeryHigh: String { return self._s[179]! } - public var Checkout_NewCard_SaveInfo: String { return self._s[181]! } - public var Gif_NoGifsPlaceholder: String { return self._s[183]! } + public var WallpaperPreview_PatternIntensity: String { return self._s[172]! } + public var WebBrowser_InAppSafari: String { return self._s[175]! } + public var TwoStepAuth_RecoveryUnavailable: String { return self._s[176]! } + public var EnterPasscode_TouchId: String { return self._s[177]! } + public var PhotoEditor_QualityVeryHigh: String { return self._s[180]! } + public var Checkout_NewCard_SaveInfo: String { return self._s[182]! } + public var Gif_NoGifsPlaceholder: String { return self._s[184]! } public func Notification_InvitedMultiple(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[185]!, self._r[185]!, [_0, _1]) + return formatWithArgumentRanges(self._s[186]!, self._r[186]!, [_0, _1]) } - public var ChatSettings_AutoDownloadEnabled: String { return self._s[186]! } - public var NetworkUsageSettings_BytesSent: String { return self._s[187]! } - public var Checkout_PasswordEntry_Pay: String { return self._s[188]! } - public var AuthSessions_TerminateSession: String { return self._s[189]! } - public var Message_File: String { return self._s[190]! } - public var MediaPicker_VideoMuteDescription: String { return self._s[191]! } - public var SocksProxySetup_ProxyStatusConnected: String { return self._s[192]! } - public var TwoStepAuth_RecoveryCode: String { return self._s[193]! } - public var EnterPasscode_EnterCurrentPasscode: String { return self._s[194]! } + public var ChatSettings_AutoDownloadEnabled: String { return self._s[187]! } + public var NetworkUsageSettings_BytesSent: String { return self._s[188]! } + public var Checkout_PasswordEntry_Pay: String { return self._s[189]! } + public var AuthSessions_TerminateSession: String { return self._s[190]! } + public var Message_File: String { return self._s[191]! } + public var MediaPicker_VideoMuteDescription: String { return self._s[192]! } + public var SocksProxySetup_ProxyStatusConnected: String { return self._s[193]! } + public var TwoStepAuth_RecoveryCode: String { return self._s[194]! } + public var EnterPasscode_EnterCurrentPasscode: String { return self._s[195]! } public func TwoStepAuth_EnterPasswordHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[195]!, self._r[195]!, [_0]) - } - public var Conversation_Moderate_Report: String { return self._s[197]! } - public var TwoStepAuth_EmailInvalid: String { return self._s[198]! } - public var Passport_Language_ms: String { return self._s[199]! } - public var Channel_Edit_AboutItem: String { return self._s[201]! } - public var DialogList_SearchSectionGlobal: String { return self._s[205]! } - public var AttachmentMenu_WebSearch: String { return self._s[206]! } - public var PasscodeSettings_TurnPasscodeOn: String { return self._s[207]! } - public var Channel_BanUser_Title: String { return self._s[208]! } - public var WallpaperPreview_SwipeTopText: String { return self._s[209]! } - public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[210]! } - public var ArchivedChats_IntroText2: String { return self._s[211]! } - public var Conversation_OpenBotLinkTitle: String { return self._s[212]! } - public var ChatSearch_SearchPlaceholder: String { return self._s[214]! } - public var Notification_Exceptions_DeleteAll: String { return self._s[215]! } - public var Passport_FieldAddressTranslationHelp: String { return self._s[216]! } - public var NotificationsSound_Aurora: String { return self._s[217]! } - public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[218]!, self._r[218]!, [_1, _2]) + return formatWithArgumentRanges(self._s[196]!, self._r[196]!, [_0]) } + public var Conversation_Moderate_Report: String { return self._s[198]! } + public var TwoStepAuth_EmailInvalid: String { return self._s[199]! } + public var Passport_Language_ms: String { return self._s[200]! } + public var Channel_Edit_AboutItem: String { return self._s[202]! } + public var DialogList_SearchSectionGlobal: String { return self._s[206]! } + public var AttachmentMenu_WebSearch: String { return self._s[207]! } + public var ChatState_WaitingForNetwork: String { return self._s[208]! } + public var Channel_BanUser_Title: String { return self._s[209]! } + public var PasscodeSettings_TurnPasscodeOn: String { return self._s[210]! } + public var WallpaperPreview_SwipeTopText: String { return self._s[211]! } + public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[212]! } + public var ArchivedChats_IntroText2: String { return self._s[213]! } + public var ChatSearch_SearchPlaceholder: String { return self._s[215]! } + public var Conversation_OpenBotLinkTitle: String { return self._s[216]! } + public var Passport_FieldAddressTranslationHelp: String { return self._s[217]! } + public var NotificationsSound_Aurora: String { return self._s[218]! } + public var Notification_Exceptions_DeleteAll: String { return self._s[219]! } public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[219]!, self._r[219]!, [_0]) + return formatWithArgumentRanges(self._s[220]!, self._r[220]!, [_0]) } - public var AuthSessions_LoggedInWithTelegram: String { return self._s[222]! } + public var AuthSessions_LoggedInWithTelegram: String { return self._s[223]! } public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[223]!, self._r[223]!, [_0, _1]) + return formatWithArgumentRanges(self._s[224]!, self._r[224]!, [_0, _1]) } - public var Passport_PasswordNext: String { return self._s[224]! } - public var Bot_GroupStatusReadsHistory: String { return self._s[225]! } - public var EmptyGroupInfo_Line2: String { return self._s[226]! } - public var VoiceOver_Chat_SeenByRecipients: String { return self._s[227]! } - public var Settings_FAQ_Intro: String { return self._s[230]! } - public var PrivacySettings_PasscodeAndTouchId: String { return self._s[232]! } - public var FeaturedStickerPacks_Title: String { return self._s[233]! } - public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[235]! } - public var Username_Title: String { return self._s[236]! } + public var Passport_PasswordNext: String { return self._s[225]! } + public var Bot_GroupStatusReadsHistory: String { return self._s[226]! } + public var EmptyGroupInfo_Line2: String { return self._s[227]! } + public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[228]!, self._r[228]!, [_1, _2]) + } + public var VoiceOver_Chat_SeenByRecipients: String { return self._s[229]! } + public var Settings_FAQ_Intro: String { return self._s[232]! } + public var PrivacySettings_PasscodeAndTouchId: String { return self._s[234]! } + public var FeaturedStickerPacks_Title: String { return self._s[235]! } + public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[237]! } + public var Username_Title: String { return self._s[238]! } public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[237]!, self._r[237]!, [_0]) + return formatWithArgumentRanges(self._s[239]!, self._r[239]!, [_0]) } - public var PasscodeSettings_AlphanumericCode: String { return self._s[238]! } - public var Localization_LanguageOther: String { return self._s[239]! } - public var Stickers_SuggestStickers: String { return self._s[240]! } + public var PasscodeSettings_AlphanumericCode: String { return self._s[240]! } + public var Localization_LanguageOther: String { return self._s[241]! } + public var Stickers_SuggestStickers: String { return self._s[242]! } public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[241]!, self._r[241]!, [_0]) + return formatWithArgumentRanges(self._s[243]!, self._r[243]!, [_0]) } - public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[242]! } - public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[243]! } - public var Conversation_DefaultRestrictedStickers: String { return self._s[244]! } + public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[244]! } + public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[245]! } + public var Conversation_DefaultRestrictedStickers: String { return self._s[246]! } public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[245]!, self._r[245]!, [_0]) + return formatWithArgumentRanges(self._s[247]!, self._r[247]!, [_0]) } - public var Wallet_TransactionInfo_CopyAddress: String { return self._s[247]! } - public var Group_UpgradeConfirmation: String { return self._s[248]! } - public var DialogList_Unpin: String { return self._s[249]! } - public var Passport_Identity_DateOfBirth: String { return self._s[250]! } - public var Month_ShortOctober: String { return self._s[251]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[252]! } - public var TwoFactorSetup_Done_Text: String { return self._s[253]! } - public var Notification_CallCanceledShort: String { return self._s[254]! } - public var Conversation_StopQuiz: String { return self._s[255]! } - public var Passport_Phone_Help: String { return self._s[256]! } - public var Passport_Language_az: String { return self._s[258]! } - public var CreatePoll_TextPlaceholder: String { return self._s[260]! } - public var VoiceOver_Chat_AnonymousPoll: String { return self._s[261]! } - public var Passport_Identity_DocumentNumber: String { return self._s[262]! } - public var PhotoEditor_CurvesRed: String { return self._s[263]! } - public var PhoneNumberHelp_Alert: String { return self._s[265]! } - public var SocksProxySetup_Port: String { return self._s[266]! } - public var Checkout_PayNone: String { return self._s[267]! } - public var AutoDownloadSettings_WiFi: String { return self._s[268]! } - public var GroupInfo_GroupType: String { return self._s[269]! } - public var StickerSettings_ContextHide: String { return self._s[270]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[271]! } - public var Group_Setup_HistoryTitle: String { return self._s[273]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[274]! } - public var PasscodeSettings_AutoLock: String { return self._s[275]! } - public var Passport_Title: String { return self._s[276]! } - public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[277]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[278]! } - public var GroupPermission_NoSendGifs: String { return self._s[279]! } - public var PrivacySettings_PasscodeOn: String { return self._s[280]! } + public var Wallet_TransactionInfo_CopyAddress: String { return self._s[249]! } + public var Group_UpgradeConfirmation: String { return self._s[250]! } + public var DialogList_Unpin: String { return self._s[251]! } + public var Passport_Identity_DateOfBirth: String { return self._s[252]! } + public var Month_ShortOctober: String { return self._s[253]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[254]! } + public var TwoFactorSetup_Done_Text: String { return self._s[255]! } + public var Notification_CallCanceledShort: String { return self._s[256]! } + public var Conversation_StopQuiz: String { return self._s[257]! } + public var Passport_Phone_Help: String { return self._s[258]! } + public var Passport_Language_az: String { return self._s[260]! } + public var CreatePoll_TextPlaceholder: String { return self._s[262]! } + public var VoiceOver_Chat_AnonymousPoll: String { return self._s[263]! } + public var Passport_Identity_DocumentNumber: String { return self._s[264]! } + public var PhotoEditor_CurvesRed: String { return self._s[265]! } + public var PhoneNumberHelp_Alert: String { return self._s[267]! } + public var SocksProxySetup_Port: String { return self._s[268]! } + public var Checkout_PayNone: String { return self._s[269]! } + public var AutoDownloadSettings_WiFi: String { return self._s[270]! } + public var GroupInfo_GroupType: String { return self._s[271]! } + public var StickerSettings_ContextHide: String { return self._s[272]! } + public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[273]! } + public var Group_Setup_HistoryTitle: String { return self._s[275]! } + public var Passport_Identity_FilesUploadNew: String { return self._s[276]! } + public var PasscodeSettings_AutoLock: String { return self._s[277]! } + public var Passport_Title: String { return self._s[278]! } + public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[279]! } + public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[280]! } + public var GroupPermission_NoSendGifs: String { return self._s[281]! } + public var PrivacySettings_PasscodeOn: String { return self._s[282]! } public func Conversation_ScheduleMessage_SendTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[281]!, self._r[281]!, [_0]) + return formatWithArgumentRanges(self._s[283]!, self._r[283]!, [_0]) } - public var State_WaitingForNetwork: String { return self._s[284]! } + public var State_WaitingForNetwork: String { return self._s[286]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[285]!, self._r[285]!, [_0, _1]) + return formatWithArgumentRanges(self._s[287]!, self._r[287]!, [_0, _1]) } - public var Calls_NotNow: String { return self._s[287]! } + public var Calls_NotNow: String { return self._s[289]! } public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[288]!, self._r[288]!, [_0]) + return formatWithArgumentRanges(self._s[290]!, self._r[290]!, [_0]) } - public var UserInfo_SendMessage: String { return self._s[289]! } - public var TwoStepAuth_PasswordSet: String { return self._s[290]! } - public var Passport_DeleteDocument: String { return self._s[291]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[292]! } + public var UserInfo_SendMessage: String { return self._s[291]! } + public var TwoStepAuth_PasswordSet: String { return self._s[292]! } + public var Passport_DeleteDocument: String { return self._s[293]! } + public var SocksProxySetup_AddProxyTitle: String { return self._s[294]! } public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[293]!, self._r[293]!, [_1]) + return formatWithArgumentRanges(self._s[295]!, self._r[295]!, [_1]) } - public var AuthSessions_AddedDeviceTitle: String { return self._s[294]! } - public var GroupRemoved_Remove: String { return self._s[295]! } - public var Passport_FieldIdentity: String { return self._s[296]! } - public var Group_Setup_TypePrivateHelp: String { return self._s[297]! } - public var Conversation_Processing: String { return self._s[300]! } - public var Wallet_Settings_BackupWallet: String { return self._s[302]! } - public var ChatSettings_AutoPlayAnimations: String { return self._s[303]! } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[306]! } - public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[307]! } - public var Month_GenFebruary: String { return self._s[308]! } - public var Wallet_Send_NetworkErrorTitle: String { return self._s[309]! } + public var AuthSessions_AddedDeviceTitle: String { return self._s[296]! } + public var GroupRemoved_Remove: String { return self._s[297]! } + public var Passport_FieldIdentity: String { return self._s[298]! } + public var Group_Setup_TypePrivateHelp: String { return self._s[299]! } + public var Conversation_Processing: String { return self._s[302]! } + public var Wallet_Settings_BackupWallet: String { return self._s[304]! } + public var ChatSettings_AutoPlayAnimations: String { return self._s[305]! } + public var AuthSessions_LogOutApplicationsHelp: String { return self._s[308]! } + public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[309]! } + public var Month_GenFebruary: String { return self._s[310]! } + public var Wallet_Send_NetworkErrorTitle: String { return self._s[311]! } public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[311]!, self._r[311]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[313]!, self._r[313]!, [_1, _2, _3, _4, _5]) } - public var Passport_Identity_TypeIdentityCard: String { return self._s[312]! } - public var Wallet_Month_ShortJune: String { return self._s[314]! } - public var AutoDownloadSettings_DataUsageMedium: String { return self._s[315]! } - public var GroupInfo_AddParticipant: String { return self._s[316]! } - public var KeyCommand_SendMessage: String { return self._s[317]! } - public var VoiceOver_Chat_YourContact: String { return self._s[319]! } - public var Map_LiveLocationShowAll: String { return self._s[320]! } - public var WallpaperSearch_ColorOrange: String { return self._s[322]! } - public var Appearance_AppIconDefaultX: String { return self._s[323]! } - public var Checkout_Receipt_Title: String { return self._s[324]! } - public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[325]! } - public var WallpaperPreview_PreviewTopText: String { return self._s[326]! } - public var Message_Contact: String { return self._s[327]! } - public var Call_StatusIncoming: String { return self._s[328]! } - public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[329]! } + public var Passport_Identity_TypeIdentityCard: String { return self._s[314]! } + public var Wallet_Month_ShortJune: String { return self._s[316]! } + public var AutoDownloadSettings_DataUsageMedium: String { return self._s[317]! } + public var GroupInfo_AddParticipant: String { return self._s[318]! } + public var KeyCommand_SendMessage: String { return self._s[319]! } + public var VoiceOver_Chat_YourContact: String { return self._s[321]! } + public var Map_LiveLocationShowAll: String { return self._s[322]! } + public var WallpaperSearch_ColorOrange: String { return self._s[324]! } + public var Appearance_AppIconDefaultX: String { return self._s[325]! } + public var Checkout_Receipt_Title: String { return self._s[326]! } + public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[327]! } + public var WallpaperPreview_PreviewTopText: String { return self._s[328]! } + public var Message_Contact: String { return self._s[329]! } + public var Call_StatusIncoming: String { return self._s[330]! } + public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[331]! } public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[330]!, self._r[330]!, [_1]) - } - public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[332]!, self._r[332]!, [_1]) } - public var VoiceOver_Media_PlaybackRate: String { return self._s[333]! } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[334]! } - public var Conversation_ViewChannel: String { return self._s[335]! } + public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[334]!, self._r[334]!, [_1]) + } + public var VoiceOver_Media_PlaybackRate: String { return self._s[335]! } + public var Passport_FieldIdentityDetailsHelp: String { return self._s[336]! } + public var Conversation_ViewChannel: String { return self._s[337]! } public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[336]!, self._r[336]!, [_0]) + return formatWithArgumentRanges(self._s[338]!, self._r[338]!, [_0]) } - public var Theme_Colors_Accent: String { return self._s[337]! } - public var Passport_Language_nl: String { return self._s[339]! } - public var Camera_Retake: String { return self._s[340]! } + public var Theme_Colors_Accent: String { return self._s[339]! } + public var Passport_Language_nl: String { return self._s[341]! } + public var Camera_Retake: String { return self._s[342]! } public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[341]!, self._r[341]!, [_0]) + return formatWithArgumentRanges(self._s[343]!, self._r[343]!, [_0]) } - public var AuthSessions_LogOutApplications: String { return self._s[342]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[343]! } - public var Tour_Title6: String { return self._s[344]! } - public var Map_ChooseAPlace: String { return self._s[345]! } - public var CallSettings_Never: String { return self._s[347]! } + public var AuthSessions_LogOutApplications: String { return self._s[344]! } + public var ApplyLanguage_ApplySuccess: String { return self._s[345]! } + public var Tour_Title6: String { return self._s[346]! } + public var Map_ChooseAPlace: String { return self._s[347]! } + public var CallSettings_Never: String { return self._s[349]! } public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[348]!, self._r[348]!, [_0]) - } - public var ChannelRemoved_RemoveInfo: String { return self._s[349]! } - public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[350]!, self._r[350]!, [_0]) } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[351]! } - public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + public var ChannelRemoved_RemoveInfo: String { return self._s[351]! } + public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[352]!, self._r[352]!, [_0]) } - public var GroupInfo_InviteLink_Title: String { return self._s[353]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[353]! } + public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[354]!, self._r[354]!, [_0]) + } + public var GroupInfo_InviteLink_Title: String { return self._s[355]! } public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[354]!, self._r[354]!, [_1, _2]) + return formatWithArgumentRanges(self._s[356]!, self._r[356]!, [_1, _2]) } - public var KeyCommand_ScrollUp: String { return self._s[355]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[356]! } - public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[357]! } + public var KeyCommand_ScrollUp: String { return self._s[357]! } + public var ContactInfo_URLLabelHomepage: String { return self._s[358]! } + public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[359]! } public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[358]!, self._r[358]!, [_0]) - } - public var TwoFactorSetup_Done_Title: String { return self._s[359]! } - public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[360]!, self._r[360]!, [_0]) } - public var CallFeedback_ReasonDistortedSpeech: String { return self._s[361]! } - public var Watch_LastSeen_WithinAWeek: String { return self._s[362]! } - public var ContactList_Context_SendMessage: String { return self._s[364]! } - public var Weekday_Tuesday: String { return self._s[365]! } - public var Wallet_Created_Title: String { return self._s[367]! } - public var ScheduledMessages_Delete: String { return self._s[368]! } - public var UserInfo_StartSecretChat: String { return self._s[369]! } - public var Passport_Identity_FilesTitle: String { return self._s[370]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[371]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[373]! } - public var ChatList_UndoArchiveRevealedTitle: String { return self._s[374]! } + public var TwoFactorSetup_Done_Title: String { return self._s[361]! } + public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[362]!, self._r[362]!, [_0]) + } + public var CallFeedback_ReasonDistortedSpeech: String { return self._s[363]! } + public var Watch_LastSeen_WithinAWeek: String { return self._s[364]! } + public var ContactList_Context_SendMessage: String { return self._s[366]! } + public var Weekday_Tuesday: String { return self._s[367]! } + public var Wallet_Created_Title: String { return self._s[369]! } + public var ScheduledMessages_Delete: String { return self._s[370]! } + public var UserInfo_StartSecretChat: String { return self._s[371]! } + public var Passport_Identity_FilesTitle: String { return self._s[372]! } + public var Permissions_NotificationsAllow_v0: String { return self._s[373]! } + public var DialogList_DeleteConversationConfirmation: String { return self._s[375]! } + public var ChatList_UndoArchiveRevealedTitle: String { return self._s[376]! } public func Wallet_Configuration_ApplyErrorTextURLUnreachable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[375]!, self._r[375]!, [_0]) + return formatWithArgumentRanges(self._s[377]!, self._r[377]!, [_0]) } - public var AuthSessions_Sessions: String { return self._s[376]! } + public var AuthSessions_Sessions: String { return self._s[378]! } public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[378]!, self._r[378]!, [_0]) + return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_0]) } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[379]! } - public var Call_StatusWaiting: String { return self._s[380]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[381]! } - public var FastTwoStepSetup_HintHelp: String { return self._s[382]! } - public var WallpaperPreview_CustomColorBottomText: String { return self._s[383]! } - public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[384]! } - public var LogoutOptions_AddAccountText: String { return self._s[385]! } - public var PasscodeSettings_6DigitCode: String { return self._s[386]! } - public var Settings_LogoutConfirmationText: String { return self._s[387]! } - public var Passport_Identity_TypePassport: String { return self._s[389]! } - public var Map_Work: String { return self._s[392]! } + public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[381]! } + public var Call_StatusWaiting: String { return self._s[382]! } + public var CreateGroup_SoftUserLimitAlert: String { return self._s[383]! } + public var FastTwoStepSetup_HintHelp: String { return self._s[384]! } + public var WallpaperPreview_CustomColorBottomText: String { return self._s[385]! } + public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[386]! } + public var LogoutOptions_AddAccountText: String { return self._s[387]! } + public var PasscodeSettings_6DigitCode: String { return self._s[388]! } + public var Settings_LogoutConfirmationText: String { return self._s[389]! } + public var Passport_Identity_TypePassport: String { return self._s[391]! } + public var Map_Work: String { return self._s[394]! } public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[393]!, self._r[393]!, [_1, _2]) + return formatWithArgumentRanges(self._s[395]!, self._r[395]!, [_1, _2]) } - public var SocksProxySetup_SaveProxy: String { return self._s[394]! } - public var AccessDenied_SaveMedia: String { return self._s[395]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[397]! } - public var CreatePoll_MultipleChoice: String { return self._s[398]! } - public var Settings_Title: String { return self._s[400]! } - public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[401]! } - public var Contacts_InviteSearchLabel: String { return self._s[403]! } - public var PrivacySettings_WebSessions: String { return self._s[404]! } - public var ConvertToSupergroup_Title: String { return self._s[405]! } + public var SocksProxySetup_SaveProxy: String { return self._s[396]! } + public var AccessDenied_SaveMedia: String { return self._s[397]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[399]! } + public var CreatePoll_MultipleChoice: String { return self._s[400]! } + public var Settings_Title: String { return self._s[402]! } + public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[403]! } + public var Contacts_InviteSearchLabel: String { return self._s[405]! } + public var PrivacySettings_WebSessions: String { return self._s[406]! } + public var ConvertToSupergroup_Title: String { return self._s[407]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[406]!, self._r[406]!, [_0]) + return formatWithArgumentRanges(self._s[408]!, self._r[408]!, [_0]) } - public var TwoFactorSetup_Hint_Text: String { return self._s[407]! } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[408]! } + public var TwoFactorSetup_Hint_Text: String { return self._s[409]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[410]! } public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[409]!, self._r[409]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[411]!, self._r[411]!, [_1, _2, _3]) } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[410]! } - public var UserInfo_BotHelp: String { return self._s[411]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[412]! } - public var Checkout_Name: String { return self._s[413]! } - public var AutoDownloadSettings_DataUsage: String { return self._s[414]! } - public var Channel_BanUser_BlockFor: String { return self._s[415]! } - public var Checkout_ShippingAddress: String { return self._s[416]! } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[417]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[418]! } - public var Privacy_Forwards: String { return self._s[419]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[420]! } - public var Appearance_ThemeCarouselNewNight: String { return self._s[421]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[412]! } + public var UserInfo_BotHelp: String { return self._s[413]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[414]! } + public var Checkout_Name: String { return self._s[415]! } + public var AutoDownloadSettings_DataUsage: String { return self._s[416]! } + public var Channel_BanUser_BlockFor: String { return self._s[417]! } + public var Checkout_ShippingAddress: String { return self._s[418]! } + public var AutoDownloadSettings_MaxVideoSize: String { return self._s[419]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[420]! } + public var Privacy_Forwards: String { return self._s[421]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[422]! } + public var Appearance_ThemeCarouselNewNight: String { return self._s[423]! } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[424]!, self._r[424]!, [_0]) + return formatWithArgumentRanges(self._s[426]!, self._r[426]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[425]! } - public var Group_OwnershipTransfer_Title: String { return self._s[426]! } - public var VoiceOver_Chat_OpenHint: String { return self._s[428]! } - public var Group_LeaveGroup: String { return self._s[429]! } - public var Settings_UsernameEmpty: String { return self._s[430]! } + public var Contacts_SortedByName: String { return self._s[427]! } + public var Group_OwnershipTransfer_Title: String { return self._s[428]! } + public var VoiceOver_Chat_OpenHint: String { return self._s[430]! } + public var Group_LeaveGroup: String { return self._s[431]! } + public var Settings_UsernameEmpty: String { return self._s[432]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[431]!, self._r[431]!, [_0]) + return formatWithArgumentRanges(self._s[433]!, self._r[433]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[432]!, self._r[432]!, [_1]) + return formatWithArgumentRanges(self._s[434]!, self._r[434]!, [_1]) } public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[433]!, self._r[433]!, [_1, _2]) + return formatWithArgumentRanges(self._s[435]!, self._r[435]!, [_1, _2]) } - public var Message_ImageExpired: String { return self._s[434]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[436]! } - public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[437]! } - public var UserInfo_AddToExisting: String { return self._s[438]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[439]! } - public var Wallet_Send_SyncInProgress: String { return self._s[440]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[441]! } + public var Message_ImageExpired: String { return self._s[436]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[438]! } + public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[439]! } + public var UserInfo_AddToExisting: String { return self._s[440]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[441]! } + public var Wallet_Send_SyncInProgress: String { return self._s[442]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[443]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[442]!, self._r[442]!, [_1]) + return formatWithArgumentRanges(self._s[444]!, self._r[444]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[443]! } - public var Passport_Language_km: String { return self._s[444]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[446]! } - public var VoiceOver_Media_PlaybackPlay: String { return self._s[447]! } - public var Notification_CallMissedShort: String { return self._s[448]! } - public var Wallet_Info_YourBalance: String { return self._s[449]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[451]! } - public var Watch_Compose_Send: String { return self._s[452]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[455]! } - public var TwoFactorSetup_Email_Action: String { return self._s[456]! } - public var Conversation_HoldForVideo: String { return self._s[457]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[458]! } - public var AuthSessions_OtherDevices: String { return self._s[459]! } - public var Wallet_TransactionInfo_CommentHeader: String { return self._s[460]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[462]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[464]! } - public var Channel_LinkItem: String { return self._s[465]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[445]! } + public var Passport_Language_km: String { return self._s[446]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[448]! } + public var VoiceOver_Media_PlaybackPlay: String { return self._s[449]! } + public var Notification_CallMissedShort: String { return self._s[450]! } + public var Wallet_Info_YourBalance: String { return self._s[451]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[453]! } + public var Watch_Compose_Send: String { return self._s[454]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[457]! } + public var TwoFactorSetup_Email_Action: String { return self._s[458]! } + public var Conversation_HoldForVideo: String { return self._s[459]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[460]! } + public var AuthSessions_OtherDevices: String { return self._s[461]! } + public var Wallet_TransactionInfo_CommentHeader: String { return self._s[462]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[464]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[466]! } + public var Channel_LinkItem: String { return self._s[467]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[466]!, self._r[466]!, [_0, _1]) + return formatWithArgumentRanges(self._s[468]!, self._r[468]!, [_0, _1]) } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[469]!, self._r[469]!, [_0]) + return formatWithArgumentRanges(self._s[471]!, self._r[471]!, [_0]) } - public var VoiceOver_Recording_StopAndPreview: String { return self._s[470]! } - public var Passport_Language_dv: String { return self._s[471]! } - public var Undo_LeftChannel: String { return self._s[472]! } - public var Notifications_ExceptionsMuted: String { return self._s[473]! } - public var ChatList_UnhideAction: String { return self._s[474]! } - public var Conversation_ContextMenuShare: String { return self._s[475]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[476]! } - public var ShareFileTip_Title: String { return self._s[477]! } - public var NotificationsSound_Chord: String { return self._s[478]! } - public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[479]! } + public var VoiceOver_Recording_StopAndPreview: String { return self._s[472]! } + public var Passport_Language_dv: String { return self._s[473]! } + public var Undo_LeftChannel: String { return self._s[474]! } + public var Notifications_ExceptionsMuted: String { return self._s[475]! } + public var ChatList_UnhideAction: String { return self._s[476]! } + public var Conversation_ContextMenuShare: String { return self._s[477]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[478]! } + public var ShareFileTip_Title: String { return self._s[479]! } + public var NotificationsSound_Chord: String { return self._s[480]! } + public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[481]! } public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[480]!, self._r[480]!, [_1, _2]) + return formatWithArgumentRanges(self._s[482]!, self._r[482]!, [_1, _2]) } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[481]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[483]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[482]!, self._r[482]!, [_0]) + return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_0]) } public func Wallet_Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[483]!, self._r[483]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[485]!, self._r[485]!, [_1, _2, _3]) } - public var Wallet_Settings_ConfigurationInfo: String { return self._s[484]! } - public var Wallpaper_ErrorNotFound: String { return self._s[485]! } - public var Notification_CallOutgoingShort: String { return self._s[487]! } - public var Wallet_WordImport_IncorrectText: String { return self._s[488]! } + public var Wallet_Settings_ConfigurationInfo: String { return self._s[486]! } + public var Wallpaper_ErrorNotFound: String { return self._s[487]! } + public var Notification_CallOutgoingShort: String { return self._s[489]! } + public var Wallet_WordImport_IncorrectText: String { return self._s[490]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[489]!, self._r[489]!, [_1, _2]) + return formatWithArgumentRanges(self._s[491]!, self._r[491]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[490]! } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[491]! } - public var ReportPeer_Report: String { return self._s[492]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[493]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[494]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[492]! } + public var Privacy_Forwards_LinkIfAllowed: String { return self._s[493]! } + public var ReportPeer_Report: String { return self._s[494]! } + public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[495]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[496]! } public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[495]!, self._r[495]!, [_1, _2]) + return formatWithArgumentRanges(self._s[497]!, self._r[497]!, [_1, _2]) } - public var StickerPack_Send: String { return self._s[496]! } - public var Login_CodeSentInternal: String { return self._s[497]! } - public var Wallet_Month_GenJanuary: String { return self._s[498]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[499]! } + public var StickerPack_Send: String { return self._s[498]! } + public var Login_CodeSentInternal: String { return self._s[499]! } + public var Wallet_Month_GenJanuary: String { return self._s[500]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[501]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[500]!, self._r[500]!, [_0]) - } - public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[502]!, self._r[502]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[503]! } - public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[504]!, self._r[504]!, [_1]) + public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[504]!, self._r[504]!, [_0]) } - public var ReportPeer_ReasonViolence: String { return self._s[506]! } - public var Appearance_ShareThemeColor: String { return self._s[507]! } - public var Map_Locating: String { return self._s[508]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[505]! } + public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[506]!, self._r[506]!, [_1]) + } + public var ReportPeer_ReasonViolence: String { return self._s[508]! } + public var Appearance_ShareThemeColor: String { return self._s[509]! } + public var Map_Locating: String { return self._s[510]! } public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[509]!, self._r[509]!, [_0]) + return formatWithArgumentRanges(self._s[511]!, self._r[511]!, [_0]) } public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[510]!, self._r[510]!, [_1]) + return formatWithArgumentRanges(self._s[512]!, self._r[512]!, [_1]) } - public var AutoDownloadSettings_GroupChats: String { return self._s[512]! } - public var CheckoutInfo_SaveInfo: String { return self._s[513]! } - public var SharedMedia_EmptyLinksText: String { return self._s[515]! } - public var Passport_Address_CityPlaceholder: String { return self._s[516]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[517]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[518]! } - public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[520]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[521]! } + public var AutoDownloadSettings_GroupChats: String { return self._s[514]! } + public var CheckoutInfo_SaveInfo: String { return self._s[515]! } + public var SharedMedia_EmptyLinksText: String { return self._s[517]! } + public var Passport_Address_CityPlaceholder: String { return self._s[518]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[519]! } + public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[520]! } + public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[522]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[523]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[522]!, self._r[522]!, [_1]) + return formatWithArgumentRanges(self._s[524]!, self._r[524]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[523]!, self._r[523]!, [_0]) + return formatWithArgumentRanges(self._s[525]!, self._r[525]!, [_0]) } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[524]! } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[525]! } - public var ChangePhoneNumberCode_Code: String { return self._s[526]! } - public var Appearance_CreateTheme: String { return self._s[527]! } + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[526]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[527]! } + public var ChangePhoneNumberCode_Code: String { return self._s[528]! } + public var Appearance_CreateTheme: String { return self._s[529]! } public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[528]!, self._r[528]!, [_0]) + return formatWithArgumentRanges(self._s[530]!, self._r[530]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[529]! } - public var HashtagSearch_AllChats: String { return self._s[530]! } - public var MediaPlayer_UnknownTrack: String { return self._s[531]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[533]! } + public var TwoStepAuth_SetupEmail: String { return self._s[531]! } + public var HashtagSearch_AllChats: String { return self._s[532]! } + public var MediaPlayer_UnknownTrack: String { return self._s[533]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[535]! } public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[534]!, self._r[534]!, [_0]) + return formatWithArgumentRanges(self._s[536]!, self._r[536]!, [_0]) } - public var PhotoEditor_QualityHigh: String { return self._s[536]! } + public var PhotoEditor_QualityHigh: String { return self._s[538]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[537]!, self._r[537]!, [_0]) + return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[538]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[539]! } - public var Message_LiveLocation: String { return self._s[540]! } - public var Cache_LowDiskSpaceText: String { return self._s[541]! } - public var Wallet_Receive_ShareAddress: String { return self._s[542]! } - public var EditTheme_ErrorLinkTaken: String { return self._s[543]! } - public var Conversation_SendMessage: String { return self._s[544]! } - public var AuthSessions_EmptyTitle: String { return self._s[545]! } - public var Privacy_PhoneNumber: String { return self._s[546]! } - public var PeopleNearby_CreateGroup: String { return self._s[547]! } - public var CallSettings_UseLessData: String { return self._s[549]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[550]! } - public var Stickers_AddToFavorites: String { return self._s[551]! } - public var Wallet_WordImport_Title: String { return self._s[552]! } - public var PhotoEditor_QualityLow: String { return self._s[553]! } - public var Watch_UserInfo_Unblock: String { return self._s[554]! } - public var Settings_Logout: String { return self._s[555]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[540]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[541]! } + public var Message_LiveLocation: String { return self._s[542]! } + public var Cache_LowDiskSpaceText: String { return self._s[543]! } + public var Wallet_Receive_ShareAddress: String { return self._s[544]! } + public var EditTheme_ErrorLinkTaken: String { return self._s[545]! } + public var Conversation_SendMessage: String { return self._s[546]! } + public var AuthSessions_EmptyTitle: String { return self._s[547]! } + public var Privacy_PhoneNumber: String { return self._s[548]! } + public var PeopleNearby_CreateGroup: String { return self._s[549]! } + public var CallSettings_UseLessData: String { return self._s[551]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[552]! } + public var Stickers_AddToFavorites: String { return self._s[553]! } + public var Wallet_WordImport_Title: String { return self._s[554]! } + public var PhotoEditor_QualityLow: String { return self._s[555]! } + public var Watch_UserInfo_Unblock: String { return self._s[556]! } + public var Settings_Logout: String { return self._s[557]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_1]) + return formatWithArgumentRanges(self._s[558]!, self._r[558]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[557]! } - public var ChannelInfo_Stats: String { return self._s[558]! } - public var TextFormat_Link: String { return self._s[559]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[559]! } + public var ChannelInfo_Stats: String { return self._s[560]! } + public var TextFormat_Link: String { return self._s[561]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[560]!, self._r[560]!, [_1, _2]) + return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_1, _2]) } - public var Wallet_TransactionInfo_Title: String { return self._s[561]! } + public var Wallet_TransactionInfo_Title: String { return self._s[563]! } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_0]) + return formatWithArgumentRanges(self._s[564]!, self._r[564]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[563]! } - public var Group_Setup_TypePublicHelp: String { return self._s[564]! } - public var Passport_Scans_UploadNew: String { return self._s[565]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[566]! } - public var DialogList_Title: String { return self._s[569]! } - public var NotificationSettings_ContactJoined: String { return self._s[570]! } - public var GroupInfo_LabelAdmin: String { return self._s[571]! } - public var KeyCommand_ChatInfo: String { return self._s[572]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[573]! } - public var Call_ReportIncludeLog: String { return self._s[574]! } + public var Watch_Notification_Joined: String { return self._s[565]! } + public var Group_Setup_TypePublicHelp: String { return self._s[566]! } + public var Passport_Scans_UploadNew: String { return self._s[567]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[568]! } + public var DialogList_Title: String { return self._s[571]! } + public var NotificationSettings_ContactJoined: String { return self._s[572]! } + public var GroupInfo_LabelAdmin: String { return self._s[573]! } + public var KeyCommand_ChatInfo: String { return self._s[574]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[575]! } + public var Call_ReportIncludeLog: String { return self._s[576]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[577]!, self._r[577]!, [_0]) + return formatWithArgumentRanges(self._s[579]!, self._r[579]!, [_0]) } - public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[578]! } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[579]! } - public var LocalGroup_IrrelevantWarning: String { return self._s[580]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[581]! } - public var Message_Sticker: String { return self._s[582]! } - public var LastSeen_JustNow: String { return self._s[584]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[586]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[587]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[588]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[589]! } - public var TwoStepAuth_Email: String { return self._s[590]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[591]! } - public var PhotoEditor_BlurToolOff: String { return self._s[592]! } - public var Message_PinnedStickerMessage: String { return self._s[593]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[594]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[595]! } - public var Passport_DiscardMessageTitle: String { return self._s[596]! } - public var Privacy_PaymentsTitle: String { return self._s[597]! } - public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[598]! } - public var ClearCache_StorageCache: String { return self._s[599]! } - public var Appearance_TextSizeSetting: String { return self._s[600]! } - public var Channel_DiscussionGroup_Header: String { return self._s[602]! } - public var VoiceOver_Chat_OptionSelected: String { return self._s[603]! } - public var Appearance_ColorTheme: String { return self._s[604]! } - public var UserInfo_ShareContact: String { return self._s[605]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[606]! } - public var Common_More: String { return self._s[607]! } - public var Watch_Message_Call: String { return self._s[608]! } - public var Profile_EncryptionKey: String { return self._s[611]! } - public var Privacy_TopPeers: String { return self._s[612]! } - public var Conversation_StopPollConfirmation: String { return self._s[613]! } - public var Wallet_Words_NotDoneText: String { return self._s[615]! } - public var Privacy_TopPeersWarning: String { return self._s[617]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[618]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[619]! } - public var Wallet_RestoreFailed_EnterWords: String { return self._s[622]! } - public var DialogList_SearchSectionMessages: String { return self._s[623]! } - public var Notifications_ChannelNotifications: String { return self._s[624]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[625]! } - public var Passport_Language_sk: String { return self._s[626]! } - public var Notification_MessageLifetime1h: String { return self._s[627]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[628]! } - public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[629]! } - public var Call_ReportSkip: String { return self._s[631]! } - public var Cache_ServiceFiles: String { return self._s[632]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[633]! } - public var VoiceOver_Chat_YourFile: String { return self._s[634]! } - public var Map_Hybrid: String { return self._s[635]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[637]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[639]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[640]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[641]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[644]! } + public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[580]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[581]! } + public var LocalGroup_IrrelevantWarning: String { return self._s[582]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[583]! } + public var Message_Sticker: String { return self._s[584]! } + public var LastSeen_JustNow: String { return self._s[586]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[588]! } + public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[589]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[590]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[591]! } + public var TwoStepAuth_Email: String { return self._s[592]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[593]! } + public var PhotoEditor_BlurToolOff: String { return self._s[594]! } + public var Message_PinnedStickerMessage: String { return self._s[595]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[596]! } + public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[597]! } + public var Passport_DiscardMessageTitle: String { return self._s[598]! } + public var Privacy_PaymentsTitle: String { return self._s[599]! } + public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[600]! } + public var ClearCache_StorageCache: String { return self._s[601]! } + public var Appearance_TextSizeSetting: String { return self._s[602]! } + public var Channel_DiscussionGroup_Header: String { return self._s[604]! } + public var VoiceOver_Chat_OptionSelected: String { return self._s[605]! } + public var Appearance_ColorTheme: String { return self._s[606]! } + public var UserInfo_ShareContact: String { return self._s[607]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[608]! } + public var Common_More: String { return self._s[609]! } + public var Watch_Message_Call: String { return self._s[610]! } + public var Profile_EncryptionKey: String { return self._s[613]! } + public var Privacy_TopPeers: String { return self._s[614]! } + public var Conversation_StopPollConfirmation: String { return self._s[615]! } + public var Wallet_Words_NotDoneText: String { return self._s[617]! } + public var Privacy_TopPeersWarning: String { return self._s[619]! } + public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[620]! } + public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[621]! } + public var Wallet_RestoreFailed_EnterWords: String { return self._s[624]! } + public var DialogList_SearchSectionMessages: String { return self._s[625]! } + public var Notifications_ChannelNotifications: String { return self._s[626]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[627]! } + public var Passport_Language_sk: String { return self._s[628]! } + public var Notification_MessageLifetime1h: String { return self._s[629]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[630]! } + public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[631]! } + public var Call_ReportSkip: String { return self._s[633]! } + public var Cache_ServiceFiles: String { return self._s[634]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[635]! } + public var VoiceOver_Chat_YourFile: String { return self._s[636]! } + public var Map_Hybrid: String { return self._s[637]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[639]! } + public func PUSH_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[640]!, self._r[640]!, [_1]) + } + public var ChatSettings_AutoDownloadVideos: String { return self._s[642]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[643]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[644]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[647]! } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[645]!, self._r[645]!, [_1]) + return formatWithArgumentRanges(self._s[648]!, self._r[648]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[647]! } - public var ScheduledMessages_ScheduledToday: String { return self._s[648]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[650]! } + public var ScheduledMessages_ScheduledToday: String { return self._s[651]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[649]!, self._r[649]!, [_1, _2]) + return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_1, _2]) } - public var Conversation_LiveLocationYou: String { return self._s[650]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[651]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[652]! } - public var UserInfo_ShareBot: String { return self._s[655]! } + public var Conversation_LiveLocationYou: String { return self._s[653]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[654]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[655]! } + public var UserInfo_ShareBot: String { return self._s[658]! } public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[656]!, self._r[656]!, [_1, _2]) + return formatWithArgumentRanges(self._s[659]!, self._r[659]!, [_1, _2]) } - public var Conversation_ClearCache: String { return self._s[657]! } - public var PhotoEditor_ShadowsTint: String { return self._s[658]! } - public var Message_Audio: String { return self._s[659]! } - public var Passport_Language_lt: String { return self._s[660]! } + public var Conversation_ClearCache: String { return self._s[660]! } + public var PhotoEditor_ShadowsTint: String { return self._s[661]! } + public var Message_Audio: String { return self._s[662]! } + public var Passport_Language_lt: String { return self._s[663]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[661]!, self._r[661]!, [_0]) + return formatWithArgumentRanges(self._s[664]!, self._r[664]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[662]! } - public var Conversation_FileICloudDrive: String { return self._s[663]! } - public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[664]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[665]! } + public var Permissions_SiriText_v0: String { return self._s[665]! } + public var Conversation_FileICloudDrive: String { return self._s[666]! } + public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[667]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[668]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[666]!, self._r[666]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[669]!, self._r[669]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[667]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[670]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[668]!, self._r[668]!, [_0]) + return formatWithArgumentRanges(self._s[671]!, self._r[671]!, [_0]) } - public var Channel_SignMessages: String { return self._s[669]! } + public var Channel_SignMessages: String { return self._s[672]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[670]!, self._r[670]!, [_1]) + return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[671]! } - public var Passport_ScanPassport: String { return self._s[672]! } - public var Watch_Suggestion_Thanks: String { return self._s[673]! } - public var BlockedUsers_AddNew: String { return self._s[674]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[674]! } + public var Passport_ScanPassport: String { return self._s[675]! } + public var Watch_Suggestion_Thanks: String { return self._s[676]! } + public var BlockedUsers_AddNew: String { return self._s[677]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[675]!, self._r[675]!, [_1, _2]) + return formatWithArgumentRanges(self._s[678]!, self._r[678]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[676]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[677]! } - public var Month_GenJuly: String { return self._s[678]! } - public var CreatePoll_QuizInfo: String { return self._s[679]! } - public var UserInfo_StartSecretChatStart: String { return self._s[680]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[681]! } - public var IntentsSettings_SuggestByShare: String { return self._s[683]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[684]! } - public var Notification_ChannelInviterSelf: String { return self._s[685]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[686]! } + public var Watch_Message_Invoice: String { return self._s[679]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[680]! } + public var Month_GenJuly: String { return self._s[681]! } + public var CreatePoll_QuizInfo: String { return self._s[682]! } + public var UserInfo_StartSecretChatStart: String { return self._s[683]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[684]! } + public var IntentsSettings_SuggestByShare: String { return self._s[686]! } + public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[687]! } + public var Notification_ChannelInviterSelf: String { return self._s[688]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[689]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[687]!, self._r[687]!, [_1, _2]) + return formatWithArgumentRanges(self._s[690]!, self._r[690]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[688]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[689]! } + public var CheckoutInfo_Title: String { return self._s[691]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[692]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[690]!, self._r[690]!, [_0]) + return formatWithArgumentRanges(self._s[693]!, self._r[693]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[691]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[692]! } - public var Passport_Language_de: String { return self._s[693]! } - public var Update_Title: String { return self._s[694]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[695]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[696]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[697]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[698]! } - public var NotificationsSound_Telegraph: String { return self._s[699]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[700]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[701]! } + public var Passport_Identity_MainPage: String { return self._s[694]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[695]! } + public var Passport_Language_de: String { return self._s[696]! } + public var Update_Title: String { return self._s[697]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[698]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[699]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[700]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[701]! } + public var NotificationsSound_Telegraph: String { return self._s[702]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[703]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[704]! } public func AutoDownloadSettings_UpTo(_ _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 ClearCache_Description: String { return self._s[703]! } - public var Stickers_SuggestAll: String { return self._s[704]! } - public var Conversation_ForwardTitle: String { return self._s[705]! } - public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[706]! } + public var ClearCache_Description: String { return self._s[706]! } + public var Stickers_SuggestAll: String { return self._s[707]! } + public var Conversation_ForwardTitle: String { return self._s[708]! } + public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[709]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[707]!, self._r[707]!, [_0]) + return formatWithArgumentRanges(self._s[710]!, self._r[710]!, [_0]) } - public var Calls_NewCall: String { return self._s[708]! } - public var Call_StatusEnded: String { return self._s[709]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[710]! } - public var Settings_ProxyConnected: String { return self._s[711]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[712]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[713]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[714]! } - public var Passport_PasswordPlaceholder: String { return self._s[715]! } - public var Message_PinnedInvoice: String { return self._s[716]! } - public var Passport_Identity_IssueDate: String { return self._s[717]! } - public var Passport_Language_pl: String { return self._s[718]! } + public var Calls_NewCall: String { return self._s[711]! } + public var Call_StatusEnded: String { return self._s[712]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[713]! } + public var Settings_ProxyConnected: String { return self._s[714]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[715]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[716]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[717]! } + public var Passport_PasswordPlaceholder: String { return self._s[718]! } + public var Message_PinnedInvoice: String { return self._s[719]! } + public var Passport_Identity_IssueDate: String { return self._s[720]! } + public var Passport_Language_pl: String { return self._s[721]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[719]!, self._r[719]!, [_0]) - } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[720]! } - public var Call_StatusConnecting: String { return self._s[721]! } - public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[722]!, self._r[722]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[724]! } - public var Common_Edit: String { return self._s[725]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[726]! } + public var Call_StatusConnecting: String { return self._s[723]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[724]! } + public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[725]!, self._r[725]!, [_0]) + } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[727]! } + public var Common_Edit: String { return self._s[728]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[729]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[727]!, self._r[727]!, [_0]) + return formatWithArgumentRanges(self._s[730]!, self._r[730]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[728]! } - public var PrivateDataSettings_Title: String { return self._s[729]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[730]! } - public var ChatList_Read: String { return self._s[731]! } - public var Wallet_WordImport_Text: String { return self._s[732]! } - public var Undo_ChatClearedForBothSides: String { return self._s[733]! } - public var GroupPermission_SectionTitle: String { return self._s[734]! } - public var TwoFactorSetup_Intro_Title: String { return self._s[736]! } + public var GroupInfo_ChatAdmins: String { return self._s[731]! } + public var PrivateDataSettings_Title: String { return self._s[732]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[733]! } + public var ChatList_Read: String { return self._s[734]! } + public var Wallet_WordImport_Text: String { return self._s[735]! } + public var Undo_ChatClearedForBothSides: String { return self._s[736]! } + public var GroupPermission_SectionTitle: String { return self._s[737]! } + public var TwoFactorSetup_Intro_Title: String { return self._s[739]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[737]!, self._r[737]!, [_1, _2]) + return formatWithArgumentRanges(self._s[740]!, self._r[740]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[738]! } - public var Update_UpdateApp: String { return self._s[739]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[740]! } - public var Settings_Appearance: String { return self._s[741]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[745]! } - public var Watch_Location_Access: String { return self._s[746]! } - public var ShareMenu_CopyShareLink: String { return self._s[748]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[749]! } - public var Conversation_Theme: String { return self._s[751]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[741]! } + public var Update_UpdateApp: String { return self._s[742]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[743]! } + public var Settings_Appearance: String { return self._s[744]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[748]! } + public var Watch_Location_Access: String { return self._s[749]! } + public var ShareMenu_CopyShareLink: String { return self._s[751]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[752]! } + public var Conversation_Theme: String { return self._s[754]! } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[752]!, self._r[752]!, [_0]) + return formatWithArgumentRanges(self._s[755]!, self._r[755]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[753]! } - public var Weekday_ShortWednesday: String { return self._s[754]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[755]! } - public var Undo_LeftGroup: String { return self._s[758]! } - public var Wallet_RestoreFailed_Text: String { return self._s[759]! } - public var Conversation_LinkDialogCopy: String { return self._s[760]! } - public var Wallet_TransactionInfo_NoAddress: String { return self._s[762]! } - public var Wallet_Navigation_Back: String { return self._s[763]! } - public var KeyCommand_FocusOnInputField: String { return self._s[764]! } - public var Contacts_SelectAll: String { return self._s[765]! } - public var Preview_SaveToCameraRoll: String { return self._s[766]! } - public var PrivacySettings_PasscodeOff: String { return self._s[767]! } - public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[768]! } - public var Wallpaper_Title: String { return self._s[769]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[770]! } - public var AccessDenied_Camera: String { return self._s[771]! } - public var Watch_Compose_CurrentLocation: String { return self._s[772]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[774]! } + public var Notifications_ClassicTones: String { return self._s[756]! } + public var Weekday_ShortWednesday: String { return self._s[757]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[758]! } + public var Undo_LeftGroup: String { return self._s[761]! } + public var Wallet_RestoreFailed_Text: String { return self._s[762]! } + public var Conversation_LinkDialogCopy: String { return self._s[763]! } + public var Wallet_TransactionInfo_NoAddress: String { return self._s[765]! } + public var Wallet_Navigation_Back: String { return self._s[766]! } + public var KeyCommand_FocusOnInputField: String { return self._s[767]! } + public var Contacts_SelectAll: String { return self._s[768]! } + public var Preview_SaveToCameraRoll: String { return self._s[769]! } + public var PrivacySettings_PasscodeOff: String { return self._s[770]! } + public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[771]! } + public func PUSH_CHANNEL_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[772]!, self._r[772]!, [_1]) + } + public var Wallpaper_Title: String { return self._s[773]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[774]! } + public var AccessDenied_Camera: String { return self._s[775]! } + public var Watch_Compose_CurrentLocation: String { return self._s[776]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[778]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[775]!, self._r[775]!, [_0]) + return formatWithArgumentRanges(self._s[779]!, self._r[779]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[776]! } - public var Passport_Language_ro: String { return self._s[777]! } - public var EditTheme_UploadNewTheme: String { return self._s[778]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[779]! } - public var Wallet_Intro_Terms: String { return self._s[780]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[780]! } + public var Passport_Language_ro: String { return self._s[781]! } + public var EditTheme_UploadNewTheme: String { return self._s[782]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[783]! } + public var Wallet_Intro_Terms: String { return self._s[784]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[781]!, self._r[781]!, [_0]) + return formatWithArgumentRanges(self._s[785]!, self._r[785]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[782]! } - public var State_ConnectingToProxy: String { return self._s[783]! } - public var Calls_RatingTitle: String { return self._s[784]! } - public var Generic_ErrorMoreInfo: String { return self._s[785]! } - public var ChatList_Search_ShowMore: String { return self._s[786]! } - public var Appearance_PreviewReplyText: String { return self._s[787]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[788]! } + public var Login_CancelPhoneVerification: String { return self._s[786]! } + public var State_ConnectingToProxy: String { return self._s[787]! } + public var Calls_RatingTitle: String { return self._s[788]! } + public var Generic_ErrorMoreInfo: String { return self._s[789]! } + public var ChatList_Search_ShowMore: String { return self._s[790]! } + public var Appearance_PreviewReplyText: String { return self._s[791]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[792]! } public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[789]!, self._r[789]!, [_0]) + return formatWithArgumentRanges(self._s[793]!, self._r[793]!, [_0]) } - public var IntentsSettings_SuggestedChatsContacts: String { return self._s[790]! } - public var SharedMedia_CategoryLinks: String { return self._s[791]! } - public var Calls_Missed: String { return self._s[792]! } - public var Cache_Photos: String { return self._s[796]! } - public var GroupPermission_NoAddMembers: String { return self._s[797]! } - public var ScheduledMessages_Title: String { return self._s[798]! } + public var IntentsSettings_SuggestedChatsContacts: String { return self._s[794]! } + public var SharedMedia_CategoryLinks: String { return self._s[795]! } + public var Calls_Missed: String { return self._s[796]! } + public var Cache_Photos: String { return self._s[800]! } + public var GroupPermission_NoAddMembers: String { return self._s[801]! } + public var ScheduledMessages_Title: String { return self._s[802]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[799]!, self._r[799]!, [_0]) - } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[800]! } - public var Settings_ProxyDisabled: String { return self._s[801]! } - public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[802]!, self._r[802]!, [_1, _2, _3, _4]) - } - public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[803]!, self._r[803]!, [_0]) } - public var ChatList_Context_RemoveFromRecents: String { return self._s[805]! } - public var Appearance_Title: String { return self._s[806]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[804]! } + public var Settings_ProxyDisabled: String { return self._s[805]! } + public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[806]!, self._r[806]!, [_1, _2, _3, _4]) + } + public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[807]!, self._r[807]!, [_0]) + } + public var ChatList_Context_RemoveFromRecents: String { return self._s[809]! } + public var Appearance_Title: String { return self._s[810]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[808]!, self._r[808]!, [_0]) + return formatWithArgumentRanges(self._s[812]!, self._r[812]!, [_0]) } - public var Conversation_WalletRequiredText: String { return self._s[809]! } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[810]! } - public var OldChannels_NoticeCreateText: String { return self._s[811]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[812]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[813]! } - public var Preview_DeletePhoto: String { return self._s[814]! } - public var Appearance_AppIconFilledX: String { return self._s[815]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[816]! } + public var Conversation_WalletRequiredText: String { return self._s[813]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[814]! } + public var OldChannels_NoticeCreateText: String { return self._s[815]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[816]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[817]! } + public var Preview_DeletePhoto: String { return self._s[818]! } + public var Appearance_AppIconFilledX: String { return self._s[819]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[820]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[817]!, self._r[817]!, [_0]) + return formatWithArgumentRanges(self._s[821]!, self._r[821]!, [_0]) } - public var Coub_TapForSound: String { return self._s[820]! } - public var Map_LocatingError: String { return self._s[821]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[823]! } - public var Conversation_SendMessage_SendSilently: String { return self._s[824]! } - public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[825]! } + public var Coub_TapForSound: String { return self._s[824]! } + public var Map_LocatingError: String { return self._s[825]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[827]! } + public var Conversation_SendMessage_SendSilently: String { return self._s[828]! } + public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[829]! } public func Wallet_Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[826]!, self._r[826]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[830]!, self._r[830]!, [_1, _2, _3]) } - public var Passport_ForgottenPassword: String { return self._s[827]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[828]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[829]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[831]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[832]! } - public var Message_Location: String { return self._s[833]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[834]! } - public var Channel_Management_Title: String { return self._s[835]! } - public var DialogList_SearchSectionDialogs: String { return self._s[837]! } - public var Compose_NewChannel_Members: String { return self._s[838]! } + public var Passport_ForgottenPassword: String { return self._s[831]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[832]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[833]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[835]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[836]! } + public var Message_Location: String { return self._s[837]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[838]! } + public var Channel_Management_Title: String { return self._s[839]! } + public var DialogList_SearchSectionDialogs: String { return self._s[841]! } + public var Compose_NewChannel_Members: String { return self._s[842]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[839]!, self._r[839]!, [_0]) + return formatWithArgumentRanges(self._s[843]!, self._r[843]!, [_0]) } - public var GroupInfo_Location: String { return self._s[840]! } - public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[841]! } - public var ClearCache_Clear: String { return self._s[842]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[843]! } - public var PhotoEditor_WarmthTool: String { return self._s[844]! } - public var Passport_Language_tr: String { return self._s[845]! } + public var GroupInfo_Location: String { return self._s[844]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[845]! } + public var ClearCache_Clear: String { return self._s[846]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[847]! } + public var PhotoEditor_WarmthTool: String { return self._s[848]! } + public var Passport_Language_tr: String { return self._s[849]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[846]!, self._r[846]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[850]!, self._r[850]!, [_1, _2, _3]) } - public var OldChannels_NoticeUpgradeText: String { return self._s[847]! } - public var Login_ResetAccountProtected_Reset: String { return self._s[849]! } - public var Watch_PhotoView_Title: String { return self._s[850]! } - public var Passport_Phone_Delete: String { return self._s[851]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[852]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[853]! } - public var GroupInfo_Permissions: String { return self._s[854]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[855]! } - public var Profile_ShareContactButton: String { return self._s[856]! } - public var ChatSettings_Other: String { return self._s[857]! } - public var UserInfo_NotificationsDisabled: String { return self._s[858]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[859]! } - public var LastSeen_WithinAMonth: String { return self._s[860]! } - public var VoiceOver_Chat_PlayHint: String { return self._s[861]! } - public var Conversation_ReportGroupLocation: String { return self._s[862]! } - public var Conversation_EncryptionCanceled: String { return self._s[863]! } - public var MediaPicker_GroupDescription: String { return self._s[864]! } - public var WebSearch_Images: String { return self._s[865]! } + public var OldChannels_NoticeUpgradeText: String { return self._s[851]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[853]! } + public var Watch_PhotoView_Title: String { return self._s[854]! } + public var Passport_Phone_Delete: String { return self._s[855]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[856]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[857]! } + public var GroupInfo_Permissions: String { return self._s[858]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[859]! } + public var Profile_ShareContactButton: String { return self._s[860]! } + public var ChatSettings_Other: String { return self._s[861]! } + public var UserInfo_NotificationsDisabled: String { return self._s[862]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[863]! } + public var LastSeen_WithinAMonth: String { return self._s[864]! } + public var VoiceOver_Chat_PlayHint: String { return self._s[865]! } + public var Conversation_ReportGroupLocation: String { return self._s[866]! } + public var Conversation_EncryptionCanceled: String { return self._s[867]! } + public var MediaPicker_GroupDescription: String { return self._s[868]! } + public var WebSearch_Images: String { return self._s[869]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[866]!, self._r[866]!, [_0]) + return formatWithArgumentRanges(self._s[870]!, self._r[870]!, [_0]) } - public var Message_Photo: String { return self._s[867]! } - public var PasscodeSettings_HelpBottom: String { return self._s[868]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[869]! } - public var VoiceOver_Media_PlaybackRateChange: String { return self._s[870]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[871]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[872]! } - public var NotificationsSound_Calypso: String { return self._s[873]! } - public var Map_Map: String { return self._s[874]! } + public var Message_Photo: String { return self._s[871]! } + public var PasscodeSettings_HelpBottom: String { return self._s[872]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[873]! } + public var VoiceOver_Media_PlaybackRateChange: String { return self._s[874]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[875]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[876]! } + public var NotificationsSound_Calypso: String { return self._s[877]! } + public var Map_Map: String { return self._s[878]! } public func Conversation_LiveLocationYouAndOther(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[875]!, self._r[875]!, [_0]) - } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[877]! } - public var ChatSettings_TextSizeUnits: String { return self._s[878]! } - public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[879]!, self._r[879]!, [_0]) } - public var Common_of: String { return self._s[880]! } - public var Conversation_ForwardContacts: String { return self._s[883]! } - public var IntentsSettings_SuggestByAll: String { return self._s[885]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[881]! } + public var ChatSettings_TextSizeUnits: String { return self._s[882]! } + public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[883]!, self._r[883]!, [_0]) + } + public var Common_of: String { return self._s[884]! } + public var Conversation_ForwardContacts: String { return self._s[887]! } + public var IntentsSettings_SuggestByAll: String { return self._s[889]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[886]!, self._r[886]!, [_0]) + return formatWithArgumentRanges(self._s[890]!, self._r[890]!, [_0]) } - public var Passport_Language_hy: String { return self._s[887]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[888]! } - public var AutoDownloadSettings_Reset: String { return self._s[889]! } - public var Wallet_TransactionInfo_AddressCopied: String { return self._s[890]! } - public var Paint_ClearConfirm: String { return self._s[891]! } - public var Camera_VideoMode: String { return self._s[892]! } + public var Passport_Language_hy: String { return self._s[891]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[892]! } + public var AutoDownloadSettings_Reset: String { return self._s[893]! } + public var Wallet_TransactionInfo_AddressCopied: String { return self._s[894]! } + public var Paint_ClearConfirm: String { return self._s[895]! } + public var Camera_VideoMode: String { return self._s[896]! } public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[893]!, self._r[893]!, [_0]) + return formatWithArgumentRanges(self._s[897]!, self._r[897]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[894]! } - public var Conversation_ViewBackground: String { return self._s[895]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[898]! } + public var Conversation_ViewBackground: String { return self._s[899]! } public func Wallet_Info_TransactionDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[896]!, self._r[896]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[900]!, self._r[900]!, [_1, _2, _3]) } - public var Passport_Language_el: String { return self._s[897]! } - public var PhotoEditor_Original: String { return self._s[898]! } - public var Settings_FAQ_Button: String { return self._s[900]! } - public var Channel_Setup_PublicNoLink: String { return self._s[902]! } - public var Conversation_UnsupportedMedia: String { return self._s[903]! } - public var Conversation_SlideToCancel: String { return self._s[904]! } - public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[905]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[906]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[907]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[908]! } - public var AutoNightTheme_NotAvailable: String { return self._s[909]! } - public var Conversation_Owner: String { return self._s[910]! } - public var Common_Create: String { return self._s[911]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[912]! } - public var ContactList_Context_Call: String { return self._s[913]! } - public var Localization_ChooseLanguage: String { return self._s[915]! } - public var ChatList_Context_AddToContacts: String { return self._s[917]! } - public var OldChannels_NoticeTitle: String { return self._s[918]! } - public var Settings_Proxy: String { return self._s[920]! } - public var Privacy_TopPeersHelp: String { return self._s[921]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[922]! } - public var Chat_UnsendMyMessages: String { return self._s[923]! } + public var Passport_Language_el: String { return self._s[901]! } + public var PhotoEditor_Original: String { return self._s[902]! } + public var Settings_FAQ_Button: String { return self._s[904]! } + public var Channel_Setup_PublicNoLink: String { return self._s[906]! } + public var Conversation_UnsupportedMedia: String { return self._s[907]! } + public var Conversation_SlideToCancel: String { return self._s[908]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[909]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[910]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[911]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[912]! } + public var AutoNightTheme_NotAvailable: String { return self._s[913]! } + public var Conversation_Owner: String { return self._s[914]! } + public var Common_Create: String { return self._s[915]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[916]! } + public var ContactList_Context_Call: String { return self._s[917]! } + public var Localization_ChooseLanguage: String { return self._s[919]! } + public var ChatList_Context_AddToContacts: String { return self._s[921]! } + public var OldChannels_NoticeTitle: String { return self._s[922]! } + public var Settings_Proxy: String { return self._s[924]! } + public var Privacy_TopPeersHelp: String { return self._s[925]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[926]! } + public var Chat_UnsendMyMessages: String { return self._s[927]! } public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[924]!, self._r[924]!, [_0]) + return formatWithArgumentRanges(self._s[928]!, self._r[928]!, [_0]) } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[925]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[929]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[927]!, self._r[927]!, [_0]) - } - public var Contacts_SortedByPresence: String { return self._s[928]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[929]! } - public var Cache_Title: String { return self._s[930]! } - public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[931]!, self._r[931]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[932]! } - public var Channel_Moderator_Title: String { return self._s[933]! } - public var InstantPage_AutoNightTheme: String { return self._s[935]! } + public var Contacts_SortedByPresence: String { return self._s[932]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[933]! } + public var Cache_Title: String { return self._s[934]! } + public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[935]!, self._r[935]!, [_0]) + } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[936]! } + public var Channel_Moderator_Title: String { return self._s[937]! } + public var InstantPage_AutoNightTheme: String { return self._s[939]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[938]!, self._r[938]!, [_1]) + return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[939]! } - public var Undo_Undo: String { return self._s[941]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[942]! } - public var TwoStepAuth_RemovePassword: String { return self._s[943]! } - public var Common_Delete: String { return self._s[944]! } - public var Contacts_AddPeopleNearby: String { return self._s[946]! } - public var Conversation_ContextMenuDelete: String { return self._s[947]! } - public var SocksProxySetup_Credentials: String { return self._s[948]! } - public var Appearance_EditTheme: String { return self._s[950]! } - public var ClearCache_StorageOtherApps: String { return self._s[951]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[952]! } - public var Wallet_Send_NetworkErrorText: String { return self._s[953]! } - public var AuthSessions_DevicesTitle: String { return self._s[955]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[957]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[958]! } - public var Passport_Language_id: String { return self._s[960]! } - public var WallpaperSearch_ColorTeal: String { return self._s[961]! } - public var ChannelIntro_Title: String { return self._s[962]! } + public var Passport_Scans_Upload: String { return self._s[943]! } + public var Undo_Undo: String { return self._s[945]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[946]! } + public var TwoStepAuth_RemovePassword: String { return self._s[947]! } + public var Common_Delete: String { return self._s[948]! } + public var Contacts_AddPeopleNearby: String { return self._s[950]! } + public var Conversation_ContextMenuDelete: String { return self._s[951]! } + public var SocksProxySetup_Credentials: String { return self._s[952]! } + public var Appearance_EditTheme: String { return self._s[954]! } + public var ClearCache_StorageOtherApps: String { return self._s[955]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[956]! } + public var Wallet_Send_NetworkErrorText: String { return self._s[957]! } + public var AuthSessions_DevicesTitle: String { return self._s[959]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[961]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[962]! } + public var Passport_Language_id: String { return self._s[964]! } + public var WallpaperSearch_ColorTeal: String { return self._s[965]! } + public var ChannelIntro_Title: String { return self._s[966]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[963]!, self._r[963]!, [_0]) + return formatWithArgumentRanges(self._s[967]!, self._r[967]!, [_0]) } - public var VoiceOver_Chat_OpenLinkHint: String { return self._s[965]! } - public var VoiceOver_Chat_Reply: String { return self._s[966]! } - public var ScheduledMessages_BotActionUnavailable: String { return self._s[967]! } - public var Channel_Info_Description: String { return self._s[968]! } - public var Stickers_FavoriteStickers: String { return self._s[969]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[970]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[971]! } - public var ChatSearch_ResultsTooltip: String { return self._s[972]! } - public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[973]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[974]! } - public var Group_PublicLink_Placeholder: String { return self._s[975]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[976]! } + public var VoiceOver_Chat_OpenLinkHint: String { return self._s[969]! } + public var VoiceOver_Chat_Reply: String { return self._s[970]! } + public var ScheduledMessages_BotActionUnavailable: String { return self._s[971]! } + public var Channel_Info_Description: String { return self._s[972]! } + public var Stickers_FavoriteStickers: String { return self._s[973]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[974]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[975]! } + public var ChatSearch_ResultsTooltip: String { return self._s[976]! } + public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[977]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[978]! } + public var Group_PublicLink_Placeholder: String { return self._s[979]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[980]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[977]!, self._r[977]!, [_1]) + return formatWithArgumentRanges(self._s[981]!, self._r[981]!, [_1]) } - public var TextFormat_Underline: String { return self._s[978]! } + public var TextFormat_Underline: String { return self._s[982]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[980]!, self._r[980]!, [_1, _2]) + return formatWithArgumentRanges(self._s[984]!, self._r[984]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[981]!, self._r[981]!, [_0]) + return formatWithArgumentRanges(self._s[985]!, self._r[985]!, [_0]) } - public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[982]! } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[986]! } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[983]!, self._r[983]!, [_1, _2]) + return formatWithArgumentRanges(self._s[987]!, self._r[987]!, [_1, _2]) } - public var Wallet_Intro_ImportExisting: String { return self._s[984]! } - public var GroupPermission_Delete: String { return self._s[985]! } - public var Passport_Language_uk: String { return self._s[986]! } - public var StickerPack_HideStickers: String { return self._s[988]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[989]! } + public var Wallet_Intro_ImportExisting: String { return self._s[988]! } + public var GroupPermission_Delete: String { return self._s[989]! } + public var Passport_Language_uk: String { return self._s[990]! } + public var StickerPack_HideStickers: String { return self._s[992]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[993]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[990]!, self._r[990]!, [_1, _2]) + return formatWithArgumentRanges(self._s[994]!, self._r[994]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[991]! } + public var Activity_UploadingVideoMessage: String { return self._s[995]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[992]!, self._r[992]!, [_0]) + return formatWithArgumentRanges(self._s[996]!, self._r[996]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[993]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[994]! } - public var Settings_CallSettings: String { return self._s[995]! } - public var Camera_SquareMode: String { return self._s[996]! } - public var Conversation_SendMessage_ScheduleMessage: String { return self._s[997]! } - public var GroupInfo_SharedMediaNone: String { return self._s[998]! } + public var Channel_TitleInfo: String { return self._s[997]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[998]! } + public var Settings_CallSettings: String { return self._s[999]! } + public var Camera_SquareMode: String { return self._s[1000]! } + public var Conversation_SendMessage_ScheduleMessage: String { return self._s[1001]! } + public var GroupInfo_SharedMediaNone: String { return self._s[1002]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[999]!, self._r[999]!, [_1]) + return formatWithArgumentRanges(self._s[1003]!, self._r[1003]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[1000]! } - public var Application_Update: String { return self._s[1002]! } - public var Month_ShortJanuary: String { return self._s[1003]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[1004]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[1005]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[1006]! } - public var Passport_Address_Street2Placeholder: String { return self._s[1007]! } + public var Bot_GenericBotStatus: String { return self._s[1004]! } + public var Application_Update: String { return self._s[1006]! } + public var Month_ShortJanuary: String { return self._s[1007]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[1008]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[1009]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[1010]! } + public var Passport_Address_Street2Placeholder: String { return self._s[1011]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1008]!, self._r[1008]!, [_0]) + return formatWithArgumentRanges(self._s[1012]!, self._r[1012]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[1009]! } - public var Appearance_PreviewOutgoingText: String { return self._s[1010]! } + public var NetworkUsageSettings_Cellular: String { return self._s[1013]! } + public var Appearance_PreviewOutgoingText: String { return self._s[1014]! } public func StickerPackActionInfo_RemovedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1011]!, self._r[1011]!, [_0]) + return formatWithArgumentRanges(self._s[1015]!, self._r[1015]!, [_0]) } - public var Notifications_PermissionsAllowInSettings: String { return self._s[1012]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[1014]! } - public var Map_Directions: String { return self._s[1015]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[1017]! } - public var Appearance_ThemeDay: String { return self._s[1018]! } - public var LogoutOptions_LogOut: String { return self._s[1019]! } - public var Group_PublicLink_Title: String { return self._s[1021]! } - public var Channel_AddBotErrorNoRights: String { return self._s[1022]! } - public var ChatList_Search_ShowLess: String { return self._s[1023]! } - public var Passport_Identity_AddPassport: String { return self._s[1024]! } - public var LocalGroup_ButtonTitle: String { return self._s[1025]! } - public var Call_Message: String { return self._s[1026]! } - public var PhotoEditor_ExposureTool: String { return self._s[1027]! } - public var Wallet_Receive_CommentInfo: String { return self._s[1029]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[1030]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[1032]! } - public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1033]! } - public var Appearance_Preview: String { return self._s[1034]! } - public var Compose_ChannelMembers: String { return self._s[1035]! } - public var Conversation_DeleteManyMessages: String { return self._s[1036]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[1037]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1038]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1039]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[1042]! } - public var Conversation_UpdateTelegram: String { return self._s[1043]! } - public var EditTheme_Create_TopInfo: String { return self._s[1044]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[1016]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[1018]! } + public var Map_Directions: String { return self._s[1019]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[1021]! } + public var Appearance_ThemeDay: String { return self._s[1022]! } + public var LogoutOptions_LogOut: String { return self._s[1023]! } + public var Group_PublicLink_Title: String { return self._s[1025]! } + public var Channel_AddBotErrorNoRights: String { return self._s[1026]! } + public var ChatList_Search_ShowLess: String { return self._s[1027]! } + public var Passport_Identity_AddPassport: String { return self._s[1028]! } + public var LocalGroup_ButtonTitle: String { return self._s[1029]! } + public var Call_Message: String { return self._s[1030]! } + public var PhotoEditor_ExposureTool: String { return self._s[1031]! } + public var Wallet_Receive_CommentInfo: String { return self._s[1033]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[1034]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[1036]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1037]! } + public var Appearance_Preview: String { return self._s[1038]! } + public var Compose_ChannelMembers: String { return self._s[1039]! } + public var Conversation_DeleteManyMessages: String { return self._s[1040]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[1041]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1042]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1043]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[1046]! } + public var Conversation_UpdateTelegram: String { return self._s[1047]! } + public var EditTheme_Create_TopInfo: String { return self._s[1048]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1045]!, self._r[1045]!, [_0]) + return formatWithArgumentRanges(self._s[1049]!, self._r[1049]!, [_0]) } - public var Wallet_WordCheck_Continue: String { return self._s[1046]! } - public var TwoFactorSetup_Hint_Action: String { return self._s[1047]! } - public var IntentsSettings_ResetAll: String { return self._s[1048]! } + public var Wallet_WordCheck_Continue: String { return self._s[1050]! } + public var TwoFactorSetup_Hint_Action: String { return self._s[1051]! } + public var IntentsSettings_ResetAll: String { return self._s[1052]! } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1049]!, self._r[1049]!, [_1]) + return formatWithArgumentRanges(self._s[1053]!, self._r[1053]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[1050]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[1051]! } + public var GroupInfo_Administrators_Title: String { return self._s[1054]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[1055]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1052]!, self._r[1052]!, [_0]) + return formatWithArgumentRanges(self._s[1056]!, self._r[1056]!, [_0]) } - public var Tour_Title3: String { return self._s[1053]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1054]! } - public var Clipboard_SendPhoto: String { return self._s[1058]! } - public var MediaPicker_Videos: String { return self._s[1059]! } - public var Passport_Email_Title: String { return self._s[1060]! } + public var Tour_Title3: String { return self._s[1057]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1058]! } + public var Clipboard_SendPhoto: String { return self._s[1062]! } + public var MediaPicker_Videos: String { return self._s[1063]! } + public var Passport_Email_Title: String { return self._s[1064]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1061]!, self._r[1061]!, [_0]) + return formatWithArgumentRanges(self._s[1065]!, self._r[1065]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[1062]! } - public var Conversation_MessageDialogDelete: String { return self._s[1063]! } - public var Privacy_Calls_CustomHelp: String { return self._s[1065]! } - public var Message_Wallpaper: String { return self._s[1066]! } - public var MemberSearch_BotSection: String { return self._s[1067]! } - public var GroupInfo_SetSound: String { return self._s[1068]! } + public var StickerPacksSettings_Title: String { return self._s[1066]! } + public var Conversation_MessageDialogDelete: String { return self._s[1067]! } + public var Privacy_Calls_CustomHelp: String { return self._s[1069]! } + public var Message_Wallpaper: String { return self._s[1070]! } + public var MemberSearch_BotSection: String { return self._s[1071]! } + public var GroupInfo_SetSound: String { return self._s[1072]! } public func Time_TomorrowAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1069]!, self._r[1069]!, [_0]) + return formatWithArgumentRanges(self._s[1073]!, self._r[1073]!, [_0]) } - public var Core_ServiceUserStatus: String { return self._s[1070]! } - public var LiveLocationUpdated_JustNow: String { return self._s[1071]! } - public var Call_StatusFailed: String { return self._s[1072]! } - public var TwoFactorSetup_Email_Placeholder: String { return self._s[1073]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1074]! } - public var TwoStepAuth_SetPassword: String { return self._s[1075]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[1076]! } + public var Core_ServiceUserStatus: String { return self._s[1074]! } + public var LiveLocationUpdated_JustNow: String { return self._s[1075]! } + public var Call_StatusFailed: String { return self._s[1076]! } + public var TwoFactorSetup_Email_Placeholder: String { return self._s[1077]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1078]! } + public var TwoStepAuth_SetPassword: String { return self._s[1079]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[1080]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1078]!, self._r[1078]!, [_0]) + return formatWithArgumentRanges(self._s[1082]!, self._r[1082]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[1079]! } - public var Map_NoPlacesNearby: String { return self._s[1080]! } - public var Profile_Username: String { return self._s[1081]! } - public var Bot_DescriptionTitle: String { return self._s[1082]! } - public var MaskStickerSettings_Title: String { return self._s[1083]! } - public var SharedMedia_CategoryOther: String { return self._s[1084]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[1085]! } - public var Common_NotNow: String { return self._s[1086]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[1087]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[1088]! } - public var Map_Location: String { return self._s[1089]! } - public var Invitation_JoinGroup: String { return self._s[1090]! } - public var AutoDownloadSettings_Title: String { return self._s[1092]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1093]! } - public var Channel_ErrorAddBlocked: String { return self._s[1094]! } - public var Conversation_UnblockUser: String { return self._s[1095]! } - public var EditTheme_Edit_TopInfo: String { return self._s[1096]! } - public var Watch_Bot_Restart: String { return self._s[1097]! } - public var TwoStepAuth_Title: String { return self._s[1098]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[1099]! } - public var Checkout_ShippingMethod: String { return self._s[1100]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1101]! } + public var Calls_SubmitRating: String { return self._s[1083]! } + public var Map_NoPlacesNearby: String { return self._s[1084]! } + public var Profile_Username: String { return self._s[1085]! } + public var Bot_DescriptionTitle: String { return self._s[1086]! } + public var MaskStickerSettings_Title: String { return self._s[1087]! } + public var SharedMedia_CategoryOther: String { return self._s[1088]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[1089]! } + public var Common_NotNow: String { return self._s[1090]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[1091]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[1092]! } + public var Map_Location: String { return self._s[1093]! } + public var Invitation_JoinGroup: String { return self._s[1094]! } + public var AutoDownloadSettings_Title: String { return self._s[1096]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1097]! } + public var Channel_ErrorAddBlocked: String { return self._s[1098]! } + public var Conversation_UnblockUser: String { return self._s[1099]! } + public var EditTheme_Edit_TopInfo: String { return self._s[1100]! } + public var Watch_Bot_Restart: String { return self._s[1101]! } + public var TwoStepAuth_Title: String { return self._s[1102]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[1103]! } + public var Checkout_ShippingMethod: String { return self._s[1104]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1105]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1102]!, self._r[1102]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1106]!, self._r[1106]!, [_1, _2, _3]) } - public var EditTheme_ChangeColors: String { return self._s[1104]! } + public var EditTheme_ChangeColors: String { return self._s[1108]! } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1105]!, self._r[1105]!, [_0]) + return formatWithArgumentRanges(self._s[1109]!, self._r[1109]!, [_0]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1106]!, self._r[1106]!, [_0]) + return formatWithArgumentRanges(self._s[1110]!, self._r[1110]!, [_0]) } - public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1107]! } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1108]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[1109]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[1110]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[1111]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1112]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1113]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[1114]! } - public var Checkout_PaymentMethod_Title: String { return self._s[1115]! } - public var SocksProxySetup_Connection: String { return self._s[1116]! } - public var Group_MessagePhotoRemoved: String { return self._s[1117]! } - public var PeopleNearby_MakeInvisible: String { return self._s[1119]! } - public var Channel_Stickers_NotFound: String { return self._s[1121]! } - public var Group_About_Help: String { return self._s[1122]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[1123]! } - public var PeopleNearby_Title: String { return self._s[1125]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1111]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1112]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[1113]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[1114]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[1115]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1116]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1117]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[1118]! } + public var Checkout_PaymentMethod_Title: String { return self._s[1119]! } + public var SocksProxySetup_Connection: String { return self._s[1120]! } + public var Group_MessagePhotoRemoved: String { return self._s[1121]! } + public var PeopleNearby_MakeInvisible: String { return self._s[1123]! } + public var Channel_Stickers_NotFound: String { return self._s[1125]! } + public var Group_About_Help: String { return self._s[1126]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[1127]! } + public var PeopleNearby_Title: String { return self._s[1129]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1126]!, self._r[1126]!, [_1]) + return formatWithArgumentRanges(self._s[1130]!, self._r[1130]!, [_1]) } - public var Map_Home: String { return self._s[1127]! } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1129]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1130]! } - public var SocksProxySetup_Password: String { return self._s[1131]! } - public var Notifications_PermissionsEnable: String { return self._s[1132]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[1134]! } + public var Map_Home: String { return self._s[1131]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1133]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1134]! } + public var SocksProxySetup_Password: String { return self._s[1135]! } + public var Notifications_PermissionsEnable: String { return self._s[1136]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[1138]! } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1135]!, self._r[1135]!, [_1]) + return formatWithArgumentRanges(self._s[1139]!, self._r[1139]!, [_1]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1137]!, self._r[1137]!, [_0]) + return formatWithArgumentRanges(self._s[1141]!, self._r[1141]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[1138]! } - public var ArchivedPacksAlert_Title: String { return self._s[1139]! } - public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1140]! } - public var Map_PlacesNearby: String { return self._s[1141]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[1142]! } + public var ArchivedPacksAlert_Title: String { return self._s[1143]! } + public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1144]! } + public var Map_PlacesNearby: String { return self._s[1145]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1142]!, self._r[1142]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1146]!, self._r[1146]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1143]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1145]! } - public var Conversation_StatusTyping: String { return self._s[1146]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[1147]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[1148]! } - public var UserInfo_CreateNewContact: String { return self._s[1149]! } - public var Passport_Identity_FrontSide: String { return self._s[1150]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1151]! } - public var Calls_CallTabTitle: String { return self._s[1152]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1153]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1147]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1149]! } + public var Conversation_StatusTyping: String { return self._s[1150]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[1151]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[1152]! } + public var UserInfo_CreateNewContact: String { return self._s[1153]! } + public var Passport_Identity_FrontSide: String { return self._s[1154]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1155]! } + public var Calls_CallTabTitle: String { return self._s[1156]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1157]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1155]!, self._r[1155]!, [_0]) + return formatWithArgumentRanges(self._s[1159]!, self._r[1159]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[1156]! } - public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1157]! } - public var SharedMedia_EmptyMusicText: String { return self._s[1158]! } - public var Wallet_Completed_Text: String { return self._s[1159]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1160]! } - public var Paint_Stickers: String { return self._s[1161]! } - public var Privacy_GroupsAndChannels: String { return self._s[1162]! } - public var ChatList_Context_Delete: String { return self._s[1164]! } - public var UserInfo_AddContact: String { return self._s[1165]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[1160]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1161]! } + public var SharedMedia_EmptyMusicText: String { return self._s[1162]! } + public var Wallet_Completed_Text: String { return self._s[1163]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1164]! } + public var Paint_Stickers: String { return self._s[1165]! } + public var Privacy_GroupsAndChannels: String { return self._s[1166]! } + public var ChatList_Context_Delete: String { return self._s[1168]! } + public var UserInfo_AddContact: String { return self._s[1169]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1166]!, self._r[1166]!, [_0]) - } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[1168]! } - public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1170]!, self._r[1170]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[1171]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[1172]! } - public var BlockedUsers_BlockUser: String { return self._s[1173]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[1174]! } - public var MediaPicker_UngroupDescription: String { return self._s[1176]! } - public var Watch_NoConnection: String { return self._s[1177]! } - public var Month_GenSeptember: String { return self._s[1178]! } - public var Conversation_ViewGroup: String { return self._s[1180]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1183]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[1184]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1185]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1186]! } - public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1187]! } - public var MediaPicker_CameraRoll: String { return self._s[1189]! } - public var Month_GenAugust: String { return self._s[1190]! } - public var Wallet_Configuration_SourceHeader: String { return self._s[1191]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[1192]! } - public var SharedMedia_EmptyText: String { return self._s[1193]! } - public var Map_ShareLiveLocation: String { return self._s[1194]! } - public var Calls_All: String { return self._s[1195]! } - public var Map_SendThisPlace: String { return self._s[1197]! } - public var Appearance_ThemeNight: String { return self._s[1199]! } - public var Conversation_HoldForAudio: String { return self._s[1200]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[1203]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[1204]! } - public var SocksProxySetup_Secret: String { return self._s[1205]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[1172]! } + public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1174]!, self._r[1174]!, [_0]) + } + public var DialogList_NoMessagesTitle: String { return self._s[1175]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[1176]! } + public var BlockedUsers_BlockUser: String { return self._s[1177]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[1178]! } + public var MediaPicker_UngroupDescription: String { return self._s[1180]! } + public var Watch_NoConnection: String { return self._s[1181]! } + public var Month_GenSeptember: String { return self._s[1182]! } + public var Conversation_ViewGroup: String { return self._s[1184]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1187]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[1188]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1189]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1190]! } + public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1191]! } + public var MediaPicker_CameraRoll: String { return self._s[1193]! } + public var Month_GenAugust: String { return self._s[1194]! } + public var Wallet_Configuration_SourceHeader: String { return self._s[1195]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[1196]! } + public var SharedMedia_EmptyText: String { return self._s[1197]! } + public var Map_ShareLiveLocation: String { return self._s[1198]! } + public var Calls_All: String { return self._s[1199]! } + public var Map_SendThisPlace: String { return self._s[1201]! } + public var Appearance_ThemeNight: String { return self._s[1203]! } + public var Conversation_HoldForAudio: String { return self._s[1204]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[1207]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1208]! } + public var SocksProxySetup_Secret: String { return self._s[1209]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1206]!, self._r[1206]!, [_0]) + return formatWithArgumentRanges(self._s[1210]!, self._r[1210]!, [_0]) } - public var Channel_BanList_RestrictedTitle: String { return self._s[1208]! } - public var Conversation_Location: String { return self._s[1209]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1212]! } + public var Conversation_Location: String { return self._s[1213]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1210]!, self._r[1210]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1214]!, self._r[1214]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1212]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1213]! } - public var Notifications_PermissionsText: String { return self._s[1214]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1215]! } - public var Call_Flip: String { return self._s[1216]! } - public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1218]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1219]! } - public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1220]! } - public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1221]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1223]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1225]! } - public var Channel_TooMuchBots: String { return self._s[1227]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1228]! } - public var Login_InvalidCodeError: String { return self._s[1229]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1230]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1216]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1217]! } + public var Notifications_PermissionsText: String { return self._s[1218]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1219]! } + public var Call_Flip: String { return self._s[1220]! } + public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1222]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1223]! } + public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1224]! } + public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1225]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1227]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1229]! } + public var Channel_TooMuchBots: String { return self._s[1231]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1232]! } + public var Login_InvalidCodeError: String { return self._s[1233]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1234]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1231]!, self._r[1231]!, [_0]) + return formatWithArgumentRanges(self._s[1235]!, self._r[1235]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1232]!, self._r[1232]!, [_0]) + return formatWithArgumentRanges(self._s[1236]!, self._r[1236]!, [_0]) } - public var VoiceOver_Navigation_ProxySettings: String { return self._s[1233]! } - public var Call_CallInProgressTitle: String { return self._s[1234]! } - public var Month_ShortSeptember: String { return self._s[1235]! } - public var Watch_ChannelInfo_Title: String { return self._s[1236]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1239]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1240]! } - public var Chat_MultipleTextMessagesDisabled: String { return self._s[1241]! } - public var Wallet_Receive_Title: String { return self._s[1242]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1243]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1244]! } - public var PhotoEditor_CropReset: String { return self._s[1245]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1247]! } - public var Channel_Management_LabelEditor: String { return self._s[1248]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1250]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1251]! } - public var Wallet_Info_WalletCreated: String { return self._s[1252]! } - public var UserInfo_Title: String { return self._s[1253]! } - public var ChatList_HideAction: String { return self._s[1254]! } - public var AccessDenied_Title: String { return self._s[1255]! } - public var DialogList_SearchLabel: String { return self._s[1256]! } - public var Group_Setup_HistoryHidden: String { return self._s[1257]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1258]! } - public var State_Updating: String { return self._s[1260]! } - public var Contacts_TabTitle: String { return self._s[1261]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1263]! } - public var GroupInfo_GroupHistory: String { return self._s[1264]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1265]! } - public var Wallpaper_SetColor: String { return self._s[1266]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1267]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1268]! } - public var Chat_AttachmentLimitReached: String { return self._s[1269]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1270]! } - public var Contacts_NotRegisteredSection: String { return self._s[1271]! } + public var VoiceOver_Navigation_ProxySettings: String { return self._s[1237]! } + public var Call_CallInProgressTitle: String { return self._s[1238]! } + public var Month_ShortSeptember: String { return self._s[1239]! } + public var Watch_ChannelInfo_Title: String { return self._s[1240]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1243]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1244]! } + public var Chat_MultipleTextMessagesDisabled: String { return self._s[1245]! } + public var Wallet_Receive_Title: String { return self._s[1246]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1247]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1248]! } + public var PhotoEditor_CropReset: String { return self._s[1249]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1251]! } + public var Channel_Management_LabelEditor: String { return self._s[1252]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1254]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1255]! } + public var Wallet_Info_WalletCreated: String { return self._s[1256]! } + public var UserInfo_Title: String { return self._s[1257]! } + public var ChatList_HideAction: String { return self._s[1258]! } + public var AccessDenied_Title: String { return self._s[1259]! } + public var DialogList_SearchLabel: String { return self._s[1260]! } + public var Group_Setup_HistoryHidden: String { return self._s[1261]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1262]! } + public var State_Updating: String { return self._s[1264]! } + public var Contacts_TabTitle: String { return self._s[1265]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1267]! } + public var GroupInfo_GroupHistory: String { return self._s[1268]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1269]! } + public var Wallpaper_SetColor: String { return self._s[1270]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1271]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1272]! } + public var Chat_AttachmentLimitReached: String { return self._s[1273]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1274]! } + public var Contacts_NotRegisteredSection: String { return self._s[1275]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1272]!, self._r[1272]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1276]!, self._r[1276]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1273]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1274]! } - public var SocksProxySetup_Connecting: String { return self._s[1275]! } - public var ExplicitContent_AlertChannel: String { return self._s[1276]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1277]! } - public var Conversation_Contact: String { return self._s[1278]! } - public var Login_CodeExpired: String { return self._s[1279]! } - public var Passport_DiscardMessageAction: String { return self._s[1280]! } - public var ChatList_Context_Unpin: String { return self._s[1281]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1282]! } + public var Paint_Clear: String { return self._s[1277]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1278]! } + public var SocksProxySetup_Connecting: String { return self._s[1279]! } + public var ExplicitContent_AlertChannel: String { return self._s[1280]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1281]! } + public var Conversation_Contact: String { return self._s[1282]! } + public var Login_CodeExpired: String { return self._s[1283]! } + public var Passport_DiscardMessageAction: String { return self._s[1284]! } + public var ChatList_Context_Unpin: String { return self._s[1285]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1286]! } public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1283]!, self._r[1283]!, [_0]) + return formatWithArgumentRanges(self._s[1287]!, self._r[1287]!, [_0]) } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1284]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1285]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1288]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1289]! } public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1286]!, self._r[1286]!, [_0]) + return formatWithArgumentRanges(self._s[1290]!, self._r[1290]!, [_0]) } - public var Month_ShortApril: String { return self._s[1287]! } - public var AuthSessions_CurrentSession: String { return self._s[1288]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1291]! } - public var Wallet_Navigation_Cancel: String { return self._s[1293]! } - public var WallpaperPreview_CropTopText: String { return self._s[1294]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1295]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1296]! } + public var Month_ShortApril: String { return self._s[1291]! } + public var AuthSessions_CurrentSession: String { return self._s[1292]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1295]! } + public var Wallet_Navigation_Cancel: String { return self._s[1297]! } + public var WallpaperPreview_CropTopText: String { return self._s[1298]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1299]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1300]! } public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1297]!, self._r[1297]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1301]!, self._r[1301]!, [_0, _1]) } - public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1298]! } - public var Channel_Setup_TypePrivate: String { return self._s[1300]! } - public var Forward_ChannelReadOnly: String { return self._s[1303]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1304]! } - public var AddContact_SharedContactException: String { return self._s[1305]! } - public var UserInfo_BotPrivacy: String { return self._s[1307]! } - public var Wallet_CreateInvoice_Title: String { return self._s[1308]! } - public var Notification_PassportValueEmail: String { return self._s[1309]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1310]! } - public var GroupPermission_NewTitle: String { return self._s[1311]! } - public var CallFeedback_ReasonDropped: String { return self._s[1312]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1313]! } - public var Channel_SignMessages_Help: String { return self._s[1315]! } - public var Undo_ChatDeleted: String { return self._s[1317]! } - public var Conversation_ChatBackground: String { return self._s[1318]! } + public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1302]! } + public var Channel_Setup_TypePrivate: String { return self._s[1304]! } + public var Forward_ChannelReadOnly: String { return self._s[1307]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1308]! } + public var AddContact_SharedContactException: String { return self._s[1309]! } + public var UserInfo_BotPrivacy: String { return self._s[1311]! } + public var Wallet_CreateInvoice_Title: String { return self._s[1312]! } + public var Notification_PassportValueEmail: String { return self._s[1313]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1314]! } + public var GroupPermission_NewTitle: String { return self._s[1315]! } + public var CallFeedback_ReasonDropped: String { return self._s[1316]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1317]! } + public var Channel_SignMessages_Help: String { return self._s[1319]! } + public var Undo_ChatDeleted: String { return self._s[1321]! } + public var Conversation_ChatBackground: String { return self._s[1322]! } public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1319]!, self._r[1319]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1323]!, self._r[1323]!, [_1, _2, _3]) } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1320]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1321]! } - public var Passport_Language_pt: String { return self._s[1322]! } - public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1323]! } - public var NotificationsSound_Popcorn: String { return self._s[1326]! } - public var AutoNightTheme_Disabled: String { return self._s[1327]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1328]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1329]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1330]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1331]! } + public func PUSH_CHAT_MESSAGE_QUIZ(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1324]!, self._r[1324]!, [_1, _2, _3]) + } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1325]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1326]! } + public var Passport_Language_pt: String { return self._s[1327]! } + public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1328]! } + public var NotificationsSound_Popcorn: String { return self._s[1331]! } + public var AutoNightTheme_Disabled: String { return self._s[1332]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1333]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1334]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1335]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1336]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1332]!, self._r[1332]!, [_0]) + return formatWithArgumentRanges(self._s[1337]!, self._r[1337]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1333]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1334]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1336]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1338]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1339]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1341]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1337]!, self._r[1337]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1342]!, self._r[1342]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1340]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1341]! } - public var Compose_NewEncryptedChat: String { return self._s[1342]! } - public var Login_CodeFloodError: String { return self._s[1343]! } - public var Calls_TabTitle: String { return self._s[1344]! } - public var Privacy_ProfilePhoto: String { return self._s[1345]! } - public var Passport_Language_he: String { return self._s[1346]! } + public var SocksProxySetup_Hostname: String { return self._s[1345]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1346]! } + public var Compose_NewEncryptedChat: String { return self._s[1347]! } + public var Login_CodeFloodError: String { return self._s[1348]! } + public var Calls_TabTitle: String { return self._s[1349]! } + public var Privacy_ProfilePhoto: String { return self._s[1350]! } + public var Passport_Language_he: String { return self._s[1351]! } public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1347]!, self._r[1347]!, [_0]) + return formatWithArgumentRanges(self._s[1352]!, self._r[1352]!, [_0]) } - public var GroupPermission_Title: String { return self._s[1348]! } + public var GroupPermission_Title: String { return self._s[1353]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1349]!, self._r[1349]!, [_0]) + return formatWithArgumentRanges(self._s[1354]!, self._r[1354]!, [_0]) } - public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1350]! } - public var GroupPermission_NoChangeInfo: String { return self._s[1351]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1352]! } - public var Tour_Text1: String { return self._s[1353]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1354]! } - public var Month_ShortFebruary: String { return self._s[1355]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1356]! } + public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1355]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1356]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1357]! } + public var Tour_Text1: String { return self._s[1358]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1359]! } + public var Month_ShortFebruary: String { return self._s[1360]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1361]! } public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1357]!, self._r[1357]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1362]!, self._r[1362]!, [_1, _2, _3]) } - public var NotificationsSound_Glass: String { return self._s[1358]! } - public var Appearance_ThemeNightBlue: String { return self._s[1359]! } - public var CheckoutInfo_Pay: String { return self._s[1360]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1362]! } - public var Call_CallAgain: String { return self._s[1364]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1365]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1366]! } - public var Passport_InvalidPasswordError: String { return self._s[1367]! } - public var Watch_Message_Game: String { return self._s[1368]! } - public var Stickers_Install: String { return self._s[1369]! } - public var VoiceOver_Chat_Message: String { return self._s[1370]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1371]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1373]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1374]! } - public var AuthSessions_OtherSessions: String { return self._s[1375]! } - public var Channel_Username_Help: String { return self._s[1376]! } - public var Camera_Title: String { return self._s[1377]! } - public var IntentsSettings_Title: String { return self._s[1378]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1380]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1381]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1382]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1383]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1384]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1385]! } - public var ScheduledMessages_DeleteMany: String { return self._s[1386]! } - public var Conversation_RestrictedStickers: String { return self._s[1387]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1389]! } - public var UserInfo_TelegramCall: String { return self._s[1391]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1392]! } - public var CreatePoll_OptionsHeader: String { return self._s[1393]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1394]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1395]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1396]! } - public var Theme_Colors_Proceed: String { return self._s[1397]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1398]! } + public var NotificationsSound_Glass: String { return self._s[1363]! } + public var Appearance_ThemeNightBlue: String { return self._s[1364]! } + public var CheckoutInfo_Pay: String { return self._s[1365]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1367]! } + public var Call_CallAgain: String { return self._s[1369]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1370]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1371]! } + public var Passport_InvalidPasswordError: String { return self._s[1372]! } + public var Watch_Message_Game: String { return self._s[1373]! } + public var Stickers_Install: String { return self._s[1374]! } + public var VoiceOver_Chat_Message: String { return self._s[1375]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1376]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1378]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1379]! } + public var AuthSessions_OtherSessions: String { return self._s[1380]! } + public var Channel_Username_Help: String { return self._s[1381]! } + public var Camera_Title: String { return self._s[1382]! } + public var IntentsSettings_Title: String { return self._s[1383]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1385]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1386]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1387]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1388]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1389]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1390]! } + public var ScheduledMessages_DeleteMany: String { return self._s[1391]! } + public var Conversation_RestrictedStickers: String { return self._s[1392]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1394]! } + public var UserInfo_TelegramCall: String { return self._s[1396]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1397]! } + public var CreatePoll_OptionsHeader: String { return self._s[1398]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1399]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1400]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1401]! } + public var Theme_Colors_Proceed: String { return self._s[1402]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1403]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1399]!, self._r[1399]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1404]!, self._r[1404]!, [_1, _2, _3]) } - public var Wallet_Month_GenAugust: String { return self._s[1400]! } - public var Settings_SaveEditedPhotos: String { return self._s[1401]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1402]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1403]! } - public var Conversation_MessageDialogRetry: String { return self._s[1404]! } - public var ChatList_Context_MarkAsUnread: String { return self._s[1405]! } - public var MessagePoll_SubmitVote: String { return self._s[1406]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1407]! } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1408]! } - public var Group_Setup_TypeHeader: String { return self._s[1409]! } - public var Paint_RecentStickers: String { return self._s[1410]! } - public var PhotoEditor_GrainTool: String { return self._s[1411]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1412]! } - public var EmptyGroupInfo_Line4: String { return self._s[1413]! } - public var Watch_AuthRequired: String { return self._s[1415]! } + public var Wallet_Month_GenAugust: String { return self._s[1405]! } + public var Settings_SaveEditedPhotos: String { return self._s[1406]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1407]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1408]! } + public var Conversation_MessageDialogRetry: String { return self._s[1409]! } + public var ChatList_Context_MarkAsUnread: String { return self._s[1410]! } + public var MessagePoll_SubmitVote: String { return self._s[1411]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1412]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1413]! } + public var Group_Setup_TypeHeader: String { return self._s[1414]! } + public var Paint_RecentStickers: String { return self._s[1415]! } + public var PhotoEditor_GrainTool: String { return self._s[1416]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1417]! } + public var EmptyGroupInfo_Line4: String { return self._s[1418]! } + public var Watch_AuthRequired: String { return self._s[1420]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1416]!, self._r[1416]!, [_0]) + return formatWithArgumentRanges(self._s[1421]!, self._r[1421]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1417]! } - public var ChannelIntro_Text: String { return self._s[1418]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1419]! } - public var GroupPermission_NoSendMedia: String { return self._s[1420]! } - public var Calls_AddTab: String { return self._s[1421]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1422]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1423]! } - public var Conversation_WalletRequiredSetup: String { return self._s[1424]! } - public var Notification_MessageLifetime1d: String { return self._s[1425]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1426]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1427]! } - public var Passport_Identity_GenderFemale: String { return self._s[1428]! } - public var BlockedUsers_BlockTitle: String { return self._s[1429]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1422]! } + public var ChannelIntro_Text: String { return self._s[1423]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1424]! } + public var GroupPermission_NoSendMedia: String { return self._s[1425]! } + public var Calls_AddTab: String { return self._s[1426]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1427]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1428]! } + public var Conversation_WalletRequiredSetup: String { return self._s[1429]! } + public var Notification_MessageLifetime1d: String { return self._s[1430]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1431]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1432]! } + public var Passport_Identity_GenderFemale: String { return self._s[1433]! } + public var BlockedUsers_BlockTitle: String { return self._s[1434]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1430]!, self._r[1430]!, [_1]) + return formatWithArgumentRanges(self._s[1435]!, self._r[1435]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1431]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1432]! } - public var Settings_Context_Logout: String { return self._s[1433]! } - public var Wallet_Info_UnknownTransaction: String { return self._s[1434]! } - public var ChatList_ArchiveAction: String { return self._s[1435]! } - public var AutoNightTheme_Scheduled: String { return self._s[1436]! } - public var TwoFactorSetup_Email_SkipAction: String { return self._s[1437]! } - public var Settings_Devices: String { return self._s[1438]! } - public var ContactInfo_Note: String { return self._s[1439]! } + public var Weekday_Yesterday: String { return self._s[1436]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1437]! } + public var Settings_Context_Logout: String { return self._s[1438]! } + public var Wallet_Info_UnknownTransaction: String { return self._s[1439]! } + public var ChatList_ArchiveAction: String { return self._s[1440]! } + public var AutoNightTheme_Scheduled: String { return self._s[1441]! } + public var TwoFactorSetup_Email_SkipAction: String { return self._s[1442]! } + public var Settings_Devices: String { return self._s[1443]! } + public var ContactInfo_Note: String { return self._s[1444]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1440]!, self._r[1440]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1445]!, self._r[1445]!, [_1, _2, _3, _4, _5, _6]) } - public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1441]! } - public var Wallet_Receive_CreateInvoice: String { return self._s[1442]! } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1443]! } - public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1444]! } + public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1446]! } + public var Wallet_Receive_CreateInvoice: String { return self._s[1447]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1448]! } + public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1449]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1445]!, self._r[1445]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1450]!, self._r[1450]!, [_1, _2]) } - public var CreatePoll_Create: String { return self._s[1446]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1447]! } + public var CreatePoll_Create: String { return self._s[1451]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1452]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1448]!, self._r[1448]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1453]!, self._r[1453]!, [_1, _2]) } - public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1449]! } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1450]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1452]! } + public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1454]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1455]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1457]! } public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1453]!, self._r[1453]!, [_1]) + return formatWithArgumentRanges(self._s[1458]!, self._r[1458]!, [_1]) } - public var Preview_OpenInInstagram: String { return self._s[1454]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1455]! } + public var Preview_OpenInInstagram: String { return self._s[1459]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1460]! } public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1456]!, self._r[1456]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1461]!, self._r[1461]!, [_1, _2, _3]) } public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1457]!, self._r[1457]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1462]!, self._r[1462]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1458]! } - public var ArchivedChats_IntroText3: String { return self._s[1459]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1460]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1461]! } - public var Wallet_Month_GenSeptember: String { return self._s[1462]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1463]! } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1463]! } + public var ArchivedChats_IntroText3: String { return self._s[1464]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1465]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1466]! } + public var Wallet_Month_GenSeptember: String { return self._s[1467]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1468]! } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1464]!, self._r[1464]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1469]!, self._r[1469]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1466]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1467]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1468]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1469]! } - public var Gif_NoGifsFound: String { return self._s[1470]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1471]! } - public var VoiceOver_MessageContextDelete: String { return self._s[1472]! } - public var EditTheme_Preview: String { return self._s[1473]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1471]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1472]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1473]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1474]! } + public var Gif_NoGifsFound: String { return self._s[1475]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1476]! } + public var VoiceOver_MessageContextDelete: String { return self._s[1477]! } + public var EditTheme_Preview: String { return self._s[1478]! } public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1474]!, self._r[1474]!, [_0]) + return formatWithArgumentRanges(self._s[1479]!, self._r[1479]!, [_0]) } - public var GroupInfo_ActionPromote: String { return self._s[1475]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1476]! } - public var GroupInfo_Permissions_Title: String { return self._s[1477]! } - public var Permissions_ContactsText_v0: String { return self._s[1478]! } - public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1479]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1480]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1483]! } - public var Passport_FieldEmailHelp: String { return self._s[1484]! } + public var GroupInfo_ActionPromote: String { return self._s[1480]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1481]! } + public var GroupInfo_Permissions_Title: String { return self._s[1482]! } + public var Permissions_ContactsText_v0: String { return self._s[1483]! } + public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1484]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1485]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1488]! } + public var Passport_FieldEmailHelp: String { return self._s[1489]! } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1485]!, self._r[1485]!, [_0]) + return formatWithArgumentRanges(self._s[1490]!, self._r[1490]!, [_0]) } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1486]! } - public var Weekday_ShortSaturday: String { return self._s[1487]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1488]! } - public var Watch_Conversation_UserInfo: String { return self._s[1489]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1490]! } - public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1491]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1492]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1493]! } - public var PhotoEditor_VignetteTool: String { return self._s[1494]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1495]! } - public var Passport_Language_et: String { return self._s[1496]! } - public var AppUpgrade_Running: String { return self._s[1497]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1499]! } - public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1500]! } - public var Passport_Language_bg: String { return self._s[1501]! } - public var Stickers_NoStickersFound: String { return self._s[1503]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1491]! } + public var Weekday_ShortSaturday: String { return self._s[1492]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1493]! } + public var Watch_Conversation_UserInfo: String { return self._s[1494]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1495]! } + public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1496]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1497]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1498]! } + public var PhotoEditor_VignetteTool: String { return self._s[1499]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1500]! } + public var Passport_Language_et: String { return self._s[1501]! } + public var AppUpgrade_Running: String { return self._s[1502]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1504]! } + public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1505]! } + public var Passport_Language_bg: String { return self._s[1506]! } + public var Stickers_NoStickersFound: String { return self._s[1508]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1505]!, self._r[1505]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1510]!, self._r[1510]!, [_1, _2]) } public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1506]!, self._r[1506]!, [_0]) + return formatWithArgumentRanges(self._s[1511]!, self._r[1511]!, [_0]) } - public var Wallet_Month_GenJuly: String { return self._s[1507]! } - public var Wallet_Receive_AddressHeader: String { return self._s[1508]! } - public var Wallet_Send_AmountText: String { return self._s[1509]! } - public var Settings_About: String { return self._s[1510]! } + public var Wallet_Month_GenJuly: String { return self._s[1512]! } + public var Wallet_Receive_AddressHeader: String { return self._s[1513]! } + public var Wallet_Send_AmountText: String { return self._s[1514]! } + public var Settings_About: String { return self._s[1515]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1511]!, self._r[1511]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1516]!, self._r[1516]!, [_0, _1, _2]) } - public var ChatList_Context_MarkAsRead: String { return self._s[1513]! } - public var KeyCommand_NewMessage: String { return self._s[1514]! } - public var Group_ErrorAddBlocked: String { return self._s[1515]! } + public var ChatList_Context_MarkAsRead: String { return self._s[1518]! } + public var KeyCommand_NewMessage: String { return self._s[1519]! } + public var Group_ErrorAddBlocked: String { return self._s[1520]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1516]!, self._r[1516]!, [_0]) - } - public var Map_LocationTitle: String { return self._s[1517]! } - public var ReportGroupLocation_Title: String { return self._s[1518]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1519]! } - public var Cache_ClearProgress: String { return self._s[1520]! } - public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1521]!, self._r[1521]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1522]! } - public var Passport_UpdateRequiredError: String { return self._s[1523]! } - public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1524]! } + public var Map_LocationTitle: String { return self._s[1522]! } + public var ReportGroupLocation_Title: String { return self._s[1523]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1524]! } + public var Cache_ClearProgress: String { return self._s[1525]! } + public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1526]!, self._r[1526]!, [_0]) + } + public var GroupRemoved_AddToGroup: String { return self._s[1527]! } + public var Passport_UpdateRequiredError: String { return self._s[1528]! } + public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1529]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1525]!, self._r[1525]!, [_1]) + return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1527]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1528]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1529]! } - public var Passport_Language_ka: String { return self._s[1530]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1532]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1533]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1534]! } + public var Passport_Language_ka: String { return self._s[1535]! } public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1531]!, self._r[1531]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1536]!, self._r[1536]!, [_1, _2, _3]) } - public var Call_Decline: String { return self._s[1532]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1533]! } - public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1536]! } + public var Call_Decline: String { return self._s[1537]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1538]! } + public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1541]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1537]!, self._r[1537]!, [_0]) + return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1538]! } - public var EditTheme_EditTitle: String { return self._s[1539]! } + public var CallFeedback_Send: String { return self._s[1543]! } + public var EditTheme_EditTitle: String { return self._s[1544]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1540]!, self._r[1540]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1541]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1546]! } public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1543]!, self._r[1543]!, [_0]) + return formatWithArgumentRanges(self._s[1548]!, self._r[1548]!, [_0]) } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1544]! } - public var Passport_DeletePassport: String { return self._s[1545]! } - public var Appearance_AppIconFilled: String { return self._s[1546]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1547]! } - public var Month_ShortDecember: String { return self._s[1548]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1550]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1549]! } + public var Passport_DeletePassport: String { return self._s[1550]! } + public var Appearance_AppIconFilled: String { return self._s[1551]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1552]! } + public var Month_ShortDecember: String { return self._s[1553]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1555]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1551]!, self._r[1551]!, [_0]) + return formatWithArgumentRanges(self._s[1556]!, self._r[1556]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1552]! } - public var Conversation_EncryptedDescription1: String { return self._s[1553]! } - public var Conversation_EncryptedDescription2: String { return self._s[1554]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1555]! } - public var Conversation_EncryptedDescription3: String { return self._s[1557]! } - public var PhotoEditor_SharpenTool: String { return self._s[1558]! } - public var Wallet_Configuration_Title: String { return self._s[1559]! } + public var Channel_Stickers_Searching: String { return self._s[1557]! } + public var Conversation_EncryptedDescription1: String { return self._s[1558]! } + public var Conversation_EncryptedDescription2: String { return self._s[1559]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1560]! } + public var Conversation_EncryptedDescription3: String { return self._s[1562]! } + public var PhotoEditor_SharpenTool: String { return self._s[1563]! } + public var Wallet_Configuration_Title: String { return self._s[1564]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1560]!, self._r[1560]!, [_0]) + return formatWithArgumentRanges(self._s[1565]!, self._r[1565]!, [_0]) } - public var Conversation_EncryptedDescription4: String { return self._s[1562]! } - public var Channel_Members_AddMembers: String { return self._s[1563]! } - public var Wallpaper_Search: String { return self._s[1564]! } - public var Weekday_Friday: String { return self._s[1566]! } - public var Privacy_ContactsSync: String { return self._s[1567]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1568]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1569]! } + public var Conversation_EncryptedDescription4: String { return self._s[1567]! } + public var Channel_Members_AddMembers: String { return self._s[1568]! } + public var Wallpaper_Search: String { return self._s[1569]! } + public var Weekday_Friday: String { return self._s[1571]! } + public var Privacy_ContactsSync: String { return self._s[1572]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1573]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1574]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1570]!, self._r[1570]!, [_0]) - } - public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1571]! } - public var GroupInfo_Permissions_Removed: String { return self._s[1572]! } - public var ScheduledMessages_ScheduledOnline: String { return self._s[1573]! } - public var Passport_Identity_GenderMale: String { return self._s[1574]! } - public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1575]!, self._r[1575]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1576]! } - public var Conversation_JumpToDate: String { return self._s[1577]! } - public var Contacts_GlobalSearch: String { return self._s[1578]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1579]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1580]! } - public var Profile_MessageLifetime1d: String { return self._s[1581]! } + public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1576]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1577]! } + public var ScheduledMessages_ScheduledOnline: String { return self._s[1578]! } + public var Passport_Identity_GenderMale: String { return self._s[1579]! } + public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1580]!, self._r[1580]!, [_0]) + } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1581]! } + public var Conversation_JumpToDate: String { return self._s[1582]! } + public var Contacts_GlobalSearch: String { return self._s[1583]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1584]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1585]! } + public var Profile_MessageLifetime1d: String { return self._s[1586]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1582]!, self._r[1582]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1587]!, self._r[1587]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1585]! } + public var StickerPack_BuiltinPackName: String { return self._s[1590]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1586]!, self._r[1586]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1591]!, self._r[1591]!, [_1, _2]) } - public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1587]! } - public var Passport_InfoTitle: String { return self._s[1589]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1590]! } + public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1592]! } + public var Passport_InfoTitle: String { return self._s[1594]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1595]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1594]!, self._r[1594]!, [_0]) + return formatWithArgumentRanges(self._s[1599]!, self._r[1599]!, [_0]) } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1595]!, self._r[1595]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1600]!, self._r[1600]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1596]! } - public var Profile_BotInfo: String { return self._s[1597]! } - public var Watch_Compose_CreateMessage: String { return self._s[1598]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1599]! } - public var Month_ShortNovember: String { return self._s[1600]! } - public var Conversation_ScamWarning: String { return self._s[1601]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1602]! } - public var Appearance_TextSize_Title: String { return self._s[1603]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1604]! } - public var NotificationsSound_Chime: String { return self._s[1605]! } - public var Passport_Language_ko: String { return self._s[1607]! } - public var InviteText_URL: String { return self._s[1608]! } - public var TextFormat_Monospace: String { return self._s[1609]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1601]! } + public var Profile_BotInfo: String { return self._s[1602]! } + public var Watch_Compose_CreateMessage: String { return self._s[1603]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1604]! } + public var Month_ShortNovember: String { return self._s[1605]! } + public var Conversation_ScamWarning: String { return self._s[1606]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1607]! } + public var Appearance_TextSize_Title: String { return self._s[1608]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1609]! } + public var NotificationsSound_Chime: String { return self._s[1610]! } + public var Passport_Language_ko: String { return self._s[1612]! } + public var InviteText_URL: String { return self._s[1613]! } + public var TextFormat_Monospace: String { return self._s[1614]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1610]!, self._r[1610]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1615]!, self._r[1615]!, [_1, _2, _3]) } - public var EditTheme_Edit_BottomInfo: String { return self._s[1611]! } + public var EditTheme_Edit_BottomInfo: String { return self._s[1616]! } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1612]!, self._r[1612]!, [_0]) + return formatWithArgumentRanges(self._s[1617]!, self._r[1617]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1613]!, self._r[1613]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1618]!, self._r[1618]!, [_1, _2]) } - public var Wallet_Words_Title: String { return self._s[1614]! } - public var Wallet_Month_ShortMay: String { return self._s[1615]! } - public var EditTheme_CreateTitle: String { return self._s[1617]! } - public var Passport_InfoLearnMore: String { return self._s[1618]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1619]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1620]! } - public var Your_card_has_expired: String { return self._s[1621]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1622]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1623]! } - public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1627]! } - public var Conversation_Report: String { return self._s[1629]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1630]! } - public var Notification_MessageLifetime1m: String { return self._s[1631]! } - public var Privacy_ContactsTitle: String { return self._s[1632]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1633]! } - public var Wallet_WordCheck_Title: String { return self._s[1634]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1635]! } - public var Channel_Members_Title: String { return self._s[1636]! } - public var Map_OpenInWaze: String { return self._s[1637]! } - public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1638]! } - public var Login_PhoneBannedError: String { return self._s[1639]! } + public var Wallet_Words_Title: String { return self._s[1619]! } + public var Wallet_Month_ShortMay: String { return self._s[1620]! } + public var EditTheme_CreateTitle: String { return self._s[1622]! } + public var Passport_InfoLearnMore: String { return self._s[1623]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1624]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1625]! } + public var Your_card_has_expired: String { return self._s[1626]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1627]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1628]! } + public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1632]! } + public var Conversation_Report: String { return self._s[1634]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1635]! } + public var Notification_MessageLifetime1m: String { return self._s[1636]! } + public var Privacy_ContactsTitle: String { return self._s[1637]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1638]! } + public var Wallet_WordCheck_Title: String { return self._s[1639]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1640]! } + public var Channel_Members_Title: String { return self._s[1641]! } + public var Map_OpenInWaze: String { return self._s[1642]! } + public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1643]! } + public var Login_PhoneBannedError: String { return self._s[1644]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1640]!, self._r[1640]!, [_0]) + return formatWithArgumentRanges(self._s[1645]!, self._r[1645]!, [_0]) } - public var IntentsSettings_MainAccount: String { return self._s[1641]! } - public var Group_Management_AddModeratorHelp: String { return self._s[1642]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1643]! } - public var Common_OK: String { return self._s[1644]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1645]! } - public var Wallet_Words_NotDoneResponse: String { return self._s[1646]! } - public var Cache_Music: String { return self._s[1647]! } - public var Wallet_Configuration_SourceURL: String { return self._s[1648]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1649]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1652]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1653]! } + public var IntentsSettings_MainAccount: String { return self._s[1646]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1647]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1648]! } + public var Common_OK: String { return self._s[1649]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1650]! } + public var Wallet_Words_NotDoneResponse: String { return self._s[1651]! } + public var Cache_Music: String { return self._s[1652]! } + public var Wallet_Configuration_SourceURL: String { return self._s[1653]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1654]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1657]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1658]! } public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1654]!, self._r[1654]!, [_1]) + return formatWithArgumentRanges(self._s[1659]!, self._r[1659]!, [_1]) } public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1655]!, self._r[1655]!, [_0]) + return formatWithArgumentRanges(self._s[1660]!, self._r[1660]!, [_0]) } - public var TwoFactorSetup_Done_Action: String { return self._s[1656]! } + public var TwoFactorSetup_Done_Action: String { return self._s[1661]! } public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1657]!, self._r[1657]!, [_0]) + return formatWithArgumentRanges(self._s[1662]!, self._r[1662]!, [_0]) } - public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1658]! } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1660]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1661]! } - public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1663]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1664]! } - public var State_ConnectingToProxyInfo: String { return self._s[1665]! } - public var Conversation_SwipeToReplyHintTitle: String { return self._s[1666]! } - public var Message_VideoMessage: String { return self._s[1668]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1669]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1670]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1671]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1672]! } + public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1663]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1665]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1666]! } + public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1668]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1669]! } + public var State_ConnectingToProxyInfo: String { return self._s[1670]! } + public var Conversation_SwipeToReplyHintTitle: String { return self._s[1671]! } + public var Message_VideoMessage: String { return self._s[1673]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1674]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1675]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1676]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1677]! } public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1673]!, self._r[1673]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1678]!, self._r[1678]!, [_1, _2, _3]) } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1674]! } - public var Activity_RecordingAudio: String { return self._s[1675]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1676]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1677]! } - public var Wallet_Info_Address: String { return self._s[1678]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1679]! } + public var Activity_RecordingAudio: String { return self._s[1680]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1681]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1682]! } + public var Wallet_Info_Address: String { return self._s[1683]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1680]!, self._r[1680]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1685]!, self._r[1685]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1684]!, self._r[1684]!, [_0]) - } - public var Conversation_ApplyLocalization: String { return self._s[1685]! } - public var TwoFactorSetup_Intro_Action: String { return self._s[1686]! } - public var UserInfo_AddPhone: String { return self._s[1687]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1688]! } - public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1689]!, self._r[1689]!, [_0]) } - public var Passport_Scans: String { return self._s[1691]! } - public var BlockedUsers_Unblock: String { return self._s[1692]! } + public var Conversation_ApplyLocalization: String { return self._s[1690]! } + public var TwoFactorSetup_Intro_Action: String { return self._s[1691]! } + public var UserInfo_AddPhone: String { return self._s[1692]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1693]! } + public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1694]!, self._r[1694]!, [_0]) + } + public var Passport_Scans: String { return self._s[1696]! } + public var BlockedUsers_Unblock: String { return self._s[1697]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1693]!, self._r[1693]!, [_1]) + return formatWithArgumentRanges(self._s[1698]!, self._r[1698]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1694]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[1695]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1696]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1697]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1698]! } + public var Channel_Management_LabelCreator: String { return self._s[1699]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[1700]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1701]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1702]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1703]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1699]!, self._r[1699]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1704]!, self._r[1704]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1700]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1701]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1702]! } - public var ChannelIntro_CreateChannel: String { return self._s[1703]! } - public var Conversation_UnreadMessages: String { return self._s[1704]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1705]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1706]! } - public var Theme_Context_Apply: String { return self._s[1707]! } - public var Notification_GroupActivated: String { return self._s[1708]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1709]! } - public var Wallet_Intro_CreateWallet: String { return self._s[1710]! } + public var Login_PhoneNumberHelp: String { return self._s[1705]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1706]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1707]! } + public var ChannelIntro_CreateChannel: String { return self._s[1708]! } + public var Conversation_UnreadMessages: String { return self._s[1709]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1710]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1711]! } + public var Theme_Context_Apply: String { return self._s[1712]! } + public var Notification_GroupActivated: String { return self._s[1713]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1714]! } + public var Wallet_Intro_CreateWallet: String { return self._s[1715]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1711]!, self._r[1711]!, [_0]) + return formatWithArgumentRanges(self._s[1716]!, self._r[1716]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1712]!, self._r[1712]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1717]!, self._r[1717]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1714]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1719]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1715]!, self._r[1715]!, [_0]) - } - public var Undo_DeletedChannel: String { return self._s[1716]! } - public var CallFeedback_AddComment: String { return self._s[1717]! } - public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1718]!, self._r[1718]!, [_0]) - } - public var Document_TargetConfirmationFormat: String { return self._s[1719]! } - public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1720]!, self._r[1720]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1721]! } + public var Undo_DeletedChannel: String { return self._s[1721]! } + public var CallFeedback_AddComment: String { return self._s[1722]! } + public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1723]!, self._r[1723]!, [_0]) + } + public var Document_TargetConfirmationFormat: String { return self._s[1724]! } + public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1725]!, self._r[1725]!, [_0]) + } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1726]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1727]!, self._r[1727]!, [_1, _2, _3, _4]) } - public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1723]! } - public var Theme_ErrorNotFound: String { return self._s[1724]! } - public var Contacts_SortByName: String { return self._s[1725]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1726]! } + public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1728]! } + public var Theme_ErrorNotFound: String { return self._s[1729]! } + public var Contacts_SortByName: String { return self._s[1730]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1731]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1728]!, self._r[1728]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1733]!, self._r[1733]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1729]! } - public var ScheduledMessages_EditTime: String { return self._s[1730]! } - public var Conversation_ClearSelfHistory: String { return self._s[1731]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1732]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1733]! } - public var Stickers_SuggestNone: String { return self._s[1734]! } - public var ChatSettings_Cache: String { return self._s[1735]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1736]! } - public var Media_ShareThisPhoto: String { return self._s[1737]! } - public var Chat_SlowmodeTooltipPending: String { return self._s[1738]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1739]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1740]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1741]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1742]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1743]! } - public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1744]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1734]! } + public var ScheduledMessages_EditTime: String { return self._s[1735]! } + public var Conversation_ClearSelfHistory: String { return self._s[1736]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1737]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1738]! } + public var Stickers_SuggestNone: String { return self._s[1739]! } + public var ChatSettings_Cache: String { return self._s[1740]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1741]! } + public var Media_ShareThisPhoto: String { return self._s[1742]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[1743]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1744]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1745]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1746]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1747]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1748]! } + public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1749]! } public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1745]!, self._r[1745]!, [_0]) + return formatWithArgumentRanges(self._s[1750]!, self._r[1750]!, [_0]) } - public var Permissions_CellularDataTitle_v0: String { return self._s[1746]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1748]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1749]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1750]! } - public var Map_OpenIn: String { return self._s[1751]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1751]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1753]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1754]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1755]! } + public var Map_OpenIn: String { return self._s[1756]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1754]!, self._r[1754]!, [_1]) + return formatWithArgumentRanges(self._s[1759]!, self._r[1759]!, [_1]) } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1755]!, self._r[1755]!, [_0]) + return formatWithArgumentRanges(self._s[1760]!, self._r[1760]!, [_0]) } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1756]! } - public var MessagePoll_LabelClosed: String { return self._s[1757]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1759]! } - public var Wallet_Send_SendAnyway: String { return self._s[1760]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1761]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1762]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1763]! } - public var Map_SetThisPlace: String { return self._s[1764]! } - public var Login_SelectCountry_Title: String { return self._s[1765]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1766]! } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1761]! } + public var MessagePoll_LabelClosed: String { return self._s[1762]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1764]! } + public var Wallet_Send_SendAnyway: String { return self._s[1765]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1766]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1767]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1768]! } + public var Map_SetThisPlace: String { return self._s[1769]! } + public var Login_SelectCountry_Title: String { return self._s[1770]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1771]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1767]!, self._r[1767]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1772]!, self._r[1772]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1768]! } - public var Watch_Suggestion_BRB: String { return self._s[1769]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1770]! } - public var Contacts_PermissionsTitle: String { return self._s[1771]! } - public var Conversation_RestrictedInline: String { return self._s[1772]! } - public var Appearance_RemoveThemeColor: String { return self._s[1774]! } - public var StickerPack_ViewPack: String { return self._s[1775]! } - public var Wallet_UnknownError: String { return self._s[1776]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1773]! } + public var Watch_Suggestion_BRB: String { return self._s[1774]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1775]! } + public var Contacts_PermissionsTitle: String { return self._s[1776]! } + public var Conversation_RestrictedInline: String { return self._s[1777]! } + public var Appearance_RemoveThemeColor: String { return self._s[1779]! } + public var StickerPack_ViewPack: String { return self._s[1780]! } + public var Wallet_UnknownError: String { return self._s[1781]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1777]!, self._r[1777]!, [_0]) + return formatWithArgumentRanges(self._s[1782]!, self._r[1782]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1779]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1782]! } - public var MessagePoll_LabelQuiz: String { return self._s[1784]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1785]! } - public var Channel_Info_Stickers: String { return self._s[1786]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1787]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1788]! } - public var Passport_DeletePersonalDetails: String { return self._s[1789]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1790]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1791]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1792]! } - public var Conversation_SearchNoResults: String { return self._s[1795]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1796]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1797]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1798]! } - public var Login_Code: String { return self._s[1799]! } - public var EditTheme_Create_BottomInfo: String { return self._s[1800]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1801]! } - public var Weekday_ShortThursday: String { return self._s[1802]! } - public var Resolve_ErrorNotFound: String { return self._s[1804]! } - public var LastSeen_Offline: String { return self._s[1805]! } - public var PeopleNearby_NoMembers: String { return self._s[1806]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1807]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1808]! } - public var GroupInfo_Title: String { return self._s[1810]! } - public var NotificationsSound_Note: String { return self._s[1811]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1812]! } - public var Watch_Message_Poll: String { return self._s[1813]! } - public var Privacy_Calls: String { return self._s[1814]! } + public var Compose_NewChannel: String { return self._s[1784]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1787]! } + public var MessagePoll_LabelQuiz: String { return self._s[1789]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1790]! } + public var Channel_Info_Stickers: String { return self._s[1791]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1792]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1793]! } + public var Passport_DeletePersonalDetails: String { return self._s[1794]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1795]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1796]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1797]! } + public var Conversation_SearchNoResults: String { return self._s[1800]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1801]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1802]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1803]! } + public var Login_Code: String { return self._s[1804]! } + public var EditTheme_Create_BottomInfo: String { return self._s[1805]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1806]! } + public var Weekday_ShortThursday: String { return self._s[1807]! } + public var Resolve_ErrorNotFound: String { return self._s[1809]! } + public var LastSeen_Offline: String { return self._s[1810]! } + public var PeopleNearby_NoMembers: String { return self._s[1811]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1812]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1813]! } + public var GroupInfo_Title: String { return self._s[1815]! } + public var NotificationsSound_Note: String { return self._s[1816]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1817]! } + public var Watch_Message_Poll: String { return self._s[1818]! } + public var Privacy_Calls: String { return self._s[1819]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1815]!, self._r[1815]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1820]!, self._r[1820]!, [_1, _2, _3]) } - public var Month_ShortAugust: String { return self._s[1816]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1817]! } - public var Notifications_Reset: String { return self._s[1818]! } - public var Conversation_Pin: String { return self._s[1819]! } - public var Passport_Language_lv: String { return self._s[1820]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1821]! } - public var BlockedUsers_Info: String { return self._s[1822]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1824]! } - public var Watch_Conversation_Unblock: String { return self._s[1826]! } + public var Month_ShortAugust: String { return self._s[1821]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1822]! } + public var Notifications_Reset: String { return self._s[1823]! } + public var Conversation_Pin: String { return self._s[1824]! } + public var Passport_Language_lv: String { return self._s[1825]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1826]! } + public var BlockedUsers_Info: String { return self._s[1827]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1829]! } + public var Watch_Conversation_Unblock: String { return self._s[1831]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1827]!, self._r[1827]!, [_0]) + return formatWithArgumentRanges(self._s[1832]!, self._r[1832]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1828]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1829]! } + public var CloudStorage_Title: String { return self._s[1833]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1834]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1830]!, self._r[1830]!, [_0]) + return formatWithArgumentRanges(self._s[1835]!, self._r[1835]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1831]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1832]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1833]! } - public var Passport_Address_EditBankStatement: String { return self._s[1834]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1836]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1837]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1838]! } + public var Passport_Address_EditBankStatement: String { return self._s[1839]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1835]!, self._r[1835]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1840]!, self._r[1840]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1836]! } - public var ShareMenu_Comment: String { return self._s[1837]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1838]! } - public var Notifications_PermissionsTitle: String { return self._s[1839]! } - public var GroupPermission_NoSendLinks: String { return self._s[1840]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1841]! } - public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1842]! } - public var Settings_Support: String { return self._s[1843]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1844]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1845]! } - public var Privacy_Forwards_Preview: String { return self._s[1846]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1847]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1848]! } - public var Common_Select: String { return self._s[1850]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1851]! } - public var WallpaperSearch_ColorGray: String { return self._s[1854]! } - public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1855]! } - public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1856]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1857]! } - public var PollResults_Title: String { return self._s[1858]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1859]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1860]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1861]! } - public var Widget_AuthRequired: String { return self._s[1862]! } - public var Camera_FlashOn: String { return self._s[1863]! } - public var Conversation_ContextMenuLookUp: String { return self._s[1864]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1865]! } - public var Watch_Suggestion_OK: String { return self._s[1866]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1841]! } + public var ShareMenu_Comment: String { return self._s[1842]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1843]! } + public var Notifications_PermissionsTitle: String { return self._s[1844]! } + public var GroupPermission_NoSendLinks: String { return self._s[1845]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1846]! } + public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1847]! } + public var Settings_Support: String { return self._s[1848]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1849]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1850]! } + public var Privacy_Forwards_Preview: String { return self._s[1851]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1852]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1853]! } + public var Common_Select: String { return self._s[1855]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1856]! } + public var WallpaperSearch_ColorGray: String { return self._s[1859]! } + public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1860]! } + public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1861]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1862]! } + public var PollResults_Title: String { return self._s[1863]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1864]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1865]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1866]! } + public var Widget_AuthRequired: String { return self._s[1867]! } + public var Camera_FlashOn: String { return self._s[1868]! } + public var Conversation_ContextMenuLookUp: String { return self._s[1869]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1870]! } + public var Watch_Suggestion_OK: String { return self._s[1871]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1868]!, self._r[1868]!, [_0]) + return formatWithArgumentRanges(self._s[1873]!, self._r[1873]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1870]!, self._r[1870]!, [_0]) + return formatWithArgumentRanges(self._s[1875]!, self._r[1875]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1871]! } - public var DialogList_AdLabel: String { return self._s[1872]! } - public var WatchRemote_NotificationText: String { return self._s[1873]! } - public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1874]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1875]! } - public var Conversation_ReportSpam: String { return self._s[1876]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1877]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1879]! } - public var PhoneLabel_Title: String { return self._s[1880]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1881]! } - public var Settings_ChangePhoneNumber: String { return self._s[1882]! } - public var Notifications_ExceptionsTitle: String { return self._s[1883]! } - public var Notifications_AlertTones: String { return self._s[1884]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1885]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1886]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1887]! } - public var VoiceOver_Chat_Photo: String { return self._s[1889]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1890]! } - public var ReportPeer_ReasonOther: String { return self._s[1891]! } - public var ChatList_Context_JoinChannel: String { return self._s[1892]! } - public var KeyCommand_ScrollDown: String { return self._s[1894]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[1895]! } + public var TextFormat_Strikethrough: String { return self._s[1876]! } + public var DialogList_AdLabel: String { return self._s[1877]! } + public var WatchRemote_NotificationText: String { return self._s[1878]! } + public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1879]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1880]! } + public var Conversation_ReportSpam: String { return self._s[1881]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1882]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1884]! } + public var PhoneLabel_Title: String { return self._s[1885]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1886]! } + public var Settings_ChangePhoneNumber: String { return self._s[1887]! } + public var Notifications_ExceptionsTitle: String { return self._s[1888]! } + public var Notifications_AlertTones: String { return self._s[1889]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1890]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1891]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1892]! } + public var VoiceOver_Chat_Photo: String { return self._s[1894]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1895]! } + public var ReportPeer_ReasonOther: String { return self._s[1896]! } + public var ChatList_Context_JoinChannel: String { return self._s[1897]! } + public var KeyCommand_ScrollDown: String { return self._s[1899]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[1900]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1896]!, self._r[1896]!, [_0]) + return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1897]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1898]! } - public var AuthSessions_LogOut: String { return self._s[1899]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1900]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1901]! } - public var Passport_Phone_Title: String { return self._s[1902]! } - public var ContactList_Context_StartSecretChat: String { return self._s[1903]! } - public var Settings_PhoneNumber: String { return self._s[1904]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1902]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1903]! } + public var AuthSessions_LogOut: String { return self._s[1904]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1905]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1906]! } + public var Passport_Phone_Title: String { return self._s[1907]! } + public var ContactList_Context_StartSecretChat: String { return self._s[1908]! } + public var Settings_PhoneNumber: String { return self._s[1909]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1905]!, self._r[1905]!, [_0]) + return formatWithArgumentRanges(self._s[1910]!, self._r[1910]!, [_0]) } - public var NotificationsSound_Alert: String { return self._s[1907]! } - public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1908]! } - public var WebSearch_SearchNoResults: String { return self._s[1909]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1911]! } - public var Wallet_Configuration_SourceInfo: String { return self._s[1912]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1913]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1914]! } - public var PhotoEditor_CurvesTool: String { return self._s[1915]! } - public var Checkout_PaymentMethod: String { return self._s[1917]! } + public var NotificationsSound_Alert: String { return self._s[1912]! } + public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1913]! } + public var WebSearch_SearchNoResults: String { return self._s[1914]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1916]! } + public var Wallet_Configuration_SourceInfo: String { return self._s[1917]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1918]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1919]! } + public var PhotoEditor_CurvesTool: String { return self._s[1920]! } + public var Checkout_PaymentMethod: String { return self._s[1922]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1918]!, self._r[1918]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1923]!, self._r[1923]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1919]! } - public var Camera_PhotoMode: String { return self._s[1922]! } - public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1923]! } - public var Appearance_TextSize_Apply: String { return self._s[1924]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1926]! } - public var CallSettings_OnMobile: String { return self._s[1927]! } - public var Tour_Text2: String { return self._s[1928]! } + public var Contacts_AccessDeniedError: String { return self._s[1924]! } + public var Camera_PhotoMode: String { return self._s[1927]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1928]! } + public var Appearance_TextSize_Apply: String { return self._s[1929]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1931]! } + public var CallSettings_OnMobile: String { return self._s[1932]! } + public var Tour_Text2: String { return self._s[1933]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1929]!, self._r[1929]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1934]!, self._r[1934]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1931]! } - public var Permissions_Skip: String { return self._s[1932]! } - public var Wallet_Words_NotDoneOk: String { return self._s[1933]! } - public var SecretImage_Title: String { return self._s[1934]! } - public var Watch_MessageView_Title: String { return self._s[1935]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1936]! } - public var AttachmentMenu_Poll: String { return self._s[1937]! } + public var DialogList_EncryptionProcessing: String { return self._s[1936]! } + public var Permissions_Skip: String { return self._s[1937]! } + public var Wallet_Words_NotDoneOk: String { return self._s[1938]! } + public var SecretImage_Title: String { return self._s[1939]! } + public var Watch_MessageView_Title: String { return self._s[1940]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1941]! } + public var AttachmentMenu_Poll: String { return self._s[1942]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1938]!, self._r[1938]!, [_0]) + return formatWithArgumentRanges(self._s[1943]!, self._r[1943]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1939]!, self._r[1939]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1944]!, self._r[1944]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1940]! } - public var WallpaperPreview_Title: String { return self._s[1941]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1942]! } - public var Settings_ProxyConnecting: String { return self._s[1943]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1945]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[1946]! } - public var Wallet_Intro_Title: String { return self._s[1947]! } - public var TwoFactorSetup_Password_Action: String { return self._s[1948]! } - public var Profile_MessageLifetime5s: String { return self._s[1949]! } - public var Username_InvalidCharacters: String { return self._s[1950]! } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1951]! } - public var ScheduledMessages_ClearAll: String { return self._s[1952]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1953]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1954]! } - public var Settings_AddAccount: String { return self._s[1955]! } - public var Notification_CreatedChannel: String { return self._s[1958]! } + public var Notification_CallCanceled: String { return self._s[1945]! } + public var WallpaperPreview_Title: String { return self._s[1946]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1947]! } + public var Settings_ProxyConnecting: String { return self._s[1948]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1950]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[1951]! } + public var Wallet_Intro_Title: String { return self._s[1952]! } + public var TwoFactorSetup_Password_Action: String { return self._s[1953]! } + public var Profile_MessageLifetime5s: String { return self._s[1954]! } + public var Username_InvalidCharacters: String { return self._s[1955]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1956]! } + public var ScheduledMessages_ClearAll: String { return self._s[1957]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1958]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1959]! } + public var Settings_AddAccount: String { return self._s[1960]! } + public var Notification_CreatedChannel: String { return self._s[1963]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1959]!, self._r[1959]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1964]!, self._r[1964]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1961]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1962]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[1963]! } - public var Contacts_TopSection: String { return self._s[1964]! } - public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1965]! } + public var Passcode_AppLockedAlert: String { return self._s[1966]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1967]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[1968]! } + public var Contacts_TopSection: String { return self._s[1969]! } + public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1970]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1966]!, self._r[1966]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1971]!, self._r[1971]!, [_0, _1]) } - public var Wallet_Info_Receive: String { return self._s[1967]! } - public var Wallet_Completed_ViewWallet: String { return self._s[1968]! } + public var Wallet_Info_Receive: String { return self._s[1972]! } + public var Wallet_Completed_ViewWallet: String { return self._s[1973]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1969]!, self._r[1969]!, [_0]) + return formatWithArgumentRanges(self._s[1974]!, self._r[1974]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1970]! } - public var UserInfo_TapToCall: String { return self._s[1971]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1973]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1974]! } - public var Common_Search: String { return self._s[1975]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1976]! } + public var ReportPeer_ReasonSpam: String { return self._s[1975]! } + public var UserInfo_TapToCall: String { return self._s[1976]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1978]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1979]! } + public var Common_Search: String { return self._s[1980]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1981]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_0]) + return formatWithArgumentRanges(self._s[1982]!, self._r[1982]!, [_0]) } - public var Wallet_Month_ShortJuly: String { return self._s[1978]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1980]! } - public var Message_InvoiceLabel: String { return self._s[1981]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1982]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1983]! } + public var Wallet_Month_ShortJuly: String { return self._s[1983]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1985]! } + public var Message_InvoiceLabel: String { return self._s[1986]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1987]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1988]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1984]!, self._r[1984]!, [_0]) + return formatWithArgumentRanges(self._s[1989]!, self._r[1989]!, [_0]) } - public var IntentsSettings_Reset: String { return self._s[1985]! } - public var Conversation_Info: String { return self._s[1986]! } - public var Login_InfoDeletePhoto: String { return self._s[1987]! } - public var Passport_Language_vi: String { return self._s[1989]! } - public var UserInfo_ScamUserWarning: String { return self._s[1990]! } - public var Conversation_Search: String { return self._s[1991]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1993]! } - public var ReportPeer_ReasonPornography: String { return self._s[1994]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1995]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1996]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1997]! } - public var Channel_Setup_TypeHeader: String { return self._s[1998]! } - public var AuthSessions_LoggedIn: String { return self._s[1999]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2000]! } - public var Login_SmsRequestState3: String { return self._s[2001]! } - public var Passport_Address_EditUtilityBill: String { return self._s[2002]! } - public var Appearance_ReduceMotionInfo: String { return self._s[2003]! } - public var Join_ChannelsTooMuch: String { return self._s[2004]! } - public var Channel_Edit_LinkItem: String { return self._s[2005]! } - public var Privacy_Calls_P2PNever: String { return self._s[2006]! } - public var Conversation_AddToReadingList: String { return self._s[2008]! } - public var Share_MultipleMessagesDisabled: String { return self._s[2009]! } - public var Message_Animation: String { return self._s[2010]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[2011]! } - public var Map_Unknown: String { return self._s[2012]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[2013]! } + public var IntentsSettings_Reset: String { return self._s[1990]! } + public var Conversation_Info: String { return self._s[1991]! } + public var Login_InfoDeletePhoto: String { return self._s[1992]! } + public var Passport_Language_vi: String { return self._s[1994]! } + public var UserInfo_ScamUserWarning: String { return self._s[1995]! } + public var Conversation_Search: String { return self._s[1996]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1998]! } + public var ReportPeer_ReasonPornography: String { return self._s[1999]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[2000]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[2001]! } + public var Map_LiveLocationGroupDescription: String { return self._s[2002]! } + public var Channel_Setup_TypeHeader: String { return self._s[2003]! } + public var AuthSessions_LoggedIn: String { return self._s[2004]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2005]! } + public var Login_SmsRequestState3: String { return self._s[2006]! } + public var Passport_Address_EditUtilityBill: String { return self._s[2007]! } + public var Appearance_ReduceMotionInfo: String { return self._s[2008]! } + public var Join_ChannelsTooMuch: String { return self._s[2009]! } + public var Channel_Edit_LinkItem: String { return self._s[2010]! } + public var Privacy_Calls_P2PNever: String { return self._s[2011]! } + public var Conversation_AddToReadingList: String { return self._s[2013]! } + public var Share_MultipleMessagesDisabled: String { return self._s[2014]! } + public var Message_Animation: String { return self._s[2015]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[2016]! } + public var Map_Unknown: String { return self._s[2017]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[2018]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2014]!, self._r[2014]!, [_1, _2]) - } - public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2015]!, self._r[2015]!, [_1, _2]) - } - public var Call_StatusRequesting: String { return self._s[2016]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[2017]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2018]! } - public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2019]!, self._r[2019]!, [_1, _2]) } + public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2020]!, self._r[2020]!, [_1, _2]) + } + public var Call_StatusRequesting: String { return self._s[2021]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[2022]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2023]! } + public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2024]!, self._r[2024]!, [_1, _2]) + } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2020]!, self._r[2020]!, [_0]) + return formatWithArgumentRanges(self._s[2025]!, self._r[2025]!, [_0]) } - public var Update_Skip: String { return self._s[2021]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2022]! } - public var Message_PinnedPollMessage: String { return self._s[2023]! } - public var BlockedUsers_Title: String { return self._s[2024]! } - public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2025]!, self._r[2025]!, [_1]) - } - public var Username_CheckingUsername: String { return self._s[2026]! } - public var NotificationsSound_Bell: String { return self._s[2027]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[2028]! } + public var Update_Skip: String { return self._s[2026]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2027]! } + public var BlockedUsers_Title: String { return self._s[2028]! } public var Weekday_Monday: String { return self._s[2029]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2030]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2031]! } - public var ChatSettings_Groups: String { return self._s[2032]! } - public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2033]! } + public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2030]!, self._r[2030]!, [_1]) + } + public var Username_CheckingUsername: String { return self._s[2031]! } + public var NotificationsSound_Bell: String { return self._s[2032]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[2033]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2034]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2035]! } + public var ChatSettings_Groups: String { return self._s[2036]! } + public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2037]! } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2034]!, self._r[2034]!, [_0]) + return formatWithArgumentRanges(self._s[2038]!, self._r[2038]!, [_0]) } - public var Your_card_was_declined: String { return self._s[2035]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2037]! } - public var Wallet_Month_ShortApril: String { return self._s[2038]! } - public var ChatList_Unmute: String { return self._s[2039]! } - public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2040]! } - public var PhotoEditor_CurvesAll: String { return self._s[2041]! } - public var Weekday_ShortTuesday: String { return self._s[2042]! } - public var DialogList_Read: String { return self._s[2043]! } - public var Appearance_AppIconClassic: String { return self._s[2044]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2045]! } - public var Passport_Identity_Gender: String { return self._s[2046]! } + public var Your_card_was_declined: String { return self._s[2039]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2041]! } + public var Wallet_Month_ShortApril: String { return self._s[2042]! } + public var ChatList_Unmute: String { return self._s[2043]! } + public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2044]! } + public var PhotoEditor_CurvesAll: String { return self._s[2045]! } + public var Weekday_ShortTuesday: String { return self._s[2046]! } + public var DialogList_Read: String { return self._s[2047]! } + public var Appearance_AppIconClassic: String { return self._s[2048]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2049]! } + public var Passport_Identity_Gender: String { return self._s[2050]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, [_0]) - } - public var Target_SelectGroup: String { return self._s[2048]! } - public var Map_HomeAndWorkInfo: String { return self._s[2050]! } - public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2051]!, self._r[2051]!, [_0]) } - public var Passport_Language_en: String { return self._s[2052]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2053]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2054]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[2055]! } - public var ScheduledMessages_SendNow: String { return self._s[2056]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[2058]! } - public var Login_InfoHelp: String { return self._s[2059]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2060]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2061]! } + public var Target_SelectGroup: String { return self._s[2052]! } + public var Map_HomeAndWorkInfo: String { return self._s[2054]! } + public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2055]!, self._r[2055]!, [_0]) + } + public var Passport_Language_en: String { return self._s[2056]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2057]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2058]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[2059]! } + public var ScheduledMessages_SendNow: String { return self._s[2060]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[2062]! } + public var Login_InfoHelp: String { return self._s[2063]! } + public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2064]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2065]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2066]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2062]!, self._r[2062]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2067]!, self._r[2067]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[2065]! } - public var CreatePoll_Title: String { return self._s[2066]! } - public var MessagePoll_QuizNoUsers: String { return self._s[2067]! } - public var Conversation_ViewTheme: String { return self._s[2068]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2069]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2070]! } - public var TwoFactorSetup_Intro_Text: String { return self._s[2071]! } - public var UserInfo_GroupsInCommon: String { return self._s[2072]! } - public var TelegramWallet_Intro_TermsUrl: String { return self._s[2073]! } - public var Call_AudioRouteHide: String { return self._s[2074]! } + public var SocksProxySetup_AddProxy: String { return self._s[2070]! } + public var CreatePoll_Title: String { return self._s[2071]! } + public var MessagePoll_QuizNoUsers: String { return self._s[2072]! } + public var Conversation_ViewTheme: String { return self._s[2073]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2074]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2075]! } + public var TwoFactorSetup_Intro_Text: String { return self._s[2076]! } + public var UserInfo_GroupsInCommon: String { return self._s[2077]! } + public var TelegramWallet_Intro_TermsUrl: String { return self._s[2078]! } + public var Call_AudioRouteHide: String { return self._s[2079]! } public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2076]!, self._r[2076]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2081]!, self._r[2081]!, [_1, _2]) } - public var ContactInfo_PhoneLabelMobile: String { return self._s[2077]! } - public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2078]! } - public var CreatePoll_QuizOptionsHeader: String { return self._s[2079]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[2082]! } + public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2083]! } + public var CreatePoll_QuizOptionsHeader: String { return self._s[2084]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2080]!, self._r[2080]!, [_0]) + return formatWithArgumentRanges(self._s[2085]!, self._r[2085]!, [_0]) } - public var TextFormat_Bold: String { return self._s[2081]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[2082]! } - public var StickerPackActionInfo_AddedTitle: String { return self._s[2083]! } - public var Notifications_Title: String { return self._s[2084]! } - public var Group_Username_InvalidTooShort: String { return self._s[2085]! } - public var Channel_ErrorAddTooMuch: String { return self._s[2086]! } + public var TextFormat_Bold: String { return self._s[2086]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[2087]! } + public var StickerPackActionInfo_AddedTitle: String { return self._s[2088]! } + public var Notifications_Title: String { return self._s[2089]! } + public var Group_Username_InvalidTooShort: String { return self._s[2090]! } + public var Channel_ErrorAddTooMuch: String { return self._s[2091]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2087]!, self._r[2087]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2092]!, self._r[2092]!, ["\(_0)"]) } - public var VoiceOver_DiscardPreparedContent: String { return self._s[2089]! } - public var Stickers_SuggestAdded: String { return self._s[2090]! } - public var Login_CountryCode: String { return self._s[2091]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[2092]! } - public var Map_GetDirections: String { return self._s[2093]! } - public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2094]! } - public var Login_PhoneFloodError: String { return self._s[2095]! } + public var VoiceOver_DiscardPreparedContent: String { return self._s[2094]! } + public var Stickers_SuggestAdded: String { return self._s[2095]! } + public var Login_CountryCode: String { return self._s[2096]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[2097]! } + public var Map_GetDirections: String { return self._s[2098]! } + public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2099]! } + public var Login_PhoneFloodError: String { return self._s[2100]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2096]!, self._r[2096]!, [_0]) + return formatWithArgumentRanges(self._s[2101]!, self._r[2101]!, [_0]) } public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2097]!, self._r[2097]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2102]!, self._r[2102]!, [_1, _2, _3]) } - public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2098]! } - public var Settings_SetUsername: String { return self._s[2100]! } - public var Group_Location_ChangeLocation: String { return self._s[2101]! } - public var Notification_GroupInviterSelf: String { return self._s[2102]! } - public var InstantPage_TapToOpenLink: String { return self._s[2103]! } + public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2103]! } + public var Settings_SetUsername: String { return self._s[2105]! } + public var Group_Location_ChangeLocation: String { return self._s[2106]! } + public var Notification_GroupInviterSelf: String { return self._s[2107]! } + public var InstantPage_TapToOpenLink: String { return self._s[2108]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2104]!, self._r[2104]!, [_0]) - } - public var Watch_Suggestion_TalkLater: String { return self._s[2105]! } - public var SecretChat_Title: String { return self._s[2106]! } - public var Group_UpgradeNoticeText1: String { return self._s[2107]! } - public var AuthSessions_Title: String { return self._s[2108]! } - public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2109]!, self._r[2109]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[2110]! } - public var Channel_About_Title: String { return self._s[2111]! } - public var Theme_ThemeChanged: String { return self._s[2112]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[2113]! } - public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2115]!, self._r[2115]!, ["\(_0)"]) + public var Watch_Suggestion_TalkLater: String { return self._s[2110]! } + public var SecretChat_Title: String { return self._s[2111]! } + public var Group_UpgradeNoticeText1: String { return self._s[2112]! } + public var AuthSessions_Title: String { return self._s[2113]! } + public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2114]!, self._r[2114]!, [_0]) } - public var VoiceOver_MessageContextReport: String { return self._s[2116]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2118]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[2119]! } + public var PhotoEditor_CropAuto: String { return self._s[2115]! } + public var Channel_About_Title: String { return self._s[2116]! } + public var Theme_ThemeChanged: String { return self._s[2117]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[2118]! } + public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, ["\(_0)"]) + } + public var VoiceOver_MessageContextReport: String { return self._s[2121]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2123]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[2124]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_1]) + return formatWithArgumentRanges(self._s[2125]!, self._r[2125]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2122]!, self._r[2122]!, [_0]) + return formatWithArgumentRanges(self._s[2127]!, self._r[2127]!, [_0]) } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2123]!, self._r[2123]!, [_0]) + return formatWithArgumentRanges(self._s[2128]!, self._r[2128]!, [_0]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[2124]! } - public var PeopleNearby_DiscoverDescription: String { return self._s[2126]! } - public var Presence_online: String { return self._s[2128]! } - public var PasscodeSettings_Title: String { return self._s[2129]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2130]! } - public var Web_OpenExternal: String { return self._s[2131]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[2133]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2134]! } - public var LocalGroup_Title: String { return self._s[2135]! } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[2129]! } + public var PeopleNearby_DiscoverDescription: String { return self._s[2131]! } + public var Presence_online: String { return self._s[2133]! } + public var PasscodeSettings_Title: String { return self._s[2134]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2135]! } + public var Web_OpenExternal: String { return self._s[2136]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[2138]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2139]! } + public var LocalGroup_Title: String { return self._s[2140]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_0]) - } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2137]! } - public var Conversation_StopQuizConfirmation: String { return self._s[2138]! } - public var Map_YouAreHere: String { return self._s[2139]! } - public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2140]!, self._r[2140]!, [_0]) - } - public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2141]!, self._r[2141]!, [_0]) } - public var Theme_Context_ChangeColors: String { return self._s[2142]! } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2143]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2144]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2142]! } + public var Conversation_StopQuizConfirmation: String { return self._s[2143]! } + public var Map_YouAreHere: String { return self._s[2144]! } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2145]!, self._r[2145]!, [_0]) } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2146]!, self._r[2146]!, [_0]) } - public var SocksProxySetup_Username: String { return self._s[2147]! } - public var Bot_Start: String { return self._s[2148]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2149]!, self._r[2149]!, [_0]) - } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Theme_Context_ChangeColors: String { return self._s[2147]! } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2148]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2149]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[2151]! } - public var AccentColor_Title: String { return self._s[2153]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2154]! } + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, [_0]) + } + public var SocksProxySetup_Username: String { return self._s[2152]! } + public var Bot_Start: String { return self._s[2153]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2154]!, self._r[2154]!, [_0]) + } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[2156]! } + public var AccentColor_Title: String { return self._s[2158]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2159]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2160]!, self._r[2160]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2156]!, self._r[2156]!, [_0]) + return formatWithArgumentRanges(self._s[2161]!, self._r[2161]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2162]!, self._r[2162]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[2158]! } - public var Login_InfoAvatarPhoto: String { return self._s[2159]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2160]! } - public var Tour_Title4: String { return self._s[2161]! } - public var Passport_Identity_Translation: String { return self._s[2162]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2163]! } - public var Login_TermsOfServiceLabel: String { return self._s[2165]! } - public var Passport_Language_it: String { return self._s[2166]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2167]! } - public var Passport_Identity_SelfieHelp: String { return self._s[2168]! } - public var Conversation_ClearAll: String { return self._s[2170]! } - public var Wallet_Send_UninitializedText: String { return self._s[2172]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[2173]! } - public var TwoStepAuth_FloodError: String { return self._s[2174]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[2163]! } + public var Login_InfoAvatarPhoto: String { return self._s[2164]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2165]! } + public var Tour_Title4: String { return self._s[2166]! } + public var Passport_Identity_Translation: String { return self._s[2167]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2168]! } + public var Login_TermsOfServiceLabel: String { return self._s[2170]! } + public var Passport_Language_it: String { return self._s[2171]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2172]! } + public var Passport_Identity_SelfieHelp: String { return self._s[2173]! } + public var Conversation_ClearAll: String { return self._s[2175]! } + public var Wallet_Send_UninitializedText: String { return self._s[2177]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[2178]! } + public var TwoStepAuth_FloodError: String { return self._s[2179]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2175]!, self._r[2175]!, [_1]) + return formatWithArgumentRanges(self._s[2180]!, self._r[2180]!, [_1]) } - public var Paint_Delete: String { return self._s[2176]! } + public var Paint_Delete: String { return self._s[2181]! } public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_0]) + return formatWithArgumentRanges(self._s[2182]!, self._r[2182]!, [_0]) } - public var Privacy_AddNewPeer: String { return self._s[2178]! } + public var Privacy_AddNewPeer: String { return self._s[2183]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2179]!, self._r[2179]!, [_1]) + return formatWithArgumentRanges(self._s[2184]!, self._r[2184]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[2180]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[2185]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2181]!, self._r[2181]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2186]!, self._r[2186]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[2182]! } + public var Message_PinnedAudioMessage: String { return self._s[2187]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2183]!, self._r[2183]!, [_0]) + return formatWithArgumentRanges(self._s[2188]!, self._r[2188]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[2184]! } - public var Notifications_GroupNotificationsSound: String { return self._s[2185]! } - public var Wallet_Month_GenNovember: String { return self._s[2186]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[2187]! } - public var Conversation_MessageEditedLabel: String { return self._s[2188]! } + public var Notification_Mute1hMin: String { return self._s[2189]! } + public var Notifications_GroupNotificationsSound: String { return self._s[2190]! } + public var Wallet_Month_GenNovember: String { return self._s[2191]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[2192]! } + public var Conversation_MessageEditedLabel: String { return self._s[2193]! } public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2189]!, self._r[2189]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2194]!, self._r[2194]!, [_0, _1]) } - public var Notification_Exceptions_AlwaysOff: String { return self._s[2190]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2191]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[2195]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2196]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2192]!, self._r[2192]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[2193]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[2198]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2194]!, self._r[2194]!, [_1]) + return formatWithArgumentRanges(self._s[2199]!, self._r[2199]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[2195]! } - public var Month_GenOctober: String { return self._s[2196]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2197]! } - public var EnterPasscode_EnterPasscode: String { return self._s[2198]! } - public var MediaPicker_TimerTooltip: String { return self._s[2200]! } - public var SharedMedia_TitleAll: String { return self._s[2201]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2204]! } - public var Conversation_RestrictedMedia: String { return self._s[2205]! } - public var AccessDenied_PhotosRestricted: String { return self._s[2206]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2208]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2209]! } + public var AccessDenied_LocationTracking: String { return self._s[2200]! } + public var Month_GenOctober: String { return self._s[2201]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2202]! } + public var EnterPasscode_EnterPasscode: String { return self._s[2203]! } + public var MediaPicker_TimerTooltip: String { return self._s[2205]! } + public var SharedMedia_TitleAll: String { return self._s[2206]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2209]! } + public var Conversation_RestrictedMedia: String { return self._s[2210]! } + public var AccessDenied_PhotosRestricted: String { return self._s[2211]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2213]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2214]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2210]!, self._r[2210]!, [_0]) + return formatWithArgumentRanges(self._s[2215]!, self._r[2215]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[2213]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[2215]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2216]! } + public var Conversation_SavedMessages: String { return self._s[2218]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[2220]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2221]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_0]) + return formatWithArgumentRanges(self._s[2223]!, self._r[2223]!, [_0]) } - public var VoiceOver_Chat_YourMessage: String { return self._s[2219]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2224]! } public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2220]!, self._r[2220]!, [_0]) + return formatWithArgumentRanges(self._s[2225]!, self._r[2225]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[2221]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2222]! } + public var ReportPeer_AlertSuccess: String { return self._s[2226]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2227]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2223]!, self._r[2223]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[2224]! } - public var PhotoEditor_FadeTool: String { return self._s[2225]! } - public var Privacy_ContactsReset: String { return self._s[2226]! } + public var Checkout_PasswordEntry_Title: String { return self._s[2229]! } + public var PhotoEditor_FadeTool: String { return self._s[2230]! } + public var Privacy_ContactsReset: String { return self._s[2231]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_0]) + return formatWithArgumentRanges(self._s[2233]!, self._r[2233]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[2229]! } - public var ChatList_Mute: String { return self._s[2230]! } + public var Message_PinnedVideoMessage: String { return self._s[2234]! } + public var ChatList_Mute: String { return self._s[2235]! } public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2231]!, self._r[2231]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2236]!, self._r[2236]!, [_1, _2, _3]) } - public var Permissions_CellularDataText_v0: String { return self._s[2232]! } - public var ShareMenu_SelectChats: String { return self._s[2235]! } - public var ChatList_Context_Unarchive: String { return self._s[2236]! } - public var MusicPlayer_VoiceNote: String { return self._s[2237]! } - public var Conversation_RestrictedText: String { return self._s[2238]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2239]! } - public var Wallet_Month_GenApril: String { return self._s[2240]! } - public var Wallet_Month_ShortMarch: String { return self._s[2241]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[2242]! } - public var Cache_Videos: String { return self._s[2243]! } - public var PrivacySettings_PhoneNumber: String { return self._s[2244]! } - public var Wallet_Month_GenFebruary: String { return self._s[2245]! } - public var FeatureDisabled_Oops: String { return self._s[2247]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[2248]! } + public var Permissions_CellularDataText_v0: String { return self._s[2237]! } + public var Conversation_PinnedQuiz: String { return self._s[2239]! } + public var ShareMenu_SelectChats: String { return self._s[2241]! } + public var ChatList_Context_Unarchive: String { return self._s[2242]! } + public var MusicPlayer_VoiceNote: String { return self._s[2243]! } + public var Conversation_RestrictedText: String { return self._s[2244]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2245]! } + public var Wallet_Month_GenApril: String { return self._s[2246]! } + public var Wallet_Month_ShortMarch: String { return self._s[2247]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[2248]! } + public var Cache_Videos: String { return self._s[2249]! } + public var PrivacySettings_PhoneNumber: String { return self._s[2250]! } + public var Wallet_Month_GenFebruary: String { return self._s[2251]! } + public var FeatureDisabled_Oops: String { return self._s[2253]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[2254]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2249]!, self._r[2249]!, [_0]) + return formatWithArgumentRanges(self._s[2255]!, self._r[2255]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[2251]! } - public var GroupPermission_NoSendPolls: String { return self._s[2252]! } - public var Wallet_Qr_ScanCode: String { return self._s[2253]! } - public var Message_VideoExpired: String { return self._s[2255]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[2256]! } - public var Notifications_Badge: String { return self._s[2257]! } - public var Wallet_Receive_AddressCopied: String { return self._s[2258]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[2259]! } - public var Username_InvalidTooShort: String { return self._s[2260]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2261]! } - public var Channel_AdminLog_PinMessages: String { return self._s[2262]! } - public var ArchivedChats_IntroTitle3: String { return self._s[2263]! } + public var Stickers_GroupStickersHelp: String { return self._s[2257]! } + public var GroupPermission_NoSendPolls: String { return self._s[2258]! } + public var Wallet_Qr_ScanCode: String { return self._s[2259]! } + public var Message_VideoExpired: String { return self._s[2261]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2262]! } + public var Notifications_Badge: String { return self._s[2263]! } + public var Wallet_Receive_AddressCopied: String { return self._s[2264]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2265]! } + public var Username_InvalidTooShort: String { return self._s[2266]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2267]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2268]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2269]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2264]!, self._r[2264]!, [_1]) - } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[2265]! } - public var Conversation_DefaultRestrictedText: String { return self._s[2266]! } - public var SharedMedia_CategoryDocs: String { return self._s[2269]! } - public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2270]!, self._r[2270]!, [_1]) } - public var Wallet_Send_UninitializedTitle: String { return self._s[2271]! } - public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2272]! } - public var Privacy_Forwards_NeverLink: String { return self._s[2274]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2271]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2272]! } + public var SharedMedia_CategoryDocs: String { return self._s[2275]! } + public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2276]!, self._r[2276]!, [_1]) + } + public var Wallet_Send_UninitializedTitle: String { return self._s[2277]! } + public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2278]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2280]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2275]!, self._r[2275]!, [_1]) + return formatWithArgumentRanges(self._s[2281]!, self._r[2281]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2276]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2282]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2277]!, self._r[2277]!, [_0]) + return formatWithArgumentRanges(self._s[2283]!, self._r[2283]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2278]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2279]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2280]! } - public var Channel_UpdatePhotoItem: String { return self._s[2281]! } - public var GroupInfo_LeftStatus: String { return self._s[2282]! } - public var Watch_MessageView_Forward: String { return self._s[2284]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2285]! } - public var Cache_ClearEmpty: String { return self._s[2287]! } - public var Localization_LanguageName: String { return self._s[2288]! } - public var Wallet_AccessDenied_Title: String { return self._s[2289]! } - public var WebSearch_GIFs: String { return self._s[2290]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2291]! } - public var Wallet_AccessDenied_Settings: String { return self._s[2292]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2293]! } - public var Common_Back: String { return self._s[2294]! } - public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2295]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2296]! } - public var Wallet_Send_Send: String { return self._s[2297]! } + public var ChatSettings_PrivateChats: String { return self._s[2284]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2285]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2286]! } + public var Channel_UpdatePhotoItem: String { return self._s[2287]! } + public var GroupInfo_LeftStatus: String { return self._s[2288]! } + public var Watch_MessageView_Forward: String { return self._s[2290]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2291]! } + public var Cache_ClearEmpty: String { return self._s[2293]! } + public var Localization_LanguageName: String { return self._s[2294]! } + public var Wallet_AccessDenied_Title: String { return self._s[2295]! } + public var WebSearch_GIFs: String { return self._s[2296]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2297]! } + public var Wallet_AccessDenied_Settings: String { return self._s[2298]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2299]! } + public var Common_Back: String { return self._s[2300]! } + public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2301]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2302]! } + public var Wallet_Send_Send: String { return self._s[2303]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2299]!, self._r[2299]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2305]!, self._r[2305]!, [_1, _2]) } - public var Wallet_Info_RefreshErrorTitle: String { return self._s[2300]! } - public var Wallet_Month_GenJune: String { return self._s[2301]! } - public var Passport_Email_Help: String { return self._s[2302]! } - public var Watch_Conversation_Reply: String { return self._s[2304]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2307]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2308]! } - public var Channel_BanUser_Unban: String { return self._s[2310]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2311]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2312]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2314]! } - public var Wallet_Send_AddressHeader: String { return self._s[2315]! } - public var Passport_Identity_Name: String { return self._s[2316]! } + public var Wallet_Info_RefreshErrorTitle: String { return self._s[2306]! } + public var Wallet_Month_GenJune: String { return self._s[2307]! } + public var Passport_Email_Help: String { return self._s[2308]! } + public var Watch_Conversation_Reply: String { return self._s[2310]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2313]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2314]! } + public var Channel_BanUser_Unban: String { return self._s[2316]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2317]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2318]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2320]! } + public var Wallet_Send_AddressHeader: String { return self._s[2321]! } + public var Passport_Identity_Name: String { return self._s[2322]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2317]!, self._r[2317]!, [_0]) + return formatWithArgumentRanges(self._s[2323]!, self._r[2323]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2318]! } - public var Conversation_BlockUser: String { return self._s[2319]! } - public var Month_GenJanuary: String { return self._s[2320]! } - public var ChatSettings_TextSize: String { return self._s[2321]! } - public var Notification_PassportValuePhone: String { return self._s[2322]! } - public var MediaPlayer_UnknownArtist: String { return self._s[2323]! } - public var Passport_Language_ne: String { return self._s[2324]! } - public var Notification_CallBack: String { return self._s[2325]! } - public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2326]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2327]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2324]! } + public var Conversation_BlockUser: String { return self._s[2325]! } + public var Month_GenJanuary: String { return self._s[2326]! } + public var ChatSettings_TextSize: String { return self._s[2327]! } + public var Notification_PassportValuePhone: String { return self._s[2328]! } + public var MediaPlayer_UnknownArtist: String { return self._s[2329]! } + public var Passport_Language_ne: String { return self._s[2330]! } + public var Notification_CallBack: String { return self._s[2331]! } + public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2332]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2333]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2328]!, self._r[2328]!, [_0]) + return formatWithArgumentRanges(self._s[2334]!, self._r[2334]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2329]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2330]! } - public var Stickers_FrequentlyUsed: String { return self._s[2331]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2332]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2334]! } + public var Channel_Info_Management: String { return self._s[2335]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2336]! } + public var Stickers_FrequentlyUsed: String { return self._s[2337]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2338]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2340]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2335]!, self._r[2335]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2341]!, self._r[2341]!, [_1, "\(_2)"]) } - public var TwoFactorSetup_Password_Title: String { return self._s[2336]! } - public var Passport_Address_EditResidentialAddress: String { return self._s[2337]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2338]! } - public var CreatePoll_TextHeader: String { return self._s[2339]! } + public var TwoFactorSetup_Password_Title: String { return self._s[2342]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2343]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2344]! } + public var CreatePoll_TextHeader: String { return self._s[2345]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2340]!, self._r[2340]!, [_0]) + return formatWithArgumentRanges(self._s[2346]!, self._r[2346]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2341]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2342]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2344]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2345]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2346]! } + public var PhotoEditor_QualityMedium: String { return self._s[2347]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2348]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2350]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2351]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2352]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2347]!, self._r[2347]!, [_0]) + return formatWithArgumentRanges(self._s[2353]!, self._r[2353]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2348]!, self._r[2348]!, [_1]) + return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_1]) } - public var LogoutOptions_LogOutWalletInfo: String { return self._s[2349]! } - public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2350]! } - public var Conversation_LinkDialogOpen: String { return self._s[2352]! } - public var TwoFactorSetup_Hint_Title: String { return self._s[2353]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2354]! } - public var Settings_Username: String { return self._s[2356]! } - public var Conversation_Block: String { return self._s[2358]! } - public var Wallpaper_Wallpaper: String { return self._s[2359]! } - public var SocksProxySetup_UseProxy: String { return self._s[2361]! } - public var Wallet_Send_Confirmation: String { return self._s[2362]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2363]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2364]! } - public var MessageTimer_Forever: String { return self._s[2365]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2366]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2367]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2368]! } - public var Passport_Language_da: String { return self._s[2369]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2370]! } + public var LogoutOptions_LogOutWalletInfo: String { return self._s[2355]! } + public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2356]! } + public var Conversation_LinkDialogOpen: String { return self._s[2358]! } + public var TwoFactorSetup_Hint_Title: String { return self._s[2359]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2360]! } + public var Settings_Username: String { return self._s[2362]! } + public var Conversation_Block: String { return self._s[2364]! } + public var Wallpaper_Wallpaper: String { return self._s[2365]! } + public var SocksProxySetup_UseProxy: String { return self._s[2367]! } + public var Wallet_Send_Confirmation: String { return self._s[2368]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2369]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2370]! } + public var MessageTimer_Forever: String { return self._s[2371]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2372]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2373]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2374]! } + public var Passport_Language_da: String { return self._s[2375]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2376]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2371]!, self._r[2371]!, [_0]) + return formatWithArgumentRanges(self._s[2377]!, self._r[2377]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[2372]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2378]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2374]!, self._r[2374]!, [_0]) + return formatWithArgumentRanges(self._s[2380]!, self._r[2380]!, [_0]) } - public var Settings_AddDevice: String { return self._s[2375]! } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2377]! } - public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2378]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2379]! } - public var Conversation_PinnedPoll: String { return self._s[2380]! } - public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2381]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2382]! } - public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2383]! } + public var Settings_AddDevice: String { return self._s[2381]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2383]! } + public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2384]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2385]! } + public var Conversation_PinnedPoll: String { return self._s[2386]! } + public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2387]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2388]! } + public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2389]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2384]!, self._r[2384]!, [_1]) + return formatWithArgumentRanges(self._s[2390]!, self._r[2390]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[2385]! } - public var Cache_ByPeerHeader: String { return self._s[2386]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2391]! } + public var Cache_ByPeerHeader: String { return self._s[2392]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2387]!, self._r[2387]!, [_0]) + return formatWithArgumentRanges(self._s[2393]!, self._r[2393]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2388]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2391]! } - public var Wallet_Completed_Title: String { return self._s[2392]! } - public var Notification_PinnedMessage: String { return self._s[2393]! } - public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2394]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2396]! } - public var Contacts_SortBy: String { return self._s[2397]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2394]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2397]! } + public var Wallet_Completed_Title: String { return self._s[2398]! } + public var Notification_PinnedMessage: String { return self._s[2399]! } + public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2400]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2402]! } + public var Contacts_SortBy: String { return self._s[2403]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2398]!, self._r[2398]!, [_1]) + return formatWithArgumentRanges(self._s[2404]!, self._r[2404]!, [_1]) } - public var Appearance_ColorThemeNight: String { return self._s[2400]! } + public var Appearance_ColorThemeNight: String { return self._s[2406]! } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2401]!, self._r[2401]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2407]!, self._r[2407]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2402]! } - public var Watch_UserInfo_Service: String { return self._s[2403]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2405]! } - public var Conversation_Unpin: String { return self._s[2407]! } - public var CancelResetAccount_Title: String { return self._s[2408]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2409]! } + public var Call_EncryptionKey_Title: String { return self._s[2408]! } + public var Watch_UserInfo_Service: String { return self._s[2409]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2411]! } + public var Conversation_Unpin: String { return self._s[2413]! } + public var CancelResetAccount_Title: String { return self._s[2414]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2415]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2417]!, self._r[2417]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2412]! } - public var CallSettings_Title: String { return self._s[2413]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2414]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2416]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2417]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2418]! } + public var Appearance_BubbleCorners_Title: String { return self._s[2419]! } + public var CallSettings_Title: String { return self._s[2420]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2421]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2423]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2424]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2418]!, self._r[2418]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2425]!, self._r[2425]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2419]! } - public var LoginPassword_PasswordHelp: String { return self._s[2420]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2421]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2422]! } - public var ChatContextMenu_TextSelectionTip: String { return self._s[2423]! } - public var Checkout_TotalPaidAmount: String { return self._s[2424]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2426]! } + public var LoginPassword_PasswordHelp: String { return self._s[2427]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2428]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2429]! } + public var ChatContextMenu_TextSelectionTip: String { return self._s[2430]! } + public var Checkout_TotalPaidAmount: String { return self._s[2431]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2425]!, self._r[2425]!, [_0]) + return formatWithArgumentRanges(self._s[2432]!, self._r[2432]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2426]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2428]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2429]! } + public var ChatState_Updating: String { return self._s[2433]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2434]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2436]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2437]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2430]!, self._r[2430]!, [_1]) + return formatWithArgumentRanges(self._s[2438]!, self._r[2438]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2431]! } - public var Contacts_InviteFriends: String { return self._s[2433]! } - public var Map_ChooseLocationTitle: String { return self._s[2434]! } - public var Conversation_StopPoll: String { return self._s[2436]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2439]! } + public var Contacts_InviteFriends: String { return self._s[2441]! } + public var Map_ChooseLocationTitle: String { return self._s[2442]! } + public var Conversation_StopPoll: String { return self._s[2444]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2437]!, self._r[2437]!, [_0]) + return formatWithArgumentRanges(self._s[2445]!, self._r[2445]!, [_0]) } - public var Call_Camera: String { return self._s[2438]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2439]! } - public var AppWallet_Intro_Text: String { return self._s[2440]! } - public var Calls_RatingFeedback: String { return self._s[2441]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2443]! } - public var Wallet_Alert_OK: String { return self._s[2444]! } - public var NotificationsSound_Pulse: String { return self._s[2445]! } - public var Watch_LastSeen_Lately: String { return self._s[2446]! } - public var ReportGroupLocation_Report: String { return self._s[2449]! } - public var Widget_NoUsers: String { return self._s[2450]! } - public var Conversation_UnvotePoll: String { return self._s[2451]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2453]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2454]! } - public var NotificationsSound_Circles: String { return self._s[2455]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2458]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2459]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2460]! } - public var Proxy_TooltipUnavailable: String { return self._s[2461]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2463]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2465]! } - public var Conversation_FileDropbox: String { return self._s[2466]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2467]! } - public var Tour_Text3: String { return self._s[2469]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2471]! } - public var GroupPermission_NoSendMessages: String { return self._s[2472]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2473]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2474]! } + public var Call_Camera: String { return self._s[2446]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2447]! } + public var AppWallet_Intro_Text: String { return self._s[2448]! } + public var Appearance_BubbleCornersSetting: String { return self._s[2449]! } + public var Calls_RatingFeedback: String { return self._s[2450]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2452]! } + public var Wallet_Alert_OK: String { return self._s[2453]! } + public var NotificationsSound_Pulse: String { return self._s[2454]! } + public var Watch_LastSeen_Lately: String { return self._s[2455]! } + public var ReportGroupLocation_Report: String { return self._s[2458]! } + public var Widget_NoUsers: String { return self._s[2459]! } + public var Conversation_UnvotePoll: String { return self._s[2460]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2462]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2463]! } + public var NotificationsSound_Circles: String { return self._s[2464]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2467]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2468]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2469]! } + public var Proxy_TooltipUnavailable: String { return self._s[2470]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2472]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2474]! } + public var Conversation_FileDropbox: String { return self._s[2475]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2476]! } + public var Tour_Text3: String { return self._s[2478]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2480]! } + public var GroupPermission_NoSendMessages: String { return self._s[2481]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2482]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2483]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2476]!, self._r[2476]!, [_0]) + return formatWithArgumentRanges(self._s[2485]!, self._r[2485]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2477]! } - public var Checkout_ShippingOption_Title: String { return self._s[2478]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2479]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2486]! } + public var Checkout_ShippingOption_Title: String { return self._s[2487]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2488]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2480]!, self._r[2480]!, [_0]) + return formatWithArgumentRanges(self._s[2489]!, self._r[2489]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2481]!, self._r[2481]!, [_0]) + return formatWithArgumentRanges(self._s[2490]!, self._r[2490]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2482]! } - public var EditTheme_FileReadError: String { return self._s[2483]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2484]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2485]! } - public var AutoDownloadSettings_Photos: String { return self._s[2487]! } - public var Appearance_PreviewIncomingText: String { return self._s[2488]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2489]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2490]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2491]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2492]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2493]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2494]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2495]! } - public var Notification_SecretChatScreenshot: String { return self._s[2496]! } - public var AccessDenied_Wallpapers: String { return self._s[2497]! } - public var ChatList_Context_Mute: String { return self._s[2499]! } - public var Passport_Address_City: String { return self._s[2500]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2501]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2502]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2503]! } - public var AccessDenied_LocationDisabled: String { return self._s[2504]! } - public var Group_Location_Title: String { return self._s[2505]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2507]! } - public var GroupInfo_Sound: String { return self._s[2508]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2509]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2510]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2511]! } - public var Contacts_Title: String { return self._s[2512]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2513]! } - public var Passport_Language_fr: String { return self._s[2514]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2515]! } - public var Notifications_ResetAllNotifications: String { return self._s[2516]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2518]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2520]! } - public var Checkout_NewCard_Title: String { return self._s[2521]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2522]! } - public var Conversation_ForwardChats: String { return self._s[2523]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2525]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2526]! } - public var Settings_FAQ: String { return self._s[2528]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2529]! } - public var Conversation_ContextMenuForward: String { return self._s[2530]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2533]! } - public var PrivacyPolicy_Title: String { return self._s[2536]! } - public var Notifications_TextTone: String { return self._s[2537]! } - public var Profile_CreateNewContact: String { return self._s[2538]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2539]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2541]! } - public var Call_Speaker: String { return self._s[2542]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2543]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2545]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2546]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2491]! } + public var EditTheme_FileReadError: String { return self._s[2492]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2493]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2494]! } + public var AutoDownloadSettings_Photos: String { return self._s[2496]! } + public var Appearance_PreviewIncomingText: String { return self._s[2497]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2498]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2499]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2500]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2501]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2502]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2503]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2504]! } + public var Notification_SecretChatScreenshot: String { return self._s[2505]! } + public var AccessDenied_Wallpapers: String { return self._s[2506]! } + public var ChatList_Context_Mute: String { return self._s[2508]! } + public var Passport_Address_City: String { return self._s[2509]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2510]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2511]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2512]! } + public var AccessDenied_LocationDisabled: String { return self._s[2513]! } + public var Group_Location_Title: String { return self._s[2514]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2516]! } + public var GroupInfo_Sound: String { return self._s[2517]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2518]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2519]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2520]! } + public var Contacts_Title: String { return self._s[2521]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2522]! } + public var Passport_Language_fr: String { return self._s[2523]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2524]! } + public var Notifications_ResetAllNotifications: String { return self._s[2525]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2527]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2529]! } + public var Checkout_NewCard_Title: String { return self._s[2530]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2531]! } + public var Conversation_ForwardChats: String { return self._s[2532]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2534]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2535]! } + public var Settings_FAQ: String { return self._s[2537]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2538]! } + public var Conversation_ContextMenuForward: String { return self._s[2539]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2542]! } + public var PrivacyPolicy_Title: String { return self._s[2545]! } + public var Notifications_TextTone: String { return self._s[2546]! } + public var Profile_CreateNewContact: String { return self._s[2547]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2548]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2550]! } + public var Call_Speaker: String { return self._s[2551]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2552]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2554]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2555]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2547]!, self._r[2547]!, [_0]) + return formatWithArgumentRanges(self._s[2556]!, self._r[2556]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2548]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2549]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2550]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2551]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2552]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2553]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2554]! } - public var Bot_Unblock: String { return self._s[2555]! } - public var TextFormat_Italic: String { return self._s[2556]! } - public var WallpaperSearch_ColorPink: String { return self._s[2557]! } - public var Settings_About_Help: String { return self._s[2559]! } - public var SearchImages_Title: String { return self._s[2560]! } - public var Weekday_Wednesday: String { return self._s[2561]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2562]! } - public var ExplicitContent_AlertTitle: String { return self._s[2563]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2557]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2558]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2559]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2560]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2561]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2562]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2563]! } + public var Bot_Unblock: String { return self._s[2564]! } + public var TextFormat_Italic: String { return self._s[2565]! } + public var WallpaperSearch_ColorPink: String { return self._s[2566]! } + public var Settings_About_Help: String { return self._s[2568]! } + public var SearchImages_Title: String { return self._s[2569]! } + public var Weekday_Wednesday: String { return self._s[2570]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2571]! } + public var ExplicitContent_AlertTitle: String { return self._s[2572]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2564]!, self._r[2564]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2573]!, self._r[2573]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2565]! } - public var Weekday_Thursday: String { return self._s[2566]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2567]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2568]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2574]! } + public var Weekday_Thursday: String { return self._s[2575]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2576]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2577]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2569]!, self._r[2569]!, [_0]) + return formatWithArgumentRanges(self._s[2578]!, self._r[2578]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2570]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2571]! } - public var Passport_RequestedInformation: String { return self._s[2572]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2573]! } - public var Conversation_EncryptionProcessing: String { return self._s[2575]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2576]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2578]! } - public var Channel_Setup_Title: String { return self._s[2579]! } - public var Conversation_SearchPlaceholder: String { return self._s[2580]! } - public var OldChannels_GroupEmptyFormat: String { return self._s[2581]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2582]! } - public var Checkout_ErrorGeneric: String { return self._s[2583]! } - public var Passport_Language_hu: String { return self._s[2584]! } - public var GroupPermission_EditingDisabled: String { return self._s[2585]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2587]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2579]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2580]! } + public var Passport_RequestedInformation: String { return self._s[2581]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2582]! } + public var Conversation_EncryptionProcessing: String { return self._s[2584]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2585]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2587]! } + public var Channel_Setup_Title: String { return self._s[2588]! } + public var Conversation_SearchPlaceholder: String { return self._s[2589]! } + public var OldChannels_GroupEmptyFormat: String { return self._s[2590]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2591]! } + public var Checkout_ErrorGeneric: String { return self._s[2592]! } + public var Passport_Language_hu: String { return self._s[2593]! } + public var GroupPermission_EditingDisabled: String { return self._s[2594]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2596]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2588]!, self._r[2588]!, [_0]) + return formatWithArgumentRanges(self._s[2597]!, self._r[2597]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2591]!, self._r[2591]!, [_1]) + return formatWithArgumentRanges(self._s[2600]!, self._r[2600]!, [_1]) } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2592]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2601]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2593]!, self._r[2593]!, [_0]) + return formatWithArgumentRanges(self._s[2602]!, self._r[2602]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2594]! } - public var Group_Location_Info: String { return self._s[2595]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2596]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2597]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2603]! } + public var Group_Location_Info: String { return self._s[2604]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2605]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2606]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2598]!, self._r[2598]!, [_0]) + return formatWithArgumentRanges(self._s[2607]!, self._r[2607]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2599]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2600]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2601]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2602]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2608]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2609]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2610]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2611]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2603]!, self._r[2603]!, [_0]) + return formatWithArgumentRanges(self._s[2612]!, self._r[2612]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2604]! } - public var Message_PinnedAnimationMessage: String { return self._s[2606]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2608]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2609]! } - public var Wallet_Info_TransactionTo: String { return self._s[2611]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2612]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2613]! } - public var Embed_PlayingInPIP: String { return self._s[2614]! } - public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2615]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2616]! } + public func Notification_PinnedQuizMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2613]!, self._r[2613]!, [_0]) + } + public var Passport_Language_cs: String { return self._s[2614]! } + public var Message_PinnedAnimationMessage: String { return self._s[2616]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2618]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2619]! } + public var Wallet_Info_TransactionTo: String { return self._s[2621]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2622]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2623]! } + public var Embed_PlayingInPIP: String { return self._s[2624]! } + public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2625]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2626]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2617]!, self._r[2617]!, [_0]) + return formatWithArgumentRanges(self._s[2627]!, self._r[2627]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2618]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2628]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2619]!, self._r[2619]!, [_1]) + return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2620]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2621]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2622]! } - public var AutoNightTheme_System: String { return self._s[2623]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2624]! } - public var CreatePoll_QuizTitle: String { return self._s[2625]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2626]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2627]! } + public var Notification_PaymentSent: String { return self._s[2630]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2631]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2632]! } + public var AutoNightTheme_System: String { return self._s[2633]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2634]! } + public var CreatePoll_QuizTitle: String { return self._s[2635]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2636]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2637]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2630]!, self._r[2630]!, [_1]) + return formatWithArgumentRanges(self._s[2640]!, self._r[2640]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_1]) + return formatWithArgumentRanges(self._s[2641]!, self._r[2641]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_1]) + return formatWithArgumentRanges(self._s[2642]!, self._r[2642]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2634]! } - public var PasscodeSettings_HelpTop: String { return self._s[2635]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2636]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2637]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2638]! } - public var EditTheme_ShortLink: String { return self._s[2639]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2640]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2641]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2642]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2643]! } - public var Call_Accept: String { return self._s[2645]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2646]! } - public var Month_GenMarch: String { return self._s[2648]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2649]! } - public var LoginPassword_Title: String { return self._s[2650]! } - public var Call_End: String { return self._s[2651]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2652]! } - public var VoiceOver_Chat_Contact: String { return self._s[2653]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2654]! } - public var CallSettings_Always: String { return self._s[2655]! } - public var CallFeedback_Success: String { return self._s[2656]! } - public var TwoStepAuth_SetupHint: String { return self._s[2657]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2644]! } + public var PasscodeSettings_HelpTop: String { return self._s[2645]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2646]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2647]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2648]! } + public var EditTheme_ShortLink: String { return self._s[2649]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2650]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2651]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2652]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2653]! } + public var Call_Accept: String { return self._s[2655]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2656]! } + public var Month_GenMarch: String { return self._s[2658]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2659]! } + public var LoginPassword_Title: String { return self._s[2660]! } + public var Call_End: String { return self._s[2661]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2662]! } + public var VoiceOver_Chat_Contact: String { return self._s[2663]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2664]! } + public var CallSettings_Always: String { return self._s[2665]! } + public var CallFeedback_Success: String { return self._s[2666]! } + public var TwoStepAuth_SetupHint: String { return self._s[2667]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2658]!, self._r[2658]!, [_1]) + return formatWithArgumentRanges(self._s[2668]!, self._r[2668]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2659]! } - public var Login_PhoneTitle: String { return self._s[2660]! } - public var Passport_FieldPhoneHelp: String { return self._s[2661]! } - public var Weekday_ShortSunday: String { return self._s[2662]! } - public var Passport_InfoFAQ_URL: String { return self._s[2663]! } - public var ContactInfo_Job: String { return self._s[2665]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2666]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2667]! } - public var CreatePoll_QuizTip: String { return self._s[2668]! } - public var TwoFactorSetup_Email_Text: String { return self._s[2669]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2670]! } - public var Invite_ChannelsTooMuch: String { return self._s[2671]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2672]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2673]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2674]! } - public var Wallet_Receive_AmountText: String { return self._s[2675]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2676]! } - public var CallFeedback_ReasonNoise: String { return self._s[2677]! } - public var Appearance_AppIconDefault: String { return self._s[2679]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2680]! } - public var MediaPicker_AddCaption: String { return self._s[2681]! } - public var CallSettings_TabIconDescription: String { return self._s[2682]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2669]! } + public var Login_PhoneTitle: String { return self._s[2670]! } + public var Passport_FieldPhoneHelp: String { return self._s[2671]! } + public var Weekday_ShortSunday: String { return self._s[2672]! } + public var Passport_InfoFAQ_URL: String { return self._s[2673]! } + public var ContactInfo_Job: String { return self._s[2675]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2676]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2677]! } + public var CreatePoll_QuizTip: String { return self._s[2678]! } + public var TwoFactorSetup_Email_Text: String { return self._s[2679]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2680]! } + public var Invite_ChannelsTooMuch: String { return self._s[2681]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2682]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2683]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2684]! } + public var Wallet_Receive_AmountText: String { return self._s[2685]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2686]! } + public var CallFeedback_ReasonNoise: String { return self._s[2687]! } + public var Appearance_AppIconDefault: String { return self._s[2689]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2690]! } + public var MediaPicker_AddCaption: String { return self._s[2691]! } + public var CallSettings_TabIconDescription: String { return self._s[2692]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2683]!, self._r[2683]!, [_0]) + return formatWithArgumentRanges(self._s[2693]!, self._r[2693]!, [_0]) } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2684]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2694]! } public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2685]!, self._r[2685]!, [_0]) + return formatWithArgumentRanges(self._s[2695]!, self._r[2695]!, [_0]) } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2686]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2687]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2688]! } - public var DialogList_SearchSectionRecent: String { return self._s[2689]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2690]! } - public var CreatePoll_Anonymous: String { return self._s[2691]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2694]! } - public var LastSeen_WithinAWeek: String { return self._s[2695]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2696]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2698]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2699]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2696]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2697]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2698]! } + public var DialogList_SearchSectionRecent: String { return self._s[2699]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2700]! } + public var CreatePoll_Anonymous: String { return self._s[2701]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2704]! } + public var LastSeen_WithinAWeek: String { return self._s[2705]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2706]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2708]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2709]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2700]!, self._r[2700]!, [_0]) + return formatWithArgumentRanges(self._s[2710]!, self._r[2710]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2701]! } - public var Conversation_StatusLeftGroup: String { return self._s[2702]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2703]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2705]! } - public var GroupPermission_AddSuccess: String { return self._s[2706]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2708]! } - public var Conversation_ContextMenuCopy: String { return self._s[2709]! } - public var AccessDenied_CallMicrophone: String { return self._s[2710]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2711]! } + public var Conversation_StatusLeftGroup: String { return self._s[2712]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2713]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2715]! } + public var GroupPermission_AddSuccess: String { return self._s[2716]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2718]! } + public var Conversation_ContextMenuCopy: String { return self._s[2719]! } + public var AccessDenied_CallMicrophone: String { return self._s[2720]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2711]!, self._r[2711]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2721]!, self._r[2721]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2712]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2713]! } - public var Checkout_PaymentMethod_New: String { return self._s[2714]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2715]! } - public var PhotoEditor_QualityTool: String { return self._s[2716]! } - public var Login_SendCodeViaSms: String { return self._s[2717]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2718]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2719]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2720]! } - public var Login_EmailNotConfiguredError: String { return self._s[2721]! } - public var SocksProxySetup_Status: String { return self._s[2722]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2723]! } - public var PrivacyPolicy_Accept: String { return self._s[2724]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2725]! } - public var Appearance_AppIconClassicX: String { return self._s[2726]! } + public var Login_InvalidFirstNameError: String { return self._s[2722]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2723]! } + public var Checkout_PaymentMethod_New: String { return self._s[2724]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2725]! } + public var PhotoEditor_QualityTool: String { return self._s[2726]! } + public var Login_SendCodeViaSms: String { return self._s[2727]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2728]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2729]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2730]! } + public var Login_EmailNotConfiguredError: String { return self._s[2731]! } + public var SocksProxySetup_Status: String { return self._s[2732]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2733]! } + public var PrivacyPolicy_Accept: String { return self._s[2734]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2735]! } + public var Appearance_AppIconClassicX: String { return self._s[2736]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2727]!, self._r[2727]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2737]!, self._r[2737]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2728]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2730]! } - public var AutoNightTheme_Automatic: String { return self._s[2731]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2732]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2733]! } - public var Cache_Help: String { return self._s[2734]! } - public var Group_ErrorAccessDenied: String { return self._s[2735]! } - public var Passport_Language_fa: String { return self._s[2736]! } - public var Wallet_Intro_Text: String { return self._s[2737]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2738]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2739]! } - public var PrivacySettings_LastSeen: String { return self._s[2740]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2738]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2740]! } + public var AutoNightTheme_Automatic: String { return self._s[2741]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2742]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2743]! } + public var Cache_Help: String { return self._s[2744]! } + public var Group_ErrorAccessDenied: String { return self._s[2745]! } + public var Passport_Language_fa: String { return self._s[2746]! } + public var Wallet_Intro_Text: String { return self._s[2747]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2748]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2749]! } + public var PrivacySettings_LastSeen: String { return self._s[2750]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2741]!, self._r[2741]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2751]!, self._r[2751]!, [_0, _1]) } - public var Wallet_Configuration_Apply: String { return self._s[2745]! } - public var Preview_SaveGif: String { return self._s[2746]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2747]! } - public var Profile_About: String { return self._s[2748]! } - public var Channel_About_Placeholder: String { return self._s[2749]! } - public var Login_InfoTitle: String { return self._s[2750]! } + public var Wallet_Configuration_Apply: String { return self._s[2755]! } + public var Preview_SaveGif: String { return self._s[2756]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2757]! } + public var Profile_About: String { return self._s[2758]! } + public var Channel_About_Placeholder: String { return self._s[2759]! } + public var Login_InfoTitle: String { return self._s[2760]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2751]!, self._r[2751]!, [_0]) + return formatWithArgumentRanges(self._s[2761]!, self._r[2761]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2752]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2754]! } - public var ContactInfo_Title: String { return self._s[2755]! } - public var Media_ShareThisVideo: String { return self._s[2756]! } - public var Weekday_ShortFriday: String { return self._s[2757]! } - public var AccessDenied_Contacts: String { return self._s[2759]! } - public var Notification_CallIncomingShort: String { return self._s[2760]! } - public var Group_Setup_TypePublic: String { return self._s[2761]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2762]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2763]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2766]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2767]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2768]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2769]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2770]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2762]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2764]! } + public var ContactInfo_Title: String { return self._s[2765]! } + public var Media_ShareThisVideo: String { return self._s[2766]! } + public var Weekday_ShortFriday: String { return self._s[2767]! } + public var AccessDenied_Contacts: String { return self._s[2769]! } + public var Notification_CallIncomingShort: String { return self._s[2770]! } + public var Group_Setup_TypePublic: String { return self._s[2771]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2772]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2773]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2776]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2777]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2778]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2779]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2780]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2771]!, self._r[2771]!, [_0]) + return formatWithArgumentRanges(self._s[2781]!, self._r[2781]!, [_0]) } - public var DialogList_Typing: String { return self._s[2772]! } - public var CallFeedback_IncludeLogs: String { return self._s[2774]! } - public var Checkout_Phone: String { return self._s[2776]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2779]! } - public var Privacy_Calls_Integration: String { return self._s[2780]! } - public var Notifications_PermissionsAllow: String { return self._s[2781]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2786]! } - public var Settings_ChatSettings: String { return self._s[2787]! } - public var Conversation_SendingOptionsTooltip: String { return self._s[2788]! } + public var DialogList_Typing: String { return self._s[2782]! } + public var CallFeedback_IncludeLogs: String { return self._s[2784]! } + public var Checkout_Phone: String { return self._s[2786]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2789]! } + public var Privacy_Calls_Integration: String { return self._s[2790]! } + public var Notifications_PermissionsAllow: String { return self._s[2791]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2796]! } + public var Settings_ChatSettings: String { return self._s[2797]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[2798]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2790]!, self._r[2790]!, [_0]) + return formatWithArgumentRanges(self._s[2800]!, self._r[2800]!, [_0]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2791]!, self._r[2791]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2801]!, self._r[2801]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2793]! } + public var GroupRemoved_DeleteUser: String { return self._s[2803]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2794]!, self._r[2794]!, [_0]) + return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2795]!, self._r[2795]!, [_1]) + return formatWithArgumentRanges(self._s[2805]!, self._r[2805]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2796]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2797]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2799]! } - public var Conversation_Unblock: String { return self._s[2800]! } - public var PrivacySettings_DataSettings: String { return self._s[2801]! } - public var WallpaperPreview_PatternPaternApply: String { return self._s[2802]! } - public var Group_PublicLink_Info: String { return self._s[2803]! } + public var Login_ContinueWithLocalization: String { return self._s[2806]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2807]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2809]! } + public var Conversation_Unblock: String { return self._s[2810]! } + public var PrivacySettings_DataSettings: String { return self._s[2811]! } + public var WallpaperPreview_PatternPaternApply: String { return self._s[2812]! } + public var Group_PublicLink_Info: String { return self._s[2813]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2814]!, self._r[2814]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2805]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2815]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2806]!, self._r[2806]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2816]!, self._r[2816]!, [_0, _1]) } - public var OldChannels_ChannelsHeader: String { return self._s[2808]! } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2809]! } - public var PrivacySettings_Passcode: String { return self._s[2811]! } - public var Call_Mute: String { return self._s[2812]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2813]! } - public var Passport_Language_dz: String { return self._s[2814]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2815]! } - public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2816]! } - public var Passport_Language_tk: String { return self._s[2817]! } + public var OldChannels_ChannelsHeader: String { return self._s[2818]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2819]! } + public var PrivacySettings_Passcode: String { return self._s[2821]! } + public var Call_Mute: String { return self._s[2822]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2823]! } + public var Passport_Language_dz: String { return self._s[2824]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2825]! } + public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2826]! } + public var Passport_Language_tk: String { return self._s[2827]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2818]!, self._r[2818]!, [_0]) + return formatWithArgumentRanges(self._s[2828]!, self._r[2828]!, [_0]) } - public var Settings_Search: String { return self._s[2819]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2820]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2821]! } - public var Wallet_Configuration_SourceJSON: String { return self._s[2822]! } - public var Conversation_ContextMenuReply: String { return self._s[2823]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2824]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2825]! } - public var Tour_Title1: String { return self._s[2826]! } - public var Wallet_Alert_Cancel: String { return self._s[2827]! } - public var Conversation_ClearGroupHistory: String { return self._s[2829]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2830]! } - public var WallpaperPreview_Motion: String { return self._s[2831]! } + public var Settings_Search: String { return self._s[2829]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2830]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2831]! } + public var Wallet_Configuration_SourceJSON: String { return self._s[2832]! } + public var Conversation_ContextMenuReply: String { return self._s[2833]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2834]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2835]! } + public var Tour_Title1: String { return self._s[2836]! } + public var Wallet_Alert_Cancel: String { return self._s[2837]! } + public var Conversation_ClearGroupHistory: String { return self._s[2839]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2840]! } + public var WallpaperPreview_Motion: String { return self._s[2841]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2832]!, self._r[2832]!, [_0]) + return formatWithArgumentRanges(self._s[2842]!, self._r[2842]!, [_0]) } - public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2833]! } - public var Call_RateCall: String { return self._s[2834]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2835]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2836]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2837]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2839]! } + public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2843]! } + public var Call_RateCall: String { return self._s[2844]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2845]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2846]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2847]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2849]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2841]!, self._r[2841]!, [_0]) + return formatWithArgumentRanges(self._s[2851]!, self._r[2851]!, [_0]) } - public var Compose_Create: String { return self._s[2842]! } - public var Contacts_InviteToTelegram: String { return self._s[2843]! } - public var GroupInfo_Notifications: String { return self._s[2844]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2846]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2847]! } - public var Month_GenApril: String { return self._s[2848]! } - public var Appearance_AutoNightTheme: String { return self._s[2849]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2851]! } - public var Login_CodeSentSms: String { return self._s[2853]! } + public var Compose_Create: String { return self._s[2852]! } + public var Contacts_InviteToTelegram: String { return self._s[2853]! } + public var GroupInfo_Notifications: String { return self._s[2854]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2856]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2857]! } + public var Month_GenApril: String { return self._s[2858]! } + public var Appearance_AutoNightTheme: String { return self._s[2859]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2861]! } + public var Login_CodeSentSms: String { return self._s[2863]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2854]!, self._r[2854]!, [_0]) + return formatWithArgumentRanges(self._s[2864]!, self._r[2864]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2855]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2856]! } - public var Passport_Language_hr: String { return self._s[2857]! } - public var Common_ActionNotAllowedError: String { return self._s[2858]! } + public var EmptyGroupInfo_Line3: String { return self._s[2865]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2866]! } + public var Passport_Language_hr: String { return self._s[2867]! } + public var Common_ActionNotAllowedError: String { return self._s[2868]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2859]!, self._r[2859]!, [_0]) + return formatWithArgumentRanges(self._s[2869]!, self._r[2869]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2860]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2861]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2862]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2863]! } - public var Privacy_SecretChatsTitle: String { return self._s[2864]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2866]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2867]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2868]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2869]! } - public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2870]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2871]! } - public var Preview_DeleteGif: String { return self._s[2872]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2873]! } - public var Group_ErrorNotMutualContact: String { return self._s[2874]! } - public var Notification_MessageLifetime5s: String { return self._s[2875]! } - public var Wallet_Send_OwnAddressAlertText: String { return self._s[2876]! } - public var OldChannels_ChannelFormat: String { return self._s[2877]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2870]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2871]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2872]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2873]! } + public var Privacy_SecretChatsTitle: String { return self._s[2874]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2876]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2877]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2878]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2879]! } + public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2880]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2881]! } + public var Preview_DeleteGif: String { return self._s[2882]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2883]! } + public var Group_ErrorNotMutualContact: String { return self._s[2884]! } + public var Notification_MessageLifetime5s: String { return self._s[2885]! } + public var Wallet_Send_OwnAddressAlertText: String { return self._s[2886]! } + public var OldChannels_ChannelFormat: String { return self._s[2887]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2878]!, self._r[2878]!, [_0]) + return formatWithArgumentRanges(self._s[2888]!, self._r[2888]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2879]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2881]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2882]! } - public var Passport_Address_AddBankStatement: String { return self._s[2883]! } - public var Notification_CallIncoming: String { return self._s[2884]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2885]! } - public var Compose_NewGroupTitle: String { return self._s[2886]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2888]! } - public var Passport_Address_Postcode: String { return self._s[2890]! } + public var VoiceOver_Chat_Video: String { return self._s[2889]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2891]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2892]! } + public var Passport_Address_AddBankStatement: String { return self._s[2893]! } + public var Notification_CallIncoming: String { return self._s[2894]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2895]! } + public var Compose_NewGroupTitle: String { return self._s[2896]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2898]! } + public var Passport_Address_Postcode: String { return self._s[2900]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2891]!, self._r[2891]!, [_0]) + return formatWithArgumentRanges(self._s[2901]!, self._r[2901]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2892]! } - public var Wallet_Month_ShortOctober: String { return self._s[2893]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2894]! } - public var WallpaperColors_Title: String { return self._s[2895]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2896]! } - public var VoiceOver_MessageContextForward: String { return self._s[2897]! } - public var GroupPermission_Duration: String { return self._s[2898]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2902]! } + public var Wallet_Month_ShortOctober: String { return self._s[2903]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2904]! } + public var WallpaperColors_Title: String { return self._s[2905]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2906]! } + public var VoiceOver_MessageContextForward: String { return self._s[2907]! } + public var GroupPermission_Duration: String { return self._s[2908]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2899]!, self._r[2899]!, [_0]) + return formatWithArgumentRanges(self._s[2909]!, self._r[2909]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2900]! } - public var Username_Placeholder: String { return self._s[2901]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2902]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2903]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2904]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2910]! } + public var Username_Placeholder: String { return self._s[2911]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2912]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2913]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2914]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2906]!, self._r[2906]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2916]!, self._r[2916]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2907]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2908]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2909]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2910]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2911]! } - public var Conversation_ContextMenuMore: String { return self._s[2912]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2913]! } - public var CallSettings_TabIcon: String { return self._s[2914]! } - public var KeyCommand_Find: String { return self._s[2915]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2916]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2917]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2918]! } - public var Message_PinnedGame: String { return self._s[2919]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2920]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2922]! } - public var Login_CallRequestState2: String { return self._s[2924]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2926]! } + public var Passport_PasswordDescription: String { return self._s[2917]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2918]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2919]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2920]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2921]! } + public var Conversation_ContextMenuMore: String { return self._s[2922]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2923]! } + public var CallSettings_TabIcon: String { return self._s[2924]! } + public var KeyCommand_Find: String { return self._s[2925]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2926]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2927]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2928]! } + public var Message_PinnedGame: String { return self._s[2929]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2930]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2932]! } + public var Login_CallRequestState2: String { return self._s[2934]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2936]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2927]!, self._r[2927]!, [_0]) + return formatWithArgumentRanges(self._s[2937]!, self._r[2937]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2929]!, self._r[2929]!, [_0]) + return formatWithArgumentRanges(self._s[2939]!, self._r[2939]!, [_0]) } - public var AuthSessions_AddDevice: String { return self._s[2930]! } - public var WallpaperPreview_Blurred: String { return self._s[2931]! } - public var Conversation_InstantPagePreview: String { return self._s[2932]! } + public var AuthSessions_AddDevice: String { return self._s[2940]! } + public var WallpaperPreview_Blurred: String { return self._s[2941]! } + public var Conversation_InstantPagePreview: String { return self._s[2942]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2933]!, self._r[2933]!, [_0]) + return formatWithArgumentRanges(self._s[2943]!, self._r[2943]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2936]! } - public var WallpaperSearch_ColorRed: String { return self._s[2937]! } - public var GroupPermission_NoPinMessages: String { return self._s[2938]! } - public var Passport_Language_es: String { return self._s[2939]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2941]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2942]! } + public var SecretTimer_VideoDescription: String { return self._s[2946]! } + public var WallpaperSearch_ColorRed: String { return self._s[2947]! } + public var GroupPermission_NoPinMessages: String { return self._s[2948]! } + public var Passport_Language_es: String { return self._s[2949]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2951]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2952]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2943]!, self._r[2943]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2953]!, self._r[2953]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2944]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2945]! } - public var Watch_UserInfo_Unmute: String { return self._s[2946]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2947]! } - public var AccessDenied_CameraRestricted: String { return self._s[2949]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2954]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2955]! } + public var Watch_UserInfo_Unmute: String { return self._s[2956]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2957]! } + public var AccessDenied_CameraRestricted: String { return self._s[2959]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2950]!, self._r[2950]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2960]!, self._r[2960]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2952]! } - public var Settings_CopyUsername: String { return self._s[2953]! } - public var Contacts_SearchLabel: String { return self._s[2954]! } - public var Map_OpenInYandexNavigator: String { return self._s[2956]! } - public var PasscodeSettings_EncryptData: String { return self._s[2957]! } - public var Settings_Wallet: String { return self._s[2958]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2959]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2960]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2961]! } - public var DialogList_AdNoticeAlert: String { return self._s[2962]! } - public var Wallet_Month_GenMay: String { return self._s[2964]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2965]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2966]! } - public var Localization_LanguageCustom: String { return self._s[2967]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2968]! } - public var CallFeedback_Title: String { return self._s[2969]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2972]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2973]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[2974]! } - public var Conversation_InfoGroup: String { return self._s[2975]! } - public var Compose_NewMessage: String { return self._s[2976]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2977]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2978]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2979]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2980]! } + public var ChatList_ReadAll: String { return self._s[2962]! } + public var Settings_CopyUsername: String { return self._s[2963]! } + public var Contacts_SearchLabel: String { return self._s[2964]! } + public var Map_OpenInYandexNavigator: String { return self._s[2966]! } + public var PasscodeSettings_EncryptData: String { return self._s[2967]! } + public var Settings_Wallet: String { return self._s[2968]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2969]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2970]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2971]! } + public var DialogList_AdNoticeAlert: String { return self._s[2972]! } + public var Wallet_Month_GenMay: String { return self._s[2974]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2975]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2976]! } + public var Localization_LanguageCustom: String { return self._s[2977]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2978]! } + public var CallFeedback_Title: String { return self._s[2979]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2982]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2983]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[2984]! } + public var Conversation_InfoGroup: String { return self._s[2985]! } + public var Compose_NewMessage: String { return self._s[2986]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2987]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2988]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2989]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2990]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_0]) + return formatWithArgumentRanges(self._s[2991]!, self._r[2991]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2982]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2983]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2984]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2985]! } - public var Channel_BlackList_Title: String { return self._s[2986]! } - public var UserInfo_PhoneCall: String { return self._s[2987]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2989]! } - public var Wallet_Month_ShortJanuary: String { return self._s[2990]! } - public var State_connecting: String { return self._s[2991]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2992]! } - public var Wallet_Month_GenMarch: String { return self._s[2993]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2994]! } - public var AuthSessions_AddedDeviceTerminate: String { return self._s[2995]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2992]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2993]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2994]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2995]! } + public var Channel_BlackList_Title: String { return self._s[2996]! } + public var UserInfo_PhoneCall: String { return self._s[2997]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2999]! } + public var Wallet_Month_ShortJanuary: String { return self._s[3000]! } + public var State_connecting: String { return self._s[3001]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[3002]! } + public var Wallet_Month_GenMarch: String { return self._s[3003]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[3004]! } + public var AuthSessions_AddedDeviceTerminate: String { return self._s[3005]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2996]!, self._r[2996]!, [_0]) + return formatWithArgumentRanges(self._s[3006]!, self._r[3006]!, [_0]) } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2997]!, self._r[2997]!, [_0]) + return formatWithArgumentRanges(self._s[3007]!, self._r[3007]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2998]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2999]! } - public var Passport_Identity_EditPassport: String { return self._s[3000]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[3002]! } - public var Localization_EnglishLanguageName: String { return self._s[3003]! } - public var Share_AuthDescription: String { return self._s[3004]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3005]! } - public var Passport_Identity_Surname: String { return self._s[3006]! } - public var Compose_TokenListPlaceholder: String { return self._s[3007]! } - public var Wallet_AccessDenied_Camera: String { return self._s[3008]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[3009]! } - public var Settings_AboutEmpty: String { return self._s[3010]! } - public var Conversation_Unmute: String { return self._s[3011]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[3013]! } - public var Wallet_Sending_Text: String { return self._s[3014]! } + public var Notifications_GroupNotifications: String { return self._s[3008]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3009]! } + public var Passport_Identity_EditPassport: String { return self._s[3010]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[3012]! } + public var Localization_EnglishLanguageName: String { return self._s[3013]! } + public var Share_AuthDescription: String { return self._s[3014]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3015]! } + public var Passport_Identity_Surname: String { return self._s[3016]! } + public var Compose_TokenListPlaceholder: String { return self._s[3017]! } + public var Wallet_AccessDenied_Camera: String { return self._s[3018]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[3019]! } + public var Settings_AboutEmpty: String { return self._s[3020]! } + public var Conversation_Unmute: String { return self._s[3021]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[3023]! } + public var Wallet_Sending_Text: String { return self._s[3024]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3015]!, self._r[3015]!, [_1]) + return formatWithArgumentRanges(self._s[3025]!, self._r[3025]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[3016]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3018]! } - public var ChatSettings_Appearance: String { return self._s[3019]! } - public var ClearCache_StorageUsage: String { return self._s[3020]! } - public var Appearance_PickAccentColor: String { return self._s[3021]! } + public var Login_CodeSentCall: String { return self._s[3026]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3028]! } + public var ChatSettings_Appearance: String { return self._s[3029]! } + public var ClearCache_StorageUsage: String { return self._s[3030]! } + public var Appearance_PickAccentColor: String { return self._s[3031]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3022]!, self._r[3022]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3032]!, self._r[3032]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3023]!, self._r[3023]!, [_1]) + return formatWithArgumentRanges(self._s[3033]!, self._r[3033]!, [_1]) } - public var Notification_CallMissed: String { return self._s[3024]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3025]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3026]! } - public var Wallet_Month_GenOctober: String { return self._s[3028]! } - public var ChatAdmins_AdminLabel: String { return self._s[3029]! } - public var KeyCommand_JumpToNextChat: String { return self._s[3030]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[3032]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3033]! } - public var Month_GenJune: String { return self._s[3034]! } - public var IntentsSettings_MainAccountInfo: String { return self._s[3035]! } - public var Watch_Location_Current: String { return self._s[3036]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3037]! } - public var Conversation_TitleMute: String { return self._s[3038]! } - public var Map_PlacesInThisArea: String { return self._s[3039]! } + public var Notification_CallMissed: String { return self._s[3034]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3035]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3036]! } + public var Wallet_Month_GenOctober: String { return self._s[3038]! } + public var ChatAdmins_AdminLabel: String { return self._s[3039]! } + public var KeyCommand_JumpToNextChat: String { return self._s[3040]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[3042]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3043]! } + public var Month_GenJune: String { return self._s[3044]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[3045]! } + public var Watch_Location_Current: String { return self._s[3046]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3047]! } + public var Conversation_TitleMute: String { return self._s[3048]! } + public var Map_PlacesInThisArea: String { return self._s[3049]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3040]!, self._r[3040]!, [_1]) + return formatWithArgumentRanges(self._s[3050]!, self._r[3050]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[3041]! } + public var GroupInfo_DeleteAndExit: String { return self._s[3051]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3042]!, self._r[3042]!, [_0]) + return formatWithArgumentRanges(self._s[3052]!, self._r[3052]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[3043]! } - public var Chat_SlowmodeSendError: String { return self._s[3044]! } - public var MaskStickerSettings_Info: String { return self._s[3045]! } - public var EditTheme_Expand_TopInfo: String { return self._s[3046]! } + public var Call_ReportPlaceholder: String { return self._s[3053]! } + public var Chat_SlowmodeSendError: String { return self._s[3054]! } + public var MaskStickerSettings_Info: String { return self._s[3055]! } + public var EditTheme_Expand_TopInfo: String { return self._s[3056]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3047]!, self._r[3047]!, [_0]) + return formatWithArgumentRanges(self._s[3057]!, self._r[3057]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[3048]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[3050]! } - public var Contacts_ShareTelegram: String { return self._s[3051]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3052]! } - public var Map_AddressOnMap: String { return self._s[3053]! } - public var Channel_ErrorAccessDenied: String { return self._s[3054]! } - public var UserInfo_ScamBotWarning: String { return self._s[3056]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[3057]! } - public var Call_ConnectionErrorTitle: String { return self._s[3058]! } - public var UserInfo_NotificationsEnable: String { return self._s[3059]! } - public var ArchivedChats_IntroText1: String { return self._s[3060]! } - public var Tour_Text4: String { return self._s[3063]! } - public var WallpaperSearch_Recent: String { return self._s[3064]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[3065]! } - public var PeopleNearby_MakeVisibleTitle: String { return self._s[3066]! } - public var Profile_MessageLifetime2s: String { return self._s[3068]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3069]! } - public var Notification_MessageLifetime2s: String { return self._s[3070]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[3058]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[3060]! } + public var Contacts_ShareTelegram: String { return self._s[3061]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3062]! } + public var Map_AddressOnMap: String { return self._s[3063]! } + public var Channel_ErrorAccessDenied: String { return self._s[3064]! } + public var UserInfo_ScamBotWarning: String { return self._s[3066]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[3067]! } + public var Call_ConnectionErrorTitle: String { return self._s[3068]! } + public var UserInfo_NotificationsEnable: String { return self._s[3069]! } + public var ArchivedChats_IntroText1: String { return self._s[3070]! } + public var Tour_Text4: String { return self._s[3073]! } + public var WallpaperSearch_Recent: String { return self._s[3074]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[3075]! } + public var PeopleNearby_MakeVisibleTitle: String { return self._s[3076]! } + public var Profile_MessageLifetime2s: String { return self._s[3078]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3079]! } + public var Notification_MessageLifetime2s: String { return self._s[3080]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3071]!, self._r[3071]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3081]!, self._r[3081]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[3072]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[3073]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3074]! } + public var Cache_ClearCache: String { return self._s[3082]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[3083]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3084]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_0]) + return formatWithArgumentRanges(self._s[3088]!, self._r[3088]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3080]!, self._r[3080]!, [_0]) + return formatWithArgumentRanges(self._s[3090]!, self._r[3090]!, [_0]) } - public var LocalGroup_Text: String { return self._s[3081]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3082]! } - public var SocksProxySetup_TypeSocks: String { return self._s[3083]! } - public var ChatList_UnarchiveAction: String { return self._s[3084]! } - public var AutoNightTheme_Title: String { return self._s[3085]! } - public var InstantPage_FeedbackButton: String { return self._s[3086]! } - public var Passport_FieldAddress: String { return self._s[3087]! } + public var LocalGroup_Text: String { return self._s[3091]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3092]! } + public var SocksProxySetup_TypeSocks: String { return self._s[3093]! } + public var ChatList_UnarchiveAction: String { return self._s[3094]! } + public var AutoNightTheme_Title: String { return self._s[3095]! } + public var InstantPage_FeedbackButton: String { return self._s[3096]! } + public var Passport_FieldAddress: String { return self._s[3097]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3088]!, self._r[3088]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3098]!, self._r[3098]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[3089]! } + public var Month_ShortMarch: String { return self._s[3099]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3090]!, self._r[3090]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3100]!, self._r[3100]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3091]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3092]! } - public var Passport_FloodError: String { return self._s[3093]! } - public var SecretGif_Title: String { return self._s[3094]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3095]! } - public var ChatList_Context_UnhideArchive: String { return self._s[3096]! } - public var Passport_Language_th: String { return self._s[3098]! } - public var Passport_Address_Address: String { return self._s[3099]! } - public var Login_InvalidLastNameError: String { return self._s[3100]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3101]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[3102]! } - public var ChatList_Context_Archive: String { return self._s[3103]! } - public var SettingsSearch_FAQ: String { return self._s[3104]! } - public var ShareMenu_Send: String { return self._s[3105]! } - public var WallpaperSearch_ColorYellow: String { return self._s[3107]! } - public var Month_GenNovember: String { return self._s[3109]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3111]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3101]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3102]! } + public var Passport_FloodError: String { return self._s[3103]! } + public var SecretGif_Title: String { return self._s[3104]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3105]! } + public var ChatList_Context_UnhideArchive: String { return self._s[3106]! } + public var Passport_Language_th: String { return self._s[3108]! } + public var Passport_Address_Address: String { return self._s[3109]! } + public var Login_InvalidLastNameError: String { return self._s[3110]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3111]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[3112]! } + public var ChatList_Context_Archive: String { return self._s[3113]! } + public var SettingsSearch_FAQ: String { return self._s[3114]! } + public var ShareMenu_Send: String { return self._s[3115]! } + public var ChatState_Connecting: String { return self._s[3116]! } + public var WallpaperSearch_ColorYellow: String { return self._s[3118]! } + public var Month_GenNovember: String { return self._s[3120]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3122]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3112]!, self._r[3112]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3123]!, self._r[3123]!, [_1, _2]) } - public var Conversation_SwipeToReplyHintText: String { return self._s[3113]! } - public var Checkout_Email: String { return self._s[3114]! } - public var NotificationsSound_Tritone: String { return self._s[3115]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[3117]! } - public var Wallet_ContextMenuCopy: String { return self._s[3119]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3124]! } + public var Checkout_Email: String { return self._s[3125]! } + public var NotificationsSound_Tritone: String { return self._s[3126]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[3128]! } + public var Wallet_ContextMenuCopy: String { return self._s[3130]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3132]!, self._r[3132]!, [_1, _2, _3]) } - public var Appearance_TextSize_Automatic: String { return self._s[3122]! } + public var Appearance_TextSize_Automatic: String { return self._s[3133]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3123]!, self._r[3123]!, [_1]) + return formatWithArgumentRanges(self._s[3134]!, self._r[3134]!, [_1]) } public func StickerPackActionInfo_AddedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3124]!, self._r[3124]!, [_0]) + return formatWithArgumentRanges(self._s[3135]!, self._r[3135]!, [_0]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[3125]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[3136]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3126]!, self._r[3126]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[3127]! } - public var Notification_Exceptions_Add: String { return self._s[3128]! } - public var DialogList_You: String { return self._s[3129]! } - public var MediaPicker_Send: String { return self._s[3132]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3133]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3134]! } - public var Call_AudioRouteSpeaker: String { return self._s[3135]! } - public var Watch_UserInfo_Title: String { return self._s[3136]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[3137]! } - public var Appearance_AccentColor: String { return self._s[3139]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3138]! } + public var Notification_Exceptions_Add: String { return self._s[3139]! } + public var DialogList_You: String { return self._s[3140]! } + public var MediaPicker_Send: String { return self._s[3143]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3144]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3145]! } + public var Call_AudioRouteSpeaker: String { return self._s[3146]! } + public var Watch_UserInfo_Title: String { return self._s[3147]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[3148]! } + public var Appearance_AccentColor: String { return self._s[3150]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3140]!, self._r[3140]!, [_0]) + return formatWithArgumentRanges(self._s[3151]!, self._r[3151]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3141]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3152]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3142]!, self._r[3142]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3153]!, self._r[3153]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[3143]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3144]! } - public var Notification_CallOutgoing: String { return self._s[3145]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3146]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3147]! } - public var Call_RecordingDisabledMessage: String { return self._s[3148]! } - public var Message_Game: String { return self._s[3149]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[3150]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3151]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3152]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3153]! } - public var Date_DialogDateFormat: String { return self._s[3155]! } - public var WallpaperColors_SetCustomColor: String { return self._s[3156]! } - public var Notifications_InAppNotifications: String { return self._s[3157]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[3154]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3155]! } + public var Notification_CallOutgoing: String { return self._s[3156]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3157]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3158]! } + public var Call_RecordingDisabledMessage: String { return self._s[3159]! } + public var Message_Game: String { return self._s[3160]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[3161]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3162]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3163]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3164]! } + public var Date_DialogDateFormat: String { return self._s[3166]! } + public var WallpaperColors_SetCustomColor: String { return self._s[3167]! } + public var Notifications_InAppNotifications: String { return self._s[3168]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_0]) + return formatWithArgumentRanges(self._s[3169]!, self._r[3169]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3159]!, self._r[3159]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3170]!, self._r[3170]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[3160]! } + public var NewContact_Title: String { return self._s[3171]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3161]!, self._r[3161]!, [_0]) + return formatWithArgumentRanges(self._s[3172]!, self._r[3172]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[3162]! } + public var Conversation_ViewContactDetails: String { return self._s[3173]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3164]!, self._r[3164]!, [_1]) + return formatWithArgumentRanges(self._s[3175]!, self._r[3175]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3165]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3166]! } - public var PrivacySettings_Title: String { return self._s[3167]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3170]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[3171]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[3172]! } - public var Contacts_PhoneNumber: String { return self._s[3173]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3175]! } - public var Map_ShowPlaces: String { return self._s[3176]! } - public var ChatAdmins_Title: String { return self._s[3177]! } - public var InstantPage_Reference: String { return self._s[3179]! } - public var Wallet_Info_Updating: String { return self._s[3180]! } - public var ReportGroupLocation_Text: String { return self._s[3181]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3176]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3177]! } + public var PrivacySettings_Title: String { return self._s[3178]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3181]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[3182]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[3183]! } + public var Contacts_PhoneNumber: String { return self._s[3184]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3186]! } + public var Map_ShowPlaces: String { return self._s[3187]! } + public var ChatAdmins_Title: String { return self._s[3188]! } + public var InstantPage_Reference: String { return self._s[3190]! } + public var Wallet_Info_Updating: String { return self._s[3191]! } + public var ReportGroupLocation_Text: String { return self._s[3192]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3182]!, self._r[3182]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[3183]! } - public var Watch_UserInfo_Block: String { return self._s[3184]! } - public var ChatSettings_Stickers: String { return self._s[3185]! } - public var ChatSettings_DownloadInBackground: String { return self._s[3186]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3187]! } + public var Camera_FlashOff: String { return self._s[3194]! } + public var Watch_UserInfo_Block: String { return self._s[3195]! } + public var ChatSettings_Stickers: String { return self._s[3196]! } + public var ChatSettings_DownloadInBackground: String { return self._s[3197]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3198]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3188]!, self._r[3188]!, [_0]) - } - public var Settings_ViewPhoto: String { return self._s[3189]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3190]! } - public var AutoDownloadSettings_Cellular: String { return self._s[3191]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[3192]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3193]! } - public var VoiceOver_MessageContextShare: String { return self._s[3194]! } - public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3196]!, self._r[3196]!, [_0]) - } - public var Privacy_DeleteDrafts: String { return self._s[3197]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3198]! } - public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3199]!, self._r[3199]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[3200]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3201]! } - public var DialogList_SavedMessages: String { return self._s[3202]! } - public var GroupInfo_UpgradeButton: String { return self._s[3203]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3205]! } - public var DialogList_Pin: String { return self._s[3206]! } + public var Settings_ViewPhoto: String { return self._s[3200]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3201]! } + public var AutoDownloadSettings_Cellular: String { return self._s[3202]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[3203]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3204]! } + public var VoiceOver_MessageContextShare: String { return self._s[3205]! } + public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3207]!, self._r[3207]!, [_0]) + } + public var Privacy_DeleteDrafts: String { return self._s[3208]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3209]! } + public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3210]!, self._r[3210]!, [_0]) + } + public var DialogList_SavedMessagesHelp: String { return self._s[3211]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3212]! } + public var DialogList_SavedMessages: String { return self._s[3213]! } + public var GroupInfo_UpgradeButton: String { return self._s[3214]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3216]! } + public var DialogList_Pin: String { return self._s[3217]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3207]!, self._r[3207]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3208]!, self._r[3208]!, [_0]) + return formatWithArgumentRanges(self._s[3219]!, self._r[3219]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3209]! } - public var UserInfo_NotificationsDisable: String { return self._s[3210]! } - public var Conversation_ContextMenuCancelEditing: String { return self._s[3211]! } - public var Paint_Outlined: String { return self._s[3212]! } - public var Activity_PlayingGame: String { return self._s[3213]! } - public var SearchImages_NoImagesFound: String { return self._s[3214]! } - public var SocksProxySetup_ProxyType: String { return self._s[3215]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3217]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3218]! } - public var Settings_AppLanguage: String { return self._s[3219]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3220]! } - public var Common_ChoosePhoto: String { return self._s[3221]! } - public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3222]! } - public var CallFeedback_ReasonEcho: String { return self._s[3223]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3220]! } + public var UserInfo_NotificationsDisable: String { return self._s[3221]! } + public var Conversation_ContextMenuCancelEditing: String { return self._s[3222]! } + public var Paint_Outlined: String { return self._s[3223]! } + public var Activity_PlayingGame: String { return self._s[3224]! } + public var SearchImages_NoImagesFound: String { return self._s[3225]! } + public var SocksProxySetup_ProxyType: String { return self._s[3226]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3228]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3229]! } + public var Settings_AppLanguage: String { return self._s[3230]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3231]! } + public var Common_ChoosePhoto: String { return self._s[3232]! } + public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3233]! } + public var CallFeedback_ReasonEcho: String { return self._s[3234]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3224]!, self._r[3224]!, [_1]) + return formatWithArgumentRanges(self._s[3235]!, self._r[3235]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3225]! } - public var PollResults_Collapse: String { return self._s[3226]! } - public var Activity_UploadingVideo: String { return self._s[3227]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3228]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3229]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3230]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3231]! } - public var PUSH_SENDER_YOU: String { return self._s[3232]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3233]! } - public var Checkout_PayWithTouchId: String { return self._s[3234]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3235]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3236]! } + public var PollResults_Collapse: String { return self._s[3237]! } + public var Activity_UploadingVideo: String { return self._s[3238]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3239]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3240]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3241]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3242]! } + public var PUSH_SENDER_YOU: String { return self._s[3243]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3244]! } + public var Checkout_PayWithTouchId: String { return self._s[3245]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3246]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3237]!, self._r[3237]!, [_1]) + return formatWithArgumentRanges(self._s[3248]!, self._r[3248]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[3238]! } + public var Notifications_ExceptionsNone: String { return self._s[3249]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3239]!, self._r[3239]!, [_0]) + return formatWithArgumentRanges(self._s[3250]!, self._r[3250]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3240]!, self._r[3240]!, [_1]) + return formatWithArgumentRanges(self._s[3251]!, self._r[3251]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3242]! } - public var Passport_Address_Region: String { return self._s[3245]! } - public var ChatList_DeleteChat: String { return self._s[3246]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3247]! } - public var PhotoEditor_TiltShift: String { return self._s[3248]! } - public var Settings_FAQ_URL: String { return self._s[3249]! } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3250]! } - public var Passport_Language_sl: String { return self._s[3251]! } - public var Settings_PrivacySettings: String { return self._s[3253]! } - public var SharedMedia_TitleLink: String { return self._s[3254]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3255]! } - public var Settings_SetProfilePhoto: String { return self._s[3256]! } - public var Channel_About_Help: String { return self._s[3257]! } - public var Contacts_PermissionsEnable: String { return self._s[3258]! } - public var Wallet_Sending_Title: String { return self._s[3259]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3260]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3261]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3263]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3264]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3265]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3266]! } - public var OldChannels_Title: String { return self._s[3267]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3268]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3270]! } - public var Map_OpenInYandexMaps: String { return self._s[3272]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3273]! } - public var VoiceOver_MessageContextReply: String { return self._s[3274]! } - public var PhotoEditor_SaturationTool: String { return self._s[3276]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[3253]! } + public var Passport_Address_Region: String { return self._s[3256]! } + public var ChatList_DeleteChat: String { return self._s[3257]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3258]! } + public var PhotoEditor_TiltShift: String { return self._s[3259]! } + public var Settings_FAQ_URL: String { return self._s[3260]! } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3261]! } + public var Passport_Language_sl: String { return self._s[3262]! } + public var Settings_PrivacySettings: String { return self._s[3264]! } + public var SharedMedia_TitleLink: String { return self._s[3265]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3266]! } + public var Settings_SetProfilePhoto: String { return self._s[3267]! } + public var Channel_About_Help: String { return self._s[3268]! } + public var Contacts_PermissionsEnable: String { return self._s[3269]! } + public var Wallet_Sending_Title: String { return self._s[3270]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3271]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3272]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3274]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3275]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3276]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3277]! } + public var OldChannels_Title: String { return self._s[3278]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3279]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3281]! } + public var Map_OpenInYandexMaps: String { return self._s[3283]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3284]! } + public var VoiceOver_MessageContextReply: String { return self._s[3285]! } + public var PhotoEditor_SaturationTool: String { return self._s[3287]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3277]!, self._r[3277]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3288]!, self._r[3288]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3278]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3279]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3280]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3289]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3290]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3291]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3281]!, self._r[3281]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3292]!, self._r[3292]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3282]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3284]! } - public var SettingsSearch_Synonyms_Wallet: String { return self._s[3285]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3293]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3295]! } + public var SettingsSearch_Synonyms_Wallet: String { return self._s[3296]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3286]!, self._r[3286]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3297]!, self._r[3297]!, [_1, _2]) } - public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3287]! } + public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3298]! } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3288]!, self._r[3288]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3299]!, self._r[3299]!, [_1, _2, _3]) } - public var WallpaperPreview_PatternTitle: String { return self._s[3289]! } - public var GroupInfo_PublicLinkAdd: String { return self._s[3290]! } - public var Passport_PassportInformation: String { return self._s[3293]! } - public var Theme_Unsupported: String { return self._s[3294]! } - public var WatchRemote_AlertTitle: String { return self._s[3295]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3296]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3298]! } + public var WallpaperPreview_PatternTitle: String { return self._s[3300]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3301]! } + public var Passport_PassportInformation: String { return self._s[3304]! } + public var Theme_Unsupported: String { return self._s[3305]! } + public var WatchRemote_AlertTitle: String { return self._s[3306]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3307]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3309]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3299]!, self._r[3299]!, [_0]) + return formatWithArgumentRanges(self._s[3310]!, self._r[3310]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3300]!, self._r[3300]!, [_1]) + return formatWithArgumentRanges(self._s[3311]!, self._r[3311]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3301]! } - public var Wallet_Navigation_Done: String { return self._s[3303]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3304]! } - public var AccessDenied_CameraDisabled: String { return self._s[3305]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3312]! } + public var Wallet_Navigation_Done: String { return self._s[3314]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3315]! } + public var AccessDenied_CameraDisabled: String { return self._s[3316]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3306]!, self._r[3306]!, [_0]) + return formatWithArgumentRanges(self._s[3317]!, self._r[3317]!, [_0]) } - public var ClearCache_Forever: String { return self._s[3307]! } - public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3308]! } - public var CreatePoll_Quiz: String { return self._s[3309]! } - public var PhotoEditor_ContrastTool: String { return self._s[3312]! } + public var ClearCache_Forever: String { return self._s[3318]! } + public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3319]! } + public var CreatePoll_Quiz: String { return self._s[3320]! } + public var PhotoEditor_ContrastTool: String { return self._s[3323]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3313]!, self._r[3313]!, [_1]) + return formatWithArgumentRanges(self._s[3324]!, self._r[3324]!, [_1]) } - public var DialogList_Draft: String { return self._s[3314]! } - public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3315]! } + public var DialogList_Draft: String { return self._s[3325]! } + public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3326]! } public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3316]!, self._r[3316]!, [_0]) + return formatWithArgumentRanges(self._s[3327]!, self._r[3327]!, [_0]) } - public var Privacy_TopPeersDelete: String { return self._s[3318]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3319]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3320]! } - public var WebSearch_RecentSectionClear: String { return self._s[3321]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3322]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3324]! } - public var Common_Done: String { return self._s[3326]! } - public var Shortcut_SwitchAccount: String { return self._s[3327]! } - public var AuthSessions_EmptyText: String { return self._s[3328]! } - public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3329]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3330]! } - public var Tour_Title5: String { return self._s[3331]! } - public var Wallet_Settings_Title: String { return self._s[3332]! } + public var Privacy_TopPeersDelete: String { return self._s[3329]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3330]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3331]! } + public var WebSearch_RecentSectionClear: String { return self._s[3332]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3333]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3335]! } + public var Common_Done: String { return self._s[3337]! } + public var Shortcut_SwitchAccount: String { return self._s[3338]! } + public var AuthSessions_EmptyText: String { return self._s[3339]! } + public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3340]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3341]! } + public var Tour_Title5: String { return self._s[3342]! } + public var Wallet_Settings_Title: String { return self._s[3343]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3333]!, self._r[3333]!, [_0]) + return formatWithArgumentRanges(self._s[3344]!, self._r[3344]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3334]! } - public var Conversation_LinkDialogSave: String { return self._s[3335]! } - public var GroupInfo_ActionRestrict: String { return self._s[3336]! } - public var Checkout_Title: String { return self._s[3337]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3339]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3341]! } - public var Notification_RenamedGroup: String { return self._s[3342]! } - public var PeopleNearby_Groups: String { return self._s[3343]! } - public var Checkout_PayWithFaceId: String { return self._s[3344]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3345]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3347]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3348]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3349]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3345]! } + public var Conversation_LinkDialogSave: String { return self._s[3346]! } + public var GroupInfo_ActionRestrict: String { return self._s[3347]! } + public var Checkout_Title: String { return self._s[3348]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3350]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3352]! } + public var Notification_RenamedGroup: String { return self._s[3353]! } + public var PeopleNearby_Groups: String { return self._s[3354]! } + public var Checkout_PayWithFaceId: String { return self._s[3355]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3356]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3358]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3359]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3360]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3350]!, self._r[3350]!, [_0]) + return formatWithArgumentRanges(self._s[3361]!, self._r[3361]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3352]! } + public var Profile_AddToExisting: String { return self._s[3363]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3353]!, self._r[3353]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3364]!, self._r[3364]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3355]! } - public var Permissions_PrivacyPolicy: String { return self._s[3356]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3357]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3358]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3360]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3362]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3363]! } + public var Cache_Files: String { return self._s[3366]! } + public var Permissions_PrivacyPolicy: String { return self._s[3367]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3368]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3369]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3371]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3373]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3374]! } public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3364]!, self._r[3364]!, [_0]) + return formatWithArgumentRanges(self._s[3375]!, self._r[3375]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3365]! } - public var VoiceOver_AttachMedia: String { return self._s[3368]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3369]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3376]! } + public var VoiceOver_AttachMedia: String { return self._s[3379]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3380]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3370]!, self._r[3370]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3381]!, self._r[3381]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3371]! } - public var Conversation_SetReminder_Title: String { return self._s[3372]! } - public var Passport_FieldAddressHelp: String { return self._s[3373]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3374]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3375]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3382]! } + public var Conversation_SetReminder_Title: String { return self._s[3383]! } + public var Passport_FieldAddressHelp: String { return self._s[3384]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3385]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3386]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3376]!, self._r[3376]!, [_0]) + return formatWithArgumentRanges(self._s[3387]!, self._r[3387]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3377]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3378]! } - public var Login_UnknownError: String { return self._s[3379]! } - public var Group_UpgradeNoticeText2: String { return self._s[3382]! } - public var Watch_Compose_AddContact: String { return self._s[3383]! } - public var ClearCache_StorageServiceFiles: String { return self._s[3384]! } - public var Web_Error: String { return self._s[3385]! } - public var Gif_Search: String { return self._s[3386]! } - public var Profile_MessageLifetime1h: String { return self._s[3387]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3388]! } - public var Channel_Username_CheckingUsername: String { return self._s[3389]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3390]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3391]! } - public var Channel_AboutItem: String { return self._s[3392]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3394]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3395]! } - public var GroupInfo_SharedMedia: String { return self._s[3396]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3388]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3389]! } + public var Login_UnknownError: String { return self._s[3390]! } + public var Group_UpgradeNoticeText2: String { return self._s[3393]! } + public var Watch_Compose_AddContact: String { return self._s[3394]! } + public var ClearCache_StorageServiceFiles: String { return self._s[3395]! } + public var Web_Error: String { return self._s[3396]! } + public var Gif_Search: String { return self._s[3397]! } + public var Profile_MessageLifetime1h: String { return self._s[3398]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3399]! } + public var Channel_Username_CheckingUsername: String { return self._s[3400]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3401]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3402]! } + public var Channel_AboutItem: String { return self._s[3403]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3405]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3406]! } + public var GroupInfo_SharedMedia: String { return self._s[3407]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3397]!, self._r[3397]!, [_1]) + return formatWithArgumentRanges(self._s[3408]!, self._r[3408]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3398]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3409]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3399]!, self._r[3399]!, [_1]) + return formatWithArgumentRanges(self._s[3410]!, self._r[3410]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3400]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3401]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3402]! } - public var CreatePoll_AddOption: String { return self._s[3403]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3404]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3405]! } - public var Channel_Management_AddModerator: String { return self._s[3406]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3407]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3408]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3409]! } - public var Theme_Colors_Background: String { return self._s[3410]! } - public var NotificationsSound_Hello: String { return self._s[3412]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3413]! } - public var Channel_Stickers_Placeholder: String { return self._s[3415]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3411]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3412]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3413]! } + public var CreatePoll_AddOption: String { return self._s[3414]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3415]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3416]! } + public var Channel_Management_AddModerator: String { return self._s[3417]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3418]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3419]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3420]! } + public var Theme_Colors_Background: String { return self._s[3421]! } + public var NotificationsSound_Hello: String { return self._s[3423]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3424]! } + public var Channel_Stickers_Placeholder: String { return self._s[3426]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3416]!, self._r[3416]!, [_0]) + return formatWithArgumentRanges(self._s[3427]!, self._r[3427]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3417]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3418]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3419]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3420]! } - public var AutoDownloadSettings_Channels: String { return self._s[3421]! } - public var Passport_Language_mn: String { return self._s[3422]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3425]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3426]! } - public var Passport_Language_ja: String { return self._s[3428]! } - public var Settings_About_Title: String { return self._s[3429]! } - public var Settings_NotificationsAndSounds: String { return self._s[3430]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3431]! } - public var Settings_BlockedUsers: String { return self._s[3432]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3428]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3429]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3430]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3431]! } + public var AutoDownloadSettings_Channels: String { return self._s[3432]! } + public var Passport_Language_mn: String { return self._s[3433]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3436]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3437]! } + public var Passport_Language_ja: String { return self._s[3439]! } + public var Settings_About_Title: String { return self._s[3440]! } + public var Settings_NotificationsAndSounds: String { return self._s[3441]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3442]! } + public var Settings_BlockedUsers: String { return self._s[3443]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3433]!, self._r[3433]!, [_0]) + return formatWithArgumentRanges(self._s[3444]!, self._r[3444]!, [_0]) } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3434]! } - public var Wallet_Weekday_Today: String { return self._s[3435]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3436]! } - public var Widget_ApplicationLocked: String { return self._s[3437]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3438]! } - public var Channel_Username_Title: String { return self._s[3439]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3445]! } + public var Wallet_Weekday_Today: String { return self._s[3446]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3447]! } + public var Widget_ApplicationLocked: String { return self._s[3448]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3449]! } + public var Channel_Username_Title: String { return self._s[3450]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3440]!, self._r[3440]!, [_0]) + return formatWithArgumentRanges(self._s[3451]!, self._r[3451]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3442]! } - public var AppleWatch_Title: String { return self._s[3443]! } - public var Activity_RecordingVideoMessage: String { return self._s[3444]! } + public var AttachmentMenu_File: String { return self._s[3453]! } + public var AppleWatch_Title: String { return self._s[3454]! } + public var Activity_RecordingVideoMessage: String { return self._s[3455]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3445]!, self._r[3445]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3456]!, self._r[3456]!, [_1, _2]) } - public var Theme_Colors_Messages: String { return self._s[3446]! } - public var Weekday_Saturday: String { return self._s[3447]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3448]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3449]! } - public var Common_Next: String { return self._s[3451]! } - public var Channel_Stickers_YourStickers: String { return self._s[3453]! } - public var Message_Theme: String { return self._s[3454]! } - public var Call_AudioRouteHeadphones: String { return self._s[3455]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3457]! } - public var Watch_Contacts_NoResults: String { return self._s[3459]! } - public var PhotoEditor_TintTool: String { return self._s[3462]! } - public var LoginPassword_ResetAccount: String { return self._s[3464]! } - public var Settings_SavedMessages: String { return self._s[3465]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3466]! } - public var Bot_GenericSupportStatus: String { return self._s[3467]! } - public var StickerPack_Add: String { return self._s[3468]! } - public var Checkout_TotalAmount: String { return self._s[3469]! } - public var Your_cards_number_is_invalid: String { return self._s[3470]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3471]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3472]! } + public var Theme_Colors_Messages: String { return self._s[3457]! } + public var Weekday_Saturday: String { return self._s[3458]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3459]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3460]! } + public var Common_Next: String { return self._s[3462]! } + public var Channel_Stickers_YourStickers: String { return self._s[3464]! } + public var Message_Theme: String { return self._s[3465]! } + public var Call_AudioRouteHeadphones: String { return self._s[3466]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3468]! } + public var Watch_Contacts_NoResults: String { return self._s[3470]! } + public var PhotoEditor_TintTool: String { return self._s[3473]! } + public var LoginPassword_ResetAccount: String { return self._s[3475]! } + public var Settings_SavedMessages: String { return self._s[3476]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3477]! } + public var Bot_GenericSupportStatus: String { return self._s[3478]! } + public var StickerPack_Add: String { return self._s[3479]! } + public var Checkout_TotalAmount: String { return self._s[3480]! } + public var Your_cards_number_is_invalid: String { return self._s[3481]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3482]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3483]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3473]!, self._r[3473]!, [_0]) + return formatWithArgumentRanges(self._s[3484]!, self._r[3484]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3485]!, self._r[3485]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3475]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3486]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3477]!, self._r[3477]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3488]!, self._r[3488]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3478]!, self._r[3478]!, [_0]) + return formatWithArgumentRanges(self._s[3489]!, self._r[3489]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3479]! } - public var StickerPack_Share: String { return self._s[3480]! } - public var Passport_DeleteAddress: String { return self._s[3481]! } - public var Settings_Passport: String { return self._s[3482]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3483]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3484]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3485]! } - public var Contacts_PermissionsText: String { return self._s[3486]! } - public var Group_Setup_HistoryVisible: String { return self._s[3487]! } - public var Wallet_Month_ShortDecember: String { return self._s[3489]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3490]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3491]! } - public var SocksProxySetup_Title: String { return self._s[3492]! } - public var Notification_Mute1h: String { return self._s[3493]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3490]! } + public var StickerPack_Share: String { return self._s[3491]! } + public var Passport_DeleteAddress: String { return self._s[3492]! } + public var Settings_Passport: String { return self._s[3493]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3494]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3495]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3496]! } + public var Contacts_PermissionsText: String { return self._s[3497]! } + public var Group_Setup_HistoryVisible: String { return self._s[3498]! } + public var Wallet_Month_ShortDecember: String { return self._s[3500]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3501]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3502]! } + public var SocksProxySetup_Title: String { return self._s[3503]! } + public var Notification_Mute1h: String { return self._s[3504]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3494]!, self._r[3494]!, [_0]) + return formatWithArgumentRanges(self._s[3505]!, self._r[3505]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3495]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3506]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3496]!, self._r[3496]!, [_1]) + return formatWithArgumentRanges(self._s[3507]!, self._r[3507]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3497]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3500]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3502]! } - public var DialogList_NoMessagesText: String { return self._s[3503]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3504]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3505]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3507]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3508]! } - public var Common_TakePhotoOrVideo: String { return self._s[3509]! } - public var Wallet_Words_Text: String { return self._s[3510]! } - public var Call_StatusBusy: String { return self._s[3511]! } - public var Conversation_PinnedMessage: String { return self._s[3512]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3513]! } - public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3514]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3515]! } - public var Undo_ChatCleared: String { return self._s[3516]! } - public var AppleWatch_ReplyPresets: String { return self._s[3517]! } - public var Passport_DiscardMessageDescription: String { return self._s[3519]! } - public var Login_NetworkError: String { return self._s[3520]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3508]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3511]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3513]! } + public var DialogList_NoMessagesText: String { return self._s[3514]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3515]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3516]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3518]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3519]! } + public var Common_TakePhotoOrVideo: String { return self._s[3520]! } + public var Wallet_Words_Text: String { return self._s[3521]! } + public var Call_StatusBusy: String { return self._s[3522]! } + public var Conversation_PinnedMessage: String { return self._s[3523]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3524]! } + public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3525]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3526]! } + public var Undo_ChatCleared: String { return self._s[3527]! } + public var AppleWatch_ReplyPresets: String { return self._s[3528]! } + public var Passport_DiscardMessageDescription: String { return self._s[3530]! } + public var Login_NetworkError: String { return self._s[3531]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3521]!, self._r[3521]!, [_0]) + return formatWithArgumentRanges(self._s[3532]!, self._r[3532]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3522]!, self._r[3522]!, [_0]) + return formatWithArgumentRanges(self._s[3533]!, self._r[3533]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3523]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3525]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3526]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3534]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3536]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3537]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3528]!, self._r[3528]!, [_0]) + return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3529]! } - public var VoiceOver_Chat_Music: String { return self._s[3530]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3531]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3533]! } - public var ConversationMedia_Title: String { return self._s[3534]! } - public var EncryptionKey_Title: String { return self._s[3536]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3537]! } - public var Notification_Exceptions_AddException: String { return self._s[3538]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3539]! } - public var Profile_MessageLifetime1m: String { return self._s[3540]! } + public var Call_ConnectionErrorMessage: String { return self._s[3540]! } + public var VoiceOver_Chat_Music: String { return self._s[3541]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3542]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3544]! } + public var ConversationMedia_Title: String { return self._s[3545]! } + public var EncryptionKey_Title: String { return self._s[3547]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3548]! } + public var Notification_Exceptions_AddException: String { return self._s[3549]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3550]! } + public var Profile_MessageLifetime1m: String { return self._s[3551]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3541]!, self._r[3541]!, [_1]) + return formatWithArgumentRanges(self._s[3552]!, self._r[3552]!, [_1]) } - public var Month_GenMay: String { return self._s[3542]! } + public var Month_GenMay: String { return self._s[3553]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3543]!, self._r[3543]!, [_0]) + return formatWithArgumentRanges(self._s[3554]!, self._r[3554]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3544]! } - public var Wallet_Send_AddressInfo: String { return self._s[3545]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3546]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3547]! } + public var PeopleNearby_Users: String { return self._s[3555]! } + public var Wallet_Send_AddressInfo: String { return self._s[3556]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3557]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3558]! } public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3549]!, self._r[3549]!, [_0]) + return formatWithArgumentRanges(self._s[3560]!, self._r[3560]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3550]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3551]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3552]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3553]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3554]! } - public var Channel_JoinChannel: String { return self._s[3556]! } - public var Appearance_Animations: String { return self._s[3559]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3561]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3562]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3563]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3564]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3565]! } + public var Channel_JoinChannel: String { return self._s[3567]! } + public var Appearance_Animations: String { return self._s[3570]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3560]!, self._r[3560]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3571]!, self._r[3571]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3562]! } - public var Appearance_ShareTheme: String { return self._s[3563]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3564]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3566]! } - public var StickerPackActionInfo_RemovedTitle: String { return self._s[3567]! } - public var Passport_Address_Street: String { return self._s[3568]! } - public var Conversation_AddContact: String { return self._s[3569]! } - public var Login_PhonePlaceholder: String { return self._s[3570]! } - public var Channel_Members_InviteLink: String { return self._s[3572]! } - public var Bot_Stop: String { return self._s[3573]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3575]! } - public var Notification_PassportValueAddress: String { return self._s[3576]! } - public var Month_ShortJuly: String { return self._s[3577]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3578]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3579]! } - public var Passport_Identity_ReverseSide: String { return self._s[3580]! } - public var Watch_Stickers_Recents: String { return self._s[3583]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3585]! } - public var Map_SendThisLocation: String { return self._s[3586]! } + public var Stickers_GroupStickers: String { return self._s[3573]! } + public var Appearance_ShareTheme: String { return self._s[3574]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3575]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3577]! } + public var StickerPackActionInfo_RemovedTitle: String { return self._s[3578]! } + public var Passport_Address_Street: String { return self._s[3579]! } + public var Conversation_AddContact: String { return self._s[3580]! } + public var Login_PhonePlaceholder: String { return self._s[3581]! } + public var Channel_Members_InviteLink: String { return self._s[3583]! } + public var Bot_Stop: String { return self._s[3584]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3586]! } + public var Notification_PassportValueAddress: String { return self._s[3587]! } + public var Month_ShortJuly: String { return self._s[3588]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3589]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3590]! } + public var Passport_Identity_ReverseSide: String { return self._s[3591]! } + public var Watch_Stickers_Recents: String { return self._s[3594]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3596]! } + public var Map_SendThisLocation: String { return self._s[3597]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3587]!, self._r[3587]!, [_0]) + return formatWithArgumentRanges(self._s[3598]!, self._r[3598]!, [_0]) } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3588]!, self._r[3588]!, [_0]) + return formatWithArgumentRanges(self._s[3599]!, self._r[3599]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[3589]! } - public var Wallet_Intro_NotNow: String { return self._s[3590]! } + public var ConvertToSupergroup_Note: String { return self._s[3600]! } + public var Wallet_Intro_NotNow: String { return self._s[3601]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3591]!, self._r[3591]!, [_0]) + return formatWithArgumentRanges(self._s[3602]!, self._r[3602]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3592]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3603]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3593]!, self._r[3593]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3604]!, self._r[3604]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3595]! } - public var Wallpaper_SearchShort: String { return self._s[3596]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3598]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3599]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3600]! } + public var Login_CallRequestState3: String { return self._s[3606]! } + public var Wallpaper_SearchShort: String { return self._s[3607]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3609]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3610]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3611]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3601]!, self._r[3601]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3612]!, self._r[3612]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3602]! } - public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3604]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3607]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3613]! } + public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3615]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3618]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3608]!, self._r[3608]!, [_0]) + return formatWithArgumentRanges(self._s[3619]!, self._r[3619]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[3609]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3610]! } + public var Passport_CorrectErrors: String { return self._s[3620]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3621]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3611]!, self._r[3611]!, [_0]) + return formatWithArgumentRanges(self._s[3622]!, self._r[3622]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3612]! } - public var Channel_DiscussionGroup: String { return self._s[3613]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3614]! } + public var Map_SendMyCurrentLocation: String { return self._s[3623]! } + public var Channel_DiscussionGroup: String { return self._s[3624]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3625]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3615]!, self._r[3615]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3626]!, self._r[3626]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3616]! } - public var Permissions_NotificationsText_v0: String { return self._s[3617]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3618]! } - public var Appearance_AppIcon: String { return self._s[3619]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3620]! } - public var LoginPassword_FloodError: String { return self._s[3621]! } - public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3623]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3624]! } + public var SharedMedia_SearchNoResults: String { return self._s[3627]! } + public var Permissions_NotificationsText_v0: String { return self._s[3628]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3629]! } + public var Appearance_AppIcon: String { return self._s[3630]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3631]! } + public var LoginPassword_FloodError: String { return self._s[3632]! } + public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3634]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3635]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3625]!, self._r[3625]!, [_0]) + return formatWithArgumentRanges(self._s[3636]!, self._r[3636]!, [_0]) } - public var Passport_Language_bn: String { return self._s[3626]! } + public var Passport_Language_bn: String { return self._s[3637]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3627]!, self._r[3627]!, [_0]) + return formatWithArgumentRanges(self._s[3638]!, self._r[3638]!, [_0]) } - public var ChatList_Context_Pin: String { return self._s[3628]! } + public var ChatList_Context_Pin: String { return self._s[3639]! } public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3629]!, self._r[3629]!, [_0]) + return formatWithArgumentRanges(self._s[3640]!, self._r[3640]!, [_0]) } public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3630]!, self._r[3630]!, [_0]) + return formatWithArgumentRanges(self._s[3641]!, self._r[3641]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3631]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3635]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3637]! } - public var Wallet_Month_GenDecember: String { return self._s[3638]! } - public var Contacts_PermissionsAllow: String { return self._s[3639]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3640]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3641]! } - public var WallpaperPreview_Pattern: String { return self._s[3642]! } - public var Paint_Duplicate: String { return self._s[3643]! } - public var Passport_Address_Country: String { return self._s[3644]! } - public var Notification_RenamedChannel: String { return self._s[3646]! } - public var ChatList_Context_Unmute: String { return self._s[3647]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3648]! } - public var Group_MessagePhotoUpdated: String { return self._s[3649]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3650]! } - public var Conversation_ContextMenuBan: String { return self._s[3651]! } - public var TwoStepAuth_EmailSent: String { return self._s[3652]! } - public var MessagePoll_NoVotes: String { return self._s[3653]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3654]! } - public var Passport_Language_is: String { return self._s[3656]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3658]! } - public var Tour_Text5: String { return self._s[3659]! } + public var Wallet_Navigation_Close: String { return self._s[3642]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3646]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3648]! } + public var Wallet_Month_GenDecember: String { return self._s[3649]! } + public var Contacts_PermissionsAllow: String { return self._s[3650]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3651]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3652]! } + public var WallpaperPreview_Pattern: String { return self._s[3653]! } + public var Paint_Duplicate: String { return self._s[3654]! } + public var Passport_Address_Country: String { return self._s[3655]! } + public var Notification_RenamedChannel: String { return self._s[3657]! } + public var ChatList_Context_Unmute: String { return self._s[3658]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3659]! } + public var Group_MessagePhotoUpdated: String { return self._s[3660]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3661]! } + public var Conversation_ContextMenuBan: String { return self._s[3662]! } + public var TwoStepAuth_EmailSent: String { return self._s[3663]! } + public var MessagePoll_NoVotes: String { return self._s[3664]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3665]! } + public var Passport_Language_is: String { return self._s[3667]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3669]! } + public var Tour_Text5: String { return self._s[3670]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3662]!, self._r[3662]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3673]!, self._r[3673]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3663]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3664]! } + public var Undo_SecretChatDeleted: String { return self._s[3674]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3675]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3665]!, self._r[3665]!, [_0]) + return formatWithArgumentRanges(self._s[3676]!, self._r[3676]!, [_0]) } - public var Forward_ErrorDisabledForChat: String { return self._s[3666]! } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3667]! } - public var Paint_Edit: String { return self._s[3669]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3671]! } - public var Undo_DeletedGroup: String { return self._s[3673]! } - public var LoginPassword_ForgotPassword: String { return self._s[3674]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3675]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3676]! } + public var Forward_ErrorDisabledForChat: String { return self._s[3677]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3678]! } + public var Paint_Edit: String { return self._s[3680]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3682]! } + public var Undo_DeletedGroup: String { return self._s[3684]! } + public var LoginPassword_ForgotPassword: String { return self._s[3685]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3686]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3687]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3677]!, self._r[3677]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3688]!, self._r[3688]!, [_0, _1]) } - public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3678]! } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3679]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3680]! } - public var Passport_Language_uz: String { return self._s[3681]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3682]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3683]! } - public var Map_StopLiveLocation: String { return self._s[3685]! } - public var VoiceOver_MessageContextSend: String { return self._s[3687]! } - public var PasscodeSettings_Help: String { return self._s[3688]! } - public var NotificationsSound_Input: String { return self._s[3689]! } - public var Share_Title: String { return self._s[3692]! } - public var LogoutOptions_Title: String { return self._s[3693]! } - public var Wallet_Send_AddressText: String { return self._s[3694]! } - public var Login_TermsOfServiceAgree: String { return self._s[3695]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3696]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3697]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3698]! } - public var EnterPasscode_EnterTitle: String { return self._s[3699]! } + public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3689]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3690]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3691]! } + public var Passport_Language_uz: String { return self._s[3692]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3693]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3694]! } + public var Map_StopLiveLocation: String { return self._s[3696]! } + public var VoiceOver_MessageContextSend: String { return self._s[3698]! } + public var PasscodeSettings_Help: String { return self._s[3699]! } + public var NotificationsSound_Input: String { return self._s[3700]! } + public var Share_Title: String { return self._s[3703]! } + public var LogoutOptions_Title: String { return self._s[3704]! } + public var Wallet_Send_AddressText: String { return self._s[3705]! } + public var Login_TermsOfServiceAgree: String { return self._s[3706]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3707]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3708]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3709]! } + public var EnterPasscode_EnterTitle: String { return self._s[3710]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3700]!, self._r[3700]!, [_0]) + return formatWithArgumentRanges(self._s[3711]!, self._r[3711]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3701]! } - public var Conversation_AddToContacts: String { return self._s[3702]! } + public var Settings_CopyPhoneNumber: String { return self._s[3712]! } + public var Conversation_AddToContacts: String { return self._s[3713]! } public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3703]!, self._r[3703]!, [_0]) - } - public var NotificationsSound_Keys: String { return self._s[3704]! } - public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3705]!, self._r[3705]!, [_0]) - } - public var Notification_MessageLifetime1w: String { return self._s[3706]! } - public var Message_Video: String { return self._s[3707]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3708]! } - public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3709]!, self._r[3709]!, [_1]) - } - public var Wallet_Receive_AmountInfo: String { return self._s[3712]! } - public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3713]!, self._r[3713]!, [_0]) - } - public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3714]!, self._r[3714]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3715]! } - public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3716]!, self._r[3716]!, [_1, _2, _3]) + public var NotificationsSound_Keys: String { return self._s[3715]! } + public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3716]!, self._r[3716]!, [_0]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3717]! } - public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3718]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3720]! } - public var PrivacyPolicy_Decline: String { return self._s[3721]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3722]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3723]! } - public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3724]! } - public var Permissions_SiriAllow_v0: String { return self._s[3726]! } - public var Wallet_Month_ShortAugust: String { return self._s[3727]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3728]! } + public var Notification_MessageLifetime1w: String { return self._s[3717]! } + public var Message_Video: String { return self._s[3718]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3719]! } + public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3720]!, self._r[3720]!, [_1]) + } + public var Wallet_Receive_AmountInfo: String { return self._s[3723]! } + public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3724]!, self._r[3724]!, [_0]) + } + public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3725]!, self._r[3725]!, [_0]) + } + public var Passport_Language_mk: String { return self._s[3726]! } + public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3727]!, self._r[3727]!, [_1, _2, _3]) + } + public var CreatePoll_CancelConfirmation: String { return self._s[3728]! } + public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3729]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3731]! } + public var PrivacyPolicy_Decline: String { return self._s[3732]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3733]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3734]! } + public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3735]! } + public var Permissions_SiriAllow_v0: String { return self._s[3737]! } + public var Wallet_Month_ShortAugust: String { return self._s[3738]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3739]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3729]!, self._r[3729]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3740]!, self._r[3740]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3730]!, self._r[3730]!, [_0]) + return formatWithArgumentRanges(self._s[3741]!, self._r[3741]!, [_0]) } - public var Paint_Regular: String { return self._s[3731]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3732]! } - public var SocksProxySetup_ShareLink: String { return self._s[3733]! } - public var Wallet_Qr_Title: String { return self._s[3734]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3735]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3737]! } - public var Wallet_Settings_Configuration: String { return self._s[3738]! } - public var GroupInfo_InviteByLink: String { return self._s[3739]! } - public var MessageTimer_Custom: String { return self._s[3740]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3741]! } - public var Conversation_StopQuizConfirmationTitle: String { return self._s[3742]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3744]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3745]! } - public var VoiceOver_Chat_Selected: String { return self._s[3746]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3747]! } - public var Channel_Username_InvalidTaken: String { return self._s[3748]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3749]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3750]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3751]! } - public var Settings_ChatBackground: String { return self._s[3752]! } - public var Channel_Subscribers_Title: String { return self._s[3753]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3754]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3755]! } - public var Watch_ConnectionDescription: String { return self._s[3756]! } - public var OldChannels_NoticeText: String { return self._s[3759]! } - public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3760]! } - public var IntentsSettings_SuggestBy: String { return self._s[3762]! } - public var Theme_ThemeChangedText: String { return self._s[3763]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3764]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3765]! } - public var Wallet_Send_TransactionInProgress: String { return self._s[3766]! } - public var EditProfile_Title: String { return self._s[3767]! } - public var NotificationsSound_Bamboo: String { return self._s[3769]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3771]! } - public var Login_SmsRequestState2: String { return self._s[3772]! } - public var Passport_Language_ar: String { return self._s[3773]! } + public var Paint_Regular: String { return self._s[3742]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3743]! } + public var SocksProxySetup_ShareLink: String { return self._s[3744]! } + public var Wallet_Qr_Title: String { return self._s[3745]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3746]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3748]! } + public var Wallet_Settings_Configuration: String { return self._s[3749]! } + public var GroupInfo_InviteByLink: String { return self._s[3750]! } + public var MessageTimer_Custom: String { return self._s[3751]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3752]! } + public var Conversation_StopQuizConfirmationTitle: String { return self._s[3753]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3755]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3756]! } + public var VoiceOver_Chat_Selected: String { return self._s[3757]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3758]! } + public var Channel_Username_InvalidTaken: String { return self._s[3759]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3760]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3761]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3762]! } + public var Settings_ChatBackground: String { return self._s[3763]! } + public var Channel_Subscribers_Title: String { return self._s[3764]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3765]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3766]! } + public var Watch_ConnectionDescription: String { return self._s[3767]! } + public var OldChannels_NoticeText: String { return self._s[3770]! } + public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3771]! } + public var IntentsSettings_SuggestBy: String { return self._s[3773]! } + public var Theme_ThemeChangedText: String { return self._s[3774]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3775]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3776]! } + public var Wallet_Send_TransactionInProgress: String { return self._s[3777]! } + public var EditProfile_Title: String { return self._s[3778]! } + public var NotificationsSound_Bamboo: String { return self._s[3780]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3782]! } + public var Login_SmsRequestState2: String { return self._s[3783]! } + public var Passport_Language_ar: String { return self._s[3784]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3774]!, self._r[3774]!, [_0]) + return formatWithArgumentRanges(self._s[3785]!, self._r[3785]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3775]! } - public var Wallet_Created_Text: String { return self._s[3776]! } - public var Conversation_MessageDialogEdit: String { return self._s[3778]! } - public var Wallet_Created_Proceed: String { return self._s[3779]! } - public var Wallet_Words_Done: String { return self._s[3780]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3781]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3786]! } + public var Wallet_Created_Text: String { return self._s[3787]! } + public var Conversation_MessageDialogEdit: String { return self._s[3789]! } + public var Wallet_Created_Proceed: String { return self._s[3790]! } + public var Wallet_Words_Done: String { return self._s[3791]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3792]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3782]!, self._r[3782]!, [_1]) + return formatWithArgumentRanges(self._s[3793]!, self._r[3793]!, [_1]) } - public var Common_Close: String { return self._s[3783]! } - public var GroupInfo_PublicLink: String { return self._s[3784]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3785]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3786]! } + public var Common_Close: String { return self._s[3794]! } + public var GroupInfo_PublicLink: String { return self._s[3795]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3796]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3797]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3790]!, self._r[3790]!, [_0]) + return formatWithArgumentRanges(self._s[3801]!, self._r[3801]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3791]! } + public var UserInfo_About_Placeholder: String { return self._s[3802]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3792]!, self._r[3792]!, [_0]) + return formatWithArgumentRanges(self._s[3803]!, self._r[3803]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3793]! } - public var Channel_Info_Banned: String { return self._s[3795]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3804]! } + public var Channel_Info_Banned: String { return self._s[3806]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3796]!, self._r[3796]!, [_0]) + return formatWithArgumentRanges(self._s[3807]!, self._r[3807]!, [_0]) } - public var Appearance_Other: String { return self._s[3797]! } - public var Passport_Language_my: String { return self._s[3798]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3799]! } + public var Appearance_Other: String { return self._s[3808]! } + public var Passport_Language_my: String { return self._s[3809]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3810]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3800]!, self._r[3800]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3811]!, self._r[3811]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3801]! } - public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3802]! } - public var Preview_CopyAddress: String { return self._s[3803]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3812]! } + public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3813]! } + public var Preview_CopyAddress: String { return self._s[3814]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3804]!, self._r[3804]!, [_0]) + return formatWithArgumentRanges(self._s[3815]!, self._r[3815]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3805]! } - public var UserInfo_BotSettings: String { return self._s[3806]! } - public var LiveLocation_MenuStopAll: String { return self._s[3808]! } - public var Passport_PasswordCreate: String { return self._s[3809]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3810]! } - public var Message_PinnedLocationMessage: String { return self._s[3811]! } - public var Map_Satellite: String { return self._s[3812]! } - public var Watch_Message_Unsupported: String { return self._s[3813]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3814]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3815]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3816]! } + public var UserInfo_BotSettings: String { return self._s[3817]! } + public var LiveLocation_MenuStopAll: String { return self._s[3819]! } + public var Passport_PasswordCreate: String { return self._s[3820]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3821]! } + public var Message_PinnedLocationMessage: String { return self._s[3822]! } + public var Map_Satellite: String { return self._s[3823]! } + public var Watch_Message_Unsupported: String { return self._s[3824]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3825]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3826]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3816]!, self._r[3816]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3827]!, self._r[3827]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3817]!, self._r[3817]!, [_0]) + return formatWithArgumentRanges(self._s[3828]!, self._r[3828]!, [_0]) } - public var Wallet_WordImport_Continue: String { return self._s[3818]! } + public var Wallet_WordImport_Continue: String { return self._s[3829]! } public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3819]!, self._r[3819]!, [_0]) + return formatWithArgumentRanges(self._s[3830]!, self._r[3830]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3820]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3821]! } - public var NotificationsSound_None: String { return self._s[3822]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3823]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3825]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3826]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3831]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3832]! } + public var NotificationsSound_None: String { return self._s[3833]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3834]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3836]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3837]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3827]!, self._r[3827]!, [_1]) + return formatWithArgumentRanges(self._s[3838]!, self._r[3838]!, [_1]) } - public var Cache_Indexing: String { return self._s[3828]! } - public var DialogList_RecentTitlePeople: String { return self._s[3830]! } - public var DialogList_EncryptionRejected: String { return self._s[3831]! } - public var GroupInfo_Administrators: String { return self._s[3832]! } - public var Passport_ScanPassportHelp: String { return self._s[3833]! } - public var Application_Name: String { return self._s[3834]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3835]! } - public var PeopleNearby_MakeVisible: String { return self._s[3837]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3838]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3839]! } + public var Cache_Indexing: String { return self._s[3839]! } + public var DialogList_RecentTitlePeople: String { return self._s[3841]! } + public var DialogList_EncryptionRejected: String { return self._s[3842]! } + public var GroupInfo_Administrators: String { return self._s[3843]! } + public var Passport_ScanPassportHelp: String { return self._s[3844]! } + public var Application_Name: String { return self._s[3845]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3846]! } + public var PeopleNearby_MakeVisible: String { return self._s[3848]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3849]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3850]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3840]!, self._r[3840]!, [_0]) + return formatWithArgumentRanges(self._s[3851]!, self._r[3851]!, [_0]) } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3841]!, self._r[3841]!, [_0]) + return formatWithArgumentRanges(self._s[3852]!, self._r[3852]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3842]!, self._r[3842]!, [_0]) + return formatWithArgumentRanges(self._s[3853]!, self._r[3853]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3843]! } - public var Privacy_ChatsTitle: String { return self._s[3844]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3845]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3846]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3847]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3848]! } - public var WebBrowser_Title: String { return self._s[3849]! } - public var Group_LinkedChannel: String { return self._s[3850]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3851]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3852]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3853]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3854]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3855]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3857]! } - public var Channel_Setup_TypePublic: String { return self._s[3859]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3854]! } + public var Privacy_ChatsTitle: String { return self._s[3855]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3856]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3857]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3858]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3859]! } + public var WebBrowser_Title: String { return self._s[3860]! } + public var Group_LinkedChannel: String { return self._s[3861]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3862]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3863]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3864]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3865]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3866]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3868]! } + public var Channel_Setup_TypePublic: String { return self._s[3870]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3860]!, self._r[3860]!, [_0]) + return formatWithArgumentRanges(self._s[3871]!, self._r[3871]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3862]! } - public var MessagePoll_ViewResults: String { return self._s[3863]! } - public var Map_OpenInMaps: String { return self._s[3865]! } + public var Channel_TypeSetup_Title: String { return self._s[3873]! } + public var MessagePoll_ViewResults: String { return self._s[3874]! } + public var Map_OpenInMaps: String { return self._s[3876]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3866]!, self._r[3866]!, [_1]) + return formatWithArgumentRanges(self._s[3877]!, self._r[3877]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3868]! } + public var NotificationsSound_Tremolo: String { return self._s[3879]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3869]!, self._r[3869]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3880]!, self._r[3880]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3870]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3871]! } - public var Passport_PasswordHelp: String { return self._s[3872]! } - public var Login_CodeExpiredError: String { return self._s[3873]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3874]! } - public var Conversation_TitleUnmute: String { return self._s[3875]! } - public var Passport_Identity_ScansHelp: String { return self._s[3876]! } - public var Passport_Language_lo: String { return self._s[3877]! } - public var Camera_FlashAuto: String { return self._s[3878]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3879]! } - public var Common_Cancel: String { return self._s[3880]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3881]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3882]! } - public var Appearance_TintAllColors: String { return self._s[3883]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3881]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3882]! } + public var Passport_PasswordHelp: String { return self._s[3883]! } + public var Login_CodeExpiredError: String { return self._s[3884]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3885]! } + public var Conversation_TitleUnmute: String { return self._s[3886]! } + public var Passport_Identity_ScansHelp: String { return self._s[3887]! } + public var Passport_Language_lo: String { return self._s[3888]! } + public var Camera_FlashAuto: String { return self._s[3889]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3890]! } + public var Common_Cancel: String { return self._s[3891]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3892]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3893]! } + public var Appearance_TintAllColors: String { return self._s[3894]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3884]!, self._r[3884]!, [_1]) + return formatWithArgumentRanges(self._s[3895]!, self._r[3895]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3885]! } - public var ChatSettings_Title: String { return self._s[3887]! } - public var Passport_PasswordReset: String { return self._s[3888]! } - public var SocksProxySetup_TypeNone: String { return self._s[3889]! } - public var EditTheme_Title: String { return self._s[3892]! } - public var PhoneNumberHelp_Help: String { return self._s[3893]! } - public var Checkout_EnterPassword: String { return self._s[3894]! } - public var Share_AuthTitle: String { return self._s[3896]! } - public var Activity_UploadingDocument: String { return self._s[3897]! } - public var State_Connecting: String { return self._s[3898]! } - public var Profile_MessageLifetime1w: String { return self._s[3899]! } - public var Conversation_ContextMenuReport: String { return self._s[3900]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3901]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3902]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3896]! } + public var ChatSettings_Title: String { return self._s[3898]! } + public var Passport_PasswordReset: String { return self._s[3899]! } + public var SocksProxySetup_TypeNone: String { return self._s[3900]! } + public var EditTheme_Title: String { return self._s[3903]! } + public var PhoneNumberHelp_Help: String { return self._s[3904]! } + public var Checkout_EnterPassword: String { return self._s[3905]! } + public var Activity_UploadingDocument: String { return self._s[3907]! } + public var Share_AuthTitle: String { return self._s[3908]! } + public var State_Connecting: String { return self._s[3909]! } + public var Profile_MessageLifetime1w: String { return self._s[3910]! } + public var Conversation_ContextMenuReport: String { return self._s[3911]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3912]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3913]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3903]!, self._r[3903]!, [_0]) + return formatWithArgumentRanges(self._s[3914]!, self._r[3914]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3904]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3905]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3907]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3908]! } - public var PhotoEditor_Set: String { return self._s[3909]! } - public var EmptyGroupInfo_Title: String { return self._s[3910]! } - public var Login_PadPhoneHelp: String { return self._s[3911]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3913]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3915]! } - public var NotificationsSound_Complete: String { return self._s[3916]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3917]! } - public var Group_Info_AdminLog: String { return self._s[3918]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3919]! } + public var AuthSessions_Terminate: String { return self._s[3915]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3916]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3918]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3919]! } + public var PhotoEditor_Set: String { return self._s[3920]! } + public var EmptyGroupInfo_Title: String { return self._s[3921]! } + public var Login_PadPhoneHelp: String { return self._s[3922]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3924]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3926]! } + public var NotificationsSound_Complete: String { return self._s[3927]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3928]! } + public var Group_Info_AdminLog: String { return self._s[3929]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3930]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3920]!, self._r[3920]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3931]!, self._r[3931]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3921]! } - public var Group_Location_CreateInThisPlace: String { return self._s[3923]! } - public var Conversation_Admin: String { return self._s[3924]! } - public var Conversation_GifTooltip: String { return self._s[3925]! } - public var Passport_NotLoggedInMessage: String { return self._s[3926]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3932]! } + public var Group_Location_CreateInThisPlace: String { return self._s[3934]! } + public var Conversation_Admin: String { return self._s[3935]! } + public var Conversation_GifTooltip: String { return self._s[3936]! } + public var Passport_NotLoggedInMessage: String { return self._s[3937]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3928]!, self._r[3928]!, [_0]) + return formatWithArgumentRanges(self._s[3939]!, self._r[3939]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3929]! } - public var SharedMedia_EmptyTitle: String { return self._s[3931]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3933]! } - public var Username_Help: String { return self._s[3934]! } - public var DialogList_LanguageTooltip: String { return self._s[3936]! } - public var Map_LoadError: String { return self._s[3937]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3938]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3939]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3940]! } - public var Notification_Exceptions_NewException: String { return self._s[3941]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3942]! } - public var WatchRemote_AlertText: String { return self._s[3943]! } + public var Profile_MessageLifetimeForever: String { return self._s[3940]! } + public var SharedMedia_EmptyTitle: String { return self._s[3942]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3944]! } + public var Username_Help: String { return self._s[3945]! } + public var DialogList_LanguageTooltip: String { return self._s[3947]! } + public var Map_LoadError: String { return self._s[3948]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3949]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3950]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3951]! } + public var Notification_Exceptions_NewException: String { return self._s[3952]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3953]! } + public var WatchRemote_AlertText: String { return self._s[3954]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3944]!, self._r[3944]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3955]!, self._r[3955]!, [_1, _2, _3]) + } + public var ChatSettings_ConnectionType_Title: String { return self._s[3959]! } + public func PUSH_PINNED_QUIZ(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3960]!, self._r[3960]!, [_1, _2]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3948]! } - public var WebBrowser_DefaultBrowser: String { return self._s[3949]! } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3950]!, self._r[3950]!, [_0]) + return formatWithArgumentRanges(self._s[3961]!, self._r[3961]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3951]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3952]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3962]! } + public var WebBrowser_DefaultBrowser: String { return self._s[3963]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3964]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3953]!, self._r[3953]!, [_0]) + return formatWithArgumentRanges(self._s[3965]!, self._r[3965]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3954]!, self._r[3954]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3966]!, self._r[3966]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3955]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3956]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3958]! } - public var Wallet_Created_ExportErrorText: String { return self._s[3959]! } - public var ChatList_UndoArchiveText1: String { return self._s[3960]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3961]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3962]! } - public var Cache_ClearNone: String { return self._s[3963]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3964]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3965]! } + public var Group_AdminLog_EmptyText: String { return self._s[3967]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3968]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3970]! } + public var Wallet_Created_ExportErrorText: String { return self._s[3971]! } + public var ChatList_UndoArchiveText1: String { return self._s[3972]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3973]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3974]! } + public var Cache_ClearNone: String { return self._s[3975]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3976]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3977]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3966]!, self._r[3966]!, [_0]) + return formatWithArgumentRanges(self._s[3978]!, self._r[3978]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[3967]! } + public var Passport_Identity_Country: String { return self._s[3979]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3968]!, self._r[3968]!, [_0]) + return formatWithArgumentRanges(self._s[3980]!, self._r[3980]!, [_0]) } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3969]!, self._r[3969]!, [_0]) + return formatWithArgumentRanges(self._s[3981]!, self._r[3981]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3970]! } - public var AccessDenied_Settings: String { return self._s[3971]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3972]! } - public var Month_ShortMay: String { return self._s[3973]! } - public var Compose_NewGroup: String { return self._s[3975]! } - public var Group_Setup_TypePrivate: String { return self._s[3977]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3979]! } - public var Appearance_ThemeDayClassic: String { return self._s[3980]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3981]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3982]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3983]! } - public var Conversation_typing: String { return self._s[3985]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3986]! } - public var Paint_Masks: String { return self._s[3987]! } - public var Contacts_DeselectAll: String { return self._s[3988]! } + public var Exceptions_AddToExceptions: String { return self._s[3982]! } + public var AccessDenied_Settings: String { return self._s[3983]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3984]! } + public var Month_ShortMay: String { return self._s[3985]! } + public var Compose_NewGroup: String { return self._s[3987]! } + public var Group_Setup_TypePrivate: String { return self._s[3989]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3991]! } + public var Appearance_ThemeDayClassic: String { return self._s[3992]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3993]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3994]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3995]! } + public var Conversation_typing: String { return self._s[3997]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[3998]! } + public var Paint_Masks: String { return self._s[3999]! } + public var Contacts_DeselectAll: String { return self._s[4000]! } public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3989]!, self._r[3989]!, [_0]) + return formatWithArgumentRanges(self._s[4001]!, self._r[4001]!, [_0]) } - public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[3990]! } - public var Username_InvalidTaken: String { return self._s[3991]! } - public var Call_StatusNoAnswer: String { return self._s[3992]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3993]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3994]! } - public var Passport_Identity_Selfie: String { return self._s[3995]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3996]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3997]! } - public var Conversation_ClearSecretHistory: String { return self._s[3998]! } - public var PeopleNearby_Description: String { return self._s[4000]! } - public var NetworkUsageSettings_Title: String { return self._s[4001]! } - public var Your_cards_security_code_is_invalid: String { return self._s[4003]! } + public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[4002]! } + public var Username_InvalidTaken: String { return self._s[4003]! } + public var Call_StatusNoAnswer: String { return self._s[4004]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[4005]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4006]! } + public var Passport_Identity_Selfie: String { return self._s[4007]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[4008]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[4009]! } + public var Conversation_ClearSecretHistory: String { return self._s[4010]! } + public var PeopleNearby_Description: String { return self._s[4012]! } + public var NetworkUsageSettings_Title: String { return self._s[4013]! } + public var Your_cards_security_code_is_invalid: String { return self._s[4015]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4005]!, self._r[4005]!, [_0]) - } - public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4006]!, self._r[4006]!, [_1, _2]) - } - public var SaveIncomingPhotosSettings_From: String { return self._s[4008]! } - public var VoiceOver_Navigation_Search: String { return self._s[4009]! } - public var Map_LiveLocationTitle: String { return self._s[4010]! } - public var Login_InfoAvatarAdd: String { return self._s[4011]! } - public var Passport_Identity_FilesView: String { return self._s[4012]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[4013]! } - public var Privacy_Calls_NeverAllow: String { return self._s[4014]! } - public var VoiceOver_Chat_File: String { return self._s[4015]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4016]! } - public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4017]!, self._r[4017]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[4018]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[4019]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4020]! } + public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4018]!, self._r[4018]!, [_1, _2]) + } + public var SaveIncomingPhotosSettings_From: String { return self._s[4020]! } + public var VoiceOver_Navigation_Search: String { return self._s[4021]! } + public var Map_LiveLocationTitle: String { return self._s[4022]! } + public var Login_InfoAvatarAdd: String { return self._s[4023]! } + public var Passport_Identity_FilesView: String { return self._s[4024]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[4025]! } + public var Privacy_Calls_NeverAllow: String { return self._s[4026]! } + public var VoiceOver_Chat_File: String { return self._s[4027]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4028]! } + public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4029]!, self._r[4029]!, [_0]) + } + public var ContactInfo_PhoneNumberHidden: String { return self._s[4030]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[4031]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4032]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4021]!, self._r[4021]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4033]!, self._r[4033]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4022]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[4023]! } - public var Tour_Title2: String { return self._s[4024]! } - public var Wallet_Sent_ViewWallet: String { return self._s[4025]! } - public var Conversation_FileOpenIn: String { return self._s[4026]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4027]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4028]! } - public var Wallpaper_Set: String { return self._s[4029]! } - public var Passport_Identity_Translations: String { return self._s[4031]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4034]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[4035]! } + public var Tour_Title2: String { return self._s[4036]! } + public var Wallet_Sent_ViewWallet: String { return self._s[4037]! } + public var Conversation_FileOpenIn: String { return self._s[4038]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4039]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4040]! } + public var Wallpaper_Set: String { return self._s[4041]! } + public var Passport_Identity_Translations: String { return self._s[4043]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4032]!, self._r[4032]!, [_0]) + return formatWithArgumentRanges(self._s[4044]!, self._r[4044]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[4033]! } + public var Channel_LeaveChannel: String { return self._s[4045]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4034]!, self._r[4034]!, [_1]) + return formatWithArgumentRanges(self._s[4046]!, self._r[4046]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4036]! } - public var PhotoEditor_HighlightsTint: String { return self._s[4037]! } - public var MessagePoll_LabelPoll: String { return self._s[4038]! } - public var Passport_Email_Delete: String { return self._s[4039]! } - public var Conversation_Mute: String { return self._s[4041]! } - public var Channel_AddBotAsAdmin: String { return self._s[4042]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[4044]! } - public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4045]! } - public var ChatSettings_IntentsSettings: String { return self._s[4047]! } - public var Channel_Management_LabelOwner: String { return self._s[4048]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4048]! } + public var PhotoEditor_HighlightsTint: String { return self._s[4049]! } + public var MessagePoll_LabelPoll: String { return self._s[4050]! } + public var Passport_Email_Delete: String { return self._s[4051]! } + public var Conversation_Mute: String { return self._s[4053]! } + public var Channel_AddBotAsAdmin: String { return self._s[4054]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[4056]! } + public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4057]! } + public var ChatSettings_IntentsSettings: String { return self._s[4059]! } + public var Channel_Management_LabelOwner: String { return self._s[4060]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4049]!, self._r[4049]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4061]!, self._r[4061]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[4050]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[4051]! } - public var Common_No: String { return self._s[4052]! } - public var Weekday_Sunday: String { return self._s[4053]! } - public var Notification_Reply: String { return self._s[4054]! } - public var Conversation_ViewMessage: String { return self._s[4055]! } + public var Calls_CallTabDescription: String { return self._s[4062]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[4063]! } + public var Common_No: String { return self._s[4064]! } + public var Weekday_Sunday: String { return self._s[4065]! } + public var Notification_Reply: String { return self._s[4066]! } + public var Conversation_ViewMessage: String { return self._s[4067]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4056]!, self._r[4056]!, [_0]) + return formatWithArgumentRanges(self._s[4068]!, self._r[4068]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4057]!, self._r[4057]!, [_0]) + return formatWithArgumentRanges(self._s[4069]!, self._r[4069]!, [_0]) } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4058]!, self._r[4058]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4070]!, self._r[4070]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4059]! } - public var Wallet_Send_Title: String { return self._s[4060]! } - public var Message_PinnedDocumentMessage: String { return self._s[4061]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[4062]! } - public var DialogList_TabTitle: String { return self._s[4064]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[4065]! } - public var Passport_FieldEmail: String { return self._s[4066]! } - public var Conversation_UnpinMessageAlert: String { return self._s[4067]! } - public var Passport_Address_TypeBankStatement: String { return self._s[4068]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[4069]! } - public var Passport_Identity_ExpiryDate: String { return self._s[4070]! } - public var Privacy_Calls_P2P: String { return self._s[4071]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4071]! } + public var Wallet_Send_Title: String { return self._s[4072]! } + public var Message_PinnedDocumentMessage: String { return self._s[4073]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[4074]! } + public var DialogList_TabTitle: String { return self._s[4076]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[4077]! } + public var Passport_FieldEmail: String { return self._s[4078]! } + public var Conversation_UnpinMessageAlert: String { return self._s[4079]! } + public var Passport_Address_TypeBankStatement: String { return self._s[4080]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[4081]! } + public var Passport_Identity_ExpiryDate: String { return self._s[4082]! } + public var Privacy_Calls_P2P: String { return self._s[4083]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4073]!, self._r[4073]!, [_0]) + return formatWithArgumentRanges(self._s[4085]!, self._r[4085]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[4074]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[4086]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4075]!, self._r[4075]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4087]!, self._r[4087]!, [_1, _2]) } - public var Stickers_ClearRecent: String { return self._s[4076]! } - public var EnterPasscode_ChangeTitle: String { return self._s[4077]! } - public var TwoFactorSetup_Email_Title: String { return self._s[4078]! } - public var Passport_InfoText: String { return self._s[4079]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4080]! } + public var Stickers_ClearRecent: String { return self._s[4088]! } + public var EnterPasscode_ChangeTitle: String { return self._s[4089]! } + public var TwoFactorSetup_Email_Title: String { return self._s[4090]! } + public var Passport_InfoText: String { return self._s[4091]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4092]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4081]!, self._r[4081]!, [_0]) + return formatWithArgumentRanges(self._s[4093]!, self._r[4093]!, [_0]) } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4082]!, self._r[4082]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4094]!, self._r[4094]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4083]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[4084]! } - public var VoiceOver_Navigation_Compose: String { return self._s[4085]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[4086]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[4088]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4089]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4095]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[4096]! } + public var VoiceOver_Navigation_Compose: String { return self._s[4097]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[4098]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[4100]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4101]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4090]!, self._r[4090]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4102]!, self._r[4102]!, [_1, _2]) } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4093]! } - public var ChatSettings_OpenLinksIn: String { return self._s[4094]! } - public var Map_HomeAndWorkTitle: String { return self._s[4095]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4105]! } + public var ChatSettings_OpenLinksIn: String { return self._s[4106]! } + public var Map_HomeAndWorkTitle: String { return self._s[4107]! } public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4097]!, self._r[4097]!, [_0]) + return formatWithArgumentRanges(self._s[4109]!, self._r[4109]!, [_0]) } - public var DialogList_Unread: String { return self._s[4098]! } + public var DialogList_Unread: String { return self._s[4110]! } public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4099]!, self._r[4099]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4111]!, self._r[4111]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[4100]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4101]! } + public var User_DeletedAccount: String { return self._s[4112]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4113]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4102]!, self._r[4102]!, [_0]) + return formatWithArgumentRanges(self._s[4114]!, self._r[4114]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[4103]! } - public var SharedMedia_CategoryMedia: String { return self._s[4104]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4105]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4106]! } - public var Watch_ChatList_Compose: String { return self._s[4107]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4108]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[4109]! } - public var Watch_Microphone_Access: String { return self._s[4110]! } - public var Group_Setup_HistoryHeader: String { return self._s[4111]! } - public var Map_SetThisLocation: String { return self._s[4112]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4113]! } - public var Activity_UploadingPhoto: String { return self._s[4114]! } - public var Conversation_Edit: String { return self._s[4116]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[4117]! } - public var Login_TermsOfServiceDecline: String { return self._s[4118]! } - public var Message_PinnedContactMessage: String { return self._s[4119]! } + public var UserInfo_NotificationsDefault: String { return self._s[4115]! } + public var SharedMedia_CategoryMedia: String { return self._s[4116]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4117]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4118]! } + public var Watch_ChatList_Compose: String { return self._s[4119]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4120]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[4121]! } + public var Watch_Microphone_Access: String { return self._s[4122]! } + public var Group_Setup_HistoryHeader: String { return self._s[4123]! } + public var Map_SetThisLocation: String { return self._s[4124]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4125]! } + public var Activity_UploadingPhoto: String { return self._s[4126]! } + public var Conversation_Edit: String { return self._s[4128]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[4129]! } + public var Login_TermsOfServiceDecline: String { return self._s[4130]! } + public var Message_PinnedContactMessage: String { return self._s[4131]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4120]!, self._r[4120]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4132]!, self._r[4132]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4121]!, self._r[4121]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[4133]!, self._r[4133]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[4122]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4124]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4125]! } + public var Appearance_LargeEmoji: String { return self._s[4134]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4136]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4137]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4126]!, self._r[4126]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4138]!, self._r[4138]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[4127]! } - public var Message_PinnedPhotoMessage: String { return self._s[4128]! } - public var Passport_FieldPhone: String { return self._s[4129]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4130]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[4131]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[4133]! } - public var Conversation_Call: String { return self._s[4134]! } - public var Common_TakePhoto: String { return self._s[4136]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4137]! } - public var Wallet_Receive_CommentHeader: String { return self._s[4138]! } - public var Channel_NotificationLoading: String { return self._s[4139]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[4139]! } + public var Message_PinnedPhotoMessage: String { return self._s[4140]! } + public var Passport_FieldPhone: String { return self._s[4141]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4142]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[4143]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[4145]! } + public var Conversation_Call: String { return self._s[4146]! } + public var Common_TakePhoto: String { return self._s[4148]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4149]! } + public var Wallet_Receive_CommentHeader: String { return self._s[4150]! } + public var Channel_NotificationLoading: String { return self._s[4151]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4140]!, self._r[4140]!, [_0]) + return formatWithArgumentRanges(self._s[4152]!, self._r[4152]!, [_0]) } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4141]!, self._r[4141]!, [_0]) + return formatWithArgumentRanges(self._s[4153]!, self._r[4153]!, [_0]) } public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4142]!, self._r[4142]!, [_1]) + return formatWithArgumentRanges(self._s[4154]!, self._r[4154]!, [_1]) } - public var Permissions_SiriTitle_v0: String { return self._s[4143]! } + public var Permissions_SiriTitle_v0: String { return self._s[4155]! } public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4144]!, self._r[4144]!, [_0]) + return formatWithArgumentRanges(self._s[4156]!, self._r[4156]!, [_0]) } public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4145]!, self._r[4145]!, [_0]) + return formatWithArgumentRanges(self._s[4157]!, self._r[4157]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[4146]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[4147]! } - public var ClearCache_FreeSpace: String { return self._s[4148]! } - public var Common_edit: String { return self._s[4149]! } - public var PrivacySettings_AuthSessions: String { return self._s[4150]! } - public var Month_ShortJune: String { return self._s[4151]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4152]! } - public var Call_ReportSend: String { return self._s[4153]! } - public var Watch_LastSeen_JustNow: String { return self._s[4154]! } - public var Notifications_MessageNotifications: String { return self._s[4155]! } - public var WallpaperSearch_ColorGreen: String { return self._s[4156]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4158]! } - public var Group_Status: String { return self._s[4159]! } + public var Channel_MessagePhotoRemoved: String { return self._s[4158]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[4159]! } + public var ClearCache_FreeSpace: String { return self._s[4160]! } + public var Appearance_BubbleCorners_Apply: String { return self._s[4161]! } + public var Common_edit: String { return self._s[4162]! } + public var PrivacySettings_AuthSessions: String { return self._s[4163]! } + public var Month_ShortJune: String { return self._s[4164]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4165]! } + public var Call_ReportSend: String { return self._s[4166]! } + public var Watch_LastSeen_JustNow: String { return self._s[4167]! } + public var Notifications_MessageNotifications: String { return self._s[4168]! } + public var WallpaperSearch_ColorGreen: String { return self._s[4169]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4171]! } + public var Group_Status: String { return self._s[4172]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4160]!, self._r[4160]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4173]!, self._r[4173]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[4161]! } - public var ShareMenu_ShareTo: String { return self._s[4162]! } - public var Conversation_Moderate_Ban: String { return self._s[4163]! } + public var TextFormat_AddLinkTitle: String { return self._s[4174]! } + public var ShareMenu_ShareTo: String { return self._s[4175]! } + public var Conversation_Moderate_Ban: String { return self._s[4176]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4164]!, self._r[4164]!, [_0]) + return formatWithArgumentRanges(self._s[4177]!, self._r[4177]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[4165]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4166]! } + public var SharedMedia_ViewInChat: String { return self._s[4178]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4179]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4167]!, self._r[4167]!, [_1]) + return formatWithArgumentRanges(self._s[4180]!, self._r[4180]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4168]!, self._r[4168]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4181]!, self._r[4181]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4170]!, self._r[4170]!, [_0]) + return formatWithArgumentRanges(self._s[4183]!, self._r[4183]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[4171]! } - public var Appearance_ReduceMotion: String { return self._s[4172]! } + public var Map_OpenInHereMaps: String { return self._s[4184]! } + public var Appearance_ReduceMotion: String { return self._s[4185]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4173]!, self._r[4173]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4186]!, self._r[4186]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[4174]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[4175]! } - public var PhotoEditor_Skip: String { return self._s[4176]! } - public func Notification_GameScoreSimple(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[4187]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[4188]! } + public var PhotoEditor_Skip: String { return self._s[4189]! } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareItem(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) - } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Notifications_Exceptions(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAHours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPhotos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_File(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Contacts_InviteContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Seconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Contacts_ImportersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) - } - public func InviteText_ContactsCountText(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) - } public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Passport_Scans(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Weeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) - } - public func UserCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_DeletedChats(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedStickers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_SelectedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_StickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func MessageTimer_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_SelectedChats(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) - } - public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusOnline(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Generic(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Video(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedFiles(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Seconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortSeconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func MessageTimer_ShortDays(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_Leave(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_InactiveYear(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedLocations(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PollResults_ShowMore(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessagePoll_VotedCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_GroupFormat(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_InactiveWeek(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Theme_UsersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func QuickSend_Photos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) - } - public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPolls(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAudios(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) } public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + public func StickerPack_AddMaskCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessagePoll_QuizCount(_ value: Int32) -> String { + public func PollResults_ShowMore(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Media_ShareItem(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_File(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_SharePhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } public func SharedMedia_Link(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) + } + public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Theme_UsersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Years(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Conversation_StatusOnline(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) } public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MuteFor_Days(_ value: Int32) -> String { + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedVideoMessages(_ value: Int32) -> String { + public func Contacts_ImportersCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) } - public func OldChannels_InactiveMonth(_ value: Int32) -> String { + public func MessageTimer_Days(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func SharedMedia_Generic(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func MessageTimer_Months(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue) - } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedGifs(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[120 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, _1, _2) } public func MessageTimer_Minutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[122 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortHours(_ value: Int32) -> String { + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + } + public func UserCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LastSeen_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessageTimer_Weeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Video(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortDays(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) } public func PeopleNearby_ShowMorePeople(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedGifs(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeletedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Invitation_Members(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPolls(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessagePoll_VotedCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) + } + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_SelectedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPhotos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func OldChannels_Leave(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Contacts_InviteContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveYear(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, _0, _1) } public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusMembers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveWeek(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func StickerPack_StickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Months(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_SelectedMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessagePoll_QuizCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + } + public func QuickSend_Photos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusSubscribers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Passport_Scans(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedStickers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveMonth(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendItem(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddStickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideoMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendGif(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[120 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[122 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_Exceptions(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[125 * 6 + Int(form.rawValue)]!, stringValue) } - public func MuteExpires_Minutes(_ value: Int32) -> String { + public func OldChannels_GroupFormat(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[126 * 6 + Int(form.rawValue)]!, stringValue) diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift index 3571d6d77f..b5696e11e6 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift @@ -549,21 +549,35 @@ public final class PresentationThemeChatList { } } +public struct PresentationThemeBubbleShadow { + public var color: UIColor + public var radius: CGFloat + public var verticalOffset: CGFloat + + public init(color: UIColor, radius: CGFloat, verticalOffset: CGFloat) { + self.color = color + self.radius = radius + self.verticalOffset = verticalOffset + } +} + public final class PresentationThemeBubbleColorComponents { public let fill: UIColor public let gradientFill: UIColor public let highlightedFill: UIColor public let stroke: UIColor + public let shadow: PresentationThemeBubbleShadow? - public init(fill: UIColor, gradientFill: UIColor? = nil, highlightedFill: UIColor, stroke: UIColor) { + public init(fill: UIColor, gradientFill: UIColor? = nil, highlightedFill: UIColor, stroke: UIColor, shadow: PresentationThemeBubbleShadow?) { self.fill = fill self.gradientFill = gradientFill ?? fill self.highlightedFill = highlightedFill self.stroke = stroke + self.shadow = shadow } public func withUpdated(fill: UIColor? = nil, gradientFill: UIColor? = nil, highlightedFill: UIColor? = nil, stroke: UIColor? = nil) -> PresentationThemeBubbleColorComponents { - return PresentationThemeBubbleColorComponents(fill: fill ?? self.fill, gradientFill: gradientFill ?? self.gradientFill, highlightedFill: highlightedFill ?? self.highlightedFill, stroke: stroke ?? self.stroke) + return PresentationThemeBubbleColorComponents(fill: fill ?? self.fill, gradientFill: gradientFill ?? self.gradientFill, highlightedFill: highlightedFill ?? self.highlightedFill, stroke: stroke ?? self.stroke, shadow: self.shadow) } } @@ -1182,6 +1196,10 @@ public final class PresentationTheme: Equatable { return self.resourceCache.object(key, self, generate) } + public func object(_ key: PresentationResourceParameterKey, _ generate: (PresentationTheme) -> AnyObject?) -> AnyObject? { + return self.resourceCache.parameterObject(key, self, generate) + } + public static func ==(lhs: PresentationTheme, rhs: PresentationTheme) -> Bool { return lhs === rhs } diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift index 876a2f188c..18b7119106 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -979,21 +979,49 @@ extension PresentationThemeChatList: Codable { } } +extension PresentationThemeBubbleShadow: Codable { + enum CodingKeys: String, CodingKey { + case color + case radius + case verticalOffset + } + + public init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init( + color: try decodeColor(values, .color), + radius: try CGFloat(Double(truncating: values.decode(Decimal.self, forKey: .radius) as NSNumber)), + verticalOffset: try CGFloat(Double(truncating: values.decode(Decimal.self, forKey: .verticalOffset) as NSNumber)) + ) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.color, .color) + try values.encode(Decimal(Double(self.radius)), forKey: .radius) + try values.encode(Decimal(Double(self.verticalOffset)), forKey: .verticalOffset) + } +} + extension PresentationThemeBubbleColorComponents: Codable { enum CodingKeys: String, CodingKey { case bg case gradientBg case highlightedBg case stroke + case shadow } public convenience init(from decoder: Decoder) throws { let values = try decoder.container(keyedBy: CodingKeys.self) let codingPath = decoder.codingPath.map { $0.stringValue }.joined(separator: ".") - self.init(fill: try decodeColor(values, .bg), - gradientFill: try decodeColor(values, .gradientBg, decoder: decoder, fallbackKey: codingPath + ".bg"), - highlightedFill: try decodeColor(values, .highlightedBg), - stroke: try decodeColor(values, .stroke)) + self.init( + fill: try decodeColor(values, .bg), + gradientFill: try decodeColor(values, .gradientBg, decoder: decoder, fallbackKey: codingPath + ".bg"), + highlightedFill: try decodeColor(values, .highlightedBg), + stroke: try decodeColor(values, .stroke), + shadow: try? values.decode(PresentationThemeBubbleShadow.self, forKey: .shadow) + ) } public func encode(to encoder: Encoder) throws { diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift index 4bc3e519cf..6811a56333 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift @@ -928,7 +928,11 @@ extension PresentationThemeDecoding { fileprivate func unbox_(_ value: Any, as type: Decodable.Type) throws -> Any? { if type == Decimal.self || type == NSDecimalNumber.self { - return try self.unbox(value, as: Decimal.self) + if let value = value as? String { + return Decimal(string: value) + } else { + return try self.unbox(value, as: Decimal.self) + } } else if let stringKeyedDictType = type as? _YAMLStringDictionaryDecodableMarker.Type { return try self.unbox(value, as: stringKeyedDictType) } else { diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift index dd1618f965..2aa29887cd 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift @@ -79,51 +79,63 @@ public final class PrincipalThemeEssentialGraphics { public let chatMessageBackgroundIncomingMaskImage: UIImage public let chatMessageBackgroundIncomingImage: UIImage public let chatMessageBackgroundIncomingOutlineImage: UIImage + public let chatMessageBackgroundIncomingShadowImage: UIImage public let chatMessageBackgroundIncomingHighlightedImage: UIImage public let chatMessageBackgroundIncomingMergedTopMaskImage: UIImage public let chatMessageBackgroundIncomingMergedTopImage: UIImage public let chatMessageBackgroundIncomingMergedTopOutlineImage: UIImage + public let chatMessageBackgroundIncomingMergedTopShadowImage: UIImage public let chatMessageBackgroundIncomingMergedTopHighlightedImage: UIImage public let chatMessageBackgroundIncomingMergedTopSideMaskImage: UIImage public let chatMessageBackgroundIncomingMergedTopSideImage: UIImage public let chatMessageBackgroundIncomingMergedTopSideOutlineImage: UIImage + public let chatMessageBackgroundIncomingMergedTopSideShadowImage: UIImage public let chatMessageBackgroundIncomingMergedTopSideHighlightedImage: UIImage public let chatMessageBackgroundIncomingMergedBottomMaskImage: UIImage public let chatMessageBackgroundIncomingMergedBottomImage: UIImage public let chatMessageBackgroundIncomingMergedBottomOutlineImage: UIImage + public let chatMessageBackgroundIncomingMergedBottomShadowImage: UIImage public let chatMessageBackgroundIncomingMergedBottomHighlightedImage: UIImage public let chatMessageBackgroundIncomingMergedBothMaskImage: UIImage public let chatMessageBackgroundIncomingMergedBothImage: UIImage public let chatMessageBackgroundIncomingMergedBothOutlineImage: UIImage + public let chatMessageBackgroundIncomingMergedBothShadowImage: UIImage public let chatMessageBackgroundIncomingMergedBothHighlightedImage: UIImage public let chatMessageBackgroundIncomingMergedSideMaskImage: UIImage public let chatMessageBackgroundIncomingMergedSideImage: UIImage public let chatMessageBackgroundIncomingMergedSideOutlineImage: UIImage + public let chatMessageBackgroundIncomingMergedSideShadowImage: UIImage public let chatMessageBackgroundIncomingMergedSideHighlightedImage: UIImage public let chatMessageBackgroundOutgoingMaskImage: UIImage public let chatMessageBackgroundOutgoingImage: UIImage public let chatMessageBackgroundOutgoingOutlineImage: UIImage + public let chatMessageBackgroundOutgoingShadowImage: UIImage public let chatMessageBackgroundOutgoingHighlightedImage: UIImage public let chatMessageBackgroundOutgoingMergedTopMaskImage: UIImage public let chatMessageBackgroundOutgoingMergedTopImage: UIImage public let chatMessageBackgroundOutgoingMergedTopOutlineImage: UIImage + public let chatMessageBackgroundOutgoingMergedTopShadowImage: UIImage public let chatMessageBackgroundOutgoingMergedTopHighlightedImage: UIImage public let chatMessageBackgroundOutgoingMergedTopSideMaskImage: UIImage public let chatMessageBackgroundOutgoingMergedTopSideImage: UIImage public let chatMessageBackgroundOutgoingMergedTopSideOutlineImage: UIImage + public let chatMessageBackgroundOutgoingMergedTopSideShadowImage: UIImage public let chatMessageBackgroundOutgoingMergedTopSideHighlightedImage: UIImage public let chatMessageBackgroundOutgoingMergedBottomMaskImage: UIImage public let chatMessageBackgroundOutgoingMergedBottomImage: UIImage public let chatMessageBackgroundOutgoingMergedBottomOutlineImage: UIImage + public let chatMessageBackgroundOutgoingMergedBottomShadowImage: UIImage public let chatMessageBackgroundOutgoingMergedBottomHighlightedImage: UIImage public let chatMessageBackgroundOutgoingMergedBothMaskImage: UIImage public let chatMessageBackgroundOutgoingMergedBothImage: UIImage public let chatMessageBackgroundOutgoingMergedBothOutlineImage: UIImage + public let chatMessageBackgroundOutgoingMergedBothShadowImage: UIImage public let chatMessageBackgroundOutgoingMergedBothHighlightedImage: UIImage public let chatMessageBackgroundOutgoingMergedSideMaskImage: UIImage public let chatMessageBackgroundOutgoingMergedSideImage: UIImage public let chatMessageBackgroundOutgoingMergedSideOutlineImage: UIImage + public let chatMessageBackgroundOutgoingMergedSideShadowImage: UIImage public let chatMessageBackgroundOutgoingMergedSideHighlightedImage: UIImage public let checkBubbleFullImage: UIImage @@ -160,7 +172,7 @@ public final class PrincipalThemeEssentialGraphics { public let incomingBubbleGradientImage: UIImage? public let outgoingBubbleGradientImage: UIImage? - init(mediaBox: MediaBox, presentationTheme: PresentationTheme, wallpaper initialWallpaper: TelegramWallpaper, preview: Bool = false, knockoutMode: Bool) { + init(mediaBox: MediaBox, presentationTheme: PresentationTheme, wallpaper initialWallpaper: TelegramWallpaper, preview: Bool = false, knockoutMode: Bool, bubbleCorners: PresentationChatBubbleCorners) { let theme = presentationTheme.chat var wallpaper = initialWallpaper @@ -215,57 +227,72 @@ public final class PrincipalThemeEssentialGraphics { let serviceColor = serviceMessageColorComponents(chatTheme: theme, wallpaper: wallpaper) + let maxCornerRadius = bubbleCorners.mainRadius + let minCornerRadius = (bubbleCorners.mergeBubbleCorners && maxCornerRadius >= 10.0) ? bubbleCorners.auxiliaryRadius : bubbleCorners.mainRadius + let emptyImage = UIImage() if preview { - self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(incoming: true, fillColor: UIColor.black, strokeColor: UIColor.clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: UIColor.black, strokeColor: UIColor.clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) self.checkBubbleFullImage = generateCheckImage(partial: false, color: theme.message.outgoingCheckColor, width: 11.0)! self.checkBubblePartialImage = generateCheckImage(partial: true, color: theme.message.outgoingCheckColor, width: 11.0)! self.chatMessageBackgroundIncomingHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedTopMaskImage = emptyImage - self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedTopShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) self.chatMessageBackgroundIncomingMergedTopHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideMaskImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = emptyImage + self.chatMessageBackgroundIncomingMergedTopSideShadowImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedBottomMaskImage = emptyImage - self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedBottomShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedBothMaskImage = emptyImage self.chatMessageBackgroundIncomingMergedBothImage = emptyImage self.chatMessageBackgroundIncomingMergedBothOutlineImage = emptyImage + self.chatMessageBackgroundIncomingMergedBothShadowImage = emptyImage self.chatMessageBackgroundIncomingMergedBothHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedSideMaskImage = emptyImage self.chatMessageBackgroundIncomingMergedSideImage = emptyImage self.chatMessageBackgroundIncomingMergedSideOutlineImage = emptyImage + self.chatMessageBackgroundIncomingMergedSideShadowImage = emptyImage self.chatMessageBackgroundIncomingMergedSideHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingHighlightedImage = emptyImage - self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedTopShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = emptyImage + self.chatMessageBackgroundOutgoingMergedTopSideShadowImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = emptyImage - self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBottomShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = emptyImage - self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBothShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideMaskImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideOutlineImage = emptyImage + self.chatMessageBackgroundOutgoingMergedSideShadowImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = emptyImage self.checkMediaFullImage = emptyImage self.checkMediaPartialImage = emptyImage @@ -288,56 +315,68 @@ public final class PrincipalThemeEssentialGraphics { self.radialIndicatorFileIconIncoming = emptyImage self.radialIndicatorFileIconOutgoing = emptyImage } else { - self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedTopHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopSideMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBothMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBothImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBothOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedBothHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundIncomingHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedTopShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundIncomingMergedTopHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedTopSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedBottomShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBothMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBothImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedBothShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundIncomingMergedBothHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundOutgoingHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedTopShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedTopSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBottomShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBothShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedSideMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedSideOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedSideMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedSideOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundOutgoingMergedSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true) + self.chatMessageBackgroundIncomingMergedSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.checkBubbleFullImage = generateCheckImage(partial: false, color: theme.message.outgoingCheckColor, width: 11.0)! self.checkBubblePartialImage = generateCheckImage(partial: true, color: theme.message.outgoingCheckColor, width: 11.0)! @@ -420,7 +459,7 @@ public final class PrincipalThemeAdditionalGraphics { public let chatEmptyItemLockIcon: UIImage public let emptyChatListCheckIcon: UIImage - init(_ theme: PresentationThemeChat, wallpaper: TelegramWallpaper) { + init(_ theme: PresentationThemeChat, wallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) { let serviceColor = serviceMessageColorComponents(chatTheme: theme, wallpaper: wallpaper) self.chatServiceBubbleFillImage = generateImage(CGSize(width: 20.0, height: 20.0), contextGenerator: { size, context -> Void in context.clear(CGRect(origin: CGPoint(), size: size)) @@ -441,14 +480,14 @@ public final class PrincipalThemeAdditionalGraphics { self.chatBubbleShareButtonImage = chatBubbleActionButtonImage(fillColor: bubbleVariableColor(variableColor: theme.message.shareButtonFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.shareButtonStrokeColor, wallpaper: wallpaper), foregroundColor: bubbleVariableColor(variableColor: theme.message.shareButtonForegroundColor, wallpaper: wallpaper), image: UIImage(bundleImageName: "Chat/Message/ShareIcon"))! self.chatBubbleNavigateButtonImage = chatBubbleActionButtonImage(fillColor: bubbleVariableColor(variableColor: theme.message.shareButtonFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.shareButtonStrokeColor, wallpaper: wallpaper), foregroundColor: bubbleVariableColor(variableColor: theme.message.shareButtonForegroundColor, wallpaper: wallpaper), image: UIImage(bundleImageName: "Chat/Message/NavigateToMessageIcon"), iconOffset: CGPoint(x: 0.0, y: 1.0))! - self.chatBubbleActionButtonIncomingMiddleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .middle) - self.chatBubbleActionButtonIncomingBottomLeftImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomLeft) - self.chatBubbleActionButtonIncomingBottomRightImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomRight) - self.chatBubbleActionButtonIncomingBottomSingleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomSingle) - self.chatBubbleActionButtonOutgoingMiddleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .middle) - self.chatBubbleActionButtonOutgoingBottomLeftImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomLeft) - self.chatBubbleActionButtonOutgoingBottomRightImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomRight) - self.chatBubbleActionButtonOutgoingBottomSingleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomSingle) + self.chatBubbleActionButtonIncomingMiddleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .middle, bubbleCorners: bubbleCorners) + self.chatBubbleActionButtonIncomingBottomLeftImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomLeft, bubbleCorners: bubbleCorners) + self.chatBubbleActionButtonIncomingBottomRightImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomRight, bubbleCorners: bubbleCorners) + self.chatBubbleActionButtonIncomingBottomSingleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomSingle, bubbleCorners: bubbleCorners) + self.chatBubbleActionButtonOutgoingMiddleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .middle, bubbleCorners: bubbleCorners) + self.chatBubbleActionButtonOutgoingBottomLeftImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomLeft, bubbleCorners: bubbleCorners) + self.chatBubbleActionButtonOutgoingBottomRightImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomRight, bubbleCorners: bubbleCorners) + self.chatBubbleActionButtonOutgoingBottomSingleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomSingle, bubbleCorners: bubbleCorners) self.chatBubbleActionButtonIncomingMessageIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotMessage"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonIncomingLinkIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotLink"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonIncomingShareIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotShare"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))! diff --git a/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift b/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift index a241cbfa43..2d59cc9eec 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift @@ -9,6 +9,7 @@ private final class PresentationsResourceCacheHolder { private final class PresentationsResourceAnyCacheHolder { var objects: [Int32: AnyObject] = [:] + var parameterObjects: [PresentationResourceParameterKey: AnyObject] = [:] } public final class PresentationsResourceCache { @@ -68,4 +69,22 @@ public final class PresentationsResourceCache { } } } + + public func parameterObject(_ key: PresentationResourceParameterKey, _ theme: PresentationTheme, _ generate: (PresentationTheme) -> AnyObject?) -> AnyObject? { + let result = self.objectCache.with { holder -> AnyObject? in + return holder.parameterObjects[key] + } + if let result = result { + return result + } else { + if let object = generate(theme) { + self.objectCache.with { holder -> Void in + holder.parameterObjects[key] = object + } + return object + } else { + return nil + } + } + } } diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift index ff03ac0902..5a33489aa8 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift @@ -20,6 +20,7 @@ public enum PresentationResourceKey: Int32 { case navigationShareIcon case navigationSearchIcon case navigationCompactSearchIcon + case navigationMoreIcon case navigationAddIcon case navigationPlayerCloseButton @@ -80,12 +81,6 @@ public enum PresentationResourceKey: Int32 { case chatTitleLockIcon case chatTitleMuteIcon - case chatPrincipalThemeEssentialGraphicsWithWallpaper - case chatPrincipalThemeEssentialGraphicsWithoutWallpaper - - case chatPrincipalThemeAdditionalGraphicsWithCustomWallpaper - case chatPrincipalThemeAdditionalGraphicsWithDefaultWallpaper - case chatBubbleVerticalLineIncomingImage case chatBubbleVerticalLineOutgoingImage @@ -236,4 +231,9 @@ public enum PresentationResourceParameterKey: Hashable { case chatListBadgeBackgroundMention(CGFloat) case chatListBadgeBackgroundInactiveMention(CGFloat) case chatListBadgeBackgroundPinned(CGFloat) + + case chatBubbleMediaCorner(incoming: Bool, mainRadius: CGFloat, inset: CGFloat) + + case chatPrincipalThemeEssentialGraphics(hasWallpaper: Bool, bubbleCorners: PresentationChatBubbleCorners) + case chatPrincipalThemeAdditionalGraphics(isCustomWallpaper: Bool, bubbleCorners: PresentationChatBubbleCorners) } diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift index e3c4799b12..c639d5bfa1 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift @@ -69,18 +69,17 @@ public struct PresentationResourcesChat { }) } - public static func principalGraphics(mediaBox: MediaBox, knockoutWallpaper: Bool, theme: PresentationTheme, wallpaper: TelegramWallpaper) -> PrincipalThemeEssentialGraphics { + public static func principalGraphics(mediaBox: MediaBox, knockoutWallpaper: Bool, theme: PresentationTheme, wallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) -> PrincipalThemeEssentialGraphics { let hasWallpaper = !wallpaper.isEmpty - let key: PresentationResourceKey = !hasWallpaper ? PresentationResourceKey.chatPrincipalThemeEssentialGraphicsWithoutWallpaper : PresentationResourceKey.chatPrincipalThemeEssentialGraphicsWithWallpaper - return theme.object(key.rawValue, { theme in - return PrincipalThemeEssentialGraphics(mediaBox: mediaBox, presentationTheme: theme, wallpaper: wallpaper, preview: theme.preview, knockoutMode: knockoutWallpaper) + return theme.object(PresentationResourceParameterKey.chatPrincipalThemeEssentialGraphics(hasWallpaper: hasWallpaper, bubbleCorners: bubbleCorners), { theme in + return PrincipalThemeEssentialGraphics(mediaBox: mediaBox, presentationTheme: theme, wallpaper: wallpaper, preview: theme.preview, knockoutMode: knockoutWallpaper, bubbleCorners: bubbleCorners) }) as! PrincipalThemeEssentialGraphics } - public static func additionalGraphics(_ theme: PresentationTheme, wallpaper: TelegramWallpaper) -> PrincipalThemeAdditionalGraphics { - let key: PresentationResourceKey = wallpaper.isBuiltin ? PresentationResourceKey.chatPrincipalThemeAdditionalGraphicsWithDefaultWallpaper : PresentationResourceKey.chatPrincipalThemeAdditionalGraphicsWithCustomWallpaper - return theme.object(key.rawValue, { theme in - return PrincipalThemeAdditionalGraphics(theme.chat, wallpaper: wallpaper) + public static func additionalGraphics(_ theme: PresentationTheme, wallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) -> PrincipalThemeAdditionalGraphics { + let key: PresentationResourceParameterKey = .chatPrincipalThemeAdditionalGraphics(isCustomWallpaper: !wallpaper.isBuiltin, bubbleCorners: bubbleCorners) + return theme.object(key, { theme in + return PrincipalThemeAdditionalGraphics(theme.chat, wallpaper: wallpaper, bubbleCorners: bubbleCorners) }) as! PrincipalThemeAdditionalGraphics } @@ -950,4 +949,10 @@ public struct PresentationResourcesChat { return generateCheckImage(partial: true, color: color, width: size) }) } + + public static func chatBubbleMediaCorner(_ theme: PresentationTheme, incoming: Bool, mainRadius: CGFloat, inset: CGFloat) -> UIImage? { + return theme.image(PresentationResourceParameterKey.chatBubbleMediaCorner(incoming: incoming, mainRadius: mainRadius, inset: inset), { _ in + return mediaBubbleCornerImage(incoming: incoming, radius: mainRadius, inset: inset) + }) + } } diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift index b5982305bb..afc4cc9f0a 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift @@ -71,6 +71,19 @@ public struct PresentationResourcesRootController { }) } + public static func navigationMoreIcon(_ theme: PresentationTheme) -> UIImage? { + return theme.image(PresentationResourceKey.navigationMoreIcon.rawValue, { theme in + return generateImage(CGSize(width: 30.0, height: 30.0), rotatedContext: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setFillColor(theme.rootController.navigationBar.accentTextColor.cgColor) + let dotSize: CGFloat = 4.0 + context.fillEllipse(in: CGRect(origin: CGPoint(x: 6.0, y: floor((size.height - dotSize) / 2.0)), size: CGSize(width: dotSize, height: dotSize))) + context.fillEllipse(in: CGRect(origin: CGPoint(x: 13.0, y: floor((size.height - dotSize) / 2.0)), size: CGSize(width: dotSize, height: dotSize))) + context.fillEllipse(in: CGRect(origin: CGPoint(x: 20.0, y: floor((size.height - dotSize) / 2.0)), size: CGSize(width: dotSize, height: dotSize))) + }) + }) + } + public static func navigationAddIcon(_ theme: PresentationTheme) -> UIImage? { return theme.image(PresentationResourceKey.navigationAddIcon.rawValue, { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat List/AddIcon"), color: theme.rootController.navigationBar.accentTextColor) diff --git a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift index 4483315d8d..d634e990e1 100644 --- a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift +++ b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift @@ -132,7 +132,7 @@ public func universalServiceMessageString(presentationData: (PresentationTheme, case sticker case location case contact - case poll + case poll(TelegramMediaPollKind) case deleted } @@ -188,8 +188,8 @@ public func universalServiceMessageString(presentationData: (PresentationTheme, type = .location } else if let _ = media as? TelegramMediaContact { type = .contact - } else if let _ = media as? TelegramMediaPoll { - type = .poll + } else if let poll = media as? TelegramMediaPoll { + type = .poll(poll.kind) } } } else { @@ -229,8 +229,13 @@ public func universalServiceMessageString(presentationData: (PresentationTheme, attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedLocationMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)])) case .contact: attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedContactMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)])) - case .poll: - attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedPollMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)])) + case let .poll(kind): + switch kind { + case .poll: + attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedPollMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)])) + case .quiz: + attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedQuizMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)])) + } case .deleted: attributedString = addAttributesToStringWithRanges(strings.PUSH_PINNED_NOTEXT(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)])) } diff --git a/submodules/TelegramUI/BUCK b/submodules/TelegramUI/BUCK index f705915c30..9a62dca17e 100644 --- a/submodules/TelegramUI/BUCK +++ b/submodules/TelegramUI/BUCK @@ -47,7 +47,6 @@ framework( "//submodules/DeviceAccess:DeviceAccess", "//submodules/WatchCommon/Host:WatchCommon", "//submodules/LightweightAccountData:LightweightAccountData", - "//submodules/HockeySDK-iOS:HockeySDK", "//submodules/BuildConfig:BuildConfig", "//submodules/BuildConfigExtra:BuildConfigExtra", "//submodules/rlottie:RLottieBinding", diff --git a/submodules/TelegramUI/Images.xcassets/Avatar/EditAvatarIconLarge.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Avatar/EditAvatarIconLarge.imageset/Contents.json new file mode 100644 index 0000000000..868e9f5048 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Avatar/EditAvatarIconLarge.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_camera.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Avatar/EditAvatarIconLarge.imageset/ic_camera.pdf b/submodules/TelegramUI/Images.xcassets/Avatar/EditAvatarIconLarge.imageset/ic_camera.pdf new file mode 100644 index 0000000000..6b39b47bbb Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Avatar/EditAvatarIconLarge.imageset/ic_camera.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonAddMember.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonAddMember.imageset/Contents.json new file mode 100644 index 0000000000..196b36b491 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonAddMember.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_pf_addmember.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonAddMember.imageset/ic_pf_addmember.pdf b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonAddMember.imageset/ic_pf_addmember.pdf new file mode 100644 index 0000000000..ad2274b415 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonAddMember.imageset/ic_pf_addmember.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonCall.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonCall.imageset/Contents.json new file mode 100644 index 0000000000..94b8f3fdef --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonCall.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_pf_call.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonCall.imageset/ic_pf_call.pdf b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonCall.imageset/ic_pf_call.pdf new file mode 100644 index 0000000000..6fdc5ac345 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonCall.imageset/ic_pf_call.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMessage.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMessage.imageset/Contents.json new file mode 100644 index 0000000000..c1007d847a --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMessage.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_pf_message.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMessage.imageset/ic_pf_message.pdf b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMessage.imageset/ic_pf_message.pdf new file mode 100644 index 0000000000..64fe2bdbd1 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMessage.imageset/ic_pf_message.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMore.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMore.imageset/Contents.json new file mode 100644 index 0000000000..176c3d211d --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMore.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_pf_more.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMore.imageset/ic_pf_more.pdf b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMore.imageset/ic_pf_more.pdf new file mode 100644 index 0000000000..a105960756 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMore.imageset/ic_pf_more.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMute.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMute.imageset/Contents.json new file mode 100644 index 0000000000..61322e832d --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMute.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_pf_mute.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMute.imageset/ic_pf_mute.pdf b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMute.imageset/ic_pf_mute.pdf new file mode 100644 index 0000000000..2cabbef68d Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonMute.imageset/ic_pf_mute.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonUnmute.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonUnmute.imageset/Contents.json new file mode 100644 index 0000000000..29259c8539 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonUnmute.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_pf_unmute.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonUnmute.imageset/ic_pf_unmute.pdf b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonUnmute.imageset/ic_pf_unmute.pdf new file mode 100644 index 0000000000..617622f59a Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Peer Info/ButtonUnmute.imageset/ic_pf_unmute.pdf differ diff --git a/submodules/TelegramUI/TelegramUI/AppDelegate.swift b/submodules/TelegramUI/TelegramUI/AppDelegate.swift index 5fd24a884e..02bcf8dd75 100644 --- a/submodules/TelegramUI/TelegramUI/AppDelegate.swift +++ b/submodules/TelegramUI/TelegramUI/AppDelegate.swift @@ -5,7 +5,7 @@ import TelegramCore import SyncCore import UserNotifications import Intents -import HockeySDK +//import HockeySDK import Postbox import PushKit import AsyncDisplayKit @@ -157,7 +157,7 @@ final class SharedApplicationContext { } } -@objc(AppDelegate) class AppDelegate: UIResponder, UIApplicationDelegate, PKPushRegistryDelegate, BITHockeyManagerDelegate, UNUserNotificationCenterDelegate, UIAlertViewDelegate { +@objc(AppDelegate) class AppDelegate: UIResponder, UIApplicationDelegate, PKPushRegistryDelegate/*, BITHockeyManagerDelegate*/, UNUserNotificationCenterDelegate, UIAlertViewDelegate { @objc var window: UIWindow? var nativeWindow: (UIWindow & WindowHost)? var mainWindow: Window1! @@ -1338,7 +1338,7 @@ final class SharedApplicationContext { self.isActivePromise.set(true) } - BITHockeyBaseManager.setPresentAlert({ [weak self] alert in + /*BITHockeyBaseManager.setPresentAlert({ [weak self] alert in if let strongSelf = self, let alert = alert { var actions: [TextAlertAction] = [] for action in alert.actions { @@ -1376,7 +1376,7 @@ final class SharedApplicationContext { #else BITHockeyManager.shared().authenticator.authenticateInstallation() #endif - } + }*/ if UIApplication.shared.isStatusBarHidden { UIApplication.shared.setStatusBarHidden(false, with: .none) diff --git a/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift b/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift index 0d7cbb8267..1ba556629e 100644 --- a/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift @@ -48,6 +48,8 @@ final class ChatAvatarNavigationNode: ASDisplayNode { } } + var tapped: (() -> Void)? + override init() { self.containerNode = ContextControllerSourceNode() self.avatarNode = AvatarNode(font: normalFont) @@ -67,6 +69,9 @@ final class ChatAvatarNavigationNode: ASDisplayNode { } strongSelf.contextAction?(strongSelf.containerNode, gesture) } + + /*self.containerNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 37.0, height: 37.0)) + self.avatarNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 37.0, height: 37.0))*/ } override func didLoad() { @@ -74,6 +79,22 @@ final class ChatAvatarNavigationNode: ASDisplayNode { self.view.isOpaque = false (self.view as? ChatAvatarNavigationNodeView)?.targetNode = self (self.view as? ChatAvatarNavigationNodeView)?.chatController = self.chatController + + /*let tapRecognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.avatarTapGesture(_:))) + self.avatarNode.view.addGestureRecognizer(tapRecognizer)*/ + } + + @objc private func avatarTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { + if case .ended = recognizer.state { + if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { + switch gesture { + case .tap: + self.tapped?() + default: + break + } + } + } } override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize { diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index d62259a257..6f3df9a6e6 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -289,7 +289,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G private weak var sendMessageActionsController: ChatSendMessageActionSheetController? private var searchResultsController: ChatSearchResultsController? - private var screenCaptureEventsDisposable: Disposable? + private var screenCaptureManager: ScreenCaptureDetectionManager? private let chatAdditionalDataDisposable = MetaDisposable() private var reportIrrelvantGeoNoticePromise = Promise() @@ -307,6 +307,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G private var updateSlowmodeStatusTimerValue: Int32? private var isDismissed = false + + private var focusOnSearchAfterAppearance: Bool = false public override var customData: Any? { return self.chatLocation @@ -346,7 +348,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G isScheduledMessages = true } - self.presentationInterfaceState = ChatPresentationInterfaceState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, limitsConfiguration: context.currentLimitsConfiguration.with { $0 }, fontSize: self.presentationData.chatFontSize, accountPeerId: context.account.peerId, mode: mode, chatLocation: chatLocation, isScheduledMessages: isScheduledMessages) + self.presentationInterfaceState = ChatPresentationInterfaceState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, limitsConfiguration: context.currentLimitsConfiguration.with { $0 }, fontSize: self.presentationData.chatFontSize, bubbleCorners: self.presentationData.chatBubbleCorners, accountPeerId: context.account.peerId, mode: mode, chatLocation: chatLocation, isScheduledMessages: isScheduledMessages) var mediaAccessoryPanelVisibility = MediaAccessoryPanelVisibility.none if case .standard = mode { @@ -363,13 +365,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } super.init(context: context, navigationBarPresentationData: navigationBarPresentationData, mediaAccessoryPanelVisibility: mediaAccessoryPanelVisibility, locationBroadcastPanelSource: locationBroadcastPanelSource) - /*switch mode { - case .overlay: - self.navigationPresentation = .standaloneModal - default: - break - }*/ - self.blocksBackgroundWhenInOverlay = true self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) @@ -1898,6 +1893,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.controllerInteraction = controllerInteraction + if case let .peer(peerId) = chatLocation, peerId != context.account.peerId, subject != .scheduledMessages { + self.navigationBar?.userInfo = PeerInfoNavigationSourceTag(peerId: peerId) + } + self.chatTitleView = ChatTitleView(account: self.context.account, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder) self.navigationItem.titleView = self.chatTitleView self.chatTitleView?.pressed = { [weak self] in @@ -1945,20 +1944,23 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G let items: [ContextMenuItem] = [ .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, icon: { _ in nil }, action: { _, f in f(.dismissWithoutContent) - self?.navigationButtonAction(.openChatInfo) + self?.navigationButtonAction(.openChatInfo(expandAvatar: true)) })) ] let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: galleryController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) strongSelf.presentInGlobalOverlay(contextController) } chatInfoButtonItem = UIBarButtonItem(customDisplayNode: avatarNode)! - /*case .group: - chatInfoButtonItem = UIBarButtonItem(customDisplayNode: ChatMultipleAvatarsNavigationNode())!*/ } chatInfoButtonItem.target = self chatInfoButtonItem.action = #selector(self.rightNavigationButtonAction) chatInfoButtonItem.accessibilityLabel = self.presentationData.strings.Conversation_Info - self.chatInfoNavigationButton = ChatNavigationButton(action: .openChatInfo, buttonItem: chatInfoButtonItem) + self.chatInfoNavigationButton = ChatNavigationButton(action: .openChatInfo(expandAvatar: true), buttonItem: chatInfoButtonItem) + + self.navigationItem.titleView = self.chatTitleView + self.chatTitleView?.pressed = { [weak self] in + self?.navigationButtonAction(.openChatInfo(expandAvatar: false)) + } self.updateChatPresentationInterfaceState(animated: false, interactive: false, { state in if let botStart = botStart, case .interactive = botStart.behavior { @@ -2037,7 +2039,15 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let strongSelf = self { if let peer = peerViewMainPeer(peerView) { strongSelf.chatTitleView?.titleContent = .peer(peerView: peerView, onlineMemberCount: onlineMemberCount, isScheduledMessages: isScheduledMessages) - (strongSelf.chatInfoNavigationButton?.buttonItem.customDisplayNode as? ChatAvatarNavigationNode)?.avatarNode.setPeer(context: strongSelf.context, theme: strongSelf.presentationData.theme, peer: peer, overrideImage: peer.isDeleted ? .deletedIcon : .none) + let imageOverride: AvatarNodeImageOverride? + if strongSelf.context.account.peerId == peer.id { + imageOverride = .savedMessagesIcon + } else if peer.isDeleted { + imageOverride = .deletedIcon + } else { + imageOverride = nil + } + (strongSelf.chatInfoNavigationButton?.buttonItem.customDisplayNode as? ChatAvatarNavigationNode)?.avatarNode.setPeer(context: strongSelf.context, theme: strongSelf.presentationData.theme, peer: peer, overrideImage: imageOverride) (strongSelf.chatInfoNavigationButton?.buttonItem.customDisplayNode as? ChatAvatarNavigationNode)?.contextActionIsEnabled = peer.restrictionText(platform: "ios", contentSettings: strongSelf.context.currentContentSettings.with { $0 }) == nil } @@ -2523,7 +2533,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.applicationInForegroundDisposable?.dispose() self.canReadHistoryDisposable?.dispose() self.networkStateDisposable?.dispose() - self.screenCaptureEventsDisposable?.dispose() self.chatAdditionalDataDisposable.dispose() self.shareStatusDisposable?.dispose() self.context.sharedContext.mediaManager.galleryHiddenMediaManager.removeTarget(self) @@ -2565,6 +2574,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G state = state.updatedStrings(self.presentationData.strings) state = state.updatedDateTimeFormat(self.presentationData.dateTimeFormat) state = state.updatedChatWallpaper(self.presentationData.chatWallpaper) + state = state.updatedBubbleCorners(self.presentationData.chatBubbleCorners) return state }) @@ -3572,7 +3582,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId), subject: nil, keepStack: .always)) } }, openPeerInfo: { [weak self] in - self?.navigationButtonAction(.openChatInfo) + self?.navigationButtonAction(.openChatInfo(expandAvatar: false)) }, togglePeerNotifications: { [weak self] in if let strongSelf = self, case let .peer(peerId) = strongSelf.chatLocation { let _ = togglePeerMuted(account: strongSelf.context.account, peerId: peerId).start() @@ -4486,6 +4496,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } self.interfaceInteraction = interfaceInteraction + + if self.focusOnSearchAfterAppearance { + self.focusOnSearchAfterAppearance = false + self.interfaceInteraction?.beginMessageSearch(.everything, "") + } + self.chatDisplayNode.interfaceInteraction = interfaceInteraction self.context.sharedContext.mediaManager.galleryHiddenMediaManager.addTarget(self) @@ -4665,10 +4681,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if !self.checkedPeerChatServiceActions { self.checkedPeerChatServiceActions = true - if case let .peer(peerId) = self.chatLocation, peerId.namespace == Namespaces.Peer.SecretChat { - self.screenCaptureEventsDisposable = screenCaptureEvents().start(next: { [weak self] _ in + if case let .peer(peerId) = self.chatLocation, peerId.namespace == Namespaces.Peer.SecretChat, self.screenCaptureManager == nil { + self.screenCaptureManager = ScreenCaptureDetectionManager(check: { [weak self] in if let strongSelf = self, strongSelf.canReadHistoryValue, strongSelf.traceVisibility() { let _ = addSecretChatMessageScreenshot(account: strongSelf.context.account, peerId: peerId).start() + return true + } else { + return false } }) } @@ -4740,6 +4759,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G })]), in: .window(.root)) })) } + + if self.focusOnSearchAfterAppearance { + self.focusOnSearchAfterAppearance = false + if let searchNode = self.navigationBar?.contentNode as? ChatSearchNavigationContentNode { + searchNode.activate() + } + } } override public func viewWillDisappear(_ animated: Bool) { @@ -5343,18 +5369,26 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.chatDisplayNode.dismissInput() self.present(actionSheet, in: .window(.root)) } - case .openChatInfo: + case let .openChatInfo(expandAvatar): switch self.chatLocationInfoData { - case let .peer(peerView): - self.navigationActionDisposable.set((peerView.get() - |> take(1) - |> deliverOnMainQueue).start(next: { [weak self] peerView in - if let strongSelf = self, let peer = peerView.peers[peerView.peerId], peer.restrictionText(platform: "ios", contentSettings: strongSelf.context.currentContentSettings.with { $0 }) == nil && !strongSelf.presentationInterfaceState.isNotAccessible { - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + case let .peer(peerView): + self.navigationActionDisposable.set((peerView.get() + |> take(1) + |> deliverOnMainQueue).start(next: { [weak self] peerView in + if let strongSelf = self, let peer = peerView.peers[peerView.peerId], peer.restrictionText(platform: "ios", contentSettings: strongSelf.context.currentContentSettings.with { $0 }) == nil && !strongSelf.presentationInterfaceState.isNotAccessible { + if peer.id == strongSelf.context.account.peerId { + strongSelf.effectiveNavigationController?.pushViewController(PeerMediaCollectionController(context: strongSelf.context, peerId: strongSelf.context.account.peerId)) + } else { + var expandAvatar = expandAvatar + if peer.smallProfileImage == nil { + expandAvatar = false + } + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: expandAvatar) { strongSelf.effectiveNavigationController?.pushViewController(infoController) } } - })) + } + })) } case .search: self.interfaceInteraction?.beginMessageSearch(.everything, "") @@ -5562,6 +5596,27 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G }) })) } + case .toggleInfoPanel: + self.updateChatPresentationInterfaceState(animated: true, interactive: true, { + return $0.updatedTitlePanelContext { + if let index = $0.firstIndex(where: { + switch $0 { + case .chatInfo: + return true + default: + return false + } + }) { + var updatedContexts = $0 + updatedContexts.remove(at: index) + return updatedContexts + } else { + var updatedContexts = $0 + updatedContexts.append(.chatInfo) + return updatedContexts.sorted() + } + } + }) } } @@ -7049,11 +7104,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.effectiveNavigationController?.pushViewController(controller) } - private func openPeer(peerId: PeerId?, navigation: ChatControllerInteractionNavigateToPeer, fromMessage: Message?) { + private func openPeer(peerId: PeerId?, navigation: ChatControllerInteractionNavigateToPeer, fromMessage: Message?, expandAvatar: Bool = false) { if case let .peer(currentPeerId) = self.chatLocation, peerId == currentPeerId { switch navigation { case .info: - self.navigationButtonAction(.openChatInfo) + self.navigationButtonAction(.openChatInfo(expandAvatar: expandAvatar)) case let .chat(textInputState, _): if let textInputState = textInputState { self.updateChatPresentationInterfaceState(animated: true, interactive: true, { @@ -7085,7 +7140,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } self.navigationActionDisposable.set((peerSignal |> take(1) |> deliverOnMainQueue).start(next: { [weak self] peer in if let strongSelf = self, let peer = peer { - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: expandAvatar) { strongSelf.effectiveNavigationController?.pushViewController(infoController) } } @@ -7502,7 +7557,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G |> take(1) |> deliverOnMainQueue).start(next: { [weak self] peer in if let strongSelf = self, peer.restrictionText(platform: "ios", contentSettings: strongSelf.context.currentContentSettings.with { $0 }) == nil { - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { strongSelf.effectiveNavigationController?.pushViewController(infoController) } } @@ -8469,6 +8524,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return nil } } + + func activateSearch() { + self.focusOnSearchAfterAppearance = true + self.interfaceInteraction?.beginMessageSearch(.everything, "") + } } private final class ContextControllerContentSourceImpl: ContextControllerContentSource { diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift index 9ebd21cde6..53a7b86c40 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift @@ -225,7 +225,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { self.reactionContainerNode = ReactionSelectionParentNode(account: context.account, theme: chatPresentationInterfaceState.theme) - self.loadingNode = ChatLoadingNode(theme: self.chatPresentationInterfaceState.theme, chatWallpaper: self.chatPresentationInterfaceState.chatWallpaper) + self.loadingNode = ChatLoadingNode(theme: self.chatPresentationInterfaceState.theme, chatWallpaper: self.chatPresentationInterfaceState.chatWallpaper, bubbleCorners: self.chatPresentationInterfaceState.bubbleCorners) self.inputPanelBackgroundNode = ASDisplayNode() if case let .color(color) = self.chatPresentationInterfaceState.chatWallpaper, UIColor(rgb: color).isEqual(self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper) { @@ -294,6 +294,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { self.backgroundNode.motionEnabled = chatPresentationInterfaceState.chatWallpaper.settings?.motion ?? false self.historyNode.verticalScrollIndicatorColor = UIColor(white: 0.5, alpha: 0.8) + self.historyNode.enableExtractedBackgrounds = true self.addSubnode(self.backgroundNode) self.addSubnode(self.historyNodeContainer) @@ -1512,7 +1513,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { if let restrictionText = restrictionText { if self.restrictedNode == nil { - let restrictedNode = ChatRecentActionsEmptyNode(theme: chatPresentationInterfaceState.theme, chatWallpaper: chatPresentationInterfaceState.chatWallpaper) + let restrictedNode = ChatRecentActionsEmptyNode(theme: chatPresentationInterfaceState.theme, chatWallpaper: chatPresentationInterfaceState.chatWallpaper, chatBubbleCorners: chatPresentationInterfaceState.bubbleCorners) self.historyNodeContainer.supernode?.insertSubnode(restrictedNode, aboveSubnode: self.historyNodeContainer) self.restrictedNode = restrictedNode } diff --git a/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift b/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift index 57b0fef12d..c0f8623b98 100644 --- a/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift @@ -121,7 +121,7 @@ private final class ChatEmptyNodeSecretChatContent: ASDisplayNode, ChatEmptyNode let lines: [NSAttributedString] = strings.map { NSAttributedString(string: $0, font: messageFont, textColor: serviceColor.primaryText) } - let graphics = PresentationResourcesChat.additionalGraphics(interfaceState.theme, wallpaper: interfaceState.chatWallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(interfaceState.theme, wallpaper: interfaceState.chatWallpaper, bubbleCorners: interfaceState.bubbleCorners) let lockIcon = graphics.chatEmptyItemLockIcon for i in 0 ..< lines.count { @@ -237,7 +237,7 @@ private final class ChatEmptyNodeGroupChatContent: ASDisplayNode, ChatEmptyNodeC let lines: [NSAttributedString] = strings.map { NSAttributedString(string: $0, font: messageFont, textColor: serviceColor.primaryText) } - let graphics = PresentationResourcesChat.additionalGraphics(interfaceState.theme, wallpaper: interfaceState.chatWallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(interfaceState.theme, wallpaper: interfaceState.chatWallpaper, bubbleCorners: interfaceState.bubbleCorners) let lockIcon = graphics.emptyChatListCheckIcon for i in 0 ..< lines.count { @@ -453,7 +453,7 @@ final class ChatEmptyNode: ASDisplayNode { self.currentTheme = interfaceState.theme self.currentStrings = interfaceState.strings - let graphics = PresentationResourcesChat.additionalGraphics(interfaceState.theme, wallpaper: interfaceState.chatWallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(interfaceState.theme, wallpaper: interfaceState.chatWallpaper, bubbleCorners: interfaceState.bubbleCorners) self.backgroundNode.image = graphics.chatEmptyItemBackgroundImage } diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift index dfba0ca7ad..34f88f5cd1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift @@ -251,7 +251,7 @@ public final class ChatHistoryGridNode: GridNode, ChatHistoryNode { self.chatPresentationDataPromise.set(context.sharedContext.presentationData |> map { presentationData in - return ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji) + return ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners) }) self.floatingSections = true diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index 6fb53ab372..f8fd60a4f5 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -506,7 +506,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { self.mode = mode let presentationData = context.sharedContext.currentPresentationData.with { $0 } - self.currentPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, animatedEmojiScale: 1.0) + self.currentPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: 1.0) self.chatPresentationDataPromise = Promise(self.currentPresentationData) @@ -893,7 +893,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings || previousWallpaper != presentationData.chatWallpaper || previousDisableAnimations != presentationData.disableAnimations || previousAnimatedEmojiScale != animatedEmojiConfig.scale { let themeData = ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper) - let chatPresentationData = ChatPresentationData(theme: themeData, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, animatedEmojiScale: animatedEmojiConfig.scale) + let chatPresentationData = ChatPresentationData(theme: themeData, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: animatedEmojiConfig.scale) strongSelf.currentPresentationData = chatPresentationData strongSelf.dynamicBounceEnabled = !presentationData.disableAnimations diff --git a/submodules/TelegramUI/TelegramUI/ChatHoleItem.swift b/submodules/TelegramUI/TelegramUI/ChatHoleItem.swift index 59c80a38c7..b88cf37698 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHoleItem.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHoleItem.swift @@ -81,7 +81,7 @@ class ChatHoleItemNode: ListViewItemNode { return { item, params, dateAtBottom in var updatedBackground: UIImage? if item.presentationData.theme !== currentItem?.presentationData.theme { - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) updatedBackground = graphics.chatServiceBubbleFillImage } diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateNavigationButtons.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateNavigationButtons.swift index bf3eafbf57..12964d2a8b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateNavigationButtons.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateNavigationButtons.swift @@ -6,13 +6,14 @@ import SyncCore import TelegramPresentationData import AccountContext -enum ChatNavigationButtonAction { - case openChatInfo +enum ChatNavigationButtonAction: Equatable { + case openChatInfo(expandAvatar: Bool) case clearHistory case clearCache case cancelMessageSelection case search case dismiss + case toggleInfoPanel } struct ChatNavigationButton: Equatable { @@ -71,7 +72,12 @@ func rightNavigationButtonForChatInterfaceState(_ presentationInterfaceState: Ch } } + if presentationInterfaceState.isScheduledMessages { + return nil + } + if case .standard(true) = presentationInterfaceState.mode { + return nil } else if let peer = presentationInterfaceState.renderedPeer?.peer { if presentationInterfaceState.accountPeerId == peer.id { if presentationInterfaceState.isScheduledMessages { diff --git a/submodules/TelegramUI/TelegramUI/ChatLoadingNode.swift b/submodules/TelegramUI/TelegramUI/ChatLoadingNode.swift index e2280941f0..6cb7638a0b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatLoadingNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatLoadingNode.swift @@ -12,13 +12,13 @@ final class ChatLoadingNode: ASDisplayNode { private let activityIndicator: ActivityIndicator private let offset: CGPoint - init(theme: PresentationTheme, chatWallpaper: TelegramWallpaper) { + init(theme: PresentationTheme, chatWallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) { self.backgroundNode = ASImageNode() self.backgroundNode.isLayerBacked = true self.backgroundNode.displayWithoutProcessing = true self.backgroundNode.displaysAsynchronously = false - let graphics = PresentationResourcesChat.additionalGraphics(theme, wallpaper: chatWallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(theme, wallpaper: chatWallpaper, bubbleCorners: bubbleCorners) self.backgroundNode.image = graphics.chatLoadingIndicatorBackgroundImage let serviceColor = serviceMessageColorComponents(theme: theme, wallpaper: chatWallpaper) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionButtonsNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageActionButtonsNode.swift index af96c3b8f2..ab5189f89b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageActionButtonsNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageActionButtonsNode.swift @@ -84,12 +84,12 @@ private final class ChatMessageActionButtonNode: ASDisplayNode { } } - class func asyncLayout(_ maybeNode: ChatMessageActionButtonNode?) -> (_ context: AccountContext, _ theme: ChatPresentationThemeData, _ strings: PresentationStrings, _ message: Message, _ button: ReplyMarkupButton, _ constrainedWidth: CGFloat, _ position: MessageBubbleActionButtonPosition) -> (minimumWidth: CGFloat, layout: ((CGFloat) -> (CGSize, () -> ChatMessageActionButtonNode))) { + class func asyncLayout(_ maybeNode: ChatMessageActionButtonNode?) -> (_ context: AccountContext, _ theme: ChatPresentationThemeData, _ bubbleCorners: PresentationChatBubbleCorners, _ strings: PresentationStrings, _ message: Message, _ button: ReplyMarkupButton, _ constrainedWidth: CGFloat, _ position: MessageBubbleActionButtonPosition) -> (minimumWidth: CGFloat, layout: ((CGFloat) -> (CGSize, () -> ChatMessageActionButtonNode))) { let titleLayout = TextNode.asyncLayout(maybeNode?.titleNode) - return { context, theme, strings, message, button, constrainedWidth, position in + return { context, theme, bubbleCorners, strings, message, button, constrainedWidth, position in let incoming = message.effectivelyIncoming(context.account.peerId) - let graphics = PresentationResourcesChat.additionalGraphics(theme.theme, wallpaper: theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(theme.theme, wallpaper: theme.wallpaper, bubbleCorners: bubbleCorners) let iconImage: UIImage? switch button.action { @@ -216,10 +216,10 @@ final class ChatMessageActionButtonsNode: ASDisplayNode { } } - class func asyncLayout(_ maybeNode: ChatMessageActionButtonsNode?) -> (_ context: AccountContext, _ theme: ChatPresentationThemeData, _ strings: PresentationStrings, _ replyMarkup: ReplyMarkupMessageAttribute, _ message: Message, _ constrainedWidth: CGFloat) -> (minWidth: CGFloat, layout: (CGFloat) -> (CGSize, (_ animated: Bool) -> ChatMessageActionButtonsNode)) { + class func asyncLayout(_ maybeNode: ChatMessageActionButtonsNode?) -> (_ context: AccountContext, _ theme: ChatPresentationThemeData, _ chatBubbleCorners: PresentationChatBubbleCorners, _ strings: PresentationStrings, _ replyMarkup: ReplyMarkupMessageAttribute, _ message: Message, _ constrainedWidth: CGFloat) -> (minWidth: CGFloat, layout: (CGFloat) -> (CGSize, (_ animated: Bool) -> ChatMessageActionButtonsNode)) { let currentButtonLayouts = maybeNode?.buttonNodes.map { ChatMessageActionButtonNode.asyncLayout($0) } ?? [] - return { context, theme, strings, replyMarkup, message, constrainedWidth in + return { context, theme, chatBubbleCorners, strings, replyMarkup, message, constrainedWidth in let buttonHeight: CGFloat = 42.0 let buttonSpacing: CGFloat = 4.0 @@ -252,9 +252,9 @@ final class ChatMessageActionButtonsNode: ASDisplayNode { let prepareButtonLayout: (minimumWidth: CGFloat, layout: ((CGFloat) -> (CGSize, () -> ChatMessageActionButtonNode))) if buttonIndex < currentButtonLayouts.count { - prepareButtonLayout = currentButtonLayouts[buttonIndex](context, theme, strings, message, button, maximumButtonWidth, buttonPosition) + prepareButtonLayout = currentButtonLayouts[buttonIndex](context, theme, chatBubbleCorners, strings, message, button, maximumButtonWidth, buttonPosition) } else { - prepareButtonLayout = ChatMessageActionButtonNode.asyncLayout(nil)(context, theme, strings, message, button, maximumButtonWidth, buttonPosition) + prepareButtonLayout = ChatMessageActionButtonNode.asyncLayout(nil)(context, theme, chatBubbleCorners, strings, message, button, maximumButtonWidth, buttonPosition) } maximumRowButtonWidth = max(maximumRowButtonWidth, prepareButtonLayout.minimumWidth) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index 0098397abf..a6ac25c1ff 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -378,7 +378,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { let currentItem = self.item return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) let incoming = item.message.effectivelyIncoming(item.context.account.peerId) var imageSize: CGSize = CGSize(width: 200.0, height: 200.0) var isEmoji = false @@ -589,7 +589,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { updatedReplyBackgroundNode = ASImageNode() } - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) replyBackgroundImage = graphics.chatFreeformContentAdditionalInfoBackgroundImage } @@ -600,7 +600,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { if currentShareButtonNode != nil { updatedShareButtonNode = currentShareButtonNode if item.presentationData.theme !== currentItem?.presentationData.theme { - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage } else { @@ -610,7 +610,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { } else { let buttonNode = HighlightableButtonNode() let buttonIcon: UIImage? - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { buttonIcon = graphics.chatBubbleNavigateButtonImage } else { @@ -625,7 +625,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { var maxContentWidth = imageSize.width var actionButtonsFinalize: ((CGFloat) -> (CGSize, (_ animated: Bool) -> ChatMessageActionButtonsNode))? if let replyMarkup = replyMarkup { - let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.strings, replyMarkup, item.message, maxContentWidth) + let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.chatBubbleCorners, item.presentationData.strings, replyMarkup, item.message, maxContentWidth) maxContentWidth = max(maxContentWidth, minWidth) actionButtonsFinalize = buttonsLayout } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift index a24df24f77..3637729c02 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift @@ -226,3 +226,76 @@ class ChatMessageBackground: ASDisplayNode { self.outlineImageNode.image = outlineImage } } + +final class ChatMessageShadowNode: ASDisplayNode { + private let contentNode: ASImageNode + private var graphics: PrincipalThemeEssentialGraphics? + + override init() { + self.contentNode = ASImageNode() + self.contentNode.isLayerBacked = true + self.contentNode.displaysAsynchronously = false + self.contentNode.displayWithoutProcessing = true + + super.init() + + self.transform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0) + + self.isLayerBacked = true + + self.addSubnode(self.contentNode) + } + + func setType(type: ChatMessageBackgroundType, hasWallpaper: Bool, graphics: PrincipalThemeEssentialGraphics) { + let shadowImage: UIImage? + + if hasWallpaper { + switch type { + case .none: + shadowImage = nil + case let .incoming(mergeType): + switch mergeType { + case .None: + shadowImage = graphics.chatMessageBackgroundIncomingShadowImage + case let .Top(side): + if side { + shadowImage = graphics.chatMessageBackgroundIncomingMergedTopSideShadowImage + } else { + shadowImage = graphics.chatMessageBackgroundIncomingMergedTopShadowImage + } + case .Bottom: + shadowImage = graphics.chatMessageBackgroundIncomingMergedBottomShadowImage + case .Both: + shadowImage = graphics.chatMessageBackgroundIncomingMergedBothShadowImage + case .Side: + shadowImage = graphics.chatMessageBackgroundIncomingMergedSideShadowImage + } + case let .outgoing(mergeType): + switch mergeType { + case .None: + shadowImage = graphics.chatMessageBackgroundOutgoingShadowImage + case let .Top(side): + if side { + shadowImage = graphics.chatMessageBackgroundOutgoingMergedTopSideShadowImage + } else { + shadowImage = graphics.chatMessageBackgroundOutgoingMergedTopShadowImage + } + case .Bottom: + shadowImage = graphics.chatMessageBackgroundOutgoingMergedBottomShadowImage + case .Both: + shadowImage = graphics.chatMessageBackgroundOutgoingMergedBothShadowImage + case .Side: + shadowImage = graphics.chatMessageBackgroundOutgoingMergedSideShadowImage + } + } + } else { + shadowImage = nil + } + + self.contentNode.image = shadowImage + } + + func updateLayout(backgroundFrame: CGRect, transition: ContainedViewLayoutTransition) { + transition.updateFrame(node: self.contentNode, frame: CGRect(origin: CGPoint(x: backgroundFrame.minX - 10.0, y: backgroundFrame.minY - 10.0), size: CGSize(width: backgroundFrame.width + 20.0, height: backgroundFrame.height + 20.0))) + } +} diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift index 7da5d38987..1f0b4a71ad 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift @@ -91,7 +91,7 @@ final class ChatMessageBubbleBackdrop: ASDisplayNode { } func setType(type: ChatMessageBackgroundType, theme: ChatPresentationThemeData, mediaBox: MediaBox, essentialGraphics: PrincipalThemeEssentialGraphics, maskMode: Bool) { - if self.currentType != type || self.theme != theme || self.currentMaskMode != maskMode { + if self.currentType != type || self.theme != theme || self.currentMaskMode != maskMode || self.essentialGraphics !== essentialGraphics { self.currentType = type self.theme = theme self.essentialGraphics = essentialGraphics diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift index f3c7671062..7d3fbc07f6 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift @@ -1,8 +1,9 @@ import Foundation import UIKit import Display +import TelegramPresentationData -func chatMessageBubbleImageContentCorners(relativeContentPosition position: ChatMessageBubbleContentPosition, normalRadius: CGFloat, mergedRadius: CGFloat, mergedWithAnotherContentRadius: CGFloat) -> ImageCorners { +func chatMessageBubbleImageContentCorners(relativeContentPosition position: ChatMessageBubbleContentPosition, normalRadius: CGFloat, mergedRadius: CGFloat, mergedWithAnotherContentRadius: CGFloat, layoutConstants: ChatMessageItemLayoutConstants, chatPresentationData: ChatPresentationData) -> ImageCorners { let topLeftCorner: ImageCorner let topRightCorner: ImageCorner @@ -12,6 +13,9 @@ func chatMessageBubbleImageContentCorners(relativeContentPosition position: Chat case .Neighbour: topLeftCorner = .Corner(mergedWithAnotherContentRadius) topRightCorner = .Corner(mergedWithAnotherContentRadius) + case .BubbleNeighbour: + topLeftCorner = .Corner(mergedRadius) + topRightCorner = .Corner(mergedRadius) case let .None(mergeStatus): switch mergeStatus { case .Left: @@ -31,12 +35,16 @@ func chatMessageBubbleImageContentCorners(relativeContentPosition position: Chat topLeftCorner = .Corner(normalRadius) case .merged: topLeftCorner = .Corner(mergedWithAnotherContentRadius) + case .mergedBubble: + topLeftCorner = .Corner(mergedRadius) } switch position.topRight { case .none: topRightCorner = .Corner(normalRadius) case .merged: topRightCorner = .Corner(mergedWithAnotherContentRadius) + case .mergedBubble: + topRightCorner = .Corner(mergedRadius) } } @@ -49,19 +57,42 @@ func chatMessageBubbleImageContentCorners(relativeContentPosition position: Chat case .Neighbour: bottomLeftCorner = .Corner(mergedWithAnotherContentRadius) bottomRightCorner = .Corner(mergedWithAnotherContentRadius) + case .BubbleNeighbour: + bottomLeftCorner = .Corner(mergedRadius) + bottomRightCorner = .Corner(mergedRadius) case let .None(mergeStatus): switch mergeStatus { case .Left: bottomLeftCorner = .Corner(mergedRadius) bottomRightCorner = .Corner(normalRadius) case let .None(status): + let bubbleInsets: UIEdgeInsets + if case .color = chatPresentationData.theme.wallpaper { + let colors: PresentationThemeBubbleColorComponents + switch status { + case .Incoming: + colors = chatPresentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper + case .Outgoing: + colors = chatPresentationData.theme.theme.chat.message.outgoing.bubble.withoutWallpaper + case .None: + colors = chatPresentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper + } + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) + } else { + bubbleInsets = layoutConstants.bubble.strokeInsets + } + } else { + bubbleInsets = layoutConstants.image.bubbleInsets + } + switch status { case .Incoming: - bottomLeftCorner = .Tail(normalRadius, true) + bottomLeftCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: true, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.left - 1.0))!) bottomRightCorner = .Corner(normalRadius) case .Outgoing: bottomLeftCorner = .Corner(normalRadius) - bottomRightCorner = .Tail(normalRadius, true) + bottomRightCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: false, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.right - 1.0))!) case .None: bottomLeftCorner = .Corner(normalRadius) bottomRightCorner = .Corner(normalRadius) @@ -75,22 +106,51 @@ func chatMessageBubbleImageContentCorners(relativeContentPosition position: Chat switch position.bottomLeft { case let .none(tail): if tail { - bottomLeftCorner = .Tail(normalRadius, true) + let bubbleInsets: UIEdgeInsets + if case .color = chatPresentationData.theme.wallpaper { + let colors: PresentationThemeBubbleColorComponents + colors = chatPresentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) + } else { + bubbleInsets = layoutConstants.bubble.strokeInsets + } + } else { + bubbleInsets = layoutConstants.image.bubbleInsets + } + + bottomLeftCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: true, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.left - 1.0))!) } else { bottomLeftCorner = .Corner(normalRadius) } case .merged: bottomLeftCorner = .Corner(mergedWithAnotherContentRadius) - } + case .mergedBubble: + bottomLeftCorner = .Corner(mergedRadius) + } switch position.bottomRight { case let .none(tail): if tail { - bottomRightCorner = .Tail(normalRadius, true) + let bubbleInsets: UIEdgeInsets + if case .color = chatPresentationData.theme.wallpaper { + let colors: PresentationThemeBubbleColorComponents + colors = chatPresentationData.theme.theme.chat.message.outgoing.bubble.withoutWallpaper + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) + } else { + bubbleInsets = layoutConstants.bubble.strokeInsets + } + } else { + bubbleInsets = layoutConstants.image.bubbleInsets + } + bottomRightCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: false, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.right - 1.0))!) } else { bottomRightCorner = .Corner(normalRadius) } case .merged: bottomRightCorner = .Corner(mergedWithAnotherContentRadius) + case .mergedBubble: + bottomRightCorner = .Corner(mergedRadius) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift index 0e2b2d8b2f..a06144dee7 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift @@ -41,11 +41,13 @@ enum ChatMessageBubbleMergeStatus { enum ChatMessageBubbleRelativePosition { case None(ChatMessageBubbleMergeStatus) + case BubbleNeighbour case Neighbour } enum ChatMessageBubbleContentMosaicNeighbor { case merged + case mergedBubble case none(tail: Bool) } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift index 93f968a020..d9b6abe090 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift @@ -76,7 +76,12 @@ private func contentNodeMessagesAndClassesForItem(_ item: ChatMessageItem) -> [( } } - if !message.text.isEmpty || isUnsupportedMedia { + var messageText = message.text + if let updatingMedia = itemAttributes.updatingMedia { + messageText = updatingMedia.text + } + + if !messageText.isEmpty || isUnsupportedMedia { if !skipText { if case .group = item.content { messageWithCaptionToAdd = (message, itemAttributes) @@ -142,8 +147,13 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode private let contextSourceNode: ContextExtractedContentContainingNode private let backgroundWallpaperNode: ChatMessageBubbleBackdrop private let backgroundNode: ChatMessageBackground + private let shadowNode: ChatMessageShadowNode private var transitionClippingNode: ASDisplayNode? + override var extractedBackgroundNode: ASDisplayNode? { + return self.shadowNode + } + private var selectionNode: ChatMessageSelectionNode? private var deliveryFailedNode: ChatMessageDeliveryFailedNode? private var swipeToReplyNode: ChatMessageSwipeToReplyNode? @@ -194,6 +204,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode self.backgroundWallpaperNode = ChatMessageBubbleBackdrop() self.backgroundNode = ChatMessageBackground() + self.shadowNode = ChatMessageShadowNode() self.messageAccessibilityArea = AccessibilityAreaNode() super.init(layerBacked: false) @@ -267,6 +278,8 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { super.animateInsertion(currentTimestamp, duration: duration, short: short) + self.shadowNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + if let subnodes = self.subnodes { for node in subnodes { if let contextNode = node as? ContextExtractedContentContainingNode { @@ -303,6 +316,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak self] _ in self?.allowsGroupOpacity = false }) + self.shadowNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) self.layer.animateScale(from: 1.0, to: 0.1, duration: 0.15, removeOnCompletion: false) self.layer.animatePosition(from: CGPoint(), to: CGPoint(x: self.bounds.width / 2.0 - self.backgroundNode.frame.midX, y: self.backgroundNode.frame.midY), duration: 0.15, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, additive: true) } @@ -483,8 +497,14 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode var bounds = strongSelf.bounds bounds.origin.x = offset strongSelf.bounds = bounds + + var shadowBounds = strongSelf.shadowNode.bounds + shadowBounds.origin.x = offset + strongSelf.shadowNode.bounds = shadowBounds + if animated { strongSelf.layer.animateBoundsOriginXAdditive(from: -offset, to: 0.0, duration: 0.1, mediaTimingFunction: CAMediaTimingFunction(name: .easeOut)) + strongSelf.shadowNode.layer.animateBoundsOriginXAdditive(from: -offset, to: 0.0, duration: 0.1, mediaTimingFunction: CAMediaTimingFunction(name: .easeOut)) } if let swipeToReplyNode = strongSelf.swipeToReplyNode { swipeToReplyNode.alpha = max(0.0, min(1.0, abs(offset / 40.0))) @@ -498,9 +518,18 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let offset = bounds.origin.x bounds.origin.x = 0.0 strongSelf.bounds = bounds + + var shadowBounds = strongSelf.shadowNode.bounds + let shadowOffset = shadowBounds.origin.x + shadowBounds.origin.x = 0.0 + strongSelf.shadowNode.bounds = shadowBounds + if !offset.isZero { strongSelf.layer.animateBoundsOriginXAdditive(from: offset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) } + if !shadowOffset.isZero { + strongSelf.shadowNode.layer.animateBoundsOriginXAdditive(from: shadowOffset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) + } if let swipeToReplyNode = strongSelf.swipeToReplyNode { strongSelf.swipeToReplyNode = nil swipeToReplyNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak swipeToReplyNode] _ in @@ -551,9 +580,16 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let offset = bounds.origin.x bounds.origin.x = 0.0 strongSelf.bounds = bounds + var shadowBounds = strongSelf.shadowNode.bounds + let shadowOffset = shadowBounds.origin.x + shadowBounds.origin.x = 0.0 + strongSelf.shadowNode.bounds = shadowBounds if !offset.isZero { strongSelf.layer.animateBoundsOriginXAdditive(from: offset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) } + if !shadowOffset.isZero { + strongSelf.shadowNode.layer.animateBoundsOriginXAdditive(from: shadowOffset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) + } if let swipeToReplyNode = strongSelf.swipeToReplyNode { strongSelf.swipeToReplyNode = nil swipeToReplyNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak swipeToReplyNode] _ in @@ -569,9 +605,16 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let offset = bounds.origin.x bounds.origin.x = 0.0 strongSelf.bounds = bounds + var shadowBounds = strongSelf.shadowNode.bounds + let shadowOffset = shadowBounds.origin.x + shadowBounds.origin.x = 0.0 + strongSelf.shadowNode.bounds = shadowBounds if !offset.isZero { strongSelf.layer.animateBoundsOriginXAdditive(from: offset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) } + if !shadowOffset.isZero { + strongSelf.shadowNode.layer.animateBoundsOriginXAdditive(from: shadowOffset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) + } if let swipeToReplyNode = strongSelf.swipeToReplyNode { strongSelf.swipeToReplyNode = nil swipeToReplyNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak swipeToReplyNode] _ in @@ -615,7 +658,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let weakSelf = Weak(self) return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) return ChatMessageBubbleItemNode.beginLayout(selfReference: weakSelf, item, params, mergedTop, mergedBottom, dateHeaderAtBottom, currentContentClassesPropertiesAndLayouts: currentContentClassesPropertiesAndLayouts, authorNameLayout: authorNameLayout, @@ -639,7 +682,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode adminBadgeLayout: (TextNodeLayoutArguments) -> (TextNodeLayout, () -> TextNode), forwardInfoLayout: (ChatPresentationData, PresentationStrings, ChatMessageForwardInfoType, Peer?, String?, CGSize) -> (CGSize, () -> ChatMessageForwardInfoNode), replyInfoLayout: (ChatPresentationData, PresentationStrings, AccountContext, ChatMessageReplyInfoType, Message, CGSize) -> (CGSize, () -> ChatMessageReplyInfoNode), - actionButtonsLayout: (AccountContext, ChatPresentationThemeData, PresentationStrings, ReplyMarkupMessageAttribute, Message, CGFloat) -> (minWidth: CGFloat, layout: (CGFloat) -> (CGSize, (Bool) -> ChatMessageActionButtonsNode)), + actionButtonsLayout: (AccountContext, ChatPresentationThemeData, PresentationChatBubbleCorners, PresentationStrings, ReplyMarkupMessageAttribute, Message, CGFloat) -> (minWidth: CGFloat, layout: (CGFloat) -> (CGSize, (Bool) -> ChatMessageActionButtonsNode)), mosaicStatusLayout: (AccountContext, ChatPresentationData, Bool, Int?, String, ChatMessageDateAndStatusType, CGSize, [MessageReaction]) -> (CGSize, (Bool) -> ChatMessageDateAndStatusNode), currentShareButtonNode: HighlightableButtonNode?, layoutConstants: ChatMessageItemLayoutConstants, @@ -1291,7 +1334,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode var actionButtonsFinalize: ((CGFloat) -> (CGSize, (_ animated: Bool) -> ChatMessageActionButtonsNode))? if let replyMarkup = replyMarkup { - let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.strings, replyMarkup, item.message, maximumNodeWidth) + let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.chatBubbleCorners, item.presentationData.strings, replyMarkup, item.message, maximumNodeWidth) maxContentWidth = max(maxContentWidth, minWidth) actionButtonsFinalize = buttonsLayout } @@ -1313,11 +1356,14 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode case .Neighbour: topLeft = .merged topRight = .merged + case .BubbleNeighbour: + topLeft = .mergedBubble + topRight = .mergedBubble case let .None(status): if position.contains(.top) && position.contains(.left) { switch status { case .Left: - topLeft = .merged + topLeft = .mergedBubble case .Right: topLeft = .none(tail: false) case .None: @@ -1332,7 +1378,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode case .Left: topRight = .none(tail: false) case .Right: - topRight = .merged + topRight = .mergedBubble case .None: topRight = .none(tail: false) } @@ -1356,11 +1402,14 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode case .Neighbour: bottomLeft = .merged bottomRight = .merged + case .BubbleNeighbour: + bottomLeft = .mergedBubble + bottomRight = .mergedBubble case let .None(status): if position.contains(.bottom) && position.contains(.left) { switch status { case .Left: - bottomLeft = .merged + bottomLeft = .mergedBubble case .Right: bottomLeft = .none(tail: false) case let .None(tailStatus): @@ -1379,7 +1428,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode case .Left: bottomRight = .none(tail: false) case .Right: - bottomRight = .merged + bottomRight = .mergedBubble case let .None(tailStatus): if case .Outgoing = tailStatus { bottomRight = .none(tail: true) @@ -1523,7 +1572,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode if currentShareButtonNode != nil { updatedShareButtonNode = currentShareButtonNode if item.presentationData.theme !== currentItem?.presentationData.theme { - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage } else { @@ -1533,7 +1582,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode } else { let buttonNode = HighlightableButtonNode() let buttonIcon: UIImage? - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { buttonIcon = graphics.chatBubbleNavigateButtonImage } else { @@ -1546,7 +1595,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let layout = ListViewItemNodeLayout(contentSize: layoutSize, insets: layoutInsets) - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) var updatedMergedTop = mergedBottom var updatedMergedBottom = mergedTop @@ -1670,6 +1719,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let hasWallpaper = item.presentationData.theme.wallpaper.hasWallpaper strongSelf.backgroundNode.setType(type: backgroundType, highlighted: strongSelf.highlightedState, graphics: graphics, maskMode: strongSelf.backgroundMaskMode, hasWallpaper: hasWallpaper, transition: transition) strongSelf.backgroundWallpaperNode.setType(type: backgroundType, theme: item.presentationData.theme, mediaBox: item.context.account.postbox.mediaBox, essentialGraphics: graphics, maskMode: strongSelf.backgroundMaskMode) + strongSelf.shadowNode.setType(type: backgroundType, hasWallpaper: hasWallpaper, graphics: graphics) strongSelf.backgroundType = backgroundType @@ -1942,10 +1992,12 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode transition.updateFrame(node: strongSelf.backgroundNode, frame: backgroundFrame) strongSelf.backgroundNode.updateLayout(size: backgroundFrame.size, transition: transition) strongSelf.backgroundWallpaperNode.updateFrame(backgroundFrame, transition: transition) + strongSelf.shadowNode.updateLayout(backgroundFrame: backgroundFrame, transition: transition) } else { strongSelf.backgroundNode.frame = backgroundFrame strongSelf.backgroundNode.updateLayout(size: backgroundFrame.size, transition: .immediate) strongSelf.backgroundWallpaperNode.frame = backgroundFrame + strongSelf.shadowNode.updateLayout(backgroundFrame: backgroundFrame, transition: .immediate) } if let (rect, size) = strongSelf.absoluteRect { strongSelf.updateAbsoluteRect(rect, within: size) @@ -2012,9 +2064,16 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let offset = bounds.origin.x bounds.origin.x = 0.0 strongSelf.bounds = bounds + var shadowBounds = strongSelf.shadowNode.bounds + let shadowOffset = shadowBounds.origin.x + shadowBounds.origin.x = 0.0 + strongSelf.shadowNode.bounds = shadowBounds if !offset.isZero { strongSelf.layer.animateBoundsOriginXAdditive(from: offset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) } + if !shadowOffset.isZero { + strongSelf.shadowNode.layer.animateBoundsOriginXAdditive(from: shadowOffset, to: 0.0, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring) + } if let swipeToReplyNode = strongSelf.swipeToReplyNode { strongSelf.swipeToReplyNode = nil swipeToReplyNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak swipeToReplyNode] _ in @@ -2142,6 +2201,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode self.backgroundNode.frame = backgroundFrame self.backgroundNode.updateLayout(size: backgroundFrame.size, transition: .immediate) self.backgroundWallpaperNode.frame = backgroundFrame + self.shadowNode.updateLayout(backgroundFrame: backgroundFrame, transition: .immediate) if let type = self.backgroundNode.type { var incomingOffset: CGFloat = 0.0 @@ -2777,7 +2837,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode if self.highlightedState != highlighted { self.highlightedState = highlighted if let backgroundType = self.backgroundType { - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) let hasWallpaper = item.presentationData.theme.wallpaper.hasWallpaper self.backgroundNode.setType(type: backgroundType, highlighted: highlighted, graphics: graphics, maskMode: self.contextSourceNode.isExtractedToContextPreview, hasWallpaper: hasWallpaper, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate) @@ -2827,6 +2887,9 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode var bounds = self.bounds bounds.origin.x = -translation.x self.bounds = bounds + var shadowBounds = self.shadowNode.bounds + shadowBounds.origin.x = -translation.x + self.shadowNode.bounds = shadowBounds if let swipeToReplyNode = self.swipeToReplyNode { swipeToReplyNode.frame = CGRect(origin: CGPoint(x: bounds.size.width, y: floor((self.contentSize.height - 33.0) / 2.0)), size: CGSize(width: 33.0, height: 33.0)) @@ -2850,7 +2913,12 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let previousBounds = bounds bounds.origin.x = 0.0 self.bounds = bounds + var shadowBounds = self.shadowNode.bounds + let previousShadowBounds = shadowBounds + shadowBounds.origin.x = 0.0 + self.shadowNode.bounds = shadowBounds self.layer.animateBounds(from: previousBounds, to: bounds, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) + self.shadowNode.layer.animateBounds(from: previousShadowBounds, to: shadowBounds, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) if let swipeToReplyNode = self.swipeToReplyNode { self.swipeToReplyNode = nil swipeToReplyNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak swipeToReplyNode] _ in diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift index 12b8e635f9..114cebebbd 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift @@ -187,7 +187,7 @@ class ChatMessageDateAndStatusNode: ASDisplayNode { let themeUpdated = presentationData.theme != currentTheme || type != currentType - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) let isDefaultWallpaper = serviceMessageColorHasDefaultWallpaper(presentationData.theme.wallpaper) let offset: CGFloat = -UIScreenPixel diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift b/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift index 45efafcf67..97640a4d64 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift @@ -161,7 +161,7 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode { self.transform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0) - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) self.backgroundNode.image = graphics.dateStaticBackground self.stickBackgroundNode.image = graphics.dateFloatingBackground @@ -190,7 +190,7 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode { let previousPresentationData = self.presentationData self.presentationData = presentationData - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) self.backgroundNode.image = graphics.dateStaticBackground self.stickBackgroundNode.image = graphics.dateFloatingBackground diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift index 77dbaa3cbe..7ef8e6201b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift @@ -115,7 +115,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { let currentForwardInfo = self.appliedForwardInfo return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) let incoming = item.message.effectivelyIncoming(item.context.account.peerId) let avatarInset: CGFloat @@ -295,7 +295,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { updatedReplyBackgroundNode = ASImageNode() } - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) replyBackgroundImage = graphics.chatFreeformContentAdditionalInfoBackgroundImage } @@ -306,7 +306,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { if currentShareButtonNode != nil { updatedShareButtonNode = currentShareButtonNode if item.presentationData.theme !== currentItem?.presentationData.theme { - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage } else { @@ -316,7 +316,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { } else { let buttonNode = HighlightableButtonNode() let buttonIcon: UIImage? - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { buttonIcon = graphics.chatBubbleNavigateButtonImage } else { @@ -364,14 +364,14 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { updatedForwardBackgroundNode = ASImageNode() } - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) forwardBackgroundImage = graphics.chatServiceBubbleFillImage } var maxContentWidth = videoLayout.contentSize.width var actionButtonsFinalize: ((CGFloat) -> (CGSize, (_ animated: Bool) -> ChatMessageActionButtonsNode))? if let replyMarkup = replyMarkup { - let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.strings, replyMarkup, item.message, maxContentWidth) + let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.chatBubbleCorners, item.presentationData.strings, replyMarkup, item.message, maxContentWidth) maxContentWidth = max(maxContentWidth, minWidth) actionButtonsFinalize = buttonsLayout } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift index 1a3e3d599b..664a47f472 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift @@ -439,7 +439,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode { if hasThumbnail { fileIconImage = nil } else { - let principalGraphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let principalGraphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) fileIconImage = incoming ? principalGraphics.radialIndicatorFileIconIncoming : principalGraphics.radialIndicatorFileIconOutgoing } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift index d71b6f4a6f..b713b25614 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift @@ -87,7 +87,7 @@ final class ChatMessageInteractiveMediaBadge: ASDisplayNode { return self.measureNode.measure(CGSize(width: 240.0, height: 160.0)).width } - func update(theme: PresentationTheme, content: ChatMessageInteractiveMediaBadgeContent?, mediaDownloadState: ChatMessageInteractiveMediaDownloadState?, alignment: NSTextAlignment = .left, animated: Bool, badgeAnimated: Bool = true) { + func update(theme: PresentationTheme?, content: ChatMessageInteractiveMediaBadgeContent?, mediaDownloadState: ChatMessageInteractiveMediaDownloadState?, alignment: NSTextAlignment = .left, animated: Bool, badgeAnimated: Bool = true) { var transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate let previousContentSize = self.previousContentSize @@ -263,7 +263,7 @@ final class ChatMessageInteractiveMediaBadge: ASDisplayNode { var originY: CGFloat = 5.0 switch mediaDownloadState { case .remote: - if let image = PresentationResourcesChat.chatBubbleFileCloudFetchMediaIcon(theme) { + if let theme = theme, let image = PresentationResourcesChat.chatBubbleFileCloudFetchMediaIcon(theme) { state = .customIcon(image) } else { state = .none diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift index 90aaeaa6e8..42c76d580f 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift @@ -954,7 +954,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } var progressRequired = false - if attributes.updatingMedia != nil { + if let updatingMedia = attributes.updatingMedia, case .update = updatingMedia.media { progressRequired = true } else if secretBeginTimeAndTimeout?.0 != nil { progressRequired = true diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift index 11450a6aa4..96066bb31d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift @@ -11,9 +11,9 @@ import ContextUI import ChatListUI struct ChatMessageItemWidthFill { - let compactInset: CGFloat - let compactWidthBoundary: CGFloat - let freeMaximumFillFactor: CGFloat + var compactInset: CGFloat + var compactWidthBoundary: CGFloat + var freeMaximumFillFactor: CGFloat func widthFor(_ width: CGFloat) -> CGFloat { if width <= self.compactWidthBoundary { @@ -25,68 +25,68 @@ struct ChatMessageItemWidthFill { } struct ChatMessageItemBubbleLayoutConstants { - let edgeInset: CGFloat - let defaultSpacing: CGFloat - let mergedSpacing: CGFloat - let maximumWidthFill: ChatMessageItemWidthFill - let minimumSize: CGSize - let contentInsets: UIEdgeInsets - let borderInset: CGFloat - let strokeInsets: UIEdgeInsets + var edgeInset: CGFloat + var defaultSpacing: CGFloat + var mergedSpacing: CGFloat + var maximumWidthFill: ChatMessageItemWidthFill + var minimumSize: CGSize + var contentInsets: UIEdgeInsets + var borderInset: CGFloat + var strokeInsets: UIEdgeInsets } struct ChatMessageItemTextLayoutConstants { - let bubbleInsets: UIEdgeInsets + var bubbleInsets: UIEdgeInsets } struct ChatMessageItemImageLayoutConstants { - let bubbleInsets: UIEdgeInsets - let statusInsets: UIEdgeInsets - let defaultCornerRadius: CGFloat - let mergedCornerRadius: CGFloat - let contentMergedCornerRadius: CGFloat - let maxDimensions: CGSize - let minDimensions: CGSize + var bubbleInsets: UIEdgeInsets + var statusInsets: UIEdgeInsets + var defaultCornerRadius: CGFloat + var mergedCornerRadius: CGFloat + var contentMergedCornerRadius: CGFloat + var maxDimensions: CGSize + var minDimensions: CGSize } struct ChatMessageItemVideoLayoutConstants { - let maxHorizontalHeight: CGFloat - let maxVerticalHeight: CGFloat + var maxHorizontalHeight: CGFloat + var maxVerticalHeight: CGFloat } struct ChatMessageItemInstantVideoConstants { - let insets: UIEdgeInsets - let dimensions: CGSize + var insets: UIEdgeInsets + var dimensions: CGSize } struct ChatMessageItemFileLayoutConstants { - let bubbleInsets: UIEdgeInsets + var bubbleInsets: UIEdgeInsets } struct ChatMessageItemWallpaperLayoutConstants { - let maxTextWidth: CGFloat + var maxTextWidth: CGFloat } struct ChatMessageItemLayoutConstants { - let avatarDiameter: CGFloat - let timestampHeaderHeight: CGFloat + var avatarDiameter: CGFloat + var timestampHeaderHeight: CGFloat - let bubble: ChatMessageItemBubbleLayoutConstants - let image: ChatMessageItemImageLayoutConstants - let video: ChatMessageItemVideoLayoutConstants - let text: ChatMessageItemTextLayoutConstants - let file: ChatMessageItemFileLayoutConstants - let instantVideo: ChatMessageItemInstantVideoConstants - let wallpapers: ChatMessageItemWallpaperLayoutConstants + var bubble: ChatMessageItemBubbleLayoutConstants + var image: ChatMessageItemImageLayoutConstants + var video: ChatMessageItemVideoLayoutConstants + var text: ChatMessageItemTextLayoutConstants + var file: ChatMessageItemFileLayoutConstants + var instantVideo: ChatMessageItemInstantVideoConstants + var wallpapers: ChatMessageItemWallpaperLayoutConstants static var `default`: ChatMessageItemLayoutConstants { return self.compact } fileprivate static var compact: ChatMessageItemLayoutConstants { - let bubble = ChatMessageItemBubbleLayoutConstants(edgeInset: 4.0, defaultSpacing: 2.0 + UIScreenPixel, mergedSpacing: 1.0, maximumWidthFill: ChatMessageItemWidthFill(compactInset: 36.0, compactWidthBoundary: 500.0, freeMaximumFillFactor: 0.85), minimumSize: CGSize(width: 40.0, height: 35.0), contentInsets: UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 0.0), borderInset: UIScreenPixel, strokeInsets: UIEdgeInsets(top: 1.0 - UIScreenPixel, left: 1.0 - UIScreenPixel, bottom: 1.0 - UIScreenPixel, right: 1.0 - UIScreenPixel)) + let bubble = ChatMessageItemBubbleLayoutConstants(edgeInset: 4.0, defaultSpacing: 2.0 + UIScreenPixel, mergedSpacing: 1.0, maximumWidthFill: ChatMessageItemWidthFill(compactInset: 36.0, compactWidthBoundary: 500.0, freeMaximumFillFactor: 0.85), minimumSize: CGSize(width: 40.0, height: 35.0), contentInsets: UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 0.0), borderInset: UIScreenPixel, strokeInsets: UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0)) let text = ChatMessageItemTextLayoutConstants(bubbleInsets: UIEdgeInsets(top: 6.0 + UIScreenPixel, left: 12.0, bottom: 6.0 - UIScreenPixel, right: 12.0)) - let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 1.0 + UIScreenPixel, left: 1.0 + UIScreenPixel, bottom: 1.0 + UIScreenPixel, right: 1.0 + UIScreenPixel), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 17.0, mergedCornerRadius: 5.0, contentMergedCornerRadius: 0.0, maxDimensions: CGSize(width: 300.0, height: 300.0), minDimensions: CGSize(width: 170.0, height: 74.0)) + let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 2.0, left: 2.0, bottom: 2.0, right: 2.0), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 16.0, mergedCornerRadius: 8.0, contentMergedCornerRadius: 0.0, maxDimensions: CGSize(width: 300.0, height: 300.0), minDimensions: CGSize(width: 170.0, height: 74.0)) let video = ChatMessageItemVideoLayoutConstants(maxHorizontalHeight: 250.0, maxVerticalHeight: 360.0) let file = ChatMessageItemFileLayoutConstants(bubbleInsets: UIEdgeInsets(top: 15.0, left: 9.0, bottom: 15.0, right: 12.0)) let instantVideo = ChatMessageItemInstantVideoConstants(insets: UIEdgeInsets(top: 4.0, left: 0.0, bottom: 4.0, right: 0.0), dimensions: CGSize(width: 212.0, height: 212.0)) @@ -96,9 +96,9 @@ struct ChatMessageItemLayoutConstants { } fileprivate static var regular: ChatMessageItemLayoutConstants { - let bubble = ChatMessageItemBubbleLayoutConstants(edgeInset: 4.0, defaultSpacing: 2.0 + UIScreenPixel, mergedSpacing: 1.0, maximumWidthFill: ChatMessageItemWidthFill(compactInset: 36.0, compactWidthBoundary: 500.0, freeMaximumFillFactor: 0.65), minimumSize: CGSize(width: 40.0, height: 35.0), contentInsets: UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 0.0), borderInset: UIScreenPixel, strokeInsets: UIEdgeInsets(top: 1.0 - UIScreenPixel, left: 1.0 - UIScreenPixel, bottom: 1.0 - UIScreenPixel, right: 1.0 - UIScreenPixel)) + let bubble = ChatMessageItemBubbleLayoutConstants(edgeInset: 4.0, defaultSpacing: 2.0 + UIScreenPixel, mergedSpacing: 1.0, maximumWidthFill: ChatMessageItemWidthFill(compactInset: 36.0, compactWidthBoundary: 500.0, freeMaximumFillFactor: 0.65), minimumSize: CGSize(width: 40.0, height: 35.0), contentInsets: UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 0.0), borderInset: UIScreenPixel, strokeInsets: UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0)) let text = ChatMessageItemTextLayoutConstants(bubbleInsets: UIEdgeInsets(top: 6.0 + UIScreenPixel, left: 12.0, bottom: 6.0 - UIScreenPixel, right: 12.0)) - let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 1.0 + UIScreenPixel, left: 1.0 + UIScreenPixel, bottom: 1.0 + UIScreenPixel, right: 1.0 + UIScreenPixel), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 17.0, mergedCornerRadius: 5.0, contentMergedCornerRadius: 5.0, maxDimensions: CGSize(width: 440.0, height: 440.0), minDimensions: CGSize(width: 170.0, height: 74.0)) + let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 2.0, left: 2.0, bottom: 2.0, right: 2.0), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 16.0, mergedCornerRadius: 8.0, contentMergedCornerRadius: 5.0, maxDimensions: CGSize(width: 440.0, height: 440.0), minDimensions: CGSize(width: 170.0, height: 74.0)) let video = ChatMessageItemVideoLayoutConstants(maxHorizontalHeight: 250.0, maxVerticalHeight: 360.0) let file = ChatMessageItemFileLayoutConstants(bubbleInsets: UIEdgeInsets(top: 15.0, left: 9.0, bottom: 15.0, right: 12.0)) let instantVideo = ChatMessageItemInstantVideoConstants(insets: UIEdgeInsets(top: 4.0, left: 0.0, bottom: 4.0, right: 0.0), dimensions: CGSize(width: 212.0, height: 212.0)) @@ -108,12 +108,24 @@ struct ChatMessageItemLayoutConstants { } } -func chatMessageItemLayoutConstants(_ constants: (ChatMessageItemLayoutConstants, ChatMessageItemLayoutConstants), params: ListViewItemLayoutParams) -> ChatMessageItemLayoutConstants { +func chatMessageItemLayoutConstants(_ constants: (ChatMessageItemLayoutConstants, ChatMessageItemLayoutConstants), params: ListViewItemLayoutParams, presentationData: ChatPresentationData) -> ChatMessageItemLayoutConstants { + var result: ChatMessageItemLayoutConstants if params.width > 680.0 { - return constants.1 + result = constants.1 } else { - return constants.0 + result = constants.0 } + result.image.defaultCornerRadius = presentationData.chatBubbleCorners.mainRadius + result.image.mergedCornerRadius = (presentationData.chatBubbleCorners.mergeBubbleCorners && result.image.defaultCornerRadius >= 10.0) ? presentationData.chatBubbleCorners.auxiliaryRadius : presentationData.chatBubbleCorners.mainRadius + let minRadius: CGFloat = 4.0 + let maxRadius: CGFloat = 16.0 + let radiusTransition = (presentationData.chatBubbleCorners.mainRadius - minRadius) / (maxRadius - minRadius) + let minInset: CGFloat = 9.0 + let maxInset: CGFloat = 12.0 + let textInset: CGFloat = min(maxInset, ceil(maxInset * radiusTransition + minInset * (1.0 - radiusTransition))) + result.text.bubbleInsets.left = textInset + result.text.bubbleInsets.right = textInset + return result } enum ChatMessageItemBottomNeighbor { diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift index f0602bea07..178685165d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift @@ -159,13 +159,13 @@ class ChatMessageMapBubbleContentNode: ChatMessageBubbleContentNode { if case let .linear(top, _) = position { relativePosition = .linear(top: top, bottom: ChatMessageBubbleRelativePosition.Neighbour) } - imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: relativePosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius) + imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: relativePosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius, layoutConstants: layoutConstants, chatPresentationData: item.presentationData) maxTextWidth = constrainedSize.width - bubbleInsets.left + bubbleInsets.right - layoutConstants.text.bubbleInsets.left - layoutConstants.text.bubbleInsets.right - 40.0 } else { maxTextWidth = constrainedSize.width - imageSize.width - bubbleInsets.left + bubbleInsets.right - layoutConstants.text.bubbleInsets.right - imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: position, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius) + imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: position, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius, layoutConstants: layoutConstants, chatPresentationData: item.presentationData) } let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(1.0, maxTextWidth), height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift index c1f5213022..fec48009c9 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift @@ -128,8 +128,8 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { } else { colors = item.presentationData.theme.theme.chat.message.outgoing.bubble.withoutWallpaper } - if colors.fill == colors.stroke { - bubbleInsets = UIEdgeInsets() + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) } else { bubbleInsets = layoutConstants.bubble.strokeInsets } @@ -159,10 +159,10 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { if forceFullCorners, case .linear = updatedPosition { updatedPosition = .linear(top: .None(.None(.None)), bottom: .None(.None(.None))) } else if hasReplyMarkup, case let .linear(top, _) = updatedPosition { - updatedPosition = .linear(top: top, bottom: .Neighbour) + updatedPosition = .linear(top: top, bottom: .BubbleNeighbour) } - let imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: updatedPosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius) + let imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: updatedPosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius, layoutConstants: layoutConstants, chatPresentationData: item.presentationData) let (refinedWidth, finishLayout) = refineLayout(CGSize(width: constrainedSize.width - bubbleInsets.left - bubbleInsets.right, height: constrainedSize.height), automaticPlayback, wideLayout, imageCorners) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift index 174ca9909a..8a812fe3e0 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift @@ -539,7 +539,7 @@ private final class ChatMessagePollOptionNode: ASDisplayNode { let shouldHaveRadioNode = optionResult == nil let isSelectable: Bool - if shouldHaveRadioNode, case .poll(multipleAnswers: true) = poll.kind { + if shouldHaveRadioNode, case .poll(multipleAnswers: true) = poll.kind, !Namespaces.Message.allScheduled.contains(message.id.namespace) { isSelectable = true } else { isSelectable = false @@ -891,7 +891,9 @@ class ChatMessagePollBubbleContentNode: ChatMessageBubbleContentNode { } } if !hasSelection { - item.controllerInteraction.requestOpenMessagePollResults(item.message.id, pollId) + if !Namespaces.Message.allScheduled.contains(item.message.id.namespace) { + item.controllerInteraction.requestOpenMessagePollResults(item.message.id, pollId) + } } else if !selectedOpaqueIdentifiers.isEmpty { item.controllerInteraction.requestSelectMessagePollOptions(item.message.id, selectedOpaqueIdentifiers) } @@ -1018,7 +1020,7 @@ class ChatMessagePollBubbleContentNode: ChatMessageBubbleContentNode { } } - if let poll = poll, poll.isClosed, case .poll = poll.kind { + if let poll = poll, poll.isClosed { typeText = item.presentationData.strings.MessagePoll_LabelClosed } else if let poll = poll { switch poll.kind { @@ -1155,7 +1157,7 @@ class ChatMessagePollBubbleContentNode: ChatMessageBubbleContentNode { boundingSize.width = max(boundingSize.width, min(270.0, constrainedSize.width)) var canVote = false - if item.message.id.namespace == Namespaces.Message.Cloud, let poll = poll, poll.pollId.namespace == Namespaces.Media.CloudPoll, !poll.isClosed { + if (item.message.id.namespace == Namespaces.Message.Cloud || Namespaces.Message.allScheduled.contains(item.message.id.namespace)), let poll = poll, poll.pollId.namespace == Namespaces.Media.CloudPoll, !poll.isClosed { var hasVoted = false if let voters = poll.results.voters { for voter in voters { @@ -1169,9 +1171,6 @@ class ChatMessagePollBubbleContentNode: ChatMessageBubbleContentNode { canVote = true } } - if Namespaces.Message.allScheduled.contains(item.message.id.namespace) { - canVote = false - } return (boundingSize.width, { boundingWidth in var resultSize = CGSize(width: max(boundingSize.width, boundingWidth), height: boundingSize.height) @@ -1349,10 +1348,7 @@ class ChatMessagePollBubbleContentNode: ChatMessageBubbleContentNode { return } - var disableAllActions = false - if Namespaces.Message.allScheduled.contains(item.message.id.namespace) { - disableAllActions = true - } + let disableAllActions = false var hasSelection = false switch poll.kind { @@ -1397,15 +1393,23 @@ class ChatMessagePollBubbleContentNode: ChatMessageBubbleContentNode { self.buttonSubmitInactiveTextNode.isHidden = hasSelectedOptions self.buttonSubmitActiveTextNode.isHidden = !hasSelectedOptions self.buttonNode.isHidden = !hasSelectedOptions + self.buttonNode.isUserInteractionEnabled = true } else { if case .public = poll.publicity, hasResults, !disableAllActions { self.votersNode.isHidden = true self.buttonViewResultsTextNode.isHidden = false self.buttonNode.isHidden = false + + if Namespaces.Message.allScheduled.contains(item.message.id.namespace) { + self.buttonNode.isUserInteractionEnabled = false + } else { + self.buttonNode.isUserInteractionEnabled = true + } } else { self.votersNode.isHidden = false self.buttonViewResultsTextNode.isHidden = true self.buttonNode.isHidden = true + self.buttonNode.isUserInteractionEnabled = true } self.buttonSubmitInactiveTextNode.isHidden = true self.buttonSubmitActiveTextNode.isHidden = true @@ -1624,10 +1628,11 @@ private final class MergedAvatarsNode: ASDisplayNode { if self.disposables[peer.peerId] == nil { if let signal = peerAvatarImage(account: context.account, peerReference: peerReference, authorOfMessage: nil, representation: representation, displayDimensions: CGSize(width: mergedImageSize, height: mergedImageSize), synchronousLoad: synchronousLoad) { let disposable = (signal - |> deliverOnMainQueue).start(next: { [weak self] image in + |> deliverOnMainQueue).start(next: { [weak self] imageVersions in guard let strongSelf = self else { return } + let image = imageVersions?.0 if let image = image { strongSelf.images[peer.peerId] = image strongSelf.setNeedsDisplay() diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift index 6b17612beb..b546deccc4 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift @@ -76,7 +76,7 @@ class ChatMessageReplyInfoNode: ASDisplayNode { let serviceColor = serviceMessageColorComponents(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) titleColor = serviceColor.primaryText - let graphics = PresentationResourcesChat.additionalGraphics(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) lineImage = graphics.chatServiceVerticalLineImage textColor = titleColor } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift index d9c2e3c55d..d4b5f3b248 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift @@ -143,7 +143,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { let currentItem = self.item return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) let incoming = item.message.effectivelyIncoming(item.context.account.peerId) var imageSize: CGSize = CGSize(width: 100.0, height: 100.0) if let telegramFile = telegramFile { @@ -353,7 +353,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { updatedReplyBackgroundNode = ASImageNode() } - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) replyBackgroundImage = graphics.chatFreeformContentAdditionalInfoBackgroundImage } @@ -364,7 +364,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { if currentShareButtonNode != nil { updatedShareButtonNode = currentShareButtonNode if item.presentationData.theme !== currentItem?.presentationData.theme { - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage } else { @@ -374,7 +374,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { } else { let buttonNode = HighlightableButtonNode() let buttonIcon: UIImage? - let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) if item.message.id.peerId == item.context.account.peerId { buttonIcon = graphics.chatBubbleNavigateButtonImage } else { @@ -389,7 +389,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { var maxContentWidth = imageSize.width var actionButtonsFinalize: ((CGFloat) -> (CGSize, (_ animated: Bool) -> ChatMessageActionButtonsNode))? if let replyMarkup = replyMarkup { - let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.strings, replyMarkup, item.message, maxContentWidth) + let (minWidth, buttonsLayout) = actionButtonsLayout(item.context, item.presentationData.theme, item.presentationData.chatBubbleCorners, item.presentationData.strings, replyMarkup, item.message, maxContentWidth) maxContentWidth = max(maxContentWidth, minWidth) actionButtonsFinalize = buttonsLayout } diff --git a/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift index e89377d3c9..96052f5d0b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift @@ -211,8 +211,13 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode { imageDimensions = representation.dimensions.cgSize } break - } else if let _ = media as? TelegramMediaPoll { - titleString = strings.Conversation_PinnedPoll + } else if let poll = media as? TelegramMediaPoll { + switch poll.kind { + case .poll: + titleString = strings.Conversation_PinnedPoll + case .quiz: + titleString = strings.Conversation_PinnedQuiz + } } } diff --git a/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift b/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift index 0927b45710..253882e904 100644 --- a/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift +++ b/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift @@ -28,6 +28,7 @@ public final class ChatPresentationData { let nameDisplayOrder: PresentationPersonNameOrder let disableAnimations: Bool let largeEmoji: Bool + let chatBubbleCorners: PresentationChatBubbleCorners let animatedEmojiScale: CGFloat let isPreview: Bool @@ -39,13 +40,14 @@ public final class ChatPresentationData { let messageFixedFont: UIFont let messageBlockQuoteFont: UIFont - init(theme: ChatPresentationThemeData, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool, animatedEmojiScale: CGFloat = 1.0, isPreview: Bool = false) { + init(theme: ChatPresentationThemeData, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool, chatBubbleCorners: PresentationChatBubbleCorners, animatedEmojiScale: CGFloat = 1.0, isPreview: Bool = false) { self.theme = theme self.fontSize = fontSize self.strings = strings self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder self.disableAnimations = disableAnimations + self.chatBubbleCorners = chatBubbleCorners self.largeEmoji = largeEmoji self.isPreview = isPreview diff --git a/submodules/TelegramUI/TelegramUI/ChatPresentationInterfaceState.swift b/submodules/TelegramUI/TelegramUI/ChatPresentationInterfaceState.swift index 60e1c60d6a..3697ec4e39 100644 --- a/submodules/TelegramUI/TelegramUI/ChatPresentationInterfaceState.swift +++ b/submodules/TelegramUI/TelegramUI/ChatPresentationInterfaceState.swift @@ -306,12 +306,13 @@ final class ChatPresentationInterfaceState: Equatable { let nameDisplayOrder: PresentationPersonNameOrder let limitsConfiguration: LimitsConfiguration let fontSize: PresentationFontSize + let bubbleCorners: PresentationChatBubbleCorners let accountPeerId: PeerId let mode: ChatControllerPresentationMode let hasScheduledMessages: Bool let isScheduledMessages: Bool - init(chatWallpaper: TelegramWallpaper, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, limitsConfiguration: LimitsConfiguration, fontSize: PresentationFontSize, accountPeerId: PeerId, mode: ChatControllerPresentationMode, chatLocation: ChatLocation, isScheduledMessages: Bool) { + init(chatWallpaper: TelegramWallpaper, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, limitsConfiguration: LimitsConfiguration, fontSize: PresentationFontSize, bubbleCorners: PresentationChatBubbleCorners, accountPeerId: PeerId, mode: ChatControllerPresentationMode, chatLocation: ChatLocation, isScheduledMessages: Bool) { self.interfaceState = ChatInterfaceState() self.inputTextPanelState = ChatTextInputPanelState() self.editMessageState = nil @@ -349,13 +350,14 @@ final class ChatPresentationInterfaceState: Equatable { self.nameDisplayOrder = nameDisplayOrder self.limitsConfiguration = limitsConfiguration self.fontSize = fontSize + self.bubbleCorners = bubbleCorners self.accountPeerId = accountPeerId self.mode = mode self.hasScheduledMessages = false self.isScheduledMessages = isScheduledMessages } - init(interfaceState: ChatInterfaceState, chatLocation: ChatLocation, renderedPeer: RenderedPeer?, isNotAccessible: Bool, explicitelyCanPinMessages: Bool, contactStatus: ChatContactStatus?, hasBots: Bool, isArchived: Bool, inputTextPanelState: ChatTextInputPanelState, editMessageState: ChatEditInterfaceMessageState?, recordedMediaPreview: ChatRecordedMediaPreview?, inputQueryResults: [ChatPresentationInputQueryKind: ChatPresentationInputQueryResult], inputMode: ChatInputMode, titlePanelContexts: [ChatTitlePanelContext], keyboardButtonsMessage: Message?, pinnedMessageId: MessageId?, pinnedMessage: Message?, peerIsBlocked: Bool, peerIsMuted: Bool, peerDiscussionId: PeerId?, peerGeoLocation: PeerGeoLocation?, callsAvailable: Bool, callsPrivate: Bool, slowmodeState: ChatSlowmodeState?, chatHistoryState: ChatHistoryNodeHistoryState?, botStartPayload: String?, urlPreview: (String, TelegramMediaWebpage)?, editingUrlPreview: (String, TelegramMediaWebpage)?, search: ChatSearchData?, searchQuerySuggestionResult: ChatPresentationInputQueryResult?, chatWallpaper: TelegramWallpaper, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, limitsConfiguration: LimitsConfiguration, fontSize: PresentationFontSize, accountPeerId: PeerId, mode: ChatControllerPresentationMode, hasScheduledMessages: Bool, isScheduledMessages: Bool) { + init(interfaceState: ChatInterfaceState, chatLocation: ChatLocation, renderedPeer: RenderedPeer?, isNotAccessible: Bool, explicitelyCanPinMessages: Bool, contactStatus: ChatContactStatus?, hasBots: Bool, isArchived: Bool, inputTextPanelState: ChatTextInputPanelState, editMessageState: ChatEditInterfaceMessageState?, recordedMediaPreview: ChatRecordedMediaPreview?, inputQueryResults: [ChatPresentationInputQueryKind: ChatPresentationInputQueryResult], inputMode: ChatInputMode, titlePanelContexts: [ChatTitlePanelContext], keyboardButtonsMessage: Message?, pinnedMessageId: MessageId?, pinnedMessage: Message?, peerIsBlocked: Bool, peerIsMuted: Bool, peerDiscussionId: PeerId?, peerGeoLocation: PeerGeoLocation?, callsAvailable: Bool, callsPrivate: Bool, slowmodeState: ChatSlowmodeState?, chatHistoryState: ChatHistoryNodeHistoryState?, botStartPayload: String?, urlPreview: (String, TelegramMediaWebpage)?, editingUrlPreview: (String, TelegramMediaWebpage)?, search: ChatSearchData?, searchQuerySuggestionResult: ChatPresentationInputQueryResult?, chatWallpaper: TelegramWallpaper, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, limitsConfiguration: LimitsConfiguration, fontSize: PresentationFontSize, bubbleCorners: PresentationChatBubbleCorners, accountPeerId: PeerId, mode: ChatControllerPresentationMode, hasScheduledMessages: Bool, isScheduledMessages: Bool) { self.interfaceState = interfaceState self.chatLocation = chatLocation self.renderedPeer = renderedPeer @@ -393,6 +395,7 @@ final class ChatPresentationInterfaceState: Equatable { self.nameDisplayOrder = nameDisplayOrder self.limitsConfiguration = limitsConfiguration self.fontSize = fontSize + self.bubbleCorners = bubbleCorners self.accountPeerId = accountPeerId self.mode = mode self.hasScheduledMessages = hasScheduledMessages @@ -530,6 +533,9 @@ final class ChatPresentationInterfaceState: Equatable { if lhs.fontSize != rhs.fontSize { return false } + if lhs.bubbleCorners != rhs.bubbleCorners { + return false + } if lhs.accountPeerId != rhs.accountPeerId { return false } @@ -546,31 +552,31 @@ final class ChatPresentationInterfaceState: Equatable { } func updatedInterfaceState(_ f: (ChatInterfaceState) -> ChatInterfaceState) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: f(self.interfaceState), chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: f(self.interfaceState), chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedPeer(_ f: (RenderedPeer?) -> RenderedPeer?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: f(self.renderedPeer), isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: f(self.renderedPeer), isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedIsNotAccessible(_ isNotAccessible: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedExplicitelyCanPinMessages(_ explicitelyCanPinMessages: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedContactStatus(_ contactStatus: ChatContactStatus?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedHasBots(_ hasBots: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedIsArchived(_ isArchived: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedInputQueryResult(queryKind: ChatPresentationInputQueryKind, _ f: (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?) -> ChatPresentationInterfaceState { @@ -581,115 +587,119 @@ final class ChatPresentationInterfaceState: Equatable { } else { inputQueryResults.removeValue(forKey: queryKind) } - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedInputTextPanelState(_ f: (ChatTextInputPanelState) -> ChatTextInputPanelState) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: f(self.inputTextPanelState), editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: f(self.inputTextPanelState), editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedEditMessageState(_ editMessageState: ChatEditInterfaceMessageState?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedRecordedMediaPreview(_ recordedMediaPreview: ChatRecordedMediaPreview?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedInputMode(_ f: (ChatInputMode) -> ChatInputMode) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: f(self.inputMode), titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: f(self.inputMode), titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedTitlePanelContext(_ f: ([ChatTitlePanelContext]) -> [ChatTitlePanelContext]) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: f(self.titlePanelContexts), keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: f(self.titlePanelContexts), keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedKeyboardButtonsMessage(_ message: Message?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: message, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: message, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedPinnedMessageId(_ pinnedMessageId: MessageId?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedPinnedMessage(_ pinnedMessage: Message?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedPeerIsBlocked(_ peerIsBlocked: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedPeerIsMuted(_ peerIsMuted: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedPeerDiscussionId(_ peerDiscussionId: PeerId?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedPeerGeoLocation(_ peerGeoLocation: PeerGeoLocation?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedCallsAvailable(_ callsAvailable: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedCallsPrivate(_ callsPrivate: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedSlowmodeState(_ slowmodeState: ChatSlowmodeState?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedBotStartPayload(_ botStartPayload: String?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedChatHistoryState(_ chatHistoryState: ChatHistoryNodeHistoryState?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedUrlPreview(_ urlPreview: (String, TelegramMediaWebpage)?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedEditingUrlPreview(_ editingUrlPreview: (String, TelegramMediaWebpage)?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedSearch(_ search: ChatSearchData?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedSearchQuerySuggestionResult(_ f: (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: f(self.searchQuerySuggestionResult), chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: f(self.searchQuerySuggestionResult), chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedMode(_ mode: ChatControllerPresentationMode) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedTheme(_ theme: PresentationTheme) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedStrings(_ strings: PresentationStrings) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedDateTimeFormat(_ dateTimeFormat: PresentationDateTimeFormat) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedChatWallpaper(_ chatWallpaper: TelegramWallpaper) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + } + + func updatedBubbleCorners(_ bubbleCorners: PresentationChatBubbleCorners) -> ChatPresentationInterfaceState { + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } func updatedHasScheduledMessages(_ hasScheduledMessages: Bool) -> ChatPresentationInterfaceState { - return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) + return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: hasScheduledMessages, isScheduledMessages: self.isScheduledMessages) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift index b4de87c21a..580e1737b1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift @@ -107,13 +107,13 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { self.listNode = ListView() self.listNode.dynamicBounceEnabled = !self.presentationData.disableAnimations self.listNode.transform = CATransform3DMakeRotation(CGFloat(Double.pi), 0.0, 0.0, 1.0) - self.loadingNode = ChatLoadingNode(theme: self.presentationData.theme, chatWallpaper: self.presentationData.chatWallpaper) - self.emptyNode = ChatRecentActionsEmptyNode(theme: self.presentationData.theme, chatWallpaper: self.presentationData.chatWallpaper) + self.loadingNode = ChatLoadingNode(theme: self.presentationData.theme, chatWallpaper: self.presentationData.chatWallpaper, bubbleCorners: self.presentationData.chatBubbleCorners) + self.emptyNode = ChatRecentActionsEmptyNode(theme: self.presentationData.theme, chatWallpaper: self.presentationData.chatWallpaper, chatBubbleCorners: self.presentationData.chatBubbleCorners) self.emptyNode.alpha = 0.0 self.state = ChatRecentActionsControllerState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, fontSize: self.presentationData.chatFontSize) - self.chatPresentationDataPromise = Promise(ChatPresentationData(theme: ChatPresentationThemeData(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper), fontSize: self.presentationData.chatFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations, largeEmoji: self.presentationData.largeEmoji)) + self.chatPresentationDataPromise = Promise(ChatPresentationData(theme: ChatPresentationThemeData(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper), fontSize: self.presentationData.chatFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations, largeEmoji: self.presentationData.largeEmoji, chatBubbleCorners: self.presentationData.chatBubbleCorners)) self.eventLogContext = ChannelAdminEventLogContext(postbox: self.context.account.postbox, network: self.context.account.network, peerId: self.peer.id) @@ -498,7 +498,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { |> deliverOnMainQueue).start(next: { [weak self] presentationData in if let strongSelf = self { strongSelf.presentationData = presentationData - strongSelf.chatPresentationDataPromise.set(.single(ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji))) + strongSelf.chatPresentationDataPromise.set(.single(ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners))) strongSelf.updateThemeAndStrings(theme: presentationData.theme, strings: presentationData.strings) } @@ -661,7 +661,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { if peer is TelegramChannel, let navigationController = strongSelf.getNavigationController() { strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id), animated: true)) } else { - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { strongSelf.pushController(infoController) } } @@ -683,7 +683,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { |> deliverOnMainQueue).start(next: { [weak self] peer in if let strongSelf = self { if let peer = peer { - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { strongSelf.pushController(infoController) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsEmptyNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsEmptyNode.swift index 3d45cd250d..8b4dfd82d5 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsEmptyNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsEmptyNode.swift @@ -22,7 +22,7 @@ final class ChatRecentActionsEmptyNode: ASDisplayNode { private var title: String = "" private var text: String = "" - init(theme: PresentationTheme, chatWallpaper: TelegramWallpaper) { + init(theme: PresentationTheme, chatWallpaper: TelegramWallpaper, chatBubbleCorners: PresentationChatBubbleCorners) { self.theme = theme self.chatWallpaper = chatWallpaper @@ -37,7 +37,7 @@ final class ChatRecentActionsEmptyNode: ASDisplayNode { super.init() - let graphics = PresentationResourcesChat.additionalGraphics(theme, wallpaper: chatWallpaper) + let graphics = PresentationResourcesChat.additionalGraphics(theme, wallpaper: chatWallpaper, bubbleCorners: chatBubbleCorners) self.backgroundNode.image = graphics.chatEmptyItemBackgroundImage self.addSubnode(self.backgroundNode) diff --git a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift index b30f9e2e02..9c845b4699 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift @@ -272,7 +272,10 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, self.messageBackgroundNode.contentMode = .scaleToFill let outgoing: PresentationThemeBubbleColorComponents = self.presentationData.chatWallpaper.isEmpty ? self.presentationData.theme.chat.message.outgoing.bubble.withoutWallpaper : self.presentationData.theme.chat.message.outgoing.bubble.withWallpaper - self.messageBackgroundNode.image = messageBubbleImage(incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) + + let maxCornerRadius = self.presentationData.chatBubbleCorners.mainRadius + let minCornerRadius = self.presentationData.chatBubbleCorners.auxiliaryRadius + self.messageBackgroundNode.image = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: maxCornerRadius, incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) self.view.addSubview(self.effectView) self.addSubnode(self.dimNode) @@ -376,7 +379,9 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, } let outgoing: PresentationThemeBubbleColorComponents = self.presentationData.chatWallpaper.isEmpty ? self.presentationData.theme.chat.message.outgoing.bubble.withoutWallpaper : self.presentationData.theme.chat.message.outgoing.bubble.withWallpaper - self.messageBackgroundNode.image = messageBubbleImage(incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) + let maxCornerRadius = self.presentationData.chatBubbleCorners.mainRadius + let minCornerRadius = self.presentationData.chatBubbleCorners.auxiliaryRadius + self.messageBackgroundNode.image = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: maxCornerRadius, incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) for node in self.contentNodes { node.updateTheme(presentationData.theme) diff --git a/submodules/TelegramUI/TelegramUI/ChatTitleView.swift b/submodules/TelegramUI/TelegramUI/ChatTitleView.swift index 04ae85c66b..e429d1315e 100644 --- a/submodules/TelegramUI/TelegramUI/ChatTitleView.swift +++ b/submodules/TelegramUI/TelegramUI/ChatTitleView.swift @@ -15,6 +15,7 @@ import PeerPresenceStatusManager import ChatTitleActivityNode import LocalizedPeerData import PhoneNumberFormat +import ChatTitleActivityNode enum ChatTitleContent { case peer(peerView: PeerView, onlineMemberCount: Int32?, isScheduledMessages: Bool) @@ -59,7 +60,7 @@ private final class ChatTitleNetworkStatusNode: ASDisplayNode { func updateTheme(theme: PresentationTheme) { self.theme = theme - self.titleNode.attributedText = NSAttributedString(string: self.title, font: Font.bold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor) + self.titleNode.attributedText = NSAttributedString(string: self.title, font: Font.medium(24.0), textColor: self.theme.rootController.navigationBar.primaryTextColor) self.activityIndicator.type = .custom(self.theme.rootController.navigationBar.primaryTextColor, 22.0, 1.5, false) } @@ -92,11 +93,11 @@ final class ChatTitleView: UIView, NavigationBarTitleView { private var nameDisplayOrder: PresentationPersonNameOrder private let contentContainer: ASDisplayNode - private let titleNode: ImmediateTextNode - private let titleLeftIconNode: ASImageNode - private let titleRightIconNode: ASImageNode - private let titleCredibilityIconNode: ASImageNode - private let activityNode: ChatTitleActivityNode + let titleNode: ImmediateTextNode + let titleLeftIconNode: ASImageNode + let titleRightIconNode: ASImageNode + let titleCredibilityIconNode: ASImageNode + let activityNode: ChatTitleActivityNode private let button: HighlightTrackingButtonNode @@ -106,7 +107,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { private var titleRightIcon: ChatTitleIcon = .none private var titleScamIcon = false - private var networkStatusNode: ChatTitleNetworkStatusNode? + //private var networkStatusNode: ChatTitleNetworkStatusNode? private var presenceManager: PeerPresenceStatusManager? @@ -122,7 +123,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { isOnline = true } - if isOnline || layout?.metrics.widthClass == .regular { + /*if isOnline || layout?.metrics.widthClass == .regular { self.contentContainer.isHidden = false if let networkStatusNode = self.networkStatusNode { self.networkStatusNode = nil @@ -136,7 +137,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { } else { statusNode = ChatTitleNetworkStatusNode(theme: self.theme) self.networkStatusNode = statusNode - self.insertSubview(statusNode.view, belowSubview: self.button.view) + self.insertSubview(statusNode.view, aboveSubview: self.contentContainer.view) } switch self.networkState { case .waitingForNetwork: @@ -152,7 +153,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { case .online: break } - } + }*/ self.setNeedsLayout() } @@ -161,6 +162,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { didSet { if self.networkState != oldValue { updateNetworkStatusNode(networkState: self.networkState, layout: self.layout) + self.updateStatus() } } } @@ -274,175 +276,191 @@ final class ChatTitleView: UIView, NavigationBarTitleView { } var state = ChatTitleActivityNodeState.none - if let (peerId, inputActivities) = self.inputActivities, !inputActivities.isEmpty, inputActivitiesAllowed { - var stringValue = "" - var first = true - var mergedActivity = inputActivities[0].1 - for (_, activity) in inputActivities { - if activity != mergedActivity { - mergedActivity = .typingText - break - } + switch self.networkState { + case .waitingForNetwork, .connecting, .updating: + var infoText: String + switch self.networkState { + case .waitingForNetwork: + infoText = self.strings.ChatState_WaitingForNetwork + case let .connecting(proxy): + infoText = self.strings.ChatState_Connecting + case .updating: + infoText = self.strings.ChatState_Updating + case .online: + infoText = "" } - if peerId.namespace == Namespaces.Peer.CloudUser || peerId.namespace == Namespaces.Peer.SecretChat { - switch mergedActivity { - case .typingText: - stringValue = strings.Conversation_typing - case .uploadingFile: - stringValue = strings.Activity_UploadingDocument - case .recordingVoice: - stringValue = strings.Activity_RecordingAudio - case .uploadingPhoto: - stringValue = strings.Activity_UploadingPhoto - case .uploadingVideo: - stringValue = strings.Activity_UploadingVideo - case .playingGame: - stringValue = strings.Activity_PlayingGame - case .recordingInstantVideo: - stringValue = strings.Activity_RecordingVideoMessage - case .uploadingInstantVideo: - stringValue = strings.Activity_UploadingVideoMessage - } - } else { - for (peer, _) in inputActivities { - let title = peer.compactDisplayTitle - if !title.isEmpty { - if first { - first = false - } else { - stringValue += ", " - } - stringValue += title + state = .info(NSAttributedString(string: infoText, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor), .generic) + case .online: + if let (peerId, inputActivities) = self.inputActivities, !inputActivities.isEmpty, inputActivitiesAllowed { + var stringValue = "" + var first = true + var mergedActivity = inputActivities[0].1 + for (_, activity) in inputActivities { + if activity != mergedActivity { + mergedActivity = .typingText + break } } - } - let color = self.theme.rootController.navigationBar.accentTextColor - let string = NSAttributedString(string: stringValue, font: Font.regular(13.0), textColor: color) - switch mergedActivity { - case .typingText: - state = .typingText(string, color) - case .recordingVoice: - state = .recordingVoice(string, color) - case .recordingInstantVideo: - state = .recordingVideo(string, color) - case .uploadingFile, .uploadingInstantVideo, .uploadingPhoto, .uploadingVideo: - state = .uploading(string, color) - case .playingGame: - state = .playingGame(string, color) - } - } else { - if let titleContent = self.titleContent { - switch titleContent { - case let .peer(peerView, onlineMemberCount, isScheduledMessages): - if let peer = peerViewMainPeer(peerView) { - let servicePeer = isServicePeer(peer) - if peer.id == self.account.peerId || isScheduledMessages { - let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) - } else if let user = peer as? TelegramUser { - if servicePeer { + if peerId.namespace == Namespaces.Peer.CloudUser || peerId.namespace == Namespaces.Peer.SecretChat { + switch mergedActivity { + case .typingText: + stringValue = strings.Conversation_typing + case .uploadingFile: + stringValue = strings.Activity_UploadingDocument + case .recordingVoice: + stringValue = strings.Activity_RecordingAudio + case .uploadingPhoto: + stringValue = strings.Activity_UploadingPhoto + case .uploadingVideo: + stringValue = strings.Activity_UploadingVideo + case .playingGame: + stringValue = strings.Activity_PlayingGame + case .recordingInstantVideo: + stringValue = strings.Activity_RecordingVideoMessage + case .uploadingInstantVideo: + stringValue = strings.Activity_UploadingVideoMessage + } + } else { + for (peer, _) in inputActivities { + let title = peer.compactDisplayTitle + if !title.isEmpty { + if first { + first = false + } else { + stringValue += ", " + } + stringValue += title + } + } + } + let color = self.theme.rootController.navigationBar.accentTextColor + let string = NSAttributedString(string: stringValue, font: Font.regular(13.0), textColor: color) + switch mergedActivity { + case .typingText: + state = .typingText(string, color) + case .recordingVoice: + state = .recordingVoice(string, color) + case .recordingInstantVideo: + state = .recordingVideo(string, color) + case .uploadingFile, .uploadingInstantVideo, .uploadingPhoto, .uploadingVideo: + state = .uploading(string, color) + case .playingGame: + state = .playingGame(string, color) + } + } else { + if let titleContent = self.titleContent { + switch titleContent { + case let .peer(peerView, onlineMemberCount, isScheduledMessages): + if let peer = peerViewMainPeer(peerView) { + let servicePeer = isServicePeer(peer) + if peer.id == self.account.peerId || isScheduledMessages { let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) state = .info(string, .generic) - } else if user.flags.contains(.isSupport) { - let statusText = self.strings.Bot_GenericSupportStatus - - let string = NSAttributedString(string: statusText, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) - } else if let _ = user.botInfo { - let statusText = self.strings.Bot_GenericBotStatus - - let string = NSAttributedString(string: statusText, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) - } else if let peer = peerViewMainPeer(peerView) { - let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 - let userPresence: TelegramUserPresence - if let presence = peerView.peerPresences[peer.id] as? TelegramUserPresence { - userPresence = presence - self.presenceManager?.reset(presence: presence) + } else if let user = peer as? TelegramUser { + if servicePeer { + let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) + } else if user.flags.contains(.isSupport) { + let statusText = self.strings.Bot_GenericSupportStatus + + let string = NSAttributedString(string: statusText, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) + } else if let _ = user.botInfo { + let statusText = self.strings.Bot_GenericBotStatus + + let string = NSAttributedString(string: statusText, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) + } else if let peer = peerViewMainPeer(peerView) { + let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + let userPresence: TelegramUserPresence + if let presence = peerView.peerPresences[peer.id] as? TelegramUserPresence { + userPresence = presence + self.presenceManager?.reset(presence: presence) + } else { + userPresence = TelegramUserPresence(status: .none, lastActivity: 0) + } + let (string, activity) = stringAndActivityForUserPresence(strings: self.strings, dateTimeFormat: self.dateTimeFormat, presence: userPresence, relativeTo: Int32(timestamp)) + let attributedString = NSAttributedString(string: string, font: Font.regular(13.0), textColor: activity ? self.theme.rootController.navigationBar.accentTextColor : self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(attributedString, activity ? .online : .lastSeenTime) } else { - userPresence = TelegramUserPresence(status: .none, lastActivity: 0) + let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) } - let (string, activity) = stringAndActivityForUserPresence(strings: self.strings, dateTimeFormat: self.dateTimeFormat, presence: userPresence, relativeTo: Int32(timestamp)) - let attributedString = NSAttributedString(string: string, font: Font.regular(13.0), textColor: activity ? self.theme.rootController.navigationBar.accentTextColor : self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(attributedString, activity ? .online : .lastSeenTime) - } else { - let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) - } - } else if let group = peer as? TelegramGroup { - var onlineCount = 0 - if let cachedGroupData = peerView.cachedData as? CachedGroupData, let participants = cachedGroupData.participants { - let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 - for participant in participants.participants { - if let presence = peerView.peerPresences[participant.peerId] as? TelegramUserPresence { - let relativeStatus = relativeUserPresenceStatus(presence, relativeTo: Int32(timestamp)) - switch relativeStatus { - case .online: - onlineCount += 1 - default: - break + } else if let group = peer as? TelegramGroup { + var onlineCount = 0 + if let cachedGroupData = peerView.cachedData as? CachedGroupData, let participants = cachedGroupData.participants { + let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + for participant in participants.participants { + if let presence = peerView.peerPresences[participant.peerId] as? TelegramUserPresence { + let relativeStatus = relativeUserPresenceStatus(presence, relativeTo: Int32(timestamp)) + switch relativeStatus { + case .online: + onlineCount += 1 + default: + break + } } } } - } - if onlineCount > 1 { - let string = NSMutableAttributedString() - - string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(group.participantCount))), ", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) - string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineCount)), font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) - state = .info(string, .generic) - } else { - let string = NSAttributedString(string: strings.Conversation_StatusMembers(Int32(group.participantCount)), font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) - } - } else if let channel = peer as? TelegramChannel { - if let cachedChannelData = peerView.cachedData as? CachedChannelData, let memberCount = cachedChannelData.participantsSummary.memberCount { - if memberCount == 0 { - let string: NSAttributedString - if case .group = channel.info { - string = NSAttributedString(string: strings.Group_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - } else { - string = NSAttributedString(string: strings.Channel_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - } + if onlineCount > 1 { + let string = NSMutableAttributedString() + + string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(group.participantCount))), ", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) + string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineCount)), font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) state = .info(string, .generic) } else { - if case .group = channel.info, let onlineMemberCount = onlineMemberCount, onlineMemberCount > 1 { - let string = NSMutableAttributedString() - - string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(memberCount))), ", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) - string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineMemberCount)), font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) + let string = NSAttributedString(string: strings.Conversation_StatusMembers(Int32(group.participantCount)), font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) + } + } else if let channel = peer as? TelegramChannel { + if let cachedChannelData = peerView.cachedData as? CachedChannelData, let memberCount = cachedChannelData.participantsSummary.memberCount { + if memberCount == 0 { + let string: NSAttributedString + if case .group = channel.info { + string = NSAttributedString(string: strings.Group_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + } else { + string = NSAttributedString(string: strings.Channel_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + } state = .info(string, .generic) } else { - let membersString: String - if case .group = channel.info { - membersString = strings.Conversation_StatusMembers(memberCount) + if case .group = channel.info, let onlineMemberCount = onlineMemberCount, onlineMemberCount > 1 { + let string = NSMutableAttributedString() + + string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(memberCount))), ", font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) + string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineMemberCount)), font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) + state = .info(string, .generic) } else { - membersString = strings.Conversation_StatusSubscribers(memberCount) + let membersString: String + if case .group = channel.info { + membersString = strings.Conversation_StatusMembers(memberCount) + } else { + membersString = strings.Conversation_StatusSubscribers(memberCount) + } + let string = NSAttributedString(string: membersString, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) } - let string = NSAttributedString(string: membersString, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) } - } - } else { - switch channel.info { - case .group: - let string = NSAttributedString(string: strings.Group_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) - case .broadcast: - let string = NSAttributedString(string: strings.Channel_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) - state = .info(string, .generic) + } else { + switch channel.info { + case .group: + let string = NSAttributedString(string: strings.Group_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) + case .broadcast: + let string = NSAttributedString(string: strings.Channel_Status, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) + state = .info(string, .generic) + } } } } - } - default: - break + default: + break + } + + self.accessibilityLabel = self.titleNode.attributedText?.string + self.accessibilityValue = state.string + } else { + self.accessibilityLabel = nil } - - self.accessibilityLabel = self.titleNode.attributedText?.string - self.accessibilityValue = state.string - } else { - self.accessibilityLabel = nil } } @@ -497,31 +515,21 @@ final class ChatTitleView: UIView, NavigationBarTitleView { self?.updateStatus() }) - self.button.addTarget(self, action: #selector(buttonPressed), forControlEvents: [.touchUpInside]) + self.button.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: [.touchUpInside]) self.button.highligthedChanged = { [weak self] highlighted in if let strongSelf = self { if highlighted { strongSelf.titleNode.layer.removeAnimation(forKey: "opacity") strongSelf.activityNode.layer.removeAnimation(forKey: "opacity") - strongSelf.titleLeftIconNode.layer.removeAnimation(forKey: "opacity") - strongSelf.titleRightIconNode.layer.removeAnimation(forKey: "opacity") strongSelf.titleCredibilityIconNode.layer.removeAnimation(forKey: "opacity") strongSelf.titleNode.alpha = 0.4 strongSelf.activityNode.alpha = 0.4 - strongSelf.titleLeftIconNode.alpha = 0.4 - strongSelf.titleRightIconNode.alpha = 0.4 - strongSelf.titleCredibilityIconNode.alpha = 0.4 } else { strongSelf.titleNode.alpha = 1.0 strongSelf.activityNode.alpha = 1.0 - strongSelf.titleLeftIconNode.alpha = 1.0 - strongSelf.titleRightIconNode.alpha = 1.0 strongSelf.titleCredibilityIconNode.alpha = 1.0 strongSelf.titleNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) strongSelf.activityNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) - strongSelf.titleLeftIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) - strongSelf.titleRightIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) - strongSelf.titleCredibilityIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) } } } @@ -543,7 +551,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { self.theme = theme self.strings = strings - self.networkStatusNode?.updateTheme(theme: theme) + //self.networkStatusNode?.updateTheme(theme: theme) let titleContent = self.titleContent self.titleContent = titleContent self.updateStatus() @@ -567,7 +575,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { if let image = self.titleLeftIconNode.image { if self.titleLeftIconNode.supernode == nil { - self.contentContainer.addSubnode(self.titleLeftIconNode) + self.titleNode.addSubnode(self.titleLeftIconNode) } leftIconWidth = image.size.width + 6.0 } else if self.titleLeftIconNode.supernode != nil { @@ -576,7 +584,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { if let image = self.titleCredibilityIconNode.image { if self.titleCredibilityIconNode.supernode == nil { - self.contentContainer.addSubnode(self.titleCredibilityIconNode) + self.titleNode.addSubnode(self.titleCredibilityIconNode) } credibilityIconWidth = image.size.width + 3.0 } else if self.titleCredibilityIconNode.supernode != nil { @@ -585,7 +593,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView { if let image = self.titleRightIconNode.image { if self.titleRightIconNode.supernode == nil { - self.contentContainer.addSubnode(self.titleRightIconNode) + self.titleNode.addSubnode(self.titleRightIconNode) } rightIconWidth = image.size.width + 3.0 } else if self.titleRightIconNode.supernode != nil { @@ -625,13 +633,13 @@ final class ChatTitleView: UIView, NavigationBarTitleView { } if let image = self.titleLeftIconNode.image { - self.titleLeftIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.minX - image.size.width - 3.0 - UIScreenPixel, y: titleFrame.minY + 4.0), size: image.size) + self.titleLeftIconNode.frame = CGRect(origin: CGPoint(x: -image.size.width - 3.0 - UIScreenPixel, y: 4.0), size: image.size) } if let image = self.titleCredibilityIconNode.image { - self.titleCredibilityIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX - image.size.width - 1.0, y: titleFrame.minY + 2.0), size: image.size) + self.titleCredibilityIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.width - image.size.width - 1.0, y: 2.0), size: image.size) } if let image = self.titleRightIconNode.image { - self.titleRightIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX + 3.0, y: titleFrame.minY + 6.0), size: image.size) + self.titleRightIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.width + 3.0, y: 6.0), size: image.size) } } else { let titleSize = self.titleNode.updateLayout(CGSize(width: floor(clearBounds.width / 2.0 - leftIconWidth - credibilityIconWidth - rightIconWidth - titleSideInset * 2.0), height: size.height)) @@ -654,21 +662,21 @@ final class ChatTitleView: UIView, NavigationBarTitleView { self.titleRightIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX - image.size.width - 1.0, y: titleFrame.minY + 6.0), size: image.size) } } - - if let networkStatusNode = self.networkStatusNode { - transition.updateFrame(node: networkStatusNode, frame: CGRect(origin: CGPoint(), size: size)) - networkStatusNode.updateLayout(size: size, transition: transition) - } } @objc func buttonPressed() { - if let pressed = self.pressed { - pressed() - } + self.pressed?() } func animateLayoutTransition() { UIView.transition(with: self, duration: 0.25, options: [.transitionCrossDissolve], animations: { }, completion: nil) } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if self.button.frame.contains(point) { + return self.button.view + } + return super.hitTest(point, with: event) + } } diff --git a/submodules/TelegramUI/TelegramUI/FileMediaResourceStatus.swift b/submodules/TelegramUI/TelegramUI/FileMediaResourceStatus.swift index df635fa8b4..03980fc8e1 100644 --- a/submodules/TelegramUI/TelegramUI/FileMediaResourceStatus.swift +++ b/submodules/TelegramUI/TelegramUI/FileMediaResourceStatus.swift @@ -33,7 +33,7 @@ func messageFileMediaPlaybackStatus(context: AccountContext, file: TelegramMedia } } -func messageFileMediaResourceStatus(context: AccountContext, file: TelegramMediaFile, message: Message, isRecentActions: Bool) -> Signal { +func messageFileMediaResourceStatus(context: AccountContext, file: TelegramMediaFile, message: Message, isRecentActions: Bool, isSharedMedia: Bool = false) -> Signal { let playbackStatus = internalMessageFileMediaPlaybackStatus(context: context, file: file, message: message, isRecentActions: isRecentActions) |> map { status -> MediaPlayerPlaybackStatus? in return status?.status } diff --git a/submodules/TelegramUI/TelegramUI/ListMessageFileItemNode.swift b/submodules/TelegramUI/TelegramUI/ListMessageFileItemNode.swift index b6e759f72f..43ce473a32 100644 --- a/submodules/TelegramUI/TelegramUI/ListMessageFileItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ListMessageFileItemNode.swift @@ -15,6 +15,7 @@ import AccountContext import RadialStatusNode import PhotoResources import MusicAlbumArtResources +import UniversalMediaPlayer private let extensionImageCache = Atomic<[UInt32: UIImage]>(value: [:]) @@ -124,6 +125,7 @@ private struct FetchControls { private enum FileIconImage: Equatable { case imageRepresentation(TelegramMediaFile, TelegramMediaImageRepresentation) case albumArt(TelegramMediaFile, SharedMediaPlaybackAlbumArt) + case roundVideo(TelegramMediaFile) static func ==(lhs: FileIconImage, rhs: FileIconImage) -> Bool { switch lhs { @@ -139,6 +141,12 @@ private enum FileIconImage: Equatable { } else { return false } + case let .roundVideo(file): + if case .roundVideo(file) = rhs { + return true + } else { + return false + } } } } @@ -159,6 +167,10 @@ final class ListMessageFileItemNode: ListMessageNode { private let statusButtonNode: HighlightTrackingButtonNode private let statusNode: RadialStatusNode + private var waveformNode: AudioWaveformNode? + private var waveformForegroundNode: AudioWaveformNode? + private var waveformScrubbingNode: MediaPlayerScrubbingNode? + private var currentIconImage: FileIconImage? private var currentMedia: Media? @@ -167,6 +179,8 @@ final class ListMessageFileItemNode: ListMessageNode { private var fetchStatus: MediaResourceStatus? private var resourceStatus: FileMediaResourceMediaStatus? private let fetchDisposable = MetaDisposable() + private let playbackStatusDisposable = MetaDisposable() + private let playbackStatus = Promise() private var downloadStatusIconNode: ASImageNode private var linearProgressNode: ASDisplayNode @@ -226,7 +240,7 @@ final class ListMessageFileItemNode: ListMessageNode { self.downloadStatusIconNode.displayWithoutProcessing = true self.progressNode = RadialProgressNode(theme: RadialProgressTheme(backgroundColor: .black, foregroundColor: .white, icon: nil)) - self.progressNode.isLayerBacked = true + //self.progressNode.isLayerBacked = true self.linearProgressNode = ASDisplayNode() self.linearProgressNode.isLayerBacked = true @@ -235,6 +249,7 @@ final class ListMessageFileItemNode: ListMessageNode { self.addSubnode(self.separatorNode) self.addSubnode(self.titleNode) + self.addSubnode(self.progressNode) self.addSubnode(self.descriptionNode) self.addSubnode(self.descriptionProgressNode) self.addSubnode(self.extensionIconNode) @@ -335,9 +350,13 @@ final class ListMessageFileItemNode: ListMessageNode { var iconImage: FileIconImage? var updateIconImageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? var updatedStatusSignal: Signal? + var updatedPlaybackStatusSignal: Signal? var updatedFetchControls: FetchControls? + var waveform: AudioWaveform? var isAudio = false + var isVoice = false + var isInstantVideo = false let message = item.message @@ -346,9 +365,12 @@ final class ListMessageFileItemNode: ListMessageNode { if let file = media as? TelegramMediaFile { selectedMedia = file + isInstantVideo = file.isInstantVideo + for attribute in file.attributes { - if case let .Audio(voice, _, title, performer, _) = attribute { + if case let .Audio(voice, _, title, performer, waveformValue) = attribute { isAudio = true + isVoice = voice titleText = NSAttributedString(string: title ?? (file.fileName ?? "Unknown Track"), font: audioTitleFont, textColor: item.theme.list.itemPrimaryTextColor) @@ -365,11 +387,21 @@ final class ListMessageFileItemNode: ListMessageNode { if !voice { iconImage = .albumArt(file, SharedMediaPlaybackAlbumArt(thumbnailResource: ExternalMusicAlbumArtResource(title: title ?? "", performer: performer ?? "", isThumbnail: true), fullSizeResource: ExternalMusicAlbumArtResource(title: title ?? "", performer: performer ?? "", isThumbnail: false))) + } else { + titleText = NSAttributedString(string: " ", font: audioTitleFont, textColor: item.theme.list.itemPrimaryTextColor) + descriptionText = NSAttributedString(string: item.message.author?.displayTitle(strings: item.strings, displayOrder: .firstLast) ?? " ", font: descriptionFont, textColor: item.theme.list.itemSecondaryTextColor) + waveformValue?.withDataNoCopy { data in + waveform = AudioWaveform(bitstream: data, bitsPerSample: 5) + } } } } - if !isAudio { + if isInstantVideo { + titleText = NSAttributedString(string: item.strings.Message_VideoMessage, font: audioTitleFont, textColor: item.theme.list.itemPrimaryTextColor) + descriptionText = NSAttributedString(string: item.message.author?.displayTitle(strings: item.strings, displayOrder: .firstLast) ?? " ", font: descriptionFont, textColor: item.theme.list.itemSecondaryTextColor) + iconImage = .roundVideo(file) + } else if !isAudio { let fileName: String = file.fileName ?? "" titleText = NSAttributedString(string: fileName, font: titleFont, textColor: item.theme.list.itemPrimaryTextColor) @@ -402,7 +434,7 @@ final class ListMessageFileItemNode: ListMessageNode { } } - if isAudio { + if isAudio && !isVoice { leftInset += 14.0 } @@ -435,9 +467,9 @@ final class ListMessageFileItemNode: ListMessageNode { } if statusUpdated { - updatedStatusSignal = messageFileMediaResourceStatus(context: item.context, file: selectedMedia, message: message, isRecentActions: false) + updatedStatusSignal = messageFileMediaResourceStatus(context: item.context, file: selectedMedia, message: message, isRecentActions: false, isSharedMedia: true) - if isAudio { + if isAudio || isInstantVideo { if let currentUpdatedStatusSignal = updatedStatusSignal { updatedStatusSignal = currentUpdatedStatusSignal |> map { status in @@ -450,6 +482,9 @@ final class ListMessageFileItemNode: ListMessageNode { } } } + if isVoice { + updatedPlaybackStatusSignal = messageFileMediaPlaybackStatus(context: item.context, file: selectedMedia, message: message, isRecentActions: false) + } } } @@ -472,6 +507,11 @@ final class ListMessageFileItemNode: ListMessageNode { let imageCorners = ImageCorners(topLeft: .Corner(4.0), topRight: .Corner(4.0), bottomLeft: .Corner(4.0), bottomRight: .Corner(4.0)) let arguments = TransformImageArguments(corners: imageCorners, imageSize: iconSize, boundingSize: iconSize, intrinsicInsets: UIEdgeInsets(), emptyColor: item.theme.list.mediaPlaceholderColor) iconImageApply = iconImageLayout(arguments) + case let .roundVideo(file): + let iconSize = CGSize(width: 42.0, height: 42.0) + let imageCorners = ImageCorners(topLeft: .Corner(iconSize.width / 2.0), topRight: .Corner(iconSize.width / 2.0), bottomLeft: .Corner(iconSize.width / 2.0), bottomRight: .Corner(iconSize.width / 2.0)) + let arguments = TransformImageArguments(corners: imageCorners, imageSize: (file.dimensions ?? PixelDimensions(width: 320, height: 320)).cgSize.aspectFilled(iconSize), boundingSize: iconSize, intrinsicInsets: UIEdgeInsets(), emptyColor: item.theme.list.mediaPlaceholderColor) + iconImageApply = iconImageLayout(arguments) } } @@ -482,7 +522,8 @@ final class ListMessageFileItemNode: ListMessageNode { updateIconImageSignal = chatWebpageSnippetFile(account: item.context.account, fileReference: .message(message: MessageReference(message), media: file), representation: representation) case let .albumArt(file, albumArt): updateIconImageSignal = playerAlbumArt(postbox: item.context.account.postbox, fileReference: .message(message: MessageReference(message), media: file), albumArt: albumArt, thumbnail: true) - + case let .roundVideo(file): + updateIconImageSignal = mediaGridMessageVideo(postbox: item.context.account.postbox, videoReference: FileMediaReference.message(message: MessageReference(message), media: file), autoFetchFullSizeThumbnail: true) } } else { updateIconImageSignal = .complete() @@ -581,6 +622,48 @@ final class ListMessageFileItemNode: ListMessageNode { strongSelf.currentIconImage = iconImage + if isVoice { + let waveformNode: AudioWaveformNode + let waveformForegroundNode: AudioWaveformNode + let waveformScrubbingNode: MediaPlayerScrubbingNode + if let current = strongSelf.waveformNode { + waveformNode = current + } else { + waveformNode = AudioWaveformNode() + waveformNode.isLayerBacked = true + strongSelf.waveformNode = waveformNode + strongSelf.addSubnode(waveformNode) + } + if let current = strongSelf.waveformForegroundNode { + waveformForegroundNode = current + } else { + waveformForegroundNode = AudioWaveformNode() + waveformForegroundNode.isLayerBacked = true + strongSelf.waveformForegroundNode = waveformForegroundNode + strongSelf.addSubnode(waveformForegroundNode) + } + if let current = strongSelf.waveformScrubbingNode { + waveformScrubbingNode = current + } else { + waveformScrubbingNode = MediaPlayerScrubbingNode(content: .custom(backgroundNode: waveformNode, foregroundContentNode: waveformForegroundNode)) + waveformScrubbingNode.hitTestSlop = UIEdgeInsets(top: -10.0, left: 0.0, bottom: -10.0, right: 0.0) + waveformScrubbingNode.seek = { timestamp in + if let strongSelf = self, let context = strongSelf.context, let message = strongSelf.message, let type = peerMessageMediaPlayerType(message) { + context.sharedContext.mediaManager.playlistControl(.seek(timestamp), type: type) + } + } + waveformScrubbingNode.enableScrubbing = false + waveformScrubbingNode.status = strongSelf.playbackStatus.get() + strongSelf.waveformScrubbingNode = waveformScrubbingNode + strongSelf.addSubnode(waveformScrubbingNode) + } + + transition.updateFrame(node: waveformScrubbingNode, frame: CGRect(origin: CGPoint(x: leftOffset + leftInset, y: 10.0), size: CGSize(width: params.width - leftInset - 16.0, height: 12.0))) + + waveformNode.setup(color: item.theme.list.controlSecondaryColor, waveform: waveform) + waveformForegroundNode.setup(color: item.theme.list.itemAccentColor, waveform: waveform) + } + if let iconImageApply = iconImageApply { if let updateImageSignal = updateIconImageSignal { strongSelf.iconImageNode.setSignal(updateImageSignal) @@ -632,10 +715,24 @@ final class ListMessageFileItemNode: ListMessageNode { transition.updateFrame(node: strongSelf.downloadStatusIconNode, frame: CGRect(origin: CGPoint(x: leftOffset + leftInset, y: strongSelf.descriptionNode.frame.minY + floor((strongSelf.descriptionNode.frame.height - 11.0) / 2.0)), size: CGSize(width: 11.0, height: 11.0))) + let progressSize: CGFloat = 40.0 + transition.updateFrame(node: strongSelf.progressNode, frame: CGRect(origin: CGPoint(x: leftOffset + params.leftInset + floor((leftInset - params.leftInset - progressSize) / 2.0), y: floor((nodeLayout.contentSize.height - progressSize) / 2.0)), size: CGSize(width: progressSize, height: progressSize))) + if let updatedFetchControls = updatedFetchControls { let _ = strongSelf.fetchControls.swap(updatedFetchControls) } + if let updatedPlaybackStatusSignal = updatedPlaybackStatusSignal { + strongSelf.playbackStatus.set(updatedPlaybackStatusSignal) + /*strongSelf.playbackStatusDisposable.set((updatedPlaybackStatusSignal |> deliverOnMainQueue).start(next: { [weak strongSelf] status in + displayLinkDispatcher.dispatch { + if let strongSelf = strongSelf { + strongSelf.playerStatus = status + } + } + }))*/ + } + strongSelf.updateStatus(transition: transition) } }) @@ -648,25 +745,34 @@ final class ListMessageFileItemNode: ListMessageNode { } var isAudio = false + var isVoice = false + var isInstantVideo = false if let file = media as? TelegramMediaFile { isAudio = file.isMusic || file.isVoice + isVoice = file.isVoice + isInstantVideo = file.isInstantVideo } + self.progressNode.isHidden = !isVoice + + var enableScrubbing = false var musicIsPlaying: Bool? var statusState: RadialStatusNodeState = .none - if !isAudio { + if !isAudio && !isInstantVideo { self.updateProgressFrame(size: contentSize, leftInset: layoutParams.leftInset, rightInset: layoutParams.rightInset, transition: .immediate) } else { - switch fetchStatus { - case let .Fetching(_, progress): - let adjustedProgress = max(progress, 0.027) - statusState = .cloudProgress(color: item.theme.list.itemAccentColor, strokeBackgroundColor: item.theme.list.itemAccentColor.withAlphaComponent(0.5), lineWidth: 2.0, value: CGFloat(adjustedProgress)) - case .Local: - break - case .Remote: - if let image = PresentationResourcesItemList.cloudFetchIcon(item.theme) { - statusState = .customIcon(image) - } + if !isVoice && !isInstantVideo { + switch fetchStatus { + case let .Fetching(_, progress): + let adjustedProgress = max(progress, 0.027) + statusState = .cloudProgress(color: item.theme.list.itemAccentColor, strokeBackgroundColor: item.theme.list.itemAccentColor.withAlphaComponent(0.5), lineWidth: 2.0, value: CGFloat(adjustedProgress)) + case .Local: + break + case .Remote: + if let image = PresentationResourcesItemList.cloudFetchIcon(item.theme) { + statusState = .customIcon(image) + } + } } self.statusNode.transitionToState(statusState, completion: {}) self.statusButtonNode.isUserInteractionEnabled = statusState != .none @@ -691,6 +797,7 @@ final class ListMessageFileItemNode: ListMessageNode { } } case let .playbackStatus(playbackStatus): + enableScrubbing = true switch playbackStatus { case .playing: musicIsPlaying = true @@ -701,7 +808,8 @@ final class ListMessageFileItemNode: ListMessageNode { } } } - if let musicIsPlaying = musicIsPlaying { + self.waveformScrubbingNode?.enableScrubbing = enableScrubbing + if let musicIsPlaying = musicIsPlaying, !isVoice, !isInstantVideo { if self.playbackOverlayNode == nil { let playbackOverlayNode = ListMessagePlaybackOverlayNode() playbackOverlayNode.frame = self.iconImageNode.frame diff --git a/submodules/TelegramUI/TelegramUI/MultiScaleTextNode.swift b/submodules/TelegramUI/TelegramUI/MultiScaleTextNode.swift new file mode 100644 index 0000000000..9eec9f4aa9 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/MultiScaleTextNode.swift @@ -0,0 +1,75 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display + +private final class MultiScaleTextStateNode: ASDisplayNode { + let textNode: ImmediateTextNode + + var currentLayout: MultiScaleTextLayout? + + override init() { + self.textNode = ImmediateTextNode() + + super.init() + + self.addSubnode(self.textNode) + } +} + +final class MultiScaleTextState { + let attributedText: NSAttributedString + let constrainedSize: CGSize + + init(attributedText: NSAttributedString, constrainedSize: CGSize) { + self.attributedText = attributedText + self.constrainedSize = constrainedSize + } +} + +struct MultiScaleTextLayout { + var size: CGSize +} + +final class MultiScaleTextNode: ASDisplayNode { + private let stateNodes: [AnyHashable: MultiScaleTextStateNode] + + init(stateKeys: [AnyHashable]) { + self.stateNodes = Dictionary(stateKeys.map { ($0, MultiScaleTextStateNode()) }, uniquingKeysWith: { lhs, _ in lhs }) + + super.init() + + for (_, node) in self.stateNodes { + self.addSubnode(node) + } + } + + func updateLayout(states: [AnyHashable: MultiScaleTextState]) -> [AnyHashable: MultiScaleTextLayout] { + assert(Set(states.keys) == Set(self.stateNodes.keys)) + + var result: [AnyHashable: MultiScaleTextLayout] = [:] + for (key, state) in states { + if let node = self.stateNodes[key] { + node.textNode.attributedText = state.attributedText + let nodeSize = node.textNode.updateLayout(state.constrainedSize) + let nodeLayout = MultiScaleTextLayout(size: nodeSize) + node.currentLayout = nodeLayout + node.textNode.frame = CGRect(origin: CGPoint(x: -nodeSize.width / 2.0, y: -nodeSize.height / 2.0), size: nodeSize) + result[key] = nodeLayout + } + } + return result + } + + func update(stateFractions: [AnyHashable: CGFloat], transition: ContainedViewLayoutTransition) { + var fractionSum: CGFloat = 0.0 + for (_, fraction) in stateFractions { + fractionSum += fraction + } + for (key, fraction) in stateFractions { + if let node = self.stateNodes[key], let nodeLayout = node.currentLayout { + transition.updateAlpha(node: node, alpha: fraction / fractionSum) + } + } + } +} diff --git a/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift b/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift index 5b05789afd..9d7591e00c 100644 --- a/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift +++ b/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift @@ -33,6 +33,10 @@ public func navigateToChatControllerImpl(_ params: NavigateToChatControllerParam controller.scrollToEndOfHistory() let _ = params.navigationController.popToViewController(controller, animated: params.animated) params.completion() + } else if params.activateMessageSearch { + controller.activateSearch() + let _ = params.navigationController.popToViewController(controller, animated: params.animated) + params.completion() } else { let _ = params.navigationController.popToViewController(controller, animated: params.animated) params.completion() @@ -65,6 +69,9 @@ public func navigateToChatControllerImpl(_ params: NavigateToChatControllerParam controller = ChatControllerImpl(context: params.context, chatLocation: params.chatLocation, subject: params.subject, botStart: params.botStart) } controller.purposefulAction = params.purposefulAction + if params.activateMessageSearch { + controller.activateSearch() + } let resolvedKeepStack: Bool switch params.keepStack { case .default: diff --git a/submodules/TelegramUI/TelegramUI/OpenAddContact.swift b/submodules/TelegramUI/TelegramUI/OpenAddContact.swift index 964bd20156..98c49ce1ba 100644 --- a/submodules/TelegramUI/TelegramUI/OpenAddContact.swift +++ b/submodules/TelegramUI/TelegramUI/OpenAddContact.swift @@ -18,7 +18,7 @@ func openAddContactImpl(context: AccountContext, firstName: String = "", lastNam let contactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: firstName, lastName: lastName, phoneNumbers: [DeviceContactPhoneNumberData(label: label, value: phoneNumber)]), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: [], note: "") present(deviceContactInfoController(context: context, subject: .create(peer: nil, contactData: contactData, isSharing: false, shareViaException: false, completion: { peer, stableId, contactData in if let peer = peer { - if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { pushController(infoController) } } else { diff --git a/submodules/TelegramUI/TelegramUI/OpenUrl.swift b/submodules/TelegramUI/TelegramUI/OpenUrl.swift index b7f18394e6..11f7c094e2 100644 --- a/submodules/TelegramUI/TelegramUI/OpenUrl.swift +++ b/submodules/TelegramUI/TelegramUI/OpenUrl.swift @@ -209,7 +209,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur case .info: let _ = (context.account.postbox.loadedPeerWithId(peerId) |> deliverOnMainQueue).start(next: { peer in - if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { context.sharedContext.applicationBindings.dismissNativeController() navigationController?.pushViewController(infoController) } @@ -491,7 +491,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur return transaction.getPeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: idValue)) } |> deliverOnMainQueue).start(next: { peer in - if let peer = peer, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let peer = peer, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { navigationController?.pushViewController(controller) } }) diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenActionItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenActionItem.swift new file mode 100644 index 0000000000..c7b9fb361f --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenActionItem.swift @@ -0,0 +1,98 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +enum PeerInfoScreenActionColor { + case accent + case destructive +} + +final class PeerInfoScreenActionItem: PeerInfoScreenItem { + let id: AnyHashable + let text: String + let color: PeerInfoScreenActionColor + let action: (() -> Void)? + + init(id: AnyHashable, text: String, color: PeerInfoScreenActionColor = .accent, action: (() -> Void)?) { + self.id = id + self.text = text + self.color = color + self.action = action + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenActionItemNode() + } +} + +private final class PeerInfoScreenActionItemNode: PeerInfoScreenItemNode { + private let selectionNode: PeerInfoScreenSelectableBackgroundNode + private let textNode: ImmediateTextNode + private let bottomSeparatorNode: ASDisplayNode + + private var item: PeerInfoScreenActionItem? + + override init() { + var bringToFrontForHighlightImpl: (() -> Void)? + self.selectionNode = PeerInfoScreenSelectableBackgroundNode(bringToFrontForHighlight: { bringToFrontForHighlightImpl?() }) + + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + self.textNode.isUserInteractionEnabled = false + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + bringToFrontForHighlightImpl = { [weak self] in + self?.bringToFrontForHighlight?() + } + + self.addSubnode(self.bottomSeparatorNode) + self.addSubnode(self.selectionNode) + self.addSubnode(self.textNode) + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenActionItem else { + return 10.0 + } + + self.item = item + + self.selectionNode.pressed = item.action + + let sideInset: CGFloat = 16.0 + + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let textColorValue: UIColor + switch item.color { + case .accent: + textColorValue = presentationData.theme.list.itemAccentColor + case .destructive: + textColorValue = presentationData.theme.list.itemDestructiveColor + } + + self.textNode.maximumNumberOfLines = 1 + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(17.0), textColor: textColorValue) + + let textSize = self.textNode.updateLayout(CGSize(width: width - sideInset * 2.0, height: .greatestFiniteMagnitude)) + + let textFrame = CGRect(origin: CGPoint(x: sideInset, y: 11.0), size: textSize) + + let height = textSize.height + 22.0 + + transition.updateFrame(node: self.textNode, frame: textFrame) + + let highlightNodeOffset: CGFloat = topItem == nil ? 0.0 : UIScreenPixel + self.selectionNode.update(size: CGSize(width: width, height: height + highlightNodeOffset), theme: presentationData.theme, transition: transition) + transition.updateFrame(node: self.selectionNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -highlightNodeOffset), size: CGSize(width: width, height: height + highlightNodeOffset))) + + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: sideInset, y: height - UIScreenPixel), size: CGSize(width: width - sideInset, height: UIScreenPixel))) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: bottomItem == nil ? 0.0 : 1.0) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenAddressItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenAddressItem.swift new file mode 100644 index 0000000000..c9391e8c5a --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenAddressItem.swift @@ -0,0 +1,122 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import TelegramPresentationData +import ItemListAddressItem +import SwiftSignalKit +import AccountContext + +final class PeerInfoScreenAddressItem: PeerInfoScreenItem { + let id: AnyHashable + let label: String + let text: String + let imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? + let action: (() -> Void)? + let longTapAction: (() -> Void)? + let linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? + + init( + id: AnyHashable, + label: String, + text: String, + imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?, + action: (() -> Void)?, + longTapAction: (() -> Void)? = nil, + linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil + ) { + self.id = id + self.label = label + self.text = text + self.imageSignal = imageSignal + self.action = action + self.longTapAction = longTapAction + self.linkItemAction = linkItemAction + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenAddressItemNode() + } +} + +private final class PeerInfoScreenAddressItemNode: PeerInfoScreenItemNode { + private let selectionNode: PeerInfoScreenSelectableBackgroundNode + private let bottomSeparatorNode: ASDisplayNode + + private var item: PeerInfoScreenAddressItem? + private var itemNode: ItemListAddressItemNode? + + override init() { + var bringToFrontForHighlightImpl: (() -> Void)? + self.selectionNode = PeerInfoScreenSelectableBackgroundNode(bringToFrontForHighlight: { bringToFrontForHighlightImpl?() }) + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + bringToFrontForHighlightImpl = { [weak self] in + self?.bringToFrontForHighlight?() + } + + self.addSubnode(self.bottomSeparatorNode) + self.addSubnode(self.selectionNode) + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenAddressItem else { + return 10.0 + } + + self.item = item + + self.selectionNode.pressed = item.action + + let sideInset: CGFloat = 16.0 + + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let addressItem = ItemListAddressItem(theme: presentationData.theme, label: item.label, text: item.text, imageSignal: item.imageSignal, sectionId: 0, style: .blocks, displayDecorations: false, action: nil, longTapAction: item.longTapAction, linkItemAction: item.linkItemAction) + + let params = ListViewItemLayoutParams(width: width, leftInset: 0.0, rightInset: 0.0, availableHeight: 1000.0) + + let itemNode: ItemListAddressItemNode + if let current = self.itemNode { + itemNode = current + addressItem.updateNode(async: { $0() }, node: { + return itemNode + }, params: params, previousItem: nil, nextItem: nil, animation: .None, completion: { (layout, apply) in + let nodeFrame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: layout.size.height)) + + itemNode.contentSize = layout.contentSize + itemNode.insets = layout.insets + itemNode.frame = nodeFrame + + apply(ListViewItemApply(isOnScreen: true)) + }) + } else { + var itemNodeValue: ListViewItemNode? + addressItem.nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: false, previousItem: nil, nextItem: nil, completion: { node, apply in + itemNodeValue = node + apply().1(ListViewItemApply(isOnScreen: true)) + }) + itemNode = itemNodeValue as! ItemListAddressItemNode + itemNode.isUserInteractionEnabled = false + self.itemNode = itemNode + self.addSubnode(itemNode) + } + + let height = itemNode.contentSize.height + + transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(), size: itemNode.bounds.size)) + + let highlightNodeOffset: CGFloat = topItem == nil ? 0.0 : UIScreenPixel + self.selectionNode.update(size: CGSize(width: width, height: height + highlightNodeOffset), theme: presentationData.theme, transition: transition) + transition.updateFrame(node: self.selectionNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -highlightNodeOffset), size: CGSize(width: width, height: height + highlightNodeOffset))) + + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: sideInset, y: height - UIScreenPixel), size: CGSize(width: width - sideInset, height: UIScreenPixel))) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: bottomItem == nil ? 0.0 : 1.0) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenCommentItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenCommentItem.swift new file mode 100644 index 0000000000..19937b5c92 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenCommentItem.swift @@ -0,0 +1,57 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +final class PeerInfoScreenCommentItem: PeerInfoScreenItem { + let id: AnyHashable + let text: String + + init(id: AnyHashable, text: String) { + self.id = id + self.text = text + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenCommentItemNode() + } +} + +private final class PeerInfoScreenCommentItemNode: PeerInfoScreenItemNode { + private let textNode: ImmediateTextNode + + private var item: PeerInfoScreenCommentItem? + + override init() { + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + self.textNode.isUserInteractionEnabled = false + + super.init() + + self.addSubnode(self.textNode) + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenCommentItem else { + return 10.0 + } + + self.item = item + + let sideInset: CGFloat = 16.0 + let verticalInset: CGFloat = 7.0 + + self.textNode.maximumNumberOfLines = 0 + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(14.0), textColor: presentationData.theme.list.freeTextColor) + + let textSize = self.textNode.updateLayout(CGSize(width: width - sideInset * 2.0, height: .greatestFiniteMagnitude)) + + let textFrame = CGRect(origin: CGPoint(x: sideInset, y: verticalInset), size: textSize) + + let height = textSize.height + verticalInset * 2.0 + + transition.updateFrame(node: self.textNode, frame: textFrame) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenDisclosureItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenDisclosureItem.swift new file mode 100644 index 0000000000..ca27a09e75 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenDisclosureItem.swift @@ -0,0 +1,115 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +final class PeerInfoScreenDisclosureItem: PeerInfoScreenItem { + let id: AnyHashable + let label: String + let text: String + let action: (() -> Void)? + + init(id: AnyHashable, label: String, text: String, action: (() -> Void)?) { + self.id = id + self.label = label + self.text = text + self.action = action + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenDisclosureItemNode() + } +} + +private final class PeerInfoScreenDisclosureItemNode: PeerInfoScreenItemNode { + private let selectionNode: PeerInfoScreenSelectableBackgroundNode + private let labelNode: ImmediateTextNode + private let textNode: ImmediateTextNode + private let arrowNode: ASImageNode + private let bottomSeparatorNode: ASDisplayNode + + private var item: PeerInfoScreenDisclosureItem? + + override init() { + var bringToFrontForHighlightImpl: (() -> Void)? + self.selectionNode = PeerInfoScreenSelectableBackgroundNode(bringToFrontForHighlight: { bringToFrontForHighlightImpl?() }) + + self.labelNode = ImmediateTextNode() + self.labelNode.displaysAsynchronously = false + self.labelNode.isUserInteractionEnabled = false + + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + self.textNode.isUserInteractionEnabled = false + + self.arrowNode = ASImageNode() + self.arrowNode.isLayerBacked = true + self.arrowNode.displaysAsynchronously = false + self.arrowNode.displayWithoutProcessing = true + self.arrowNode.isUserInteractionEnabled = false + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + bringToFrontForHighlightImpl = { [weak self] in + self?.bringToFrontForHighlight?() + } + + self.addSubnode(self.bottomSeparatorNode) + self.addSubnode(self.selectionNode) + self.addSubnode(self.labelNode) + self.addSubnode(self.textNode) + self.addSubnode(self.arrowNode) + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenDisclosureItem else { + return 10.0 + } + + self.item = item + + self.selectionNode.pressed = item.action + + let sideInset: CGFloat = 16.0 + + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let textColorValue: UIColor = presentationData.theme.list.itemPrimaryTextColor + let labelColorValue: UIColor = presentationData.theme.list.itemSecondaryTextColor + + self.labelNode.attributedText = NSAttributedString(string: item.label, font: Font.regular(17.0), textColor: labelColorValue) + + self.textNode.maximumNumberOfLines = 1 + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(17.0), textColor: textColorValue) + + let textSize = self.textNode.updateLayout(CGSize(width: width - sideInset * 2.0, height: .greatestFiniteMagnitude)) + let labelSize = self.labelNode.updateLayout(CGSize(width: width - textSize.width - sideInset * 2.0, height: .greatestFiniteMagnitude)) + + let arrowInset: CGFloat = 18.0 + + let textFrame = CGRect(origin: CGPoint(x: sideInset, y: 11.0), size: textSize) + let labelFrame = CGRect(origin: CGPoint(x: width - sideInset - arrowInset - labelSize.width, y: 11.0), size: labelSize) + + let height = textSize.height + 22.0 + + if let arrowImage = PresentationResourcesItemList.disclosureArrowImage(presentationData.theme) { + self.arrowNode.image = arrowImage + let arrowFrame = CGRect(origin: CGPoint(x: width - 7.0 - arrowImage.size.width, y: floorToScreenPixels((height - arrowImage.size.height) / 2.0)), size: arrowImage.size) + transition.updateFrame(node: self.arrowNode, frame: arrowFrame) + } + + transition.updateFrame(node: self.labelNode, frame: labelFrame) + transition.updateFrame(node: self.textNode, frame: textFrame) + + let highlightNodeOffset: CGFloat = topItem == nil ? 0.0 : UIScreenPixel + self.selectionNode.update(size: CGSize(width: width, height: height + highlightNodeOffset), theme: presentationData.theme, transition: transition) + transition.updateFrame(node: self.selectionNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -highlightNodeOffset), size: CGSize(width: width, height: height + highlightNodeOffset))) + + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: sideInset, y: height - UIScreenPixel), size: CGSize(width: width - sideInset, height: UIScreenPixel))) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: bottomItem == nil ? 0.0 : 1.0) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenHeaderItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenHeaderItem.swift new file mode 100644 index 0000000000..6ab8aab21e --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenHeaderItem.swift @@ -0,0 +1,57 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +final class PeerInfoScreenHeaderItem: PeerInfoScreenItem { + let id: AnyHashable + let text: String + + init(id: AnyHashable, text: String) { + self.id = id + self.text = text + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenHeaderItemNode() + } +} + +private final class PeerInfoScreenHeaderItemNode: PeerInfoScreenItemNode { + private let textNode: ImmediateTextNode + + private var item: PeerInfoScreenHeaderItem? + + override init() { + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + self.textNode.isUserInteractionEnabled = false + + super.init() + + self.addSubnode(self.textNode) + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenHeaderItem else { + return 10.0 + } + + self.item = item + + let sideInset: CGFloat = 16.0 + let verticalInset: CGFloat = 7.0 + + self.textNode.maximumNumberOfLines = 0 + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(13.0), textColor: presentationData.theme.list.freeTextColor) + + let textSize = self.textNode.updateLayout(CGSize(width: width - sideInset * 2.0, height: .greatestFiniteMagnitude)) + + let textFrame = CGRect(origin: CGPoint(x: sideInset, y: verticalInset), size: textSize) + + let height = textSize.height + verticalInset * 2.0 + + transition.updateFrame(node: self.textNode, frame: textFrame) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift new file mode 100644 index 0000000000..d7f382389f --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift @@ -0,0 +1,123 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +enum PeerInfoScreenLabeledValueTextColor { + case primary + case accent +} + +enum PeerInfoScreenLabeledValueTextBehavior: Equatable { + case singleLine + case multiLine(maxLines: Int) +} + +final class PeerInfoScreenLabeledValueItem: PeerInfoScreenItem { + let id: AnyHashable + let label: String + let text: String + let textColor: PeerInfoScreenLabeledValueTextColor + let textBehavior: PeerInfoScreenLabeledValueTextBehavior + let action: (() -> Void)? + + init(id: AnyHashable, label: String, text: String, textColor: PeerInfoScreenLabeledValueTextColor = .primary, textBehavior: PeerInfoScreenLabeledValueTextBehavior = .singleLine, action: (() -> Void)?) { + self.id = id + self.label = label + self.text = text + self.textColor = textColor + self.textBehavior = textBehavior + self.action = action + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenLabeledValueItemNode() + } +} + +private final class PeerInfoScreenLabeledValueItemNode: PeerInfoScreenItemNode { + private let selectionNode: PeerInfoScreenSelectableBackgroundNode + private let labelNode: ImmediateTextNode + private let textNode: ImmediateTextNode + private let bottomSeparatorNode: ASDisplayNode + + private var item: PeerInfoScreenLabeledValueItem? + + override init() { + var bringToFrontForHighlightImpl: (() -> Void)? + self.selectionNode = PeerInfoScreenSelectableBackgroundNode(bringToFrontForHighlight: { bringToFrontForHighlightImpl?() }) + + self.labelNode = ImmediateTextNode() + self.labelNode.displaysAsynchronously = false + self.labelNode.isUserInteractionEnabled = false + + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + self.textNode.isUserInteractionEnabled = false + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + bringToFrontForHighlightImpl = { [weak self] in + self?.bringToFrontForHighlight?() + } + + self.addSubnode(self.bottomSeparatorNode) + self.addSubnode(self.selectionNode) + self.addSubnode(self.labelNode) + self.addSubnode(self.textNode) + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenLabeledValueItem else { + return 10.0 + } + + self.item = item + + self.selectionNode.pressed = item.action + + let sideInset: CGFloat = 16.0 + + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let textColorValue: UIColor + switch item.textColor { + case .primary: + textColorValue = presentationData.theme.list.itemPrimaryTextColor + case .accent: + textColorValue = presentationData.theme.list.itemAccentColor + } + + self.labelNode.attributedText = NSAttributedString(string: item.label, font: Font.regular(14.0), textColor: presentationData.theme.list.itemPrimaryTextColor) + + switch item.textBehavior { + case .singleLine: + self.textNode.maximumNumberOfLines = 1 + case let .multiLine(maxLines): + self.textNode.maximumNumberOfLines = maxLines + } + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(17.0), textColor: textColorValue) + + let labelSize = self.labelNode.updateLayout(CGSize(width: width - sideInset * 2.0, height: .greatestFiniteMagnitude)) + let textSize = self.textNode.updateLayout(CGSize(width: width - sideInset * 2.0, height: .greatestFiniteMagnitude)) + + let labelFrame = CGRect(origin: CGPoint(x: sideInset, y: 11.0), size: labelSize) + let textFrame = CGRect(origin: CGPoint(x: sideInset, y: labelFrame.maxY + 3.0), size: textSize) + + transition.updateFrame(node: self.labelNode, frame: labelFrame) + transition.updateFrame(node: self.textNode, frame: textFrame) + + let height = labelSize.height + 3.0 + textSize.height + 22.0 + + let highlightNodeOffset: CGFloat = topItem == nil ? 0.0 : UIScreenPixel + self.selectionNode.update(size: CGSize(width: width, height: height + highlightNodeOffset), theme: presentationData.theme, transition: transition) + transition.updateFrame(node: self.selectionNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -highlightNodeOffset), size: CGSize(width: width, height: height + highlightNodeOffset))) + + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: sideInset, y: height - UIScreenPixel), size: CGSize(width: width - sideInset, height: UIScreenPixel))) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: bottomItem == nil ? 0.0 : 1.0) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift new file mode 100644 index 0000000000..246861f33d --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift @@ -0,0 +1,124 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import TelegramPresentationData +import ItemListPeerItem +import SwiftSignalKit +import AccountContext +import Postbox +import SyncCore +import TelegramCore +import ItemListUI + +final class PeerInfoScreenMemberItem: PeerInfoScreenItem { + let id: AnyHashable + let context: AccountContext + let peer: Peer + let presence: TelegramUserPresence? + let action: (() -> Void)? + + init( + id: AnyHashable, + context: AccountContext, + peer: Peer, + presence: TelegramUserPresence?, + action: (() -> Void)? + ) { + self.id = id + self.context = context + self.peer = peer + self.presence = presence + self.action = action + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenMemberItemNode() + } +} + +private final class PeerInfoScreenMemberItemNode: PeerInfoScreenItemNode { + private let selectionNode: PeerInfoScreenSelectableBackgroundNode + private let bottomSeparatorNode: ASDisplayNode + + private var item: PeerInfoScreenMemberItem? + private var itemNode: ItemListPeerItemNode? + + override init() { + var bringToFrontForHighlightImpl: (() -> Void)? + self.selectionNode = PeerInfoScreenSelectableBackgroundNode(bringToFrontForHighlight: { bringToFrontForHighlightImpl?() }) + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + bringToFrontForHighlightImpl = { [weak self] in + self?.bringToFrontForHighlight?() + } + + self.addSubnode(self.bottomSeparatorNode) + self.addSubnode(self.selectionNode) + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenMemberItem else { + return 10.0 + } + + self.item = item + + self.selectionNode.pressed = item.action + + let sideInset: CGFloat = 16.0 + + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let peerItem = ItemListPeerItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: item.context, peer: item.peer, height: .peerList, presence: item.presence, text: .presence, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: false, sectionId: 0, action: nil, setPeerIdWithRevealedOptions: { lhs, rhs in + + }, removePeer: { _ in + + }, contextAction: nil, hasTopStripe: false, hasTopGroupInset: false, noInsets: true, displayDecorations: false) + + let params = ListViewItemLayoutParams(width: width, leftInset: 0.0, rightInset: 0.0, availableHeight: 1000.0) + + let itemNode: ItemListPeerItemNode + if let current = self.itemNode { + itemNode = current + peerItem.updateNode(async: { $0() }, node: { + return itemNode + }, params: params, previousItem: nil, nextItem: nil, animation: .None, completion: { (layout, apply) in + let nodeFrame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: layout.size.height)) + + itemNode.contentSize = layout.contentSize + itemNode.insets = layout.insets + itemNode.frame = nodeFrame + + apply(ListViewItemApply(isOnScreen: true)) + }) + } else { + var itemNodeValue: ListViewItemNode? + peerItem.nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: false, previousItem: nil, nextItem: nil, completion: { node, apply in + itemNodeValue = node + apply().1(ListViewItemApply(isOnScreen: true)) + }) + itemNode = itemNodeValue as! ItemListPeerItemNode + itemNode.isUserInteractionEnabled = false + self.itemNode = itemNode + self.addSubnode(itemNode) + } + + let height = itemNode.contentSize.height + + transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(), size: itemNode.bounds.size)) + + let highlightNodeOffset: CGFloat = topItem == nil ? 0.0 : UIScreenPixel + self.selectionNode.update(size: CGSize(width: width, height: height + highlightNodeOffset), theme: presentationData.theme, transition: transition) + transition.updateFrame(node: self.selectionNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -highlightNodeOffset), size: CGSize(width: width, height: height + highlightNodeOffset))) + + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: sideInset, y: height - UIScreenPixel), size: CGSize(width: width - sideInset, height: UIScreenPixel))) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: bottomItem == nil ? 0.0 : 1.0) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift new file mode 100644 index 0000000000..08b0c6e17a --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift @@ -0,0 +1,55 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +final class PeerInfoScreenSelectableBackgroundNode: ASDisplayNode { + private let backgroundNode: ASDisplayNode + private let buttonNode: HighlightTrackingButtonNode + + let bringToFrontForHighlight: () -> Void + + var pressed: (() -> Void)? { + didSet { + self.buttonNode.isUserInteractionEnabled = self.pressed != nil + } + } + + init(bringToFrontForHighlight: @escaping () -> Void) { + self.bringToFrontForHighlight = bringToFrontForHighlight + + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + self.backgroundNode.alpha = 0.0 + + self.buttonNode = HighlightTrackingButtonNode() + + super.init() + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.buttonNode) + + self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside) + self.buttonNode.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.bringToFrontForHighlight() + strongSelf.backgroundNode.layer.removeAnimation(forKey: "opacity") + strongSelf.backgroundNode.alpha = 1.0 + } else { + strongSelf.backgroundNode.alpha = 0.0 + strongSelf.backgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25) + } + } + } + } + + @objc private func buttonPressed() { + self.pressed?() + } + + func update(size: CGSize, theme: PresentationTheme, transition: ContainedViewLayoutTransition) { + self.backgroundNode.backgroundColor = theme.list.itemHighlightedBackgroundColor + transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: size)) + transition.updateFrame(node: self.buttonNode, frame: CGRect(origin: CGPoint(), size: size)) + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSwitchItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSwitchItem.swift new file mode 100644 index 0000000000..8a798af589 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSwitchItem.swift @@ -0,0 +1,121 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +final class PeerInfoScreenSwitchItem: PeerInfoScreenItem { + let id: AnyHashable + let text: String + let value: Bool + let toggled: ((Bool) -> Void)? + + init(id: AnyHashable, text: String, value: Bool, toggled: ((Bool) -> Void)?) { + self.id = id + self.text = text + self.value = value + self.toggled = toggled + } + + func node() -> PeerInfoScreenItemNode { + return PeerInfoScreenSwitchItemNode() + } +} + +private final class PeerInfoScreenSwitchItemNode: PeerInfoScreenItemNode { + private let selectionNode: PeerInfoScreenSelectableBackgroundNode + private let textNode: ImmediateTextNode + private let switchNode: SwitchNode + private let bottomSeparatorNode: ASDisplayNode + + private var item: PeerInfoScreenSwitchItem? + + private var theme: PresentationTheme? + + override init() { + var bringToFrontForHighlightImpl: (() -> Void)? + self.selectionNode = PeerInfoScreenSelectableBackgroundNode(bringToFrontForHighlight: { bringToFrontForHighlightImpl?() }) + + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + self.textNode.isUserInteractionEnabled = false + + self.switchNode = SwitchNode() + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + bringToFrontForHighlightImpl = { [weak self] in + self?.bringToFrontForHighlight?() + } + + self.addSubnode(self.bottomSeparatorNode) + self.addSubnode(self.selectionNode) + self.addSubnode(self.textNode) + self.addSubnode(self.switchNode) + + self.switchNode.valueUpdated = { [weak self] value in + self?.item?.toggled?(value) + } + } + + override func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + guard let item = item as? PeerInfoScreenSwitchItem else { + return 10.0 + } + + let firstTime = self.item == nil + + if self.theme !== presentationData.theme { + self.theme = presentationData.theme + + self.switchNode.frameColor = presentationData.theme.list.itemSwitchColors.frameColor + self.switchNode.contentColor = presentationData.theme.list.itemSwitchColors.contentColor + self.switchNode.handleColor = presentationData.theme.list.itemSwitchColors.handleColor + } + + self.item = item + + self.selectionNode.pressed = nil + + let sideInset: CGFloat = 16.0 + + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let textColorValue: UIColor = presentationData.theme.list.itemPrimaryTextColor + + self.textNode.maximumNumberOfLines = 1 + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(17.0), textColor: textColorValue) + + let textSize = self.textNode.updateLayout(CGSize(width: width - sideInset * 2.0 - 56.0, height: .greatestFiniteMagnitude)) + + let arrowInset: CGFloat = 18.0 + + let textFrame = CGRect(origin: CGPoint(x: sideInset, y: 11.0), size: textSize) + + let height = textSize.height + 22.0 + + transition.updateFrame(node: self.textNode, frame: textFrame) + + if let switchView = self.switchNode.view as? UISwitch { + if self.switchNode.bounds.size.width.isZero { + switchView.sizeToFit() + } + let switchSize = switchView.bounds.size + + self.switchNode.frame = CGRect(origin: CGPoint(x: width - switchSize.width - 15.0, y: floor((height - switchSize.height) / 2.0)), size: switchSize) + if switchView.isOn != item.value { + switchView.setOn(item.value, animated: !firstTime) + } + } + + let highlightNodeOffset: CGFloat = topItem == nil ? 0.0 : UIScreenPixel + self.selectionNode.update(size: CGSize(width: width, height: height + highlightNodeOffset), theme: presentationData.theme, transition: transition) + transition.updateFrame(node: self.selectionNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -highlightNodeOffset), size: CGSize(width: width, height: height + highlightNodeOffset))) + + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: sideInset, y: height - UIScreenPixel), size: CGSize(width: width - sideInset, height: UIScreenPixel))) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: bottomItem == nil ? 0.0 : 1.0) + + return height + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift new file mode 100644 index 0000000000..04db539477 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift @@ -0,0 +1,181 @@ +import AsyncDisplayKit +import Display +import TelegramCore +import SyncCore +import SwiftSignalKit +import Postbox +import TelegramPresentationData +import AccountContext +import ContextUI +import PhotoResources +import TelegramUIPreferences +import ItemListPeerItem +import MergeLists +import ItemListUI + +private struct GroupsInCommonListTransaction { + let deletions: [ListViewDeleteItem] + let insertions: [ListViewInsertItem] + let updates: [ListViewUpdateItem] +} + +private struct GroupsInCommonListEntry: Comparable, Identifiable { + var index: Int + var peer: Peer + + var stableId: PeerId { + return self.peer.id + } + + static func ==(lhs: GroupsInCommonListEntry, rhs: GroupsInCommonListEntry) -> Bool { + return lhs.peer.isEqual(rhs.peer) + } + + static func <(lhs: GroupsInCommonListEntry, rhs: GroupsInCommonListEntry) -> Bool { + return lhs.index < rhs.index + } + + func item(context: AccountContext, presentationData: PresentationData, openPeer: @escaping (Peer) -> Void, openPeerContextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void) -> ListViewItem { + let peer = self.peer + return ItemListPeerItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: context, peer: self.peer, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), switchValue: nil, enabled: true, selectable: true, sectionId: 0, action: { + openPeer(peer) + }, setPeerIdWithRevealedOptions: { _, _ in + }, removePeer: { _ in + }, contextAction: { node, gesture in + openPeerContextAction(peer, node, gesture) + }, hasTopStripe: false, noInsets: true) + } +} + +private func preparedTransition(from fromEntries: [GroupsInCommonListEntry], to toEntries: [GroupsInCommonListEntry], context: AccountContext, presentationData: PresentationData, openPeer: @escaping (Peer) -> Void, openPeerContextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void) -> GroupsInCommonListTransaction { + let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) + + let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, openPeer: openPeer, openPeerContextAction: openPeerContextAction), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, openPeer: openPeer, openPeerContextAction: openPeerContextAction), directionHint: nil) } + + return GroupsInCommonListTransaction(deletions: deletions, insertions: insertions, updates: updates) +} + +final class PeerInfoGroupsInCommonPaneNode: ASDisplayNode, PeerInfoPaneNode { + private let context: AccountContext + private let peerId: PeerId + private let chatControllerInteraction: ChatControllerInteraction + private let openPeerContextAction: (Peer, ASDisplayNode, ContextGesture?) -> Void + + private let listNode: ListView + private var peers: [Peer] = [] + private var currentEntries: [GroupsInCommonListEntry] = [] + private var enqueuedTransactions: [GroupsInCommonListTransaction] = [] + + private var currentParams: (size: CGSize, isScrollingLockedAtTop: Bool, presentationData: PresentationData)? + + private let ready = Promise() + private var didSetReady: Bool = false + var isReady: Signal { + return self.ready.get() + } + + init(context: AccountContext, peerId: PeerId, chatControllerInteraction: ChatControllerInteraction, openPeerContextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void, peers: [Peer]) { + self.context = context + self.peerId = peerId + self.chatControllerInteraction = chatControllerInteraction + self.openPeerContextAction = openPeerContextAction + + self.listNode = ListView() + + super.init() + + self.listNode.preloadPages = true + self.addSubnode(self.listNode) + + self.peers = peers + } + + deinit { + } + + func scrollToTop() -> Bool { + if !self.listNode.scrollToOffsetFromTop(0.0) { + self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Spring(duration: 0.4), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + return true + } else { + return false + } + } + + func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, isScrollingLockedAtTop: Bool, presentationData: PresentationData, synchronous: Bool, transition: ContainedViewLayoutTransition) { + let isFirstLayout = self.currentParams == nil + self.currentParams = (size, isScrollingLockedAtTop, presentationData) + + transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(), size: size)) + let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition) + + self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: size, insets: UIEdgeInsets(top: 0.0, left: sideInset, bottom: bottomInset, right: sideInset), duration: duration, curve: curve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + + self.listNode.scrollEnabled = !isScrollingLockedAtTop + + if isFirstLayout { + self.updatePeers(peers: self.peers, presentationData: presentationData) + } + } + + private func updatePeers(peers: [Peer], presentationData: PresentationData) { + var entries: [GroupsInCommonListEntry] = [] + for peer in peers { + entries.append(GroupsInCommonListEntry(index: entries.count, peer: peer)) + } + let transaction = preparedTransition(from: self.currentEntries, to: entries, context: self.context, presentationData: presentationData, openPeer: { [weak self] peer in + self?.chatControllerInteraction.openPeer(peer.id, .default, nil) + }, openPeerContextAction: { [weak self] peer, node, gesture in + self?.openPeerContextAction(peer, node, gesture) + }) + self.currentEntries = entries + self.enqueuedTransactions.append(transaction) + self.dequeueTransaction() + } + + private func dequeueTransaction() { + guard let (layout, _, _) = self.currentParams, let transaction = self.enqueuedTransactions.first else { + return + } + + self.enqueuedTransactions.remove(at: 0) + + var options = ListViewDeleteAndInsertOptions() + options.insert(.Synchronous) + + self.listNode.transaction(deleteIndices: transaction.deletions, insertIndicesAndItems: transaction.insertions, updateIndicesAndItems: transaction.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { [weak self] _ in + guard let strongSelf = self else { + return + } + if !strongSelf.didSetReady { + strongSelf.didSetReady = true + strongSelf.ready.set(.single(true)) + } + }) + } + + func findLoadedMessage(id: MessageId) -> Message? { + return nil + } + + func updateHiddenMedia() { + } + + func transferVelocity(_ velocity: CGFloat) { + if velocity > 0.0 { + self.listNode.transferVelocity(velocity) + } + } + + func transitionNodeForGallery(messageId: MessageId, media: Media) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? { + return nil + } + + func addToTransitionSurface(view: UIView) { + } + + func updateSelectedMessages(animated: Bool) { + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoListPaneNode.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoListPaneNode.swift new file mode 100644 index 0000000000..b021f9542c --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoListPaneNode.swift @@ -0,0 +1,125 @@ +import AsyncDisplayKit +import Display +import TelegramCore +import SyncCore +import SwiftSignalKit +import Postbox +import TelegramPresentationData +import AccountContext +import ContextUI +import PhotoResources +import TelegramUIPreferences + +final class PeerInfoListPaneNode: ASDisplayNode, PeerInfoPaneNode { + private let context: AccountContext + private let peerId: PeerId + private let chatControllerInteraction: ChatControllerInteraction + + private let listNode: ChatHistoryListNode + + private var currentParams: (size: CGSize, isScrollingLockedAtTop: Bool, presentationData: PresentationData)? + + private let ready = Promise() + private var didSetReady: Bool = false + var isReady: Signal { + return self.ready.get() + } + + private let selectedMessagesPromise = Promise?>(nil) + private var selectedMessages: Set? { + didSet { + if self.selectedMessages != oldValue { + self.selectedMessagesPromise.set(.single(self.selectedMessages)) + } + } + } + + private var hiddenMediaDisposable: Disposable? + + init(context: AccountContext, chatControllerInteraction: ChatControllerInteraction, peerId: PeerId, tagMask: MessageTags) { + self.context = context + self.peerId = peerId + self.chatControllerInteraction = chatControllerInteraction + + self.selectedMessages = chatControllerInteraction.selectionState.flatMap { $0.selectedIds } + self.selectedMessagesPromise.set(.single(self.selectedMessages)) + + self.listNode = ChatHistoryListNode(context: context, chatLocation: .peer(peerId), tagMask: tagMask, subject: nil, controllerInteraction: chatControllerInteraction, selectedMessages: self.selectedMessagesPromise.get(), mode: .list(search: false, reversed: false)) + + super.init() + + self.listNode.preloadPages = true + self.addSubnode(self.listNode) + + self.ready.set(self.listNode.historyState.get() + |> take(1) + |> map { _ -> Bool in true }) + } + + deinit { + self.hiddenMediaDisposable?.dispose() + } + + func scrollToTop() -> Bool { + let offset = self.listNode.visibleContentOffset() + switch offset { + case let .known(value) where value <= CGFloat.ulpOfOne: + return false + default: + self.listNode.scrollToEndOfHistory() + return true + } + } + + func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, isScrollingLockedAtTop: Bool, presentationData: PresentationData, synchronous: Bool, transition: ContainedViewLayoutTransition) { + self.currentParams = (size, isScrollingLockedAtTop, presentationData) + + transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(), size: size)) + let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition) + self.listNode.updateLayout(transition: transition, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: size, insets: UIEdgeInsets(top: 0.0, left: sideInset, bottom: bottomInset, right: sideInset), duration: duration, curve: curve)) + self.listNode.scrollEnabled = !isScrollingLockedAtTop + } + + func findLoadedMessage(id: MessageId) -> Message? { + self.listNode.messageInCurrentHistoryView(id) + } + + func updateHiddenMedia() { + self.listNode.forEachItemNode { itemNode in + if let itemNode = itemNode as? ListMessageNode { + itemNode.updateHiddenMedia() + } + } + } + + func transferVelocity(_ velocity: CGFloat) { + if velocity > 0.0 { + self.listNode.transferVelocity(velocity) + } + } + + func transitionNodeForGallery(messageId: MessageId, media: Media) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? { + var transitionNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? + self.listNode.forEachItemNode { itemNode in + if let itemNode = itemNode as? ListMessageNode { + if let result = itemNode.transitionNode(id: messageId, media: media) { + transitionNode = result + } + } + } + return transitionNode + } + + func addToTransitionSurface(view: UIView) { + self.view.addSubview(view) + } + + func updateSelectedMessages(animated: Bool) { + self.listNode.forEachItemNode { itemNode in + if let itemNode = itemNode as? ChatMessageItemView { + itemNode.updateSelectionState(animated: animated) + } + } + self.selectedMessages = self.chatControllerInteraction.selectionState.flatMap { $0.selectedIds } + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoMembersPane.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoMembersPane.swift new file mode 100644 index 0000000000..243a95f6a9 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoMembersPane.swift @@ -0,0 +1,196 @@ +import AsyncDisplayKit +import Display +import TelegramCore +import SyncCore +import SwiftSignalKit +import Postbox +import TelegramPresentationData +import AccountContext +import ContextUI +import PhotoResources +import TelegramUIPreferences +import ItemListPeerItem +import MergeLists +import ItemListUI + +private struct PeerMembersListTransaction { + let deletions: [ListViewDeleteItem] + let insertions: [ListViewInsertItem] + let updates: [ListViewUpdateItem] +} + +private struct PeerMembersListEntry: Comparable, Identifiable { + var index: Int + var member: PeerInfoMember + + var stableId: PeerId { + return self.member.id + } + + static func ==(lhs: PeerMembersListEntry, rhs: PeerMembersListEntry) -> Bool { + return lhs.member == rhs.member + } + + static func <(lhs: PeerMembersListEntry, rhs: PeerMembersListEntry) -> Bool { + return lhs.index < rhs.index + } + + func item(context: AccountContext, presentationData: PresentationData, openPeer: @escaping (Peer) -> Void) -> ListViewItem { + let member = self.member + return ItemListPeerItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: context, peer: member.peer, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), switchValue: nil, enabled: true, selectable: true, sectionId: 0, action: { + openPeer(member.peer) + }, setPeerIdWithRevealedOptions: { _, _ in + }, removePeer: { _ in + }, contextAction: nil/*{ node, gesture in + openPeerContextAction(peer, node, gesture) + }*/, hasTopStripe: false, noInsets: true) + } +} + +private func preparedTransition(from fromEntries: [PeerMembersListEntry], to toEntries: [PeerMembersListEntry], context: AccountContext, presentationData: PresentationData, openPeer: @escaping (Peer) -> Void) -> PeerMembersListTransaction { + let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) + + let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, openPeer: openPeer), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, openPeer: openPeer), directionHint: nil) } + + return PeerMembersListTransaction(deletions: deletions, insertions: insertions, updates: updates) +} + +final class PeerInfoMembersPaneNode: ASDisplayNode, PeerInfoPaneNode { + private let context: AccountContext + private let membersContext: PeerInfoMembersContext + + private let listNode: ListView + private var currentEntries: [PeerMembersListEntry] = [] + private var currentState: PeerInfoMembersState? + private var canLoadMore: Bool = false + private var enqueuedTransactions: [PeerMembersListTransaction] = [] + + private var currentParams: (size: CGSize, isScrollingLockedAtTop: Bool, presentationData: PresentationData)? + + private let ready = Promise() + private var didSetReady: Bool = false + var isReady: Signal { + return self.ready.get() + } + + private var disposable: Disposable? + + init(context: AccountContext, membersContext: PeerInfoMembersContext) { + self.context = context + self.membersContext = membersContext + + self.listNode = ListView() + + super.init() + + self.listNode.preloadPages = true + self.addSubnode(self.listNode) + + self.disposable = (membersContext.state + |> deliverOnMainQueue).start(next: { [weak self] state in + guard let strongSelf = self else { + return + } + strongSelf.currentState = state + if let (_, _, presentationData) = strongSelf.currentParams { + strongSelf.updateState(state: state, presentationData: presentationData) + } + }) + + self.listNode.visibleBottomContentOffsetChanged = { [weak self] offset in + guard let strongSelf = self, let state = strongSelf.currentState, case .ready(true) = state.dataState else { + return + } + if case let .known(value) = offset, value < 100.0 { + strongSelf.membersContext.loadMore() + } + } + } + + deinit { + } + + func scrollToTop() -> Bool { + if !self.listNode.scrollToOffsetFromTop(0.0) { + self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Spring(duration: 0.4), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + return true + } else { + return false + } + } + + func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, isScrollingLockedAtTop: Bool, presentationData: PresentationData, synchronous: Bool, transition: ContainedViewLayoutTransition) { + let isFirstLayout = self.currentParams == nil + self.currentParams = (size, isScrollingLockedAtTop, presentationData) + + transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(), size: size)) + let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition) + + self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: size, insets: UIEdgeInsets(top: 0.0, left: sideInset, bottom: bottomInset, right: sideInset), duration: duration, curve: curve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + + self.listNode.scrollEnabled = !isScrollingLockedAtTop + + if isFirstLayout, let state = self.currentState { + self.updateState(state: state, presentationData: presentationData) + } + } + + private func updateState(state: PeerInfoMembersState, presentationData: PresentationData) { + var entries: [PeerMembersListEntry] = [] + for member in state.members { + entries.append(PeerMembersListEntry(index: entries.count, member: member)) + } + let transaction = preparedTransition(from: self.currentEntries, to: entries, context: self.context, presentationData: presentationData, openPeer: { [weak self] peer in + + }) + self.currentEntries = entries + self.enqueuedTransactions.append(transaction) + self.dequeueTransaction() + } + + private func dequeueTransaction() { + guard let (layout, _, _) = self.currentParams, let transaction = self.enqueuedTransactions.first else { + return + } + + self.enqueuedTransactions.remove(at: 0) + + var options = ListViewDeleteAndInsertOptions() + options.insert(.Synchronous) + + self.listNode.transaction(deleteIndices: transaction.deletions, insertIndicesAndItems: transaction.insertions, updateIndicesAndItems: transaction.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { [weak self] _ in + guard let strongSelf = self else { + return + } + if !strongSelf.didSetReady { + strongSelf.didSetReady = true + strongSelf.ready.set(.single(true)) + } + }) + } + + func findLoadedMessage(id: MessageId) -> Message? { + return nil + } + + func updateHiddenMedia() { + } + + func transferVelocity(_ velocity: CGFloat) { + if velocity > 0.0 { + self.listNode.transferVelocity(velocity) + } + } + + func transitionNodeForGallery(messageId: MessageId, media: Media) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? { + return nil + } + + func addToTransitionSurface(view: UIView) { + } + + func updateSelectedMessages(animated: Bool) { + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift new file mode 100644 index 0000000000..34e7e78ef9 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift @@ -0,0 +1,640 @@ +import AsyncDisplayKit +import Display +import TelegramCore +import SyncCore +import SwiftSignalKit +import Postbox +import TelegramPresentationData +import AccountContext +import ContextUI +import PhotoResources +import RadialStatusNode +import TelegramStringFormatting +import GridMessageSelectionNode + +private let mediaBadgeBackgroundColor = UIColor(white: 0.0, alpha: 0.6) +private let mediaBadgeTextColor = UIColor.white + +private final class VisualMediaItemInteraction { + let openMessage: (Message) -> Void + let openMessageContextActions: (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void + let toggleSelection: (MessageId, Bool) -> Void + + var hiddenMedia: [MessageId: [Media]] = [:] + var selectedMessageIds: Set? + + init( + openMessage: @escaping (Message) -> Void, + openMessageContextActions: @escaping (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void, + toggleSelection: @escaping (MessageId, Bool) -> Void + ) { + self.openMessage = openMessage + self.openMessageContextActions = openMessageContextActions + self.toggleSelection = toggleSelection + } +} + +private final class VisualMediaItemNode: ASDisplayNode { + private let context: AccountContext + private let interaction: VisualMediaItemInteraction + + private let containerNode: ContextControllerSourceNode + private let imageNode: TransformImageNode + private var statusNode: RadialStatusNode + private let mediaBadgeNode: ChatMessageInteractiveMediaBadge + private var selectionNode: GridMessageSelectionNode? + + private let fetchStatusDisposable = MetaDisposable() + private let fetchDisposable = MetaDisposable() + private var resourceStatus: MediaResourceStatus? + + private var item: (VisualMediaItem, Media?, CGSize, CGSize?)? + private var theme: PresentationTheme? + + init(context: AccountContext, interaction: VisualMediaItemInteraction) { + self.context = context + self.interaction = interaction + + self.containerNode = ContextControllerSourceNode() + self.imageNode = TransformImageNode() + self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(white: 0.0, alpha: 0.6)) + let progressDiameter: CGFloat = 40.0 + self.statusNode.frame = CGRect(x: 0.0, y: 0.0, width: progressDiameter, height: progressDiameter) + self.statusNode.isUserInteractionEnabled = false + + self.mediaBadgeNode = ChatMessageInteractiveMediaBadge() + self.mediaBadgeNode.frame = CGRect(origin: CGPoint(x: 6.0, y: 6.0), size: CGSize(width: 50.0, height: 50.0)) + + super.init() + + self.addSubnode(self.containerNode) + self.containerNode.addSubnode(self.imageNode) + self.containerNode.addSubnode(self.mediaBadgeNode) + + self.containerNode.activated = { [weak self] gesture in + guard let strongSelf = self, let item = strongSelf.item else { + return + } + strongSelf.interaction.openMessageContextActions(item.0.message, strongSelf.containerNode, strongSelf.containerNode.bounds, gesture) + } + } + + deinit { + self.fetchStatusDisposable.dispose() + self.fetchDisposable.dispose() + } + + override func didLoad() { + super.didLoad() + + self.view.addGestureRecognizer(TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:)))) + } + + @objc func tapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { + if case .ended = recognizer.state { + if let (gesture, _) = recognizer.lastRecognizedGestureAndLocation { + if case .tap = gesture { + if let (item, _, _, _) = self.item { + self.interaction.openMessage(item.message) + } + } + } + } + } + + func update(size: CGSize, item: VisualMediaItem, theme: PresentationTheme, synchronousLoad: Bool) { + if item === self.item?.0 && size == self.item?.2 { + return + } + self.theme = theme + var media: Media? + for value in item.message.media { + if let image = value as? TelegramMediaImage { + media = image + break + } else if let file = value as? TelegramMediaFile { + media = file + break + } + } + + if let media = media, (self.item?.1 == nil || !media.isEqual(to: self.item!.1!)) { + var mediaDimensions: CGSize? + if let image = media as? TelegramMediaImage, let largestSize = largestImageRepresentation(image.representations)?.dimensions { + mediaDimensions = largestSize.cgSize + + self.imageNode.setSignal(mediaGridMessagePhoto(account: context.account, photoReference: .message(message: MessageReference(item.message), media: image), fullRepresentationSize: CGSize(width: 300.0, height: 300.0), synchronousLoad: synchronousLoad), attemptSynchronously: synchronousLoad, dispatchOnDisplayLink: true) + + self.fetchStatusDisposable.set(nil) + self.statusNode.transitionToState(.none, completion: { [weak self] in + self?.statusNode.isHidden = true + }) + self.mediaBadgeNode.isHidden = true + self.resourceStatus = nil + } else if let file = media as? TelegramMediaFile, file.isVideo { + mediaDimensions = file.dimensions?.cgSize + self.imageNode.setSignal(mediaGridMessageVideo(postbox: context.account.postbox, videoReference: .message(message: MessageReference(item.message), media: file), synchronousLoad: synchronousLoad, autoFetchFullSizeThumbnail: true), attemptSynchronously: synchronousLoad) + + self.mediaBadgeNode.isHidden = false + + self.resourceStatus = nil + self.fetchStatusDisposable.set((messageMediaFileStatus(context: context, messageId: item.message.id, file: file) |> deliverOnMainQueue).start(next: { [weak self] status in + if let strongSelf = self, let (item, _, _, _) = strongSelf.item { + strongSelf.resourceStatus = status + + let isStreamable = isMediaStreamable(message: item.message, media: file) + + let statusState: RadialStatusNodeState = .none + /*if isStreamable { + statusState = .none + } else { + switch status { + case let .Fetching(_, progress): + let adjustedProgress = max(progress, 0.027) + statusState = .progress(color: .white, lineWidth: nil, value: CGFloat(adjustedProgress), cancelEnabled: true) + case .Local: + statusState = .none + case .Remote: + statusState = .download(.white) + } + }*/ + + switch statusState { + case .none: + break + default: + strongSelf.statusNode.isHidden = false + } + + strongSelf.statusNode.transitionToState(statusState, animated: true, completion: { + if let strongSelf = self { + if case .none = statusState { + strongSelf.statusNode.isHidden = true + } + } + }) + + if let duration = file.duration { + let durationString = stringForDuration(duration) + + var badgeContent: ChatMessageInteractiveMediaBadgeContent? + var mediaDownloadState: ChatMessageInteractiveMediaDownloadState? + + if isStreamable { + switch status { + case let .Fetching(_, progress): + let progressString = String(format: "%d%%", Int(progress * 100.0)) + badgeContent = .text(inset: 12.0, backgroundColor: mediaBadgeBackgroundColor, foregroundColor: mediaBadgeTextColor, text: NSAttributedString(string: progressString)) + mediaDownloadState = .compactFetching(progress: 0.0) + case .Local: + badgeContent = .text(inset: 0.0, backgroundColor: mediaBadgeBackgroundColor, foregroundColor: mediaBadgeTextColor, text: NSAttributedString(string: durationString)) + case .Remote: + badgeContent = .text(inset: 12.0, backgroundColor: mediaBadgeBackgroundColor, foregroundColor: mediaBadgeTextColor, text: NSAttributedString(string: durationString)) + mediaDownloadState = .compactRemote + } + } else { + badgeContent = .text(inset: 0.0, backgroundColor: mediaBadgeBackgroundColor, foregroundColor: mediaBadgeTextColor, text: NSAttributedString(string: durationString)) + } + + strongSelf.mediaBadgeNode.update(theme: nil, content: badgeContent, mediaDownloadState: mediaDownloadState, alignment: .right, animated: false, badgeAnimated: false) + } + } + })) + if self.statusNode.supernode == nil { + self.imageNode.addSubnode(self.statusNode) + } + } else { + self.mediaBadgeNode.isHidden = true + } + self.item = (item, media, size, mediaDimensions) + + let progressDiameter: CGFloat = 40.0 + self.statusNode.frame = CGRect(origin: CGPoint(x: floor((size.width - progressDiameter) / 2.0), y: floor((size.height - progressDiameter) / 2.0)), size: CGSize(width: progressDiameter, height: progressDiameter)) + + self.mediaBadgeNode.frame = CGRect(origin: CGPoint(x: size.width - 3.0, y: size.height - 18.0 - 3.0), size: CGSize(width: 50.0, height: 50.0)) + + self.selectionNode?.frame = CGRect(origin: CGPoint(), size: size) + + self.updateHiddenMedia() + } + + if let (item, media, _, mediaDimensions) = self.item { + self.item = (item, media, size, mediaDimensions) + + let imageFrame = CGRect(origin: CGPoint(), size: size) + + self.containerNode.frame = imageFrame + self.imageNode.frame = imageFrame + + if let mediaDimensions = mediaDimensions { + let imageSize = mediaDimensions.aspectFilled(imageFrame.size) + self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageFrame.size, intrinsicInsets: UIEdgeInsets(), emptyColor: theme.list.mediaPlaceholderColor))() + } + + self.updateSelectionState(animated: false) + } + } + + func updateSelectionState(animated: Bool) { + if let (item, media, _, mediaDimensions) = self.item, let theme = self.theme { + if let selectedIds = self.interaction.selectedMessageIds { + let selected = selectedIds.contains(item.message.id) + + if let selectionNode = self.selectionNode { + selectionNode.updateSelected(selected, animated: animated) + selectionNode.frame = CGRect(origin: CGPoint(), size: self.bounds.size) + } else { + let selectionNode = GridMessageSelectionNode(theme: theme, toggle: { [weak self] value in + if let strongSelf = self, let messageId = strongSelf.item?.0.message.id { + var toggledValue = true + if let selectedMessageIds = strongSelf.interaction.selectedMessageIds, selectedMessageIds.contains(messageId) { + toggledValue = false + } + strongSelf.interaction.toggleSelection(messageId, toggledValue) + } + }) + + selectionNode.frame = CGRect(origin: CGPoint(), size: self.bounds.size) + self.containerNode.addSubnode(selectionNode) + self.selectionNode = selectionNode + selectionNode.updateSelected(selected, animated: false) + if animated { + selectionNode.animateIn() + } + } + } else { + if let selectionNode = self.selectionNode { + self.selectionNode = nil + if animated { + selectionNode.animateOut { [weak selectionNode] in + selectionNode?.removeFromSupernode() + } + } else { + selectionNode.removeFromSupernode() + } + } + } + } + } + + func transitionNode() -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? { + let imageNode = self.imageNode + return (self.imageNode, self.imageNode.bounds, { [weak self, weak imageNode] in + var statusNodeHidden = false + var accessoryHidden = false + if let strongSelf = self { + statusNodeHidden = strongSelf.statusNode.isHidden + accessoryHidden = strongSelf.mediaBadgeNode.isHidden + strongSelf.statusNode.isHidden = true + strongSelf.mediaBadgeNode.isHidden = true + } + let view = imageNode?.view.snapshotContentTree(unhide: true) + if let strongSelf = self { + strongSelf.statusNode.isHidden = statusNodeHidden + strongSelf.mediaBadgeNode.isHidden = accessoryHidden + } + return (view, nil) + }) + } + + func updateHiddenMedia() { + if let (item, _, _, _) = self.item { + if let _ = self.interaction.hiddenMedia[item.message.id] { + self.isHidden = true + } else { + self.isHidden = false + } + } else { + self.isHidden = false + } + } +} + +private final class VisualMediaItem { + let message: Message + + init(message: Message) { + self.message = message + } +} + +final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDelegate { + private let context: AccountContext + private let peerId: PeerId + private let chatControllerInteraction: ChatControllerInteraction + + private let scrollNode: ASScrollNode + + private var _itemInteraction: VisualMediaItemInteraction? + private var itemInteraction: VisualMediaItemInteraction { + return self._itemInteraction! + } + + private var currentParams: (size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, isScrollingLockedAtTop: Bool, presentationData: PresentationData)? + + private let ready = Promise() + private var didSetReady: Bool = false + var isReady: Signal { + return self.ready.get() + } + + private let listDisposable = MetaDisposable() + private var hiddenMediaDisposable: Disposable? + private var mediaItems: [VisualMediaItem] = [] + private var visibleMediaItems: [UInt32: VisualMediaItemNode] = [:] + + private var numberOfItemsToRequest: Int = 50 + private var currentView: MessageHistoryView? + private var isRequestingView: Bool = false + private var isFirstHistoryView: Bool = true + + private var decelerationAnimator: ConstantDisplayLinkAnimator? + + init(context: AccountContext, chatControllerInteraction: ChatControllerInteraction, peerId: PeerId) { + self.context = context + self.peerId = peerId + self.chatControllerInteraction = chatControllerInteraction + + self.scrollNode = ASScrollNode() + + super.init() + + self._itemInteraction = VisualMediaItemInteraction( + openMessage: { [weak self] message in + self?.chatControllerInteraction.openMessage(message, .default) + }, + openMessageContextActions: { [weak self] message, sourceNode, sourceRect, gesture in + self?.chatControllerInteraction.openMessageContextActions(message, sourceNode, sourceRect, gesture) + }, + toggleSelection: { [weak self] id, value in + self?.chatControllerInteraction.toggleMessagesSelection([id], value) + } + ) + self.itemInteraction.selectedMessageIds = chatControllerInteraction.selectionState.flatMap { $0.selectedIds } + + self.scrollNode.view.delaysContentTouches = false + self.scrollNode.view.showsVerticalScrollIndicator = false + if #available(iOS 11.0, *) { + self.scrollNode.view.contentInsetAdjustmentBehavior = .never + } + self.scrollNode.view.scrollsToTop = false + self.scrollNode.view.delegate = self + + self.addSubnode(self.scrollNode) + + self.requestHistoryAroundVisiblePosition() + + self.hiddenMediaDisposable = context.sharedContext.mediaManager.galleryHiddenMediaManager.hiddenIds().start(next: { [weak self] ids in + guard let strongSelf = self else { + return + } + var hiddenMedia: [MessageId: [Media]] = [:] + for id in ids { + if case let .chat(accountId, messageId, media) = id, accountId == strongSelf.context.account.id { + hiddenMedia[messageId] = [media] + } + } + strongSelf.itemInteraction.hiddenMedia = hiddenMedia + for (_, itemNode) in strongSelf.visibleMediaItems { + itemNode.updateHiddenMedia() + } + }) + } + + deinit { + self.listDisposable.dispose() + self.hiddenMediaDisposable?.dispose() + } + + private func requestHistoryAroundVisiblePosition() { + if self.isRequestingView { + return + } + self.isRequestingView = true + self.listDisposable.set((self.context.account.viewTracker.aroundMessageHistoryViewForLocation(.peer(self.peerId), index: .upperBound, anchorIndex: .upperBound, count: self.numberOfItemsToRequest, fixedCombinedReadStates: nil, tagMask: .photoOrVideo) + |> deliverOnMainQueue).start(next: { [weak self] (view, updateType, _) in + guard let strongSelf = self else { + return + } + strongSelf.updateHistory(view: view, updateType: updateType) + strongSelf.isRequestingView = false + })) + } + + private func updateHistory(view: MessageHistoryView, updateType: ViewUpdateType) { + self.currentView = view + + self.mediaItems.removeAll() + switch updateType { + case .FillHole: + self.requestHistoryAroundVisiblePosition() + default: + for entry in view.entries.reversed() { + self.mediaItems.append(VisualMediaItem(message: entry.message)) + } + + let wasFirstHistoryView = self.isFirstHistoryView + self.isFirstHistoryView = false + + if let (size, sideInset, bottomInset, visibleHeight, isScrollingLockedAtTop, presentationData) = self.currentParams { + self.update(size: size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, isScrollingLockedAtTop: isScrollingLockedAtTop, presentationData: presentationData, synchronous: wasFirstHistoryView, transition: .immediate) + if !self.didSetReady { + self.didSetReady = true + self.ready.set(.single(true)) + } + } + } + } + + func scrollToTop() -> Bool { + if self.scrollNode.view.contentOffset.y > 0.0 { + self.scrollNode.view.setContentOffset(CGPoint(), animated: true) + return true + } else { + return false + } + } + + func findLoadedMessage(id: MessageId) -> Message? { + for item in self.mediaItems { + if item.message.id == id { + return item.message + } + } + return nil + } + + func updateHiddenMedia() { + for (_, itemNode) in self.visibleMediaItems { + itemNode.updateHiddenMedia() + } + } + + func transferVelocity(_ velocity: CGFloat) { + if velocity > 0.0 { + //print("transferVelocity \(velocity)") + self.decelerationAnimator?.isPaused = true + let startTime = CACurrentMediaTime() + var currentOffset = self.scrollNode.view.contentOffset + let decelerationRate: CGFloat = 0.998 + self.decelerationAnimator = ConstantDisplayLinkAnimator(update: { [weak self] in + guard let strongSelf = self else { + return + } + let t = CACurrentMediaTime() - startTime + var currentVelocity = velocity * 15.0 * CGFloat(pow(Double(decelerationRate), 1000.0 * t)) + //print("value at \(t) = \(currentVelocity)") + currentOffset.y += currentVelocity + let maxOffset = strongSelf.scrollNode.view.contentSize.height - strongSelf.scrollNode.bounds.height + if currentOffset.y >= maxOffset { + currentOffset.y = maxOffset + currentVelocity = 0.0 + } + if currentOffset.y < 0.0 { + currentOffset.y = 0.0 + currentVelocity = 0.0 + } + + if abs(currentVelocity) < 0.1 { + strongSelf.decelerationAnimator?.isPaused = true + strongSelf.decelerationAnimator = nil + } + var contentOffset = strongSelf.scrollNode.view.contentOffset + contentOffset.y = floorToScreenPixels(currentOffset.y) + strongSelf.scrollNode.view.setContentOffset(contentOffset, animated: false) + }) + self.decelerationAnimator?.isPaused = false + } + } + + func transitionNodeForGallery(messageId: MessageId, media: Media) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? { + for item in self.mediaItems { + if item.message.id == messageId { + if let itemNode = self.visibleMediaItems[item.message.stableId] { + return itemNode.transitionNode() + } + break + } + } + return nil + } + + func addToTransitionSurface(view: UIView) { + self.scrollNode.view.addSubview(view) + } + + func updateSelectedMessages(animated: Bool) { + self.itemInteraction.selectedMessageIds = self.chatControllerInteraction.selectionState.flatMap { $0.selectedIds } + for (_, itemNode) in self.visibleMediaItems { + itemNode.updateSelectionState(animated: animated) + } + } + + func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, isScrollingLockedAtTop: Bool, presentationData: PresentationData, synchronous: Bool, transition: ContainedViewLayoutTransition) { + self.currentParams = (size, sideInset, bottomInset, visibleHeight, isScrollingLockedAtTop, presentationData) + + transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: size)) + + let itemSpacing: CGFloat = 1.0 + let itemsInRow: Int = max(3, min(6, Int(size.width / 100.0))) + let itemSize: CGFloat = floor(size.width / CGFloat(itemsInRow)) + + let rowCount: Int = self.mediaItems.count / itemsInRow + (self.mediaItems.count % itemsInRow == 0 ? 0 : 1) + let contentHeight = CGFloat(rowCount + 1) * itemSpacing + CGFloat(rowCount) * itemSize + bottomInset + + self.scrollNode.view.contentSize = CGSize(width: size.width, height: contentHeight) + self.updateVisibleItems(size: size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, theme: presentationData.theme, synchronousLoad: synchronous) + + if isScrollingLockedAtTop { + transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(), size: self.scrollNode.bounds.size)) + } + self.scrollNode.view.isScrollEnabled = !isScrollingLockedAtTop + } + + func scrollViewWillBeginDragging(_ scrollView: UIScrollView) { + self.decelerationAnimator?.isPaused = true + self.decelerationAnimator = nil + } + + func scrollViewDidScroll(_ scrollView: UIScrollView) { + if let (size, sideInset, bottomInset, visibleHeight, _, presentationData) = self.currentParams { + self.updateVisibleItems(size: size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, theme: presentationData.theme, synchronousLoad: false) + + if scrollView.contentOffset.y >= scrollView.contentSize.height - scrollView.bounds.height * 2.0, let currentView = self.currentView, currentView.earlierId != nil { + if !self.isRequestingView { + self.numberOfItemsToRequest += 50 + self.requestHistoryAroundVisiblePosition() + } + } + } + } + + private func updateVisibleItems(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, theme: PresentationTheme, synchronousLoad: Bool) { + let availableWidth = size.width - sideInset * 2.0 + + let itemSpacing: CGFloat = 1.0 + let itemsInRow: Int = max(3, min(6, Int(availableWidth / 140.0))) + let itemSize: CGFloat = floor(availableWidth / CGFloat(itemsInRow)) + + let rowCount: Int = self.mediaItems.count / itemsInRow + (self.mediaItems.count % itemsInRow == 0 ? 0 : 1) + + let visibleRect = self.scrollNode.view.bounds + var minVisibleRow = Int(floor((visibleRect.minY - itemSpacing) / (itemSize + itemSpacing))) + minVisibleRow = max(0, minVisibleRow) + var maxVisibleRow = Int(ceil((visibleRect.maxY - itemSpacing) / (itemSize + itemSpacing))) + maxVisibleRow = min(rowCount - 1, maxVisibleRow) + + let minVisibleIndex = minVisibleRow * itemsInRow + let maxVisibleIndex = min(self.mediaItems.count - 1, (maxVisibleRow + 1) * itemsInRow - 1) + + var validIds = Set() + if minVisibleIndex <= maxVisibleIndex { + for i in minVisibleIndex ... maxVisibleIndex { + let stableId = self.mediaItems[i].message.stableId + validIds.insert(stableId) + let rowIndex = i / Int(itemsInRow) + let columnIndex = i % Int(itemsInRow) + let itemOrigin = CGPoint(x: sideInset + CGFloat(columnIndex) * (itemSize + itemSpacing), y: itemSpacing + CGFloat(rowIndex) * (itemSize + itemSpacing)) + let itemFrame = CGRect(origin: itemOrigin, size: CGSize(width: columnIndex == itemsInRow ? (availableWidth - itemOrigin.x) : itemSize, height: itemSize)) + let itemNode: VisualMediaItemNode + if let current = self.visibleMediaItems[stableId] { + itemNode = current + } else { + itemNode = VisualMediaItemNode(context: self.context, interaction: self.itemInteraction) + self.visibleMediaItems[stableId] = itemNode + self.scrollNode.addSubnode(itemNode) + } + itemNode.frame = itemFrame + var itemSynchronousLoad = false + if itemFrame.maxY <= visibleHeight { + itemSynchronousLoad = synchronousLoad + } + itemNode.update(size: itemFrame.size, item: self.mediaItems[i], theme: theme, synchronousLoad: itemSynchronousLoad) + } + } + var removeKeys: [UInt32] = [] + for (id, _) in self.visibleMediaItems { + if !validIds.contains(id) { + removeKeys.append(id) + } + } + for id in removeKeys { + if let itemNode = self.visibleMediaItems.removeValue(forKey: id) { + itemNode.removeFromSupernode() + } + } + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + guard let result = super.hitTest(point, with: event) else { + return nil + } + if self.decelerationAnimator != nil { + self.decelerationAnimator?.isPaused = true + self.decelerationAnimator = nil + + return self.scrollNode.view + } + return result + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift new file mode 100644 index 0000000000..09bbdafd90 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift @@ -0,0 +1,547 @@ +import Foundation +import UIKit +import Postbox +import SyncCore +import TelegramCore +import SwiftSignalKit +import AccountContext +import PeerPresenceStatusManager +import TelegramStringFormatting +import TelegramPresentationData + +enum PeerInfoUpdatingAvatar { + case none + case image(TelegramMediaImageRepresentation) +} + +final class PeerInfoState { + let isEditing: Bool + let selectedMessageIds: Set? + let updatingAvatar: PeerInfoUpdatingAvatar? + + init( + isEditing: Bool, + selectedMessageIds: Set?, + updatingAvatar: PeerInfoUpdatingAvatar? + ) { + self.isEditing = isEditing + self.selectedMessageIds = selectedMessageIds + self.updatingAvatar = updatingAvatar + } + + func withIsEditing(_ isEditing: Bool) -> PeerInfoState { + return PeerInfoState( + isEditing: isEditing, + selectedMessageIds: self.selectedMessageIds, + updatingAvatar: self.updatingAvatar + ) + } + + func withSelectedMessageIds(_ selectedMessageIds: Set?) -> PeerInfoState { + return PeerInfoState( + isEditing: self.isEditing, + selectedMessageIds: selectedMessageIds, + updatingAvatar: self.updatingAvatar + ) + } + + func withUpdatingAvatar(_ updatingAvatar: PeerInfoUpdatingAvatar?) -> PeerInfoState { + return PeerInfoState( + isEditing: self.isEditing, + selectedMessageIds: self.selectedMessageIds, + updatingAvatar: updatingAvatar + ) + } +} + +final class PeerInfoScreenData { + let peer: Peer? + let cachedData: CachedPeerData? + let status: PeerInfoStatusData? + let notificationSettings: TelegramPeerNotificationSettings? + let globalNotificationSettings: GlobalNotificationSettings? + let isContact: Bool + let availablePanes: [PeerInfoPaneKey] + let groupsInCommon: [Peer]? + let linkedDiscussionPeer: Peer? + let members: PeerInfoMembersData? + + init( + peer: Peer?, + cachedData: CachedPeerData?, + status: PeerInfoStatusData?, + notificationSettings: TelegramPeerNotificationSettings?, + globalNotificationSettings: GlobalNotificationSettings?, + isContact: Bool, + availablePanes: [PeerInfoPaneKey], + groupsInCommon: [Peer]?, + linkedDiscussionPeer: Peer?, + members: PeerInfoMembersData? + ) { + self.peer = peer + self.cachedData = cachedData + self.status = status + self.notificationSettings = notificationSettings + self.globalNotificationSettings = globalNotificationSettings + self.isContact = isContact + self.availablePanes = availablePanes + self.groupsInCommon = groupsInCommon + self.linkedDiscussionPeer = linkedDiscussionPeer + self.members = members + } +} + +enum PeerInfoScreenInputUserKind { + case user + case bot + case support +} + +enum PeerInfoScreenInputData: Equatable { + case none + case user(userId: PeerId, secretChatId: PeerId?, kind: PeerInfoScreenInputUserKind) + case channel + case group(isSupergroup: Bool, membersContext: PeerInfoMembersContext) +} + +func peerInfoAvailableMediaPanes(context: AccountContext, peerId: PeerId) -> Signal<[PeerInfoPaneKey], NoError> { + let tags: [(MessageTags, PeerInfoPaneKey)] = [ + (.photoOrVideo, .media), + (.file, .files), + (.music, .music), + //(.voiceOrInstantVideo, .voice), + (.webPage, .links) + ] + return combineLatest(tags.map { tagAndKey -> Signal in + let (tag, key) = tagAndKey + return context.account.viewTracker.aroundMessageHistoryViewForLocation(.peer(peerId), index: .upperBound, anchorIndex: .upperBound, count: 20, clipHoles: false, fixedCombinedReadStates: nil, tagMask: tag) + |> map { (view, _, _) -> PeerInfoPaneKey? in + if view.entries.isEmpty { + return nil + } else { + return key + } + } + }) + |> map { keys -> [PeerInfoPaneKey] in + return keys.compactMap { $0 } + } + |> distinctUntilChanged + /*return context.account.postbox.combinedView(keys: tags.map { (tag, _) -> PostboxViewKey in + return .historyTagInfo(peerId: peerId, tag: tag) + }) + |> map { view -> [PeerInfoPaneKey] in + return tags.compactMap { (tag, key) -> PeerInfoPaneKey? in + if let info = view.views[.historyTagInfo(peerId: peerId, tag: tag)] as? HistoryTagInfoView, !info.isEmpty { + return key + } else { + return nil + } + } + } + |> distinctUntilChanged*/ +} + +struct PeerInfoStatusData: Equatable { + var text: String + var isActivity: Bool +} + +enum PeerInfoMembersData: Equatable { + case shortList([PeerInfoMember]) + case longList(PeerInfoMembersContext) +} + +func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat) -> Signal { + return context.account.postbox.combinedView(keys: [.basicPeer(peerId)]) + |> map { view -> PeerInfoScreenInputData in + guard let peer = (view.views[.basicPeer(peerId)] as? BasicPeerView)?.peer else { + return .none + } + if let user = peer as? TelegramUser { + let kind: PeerInfoScreenInputUserKind + if user.flags.contains(.isSupport) { + kind = .support + } else if user.botInfo != nil { + kind = .bot + } else { + kind = .user + } + return .user(userId: user.id, secretChatId: nil, kind: kind) + } else if let channel = peer as? TelegramChannel { + if case .group = channel.info { + return .group(isSupergroup: true, membersContext: PeerInfoMembersContext(context: context, peerId: channel.id)) + } else { + return .channel + } + } else if let group = peer as? TelegramGroup { + return .group(isSupergroup: false, membersContext: PeerInfoMembersContext(context: context, peerId: group.id)) + } else { + return .none + } + } + |> distinctUntilChanged + |> mapToSignal { inputData -> Signal in + switch inputData { + case .none: + return .single(PeerInfoScreenData( + peer: nil, + cachedData: nil, + status: nil, + notificationSettings: nil, + globalNotificationSettings: nil, + isContact: false, + availablePanes: [], + groupsInCommon: nil, + linkedDiscussionPeer: nil, + members: nil + )) + case let .user(peerId, secretChatId, kind): + let groupsInCommonSignal: Signal<[Peer]?, NoError> + switch kind { + case .user: + groupsInCommonSignal = .single(nil) + |> then( + groupsInCommon(account: context.account, peerId: peerId) + |> map(Optional.init) + ) + default: + groupsInCommonSignal = .single([]) + } + enum StatusInputData: Equatable { + case none + case presence(TelegramUserPresence) + case bot + case support + } + let status = Signal { subscriber in + class Manager { + var currentValue: TelegramUserPresence? = nil + var updateManager: QueueLocalObject? = nil + } + let manager = Atomic(value: Manager()) + let notify: () -> Void = { + let data = manager.with { manager -> PeerInfoStatusData? in + if let presence = manager.currentValue { + let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + let (text, isActivity) = stringAndActivityForUserPresence(strings: strings, dateTimeFormat: dateTimeFormat, presence: presence, relativeTo: Int32(timestamp), expanded: true) + return PeerInfoStatusData(text: text, isActivity: isActivity) + } else { + return nil + } + } + subscriber.putNext(data) + } + let disposable = (context.account.viewTracker.peerView(peerId, updateData: false) + |> map { view -> StatusInputData in + guard let user = view.peers[peerId] as? TelegramUser else { + return .none + } + if user.isDeleted { + return .none + } + if user.flags.contains(.isSupport) { + return .support + } + if user.botInfo != nil { + return .bot + } + guard let presence = view.peerPresences[peerId] as? TelegramUserPresence else { + return .none + } + return .presence(presence) + } + |> distinctUntilChanged).start(next: { inputData in + switch inputData { + case .bot: + subscriber.putNext(PeerInfoStatusData(text: strings.Bot_GenericBotStatus, isActivity: false)) + case .support: + subscriber.putNext(PeerInfoStatusData(text: strings.Bot_GenericSupportStatus, isActivity: false)) + default: + var presence: TelegramUserPresence? + if case let .presence(value) = inputData { + presence = value + } + let _ = manager.with { manager -> Void in + manager.currentValue = presence + if let presence = presence { + let updateManager: QueueLocalObject + if let current = manager.updateManager { + updateManager = current + } else { + updateManager = QueueLocalObject(queue: .mainQueue(), generate: { + return PeerPresenceStatusManager(update: { + notify() + }) + }) + } + updateManager.with { updateManager in + updateManager.reset(presence: presence) + } + } else if let _ = manager.updateManager { + manager.updateManager = nil + } + } + notify() + } + }) + return disposable + } + |> distinctUntilChanged + let globalNotificationsKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.globalNotifications])) + var combinedKeys: [PostboxViewKey] = [] + combinedKeys.append(globalNotificationsKey) + if let secretChatId = secretChatId { + combinedKeys.append(.peerChatState(peerId: peerId)) + } + return combineLatest( + context.account.viewTracker.peerView(peerId, updateData: true), + peerInfoAvailableMediaPanes(context: context, peerId: peerId), + context.account.postbox.combinedView(keys: combinedKeys), + status, + groupsInCommonSignal + ) + |> map { peerView, availablePanes, combinedView, status, groupsInCommon -> PeerInfoScreenData in + var globalNotificationSettings: GlobalNotificationSettings = .defaultSettings + if let preferencesView = combinedView.views[globalNotificationsKey] as? PreferencesView { + if let settings = preferencesView.values[PreferencesKeys.globalNotifications] as? GlobalNotificationSettings { + globalNotificationSettings = settings + } + } + + var availablePanes = availablePanes + if let groupsInCommon = groupsInCommon { + if !groupsInCommon.isEmpty { + availablePanes.append(.groupsInCommon) + } + } else if let cachedData = peerView.cachedData as? CachedUserData { + if cachedData.commonGroupCount != 0 { + availablePanes.append(.groupsInCommon) + } + } + + return PeerInfoScreenData( + peer: peerView.peers[peerId], + cachedData: peerView.cachedData, + status: status, + notificationSettings: peerView.notificationSettings as? TelegramPeerNotificationSettings, + globalNotificationSettings: globalNotificationSettings, + isContact: peerView.peerIsContact, + availablePanes: availablePanes, + groupsInCommon: groupsInCommon, + linkedDiscussionPeer: nil, + members: nil + ) + } + case .channel: + let status = context.account.viewTracker.peerView(peerId, updateData: false) + |> map { peerView -> PeerInfoStatusData? in + guard let channel = peerView.peers[peerId] as? TelegramChannel else { + return PeerInfoStatusData(text: strings.Channel_Status, isActivity: false) + } + if let cachedChannelData = peerView.cachedData as? CachedChannelData, let memberCount = cachedChannelData.participantsSummary.memberCount, memberCount != 0 { + return PeerInfoStatusData(text: strings.Conversation_StatusSubscribers(memberCount), isActivity: false) + } else { + return PeerInfoStatusData(text: strings.Channel_Status, isActivity: false) + } + } + |> distinctUntilChanged + + let globalNotificationsKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.globalNotifications])) + var combinedKeys: [PostboxViewKey] = [] + combinedKeys.append(globalNotificationsKey) + return combineLatest( + context.account.viewTracker.peerView(peerId, updateData: true), + peerInfoAvailableMediaPanes(context: context, peerId: peerId), + context.account.postbox.combinedView(keys: combinedKeys), + status + ) + |> map { peerView, availablePanes, combinedView, status -> PeerInfoScreenData in + var globalNotificationSettings: GlobalNotificationSettings = .defaultSettings + if let preferencesView = combinedView.views[globalNotificationsKey] as? PreferencesView { + if let settings = preferencesView.values[PreferencesKeys.globalNotifications] as? GlobalNotificationSettings { + globalNotificationSettings = settings + } + } + + var discussionPeer: Peer? + if let linkedDiscussionPeerId = (peerView.cachedData as? CachedChannelData)?.linkedDiscussionPeerId, let peer = peerView.peers[linkedDiscussionPeerId] { + discussionPeer = peer + } + + return PeerInfoScreenData( + peer: peerView.peers[peerId], + cachedData: peerView.cachedData, + status: status, + notificationSettings: peerView.notificationSettings as? TelegramPeerNotificationSettings, + globalNotificationSettings: globalNotificationSettings, + isContact: peerView.peerIsContact, + availablePanes: availablePanes, + groupsInCommon: [], + linkedDiscussionPeer: discussionPeer, + members: nil + ) + } + case let .group(_, membersContext): + let status = context.account.viewTracker.peerView(peerId, updateData: false) + |> map { peerView -> PeerInfoStatusData? in + guard let channel = peerView.peers[peerId] as? TelegramChannel else { + return PeerInfoStatusData(text: strings.Channel_Status, isActivity: false) + } + if let cachedChannelData = peerView.cachedData as? CachedChannelData, let memberCount = cachedChannelData.participantsSummary.memberCount, memberCount != 0 { + return PeerInfoStatusData(text: strings.Conversation_StatusMembers(memberCount), isActivity: false) + } else { + return PeerInfoStatusData(text: strings.Group_Status, isActivity: false) + } + } + |> distinctUntilChanged + + let membersData: Signal = membersContext.state + |> map { state -> PeerInfoMembersData? in + if state.members.count > 5 { + return .longList(membersContext) + } else { + return .shortList(state.members) + } + } + |> distinctUntilChanged + + let globalNotificationsKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.globalNotifications])) + var combinedKeys: [PostboxViewKey] = [] + combinedKeys.append(globalNotificationsKey) + return combineLatest( + context.account.viewTracker.peerView(peerId, updateData: true), + peerInfoAvailableMediaPanes(context: context, peerId: peerId), + context.account.postbox.combinedView(keys: combinedKeys), + status, + membersData + ) + |> map { peerView, availablePanes, combinedView, status, membersData -> PeerInfoScreenData in + var globalNotificationSettings: GlobalNotificationSettings = .defaultSettings + if let preferencesView = combinedView.views[globalNotificationsKey] as? PreferencesView { + if let settings = preferencesView.values[PreferencesKeys.globalNotifications] as? GlobalNotificationSettings { + globalNotificationSettings = settings + } + } + + var discussionPeer: Peer? + if let linkedDiscussionPeerId = (peerView.cachedData as? CachedChannelData)?.linkedDiscussionPeerId, let peer = peerView.peers[linkedDiscussionPeerId] { + discussionPeer = peer + } + + var availablePanes = availablePanes + if let membersData = membersData, case .longList = membersData { + availablePanes.insert(.members, at: 0) + } + + return PeerInfoScreenData( + peer: peerView.peers[peerId], + cachedData: peerView.cachedData, + status: status, + notificationSettings: peerView.notificationSettings as? TelegramPeerNotificationSettings, + globalNotificationSettings: globalNotificationSettings, + isContact: peerView.peerIsContact, + availablePanes: availablePanes, + groupsInCommon: [], + linkedDiscussionPeer: discussionPeer, + members: membersData + ) + } + } + } +} + +func canEditPeerInfo(peer: Peer?) -> Bool { + if let channel = peer as? TelegramChannel { + if channel.hasPermission(.changeInfo) { + return true + } + } else if let group = peer as? TelegramGroup { + switch group.role { + case .admin, .creator: + return true + case .member: + break + } + if !group.hasBannedPermission(.banChangeInfo) { + return true + } + } + return false +} + +func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?) -> [PeerInfoHeaderButtonKey] { + var result: [PeerInfoHeaderButtonKey] = [] + if let user = peer as? TelegramUser { + result.append(.message) + var callsAvailable = false + if !user.isDeleted, user.botInfo == nil, !user.flags.contains(.isSupport), let cachedUserData = cachedData as? CachedUserData { + callsAvailable = cachedUserData.callsAvailable + } + if callsAvailable { + result.append(.call) + } + result.append(.mute) + result.append(.more) + } else if let channel = peer as? TelegramChannel { + switch channel.info { + case .broadcast: + if let cachedData = cachedData as? CachedChannelData { + if cachedData.linkedDiscussionPeerId != nil { + result.append(.discussion) + } + } + case .group: + if channel.flags.contains(.isCreator) || channel.hasPermission(.inviteMembers) { + result.append(.addMember) + } + } + + result.append(.mute) + result.append(.more) + } else if let group = peer as? TelegramGroup { + var canEditGroupInfo = false + var canEditMembers = false + var canAddMembers = false + var isPublic = false + var isCreator = false + + if case .creator = group.role { + isCreator = true + } + switch group.role { + case .admin, .creator: + canEditGroupInfo = true + canEditMembers = true + canAddMembers = true + case .member: + break + } + if !group.hasBannedPermission(.banChangeInfo) { + canEditGroupInfo = true + } + if !group.hasBannedPermission(.banAddMembers) { + canAddMembers = true + } + + if canAddMembers { + result.append(.addMember) + } + + result.append(.mute) + result.append(.more) + } + return result +} + +func peerInfoCanEdit(peer: Peer?, cachedData: CachedPeerData?) -> Bool { + if let user = peer as? TelegramUser { + if user.isDeleted { + return false + } + return true + } else if peer is TelegramChannel || peer is TelegramGroup { + return true + } + return false +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoHeaderNode.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoHeaderNode.swift new file mode 100644 index 0000000000..606947df54 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoHeaderNode.swift @@ -0,0 +1,1822 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import Postbox +import SyncCore +import TelegramCore +import AvatarNode +import AccountContext +import SwiftSignalKit +import TelegramPresentationData +import PhotoResources +import PeerAvatarGalleryUI +import TelegramStringFormatting +import ActivityIndicator + +enum PeerInfoHeaderButtonKey: Hashable { + case message + case discussion + case call + case mute + case more + case addMember +} + +enum PeerInfoHeaderButtonIcon { + case message + case call + case mute + case unmute + case more + case addMember +} + +final class PeerInfoHeaderButtonNode: HighlightableButtonNode { + let key: PeerInfoHeaderButtonKey + private let action: (PeerInfoHeaderButtonNode) -> Void + let containerNode: ASDisplayNode + private let backgroundNode: ASImageNode + private let textNode: ImmediateTextNode + + private var theme: PresentationTheme? + private var icon: PeerInfoHeaderButtonIcon? + + init(key: PeerInfoHeaderButtonKey, action: @escaping (PeerInfoHeaderButtonNode) -> Void) { + self.key = key + self.action = action + + self.containerNode = ASDisplayNode() + + self.backgroundNode = ASImageNode() + self.backgroundNode.displaysAsynchronously = false + self.backgroundNode.displayWithoutProcessing = true + + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + + super.init() + + self.addSubnode(self.containerNode) + self.containerNode.addSubnode(self.backgroundNode) + self.containerNode.addSubnode(self.textNode) + + self.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.layer.removeAnimation(forKey: "opacity") + strongSelf.alpha = 0.4 + } else { + strongSelf.alpha = 1.0 + strongSelf.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) + } + } + } + + self.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside) + } + + @objc private func buttonPressed() { + self.action(self) + } + + func update(size: CGSize, text: String, icon: PeerInfoHeaderButtonIcon, isExpanded: Bool, presentationData: PresentationData, transition: ContainedViewLayoutTransition) { + if self.theme != presentationData.theme || self.icon != icon { + self.theme = presentationData.theme + self.icon = icon + self.backgroundNode.image = generateImage(CGSize(width: 40.0, height: 40.0), contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setFillColor(presentationData.theme.list.itemAccentColor.cgColor) + context.fillEllipse(in: CGRect(origin: CGPoint(), size: size)) + context.setBlendMode(.normal) + context.setFillColor(presentationData.theme.list.itemCheckColors.foregroundColor.cgColor) + let imageName: String + switch icon { + case .message: + imageName = "Peer Info/ButtonMessage" + case .call: + imageName = "Peer Info/ButtonCall" + case .mute: + imageName = "Peer Info/ButtonMute" + case .unmute: + imageName = "Peer Info/ButtonUnmute" + case .more: + imageName = "Peer Info/ButtonMore" + case .addMember: + imageName = "Peer Info/ButtonAddMember" + } + if let image = UIImage(bundleImageName: imageName) { + let imageRect = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0)), size: image.size) + context.clip(to: imageRect, mask: image.cgImage!) + context.fill(imageRect) + } + }) + } + + self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(12.0), textColor: presentationData.theme.list.itemAccentColor) + let titleSize = self.textNode.updateLayout(CGSize(width: 120.0, height: .greatestFiniteMagnitude)) + + transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(), size: size)) + transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: size)) + transition.updateFrameAdditiveToCenter(node: self.textNode, frame: CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: size.height + 6.0), size: titleSize)) + transition.updateAlpha(node: self.textNode, alpha: isExpanded ? 0.0 : 1.0) + } +} + +final class PeerInfoHeaderNavigationTransition { + let sourceNavigationBar: NavigationBar + let sourceTitleView: ChatTitleView + let sourceTitleFrame: CGRect + let sourceSubtitleFrame: CGRect + let fraction: CGFloat + + init(sourceNavigationBar: NavigationBar, sourceTitleView: ChatTitleView, sourceTitleFrame: CGRect, sourceSubtitleFrame: CGRect, fraction: CGFloat) { + self.sourceNavigationBar = sourceNavigationBar + self.sourceTitleView = sourceTitleView + self.sourceTitleFrame = sourceTitleFrame + self.sourceSubtitleFrame = sourceSubtitleFrame + self.fraction = fraction + } +} + +enum PeerInfoAvatarListItem: Equatable { + case topImage([ImageRepresentationWithReference]) + case image(TelegramMediaImageReference?, [ImageRepresentationWithReference]) + + var id: WrappedMediaResourceId { + switch self { + case let .topImage(representations): + let representation = largestImageRepresentation(representations.map { $0.representation }) ?? representations[representations.count - 1].representation + return WrappedMediaResourceId(representation.resource.id) + case let .image(_, representations): + let representation = largestImageRepresentation(representations.map { $0.representation }) ?? representations[representations.count - 1].representation + return WrappedMediaResourceId(representation.resource.id) + } + } +} + +final class PeerInfoAvatarListItemNode: ASDisplayNode { + private let context: AccountContext + let imageNode: TransformImageNode + + let isReady = Promise() + private var didSetReady: Bool = false + + init(context: AccountContext) { + self.context = context + self.imageNode = TransformImageNode() + + super.init() + + self.addSubnode(self.imageNode) + + self.imageNode.imageUpdated = { [weak self] _ in + guard let strongSelf = self else { + return + } + if !strongSelf.didSetReady { + strongSelf.didSetReady = true + strongSelf.isReady.set(.single(true)) + } + } + } + + func setup(item: PeerInfoAvatarListItem, synchronous: Bool) { + let representations: [ImageRepresentationWithReference] + switch item { + case let .topImage(topRepresentations): + representations = topRepresentations + case let .image(_, imageRepresentations): + representations = imageRepresentations + } + self.imageNode.setSignal(chatAvatarGalleryPhoto(account: self.context.account, representations: representations, autoFetchFullSize: true, attemptSynchronously: synchronous), attemptSynchronously: synchronous, dispatchOnDisplayLink: false) + } + + func update(size: CGSize, transition: ContainedViewLayoutTransition) { + let imageSize = CGSize(width: min(size.width, size.height), height: min(size.width, size.height)) + let makeLayout = self.imageNode.asyncLayout() + let applyLayout = makeLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets())) + let _ = applyLayout() + transition.updateFrame(node: self.imageNode, frame: CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: floor((size.height - imageSize.height) / 2.0)), size: imageSize)) + } +} + +final class PeerInfoAvatarListContainerNode: ASDisplayNode { + private let context: AccountContext + + let controlsContainerNode: ASDisplayNode + let controlsClippingNode: ASDisplayNode + let controlsClippingOffsetNode: ASDisplayNode + let shadowNode: ASImageNode + + let contentNode: ASDisplayNode + let leftHighlightNode: ASImageNode + let rightHighlightNode: ASImageNode + var highlightedSide: Bool? + let stripContainerNode: ASDisplayNode + let highlightContainerNode: ASDisplayNode + private(set) var galleryEntries: [AvatarGalleryEntry] = [] + private var items: [PeerInfoAvatarListItem] = [] + private var itemNodes: [WrappedMediaResourceId: PeerInfoAvatarListItemNode] = [:] + private var stripNodes: [ASImageNode] = [] + private let inactiveStripImage: UIImage + private let activeStripImage: UIImage + private var appliedStripNodeCurrentIndex: Int? + private var currentIndex: Int = 0 + private var transitionFraction: CGFloat = 0.0 + + private var validLayout: CGSize? + + private let disposable = MetaDisposable() + private var initializedList = false + + let isReady = Promise() + private var didSetReady = false + + var currentItemNode: PeerInfoAvatarListItemNode? { + if self.currentIndex >= 0 && self.currentIndex < self.items.count { + return self.itemNodes[self.items[self.currentIndex].id] + } else { + return nil + } + } + + init(context: AccountContext) { + self.context = context + + self.contentNode = ASDisplayNode() + + self.leftHighlightNode = ASImageNode() + self.leftHighlightNode.displaysAsynchronously = false + self.leftHighlightNode.displayWithoutProcessing = true + self.leftHighlightNode.contentMode = .scaleToFill + self.leftHighlightNode.image = generateImage(CGSize(width: 88.0, height: 1.0), contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + + let topColor = UIColor(rgb: 0x000000, alpha: 0.1) + let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0) + + var locations: [CGFloat] = [0.0, 1.0] + let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor] + + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)! + + context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation]) + }) + self.leftHighlightNode.isHidden = true + + self.rightHighlightNode = ASImageNode() + self.rightHighlightNode.displaysAsynchronously = false + self.rightHighlightNode.displayWithoutProcessing = true + self.rightHighlightNode.contentMode = .scaleToFill + self.rightHighlightNode.image = generateImage(CGSize(width: 88.0, height: 1.0), contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + + let topColor = UIColor(rgb: 0x000000, alpha: 0.1) + let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0) + + var locations: [CGFloat] = [0.0, 1.0] + let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor] + + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)! + + context.drawLinearGradient(gradient, start: CGPoint(x: size.width, y: 0.0), end: CGPoint(x: 0.0, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation]) + }) + self.rightHighlightNode.isHidden = true + + self.stripContainerNode = ASDisplayNode() + self.contentNode.addSubnode(self.stripContainerNode) + self.inactiveStripImage = generateSmallHorizontalStretchableFilledCircleImage(diameter: 2.0, color: UIColor(white: 1.0, alpha: 0.2))! + self.activeStripImage = generateSmallHorizontalStretchableFilledCircleImage(diameter: 2.0, color: .white)! + + self.highlightContainerNode = ASDisplayNode() + self.highlightContainerNode.addSubnode(self.leftHighlightNode) + self.highlightContainerNode.addSubnode(self.rightHighlightNode) + + self.controlsContainerNode = ASDisplayNode() + self.controlsContainerNode.isUserInteractionEnabled = false + + self.controlsClippingOffsetNode = ASDisplayNode() + + self.controlsClippingNode = ASDisplayNode() + self.controlsClippingNode.isUserInteractionEnabled = false + self.controlsClippingNode.clipsToBounds = true + + self.shadowNode = ASImageNode() + self.shadowNode.displaysAsynchronously = false + self.shadowNode.displayWithoutProcessing = true + self.shadowNode.contentMode = .scaleToFill + + do { + let size = CGSize(width: 88.0, height: 88.0) + UIGraphicsBeginImageContextWithOptions(size, false, 0.0) + if let context = UIGraphicsGetCurrentContext() { + context.clip(to: CGRect(origin: CGPoint(), size: size)) + + let topColor = UIColor(rgb: 0x000000, alpha: 0.4) + let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0) + + var locations: [CGFloat] = [0.0, 1.0] + let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor] + + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)! + + context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation]) + + let image = UIGraphicsGetImageFromCurrentImageContext() + UIGraphicsEndImageContext() + if let image = image { + self.shadowNode.image = generateImage(image.size, contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.translateBy(x: size.width / 2.0, y: size.height / 2.0) + context.rotate(by: -CGFloat.pi / 2.0) + context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0) + context.draw(image.cgImage!, in: CGRect(origin: CGPoint(), size: size)) + }) + } + } + } + + super.init() + + self.backgroundColor = .black + + self.addSubnode(self.contentNode) + + self.controlsContainerNode.addSubnode(self.highlightContainerNode) + self.controlsContainerNode.addSubnode(self.shadowNode) + self.controlsContainerNode.addSubnode(self.stripContainerNode) + self.controlsClippingNode.addSubnode(self.controlsContainerNode) + self.controlsClippingOffsetNode.addSubnode(self.controlsClippingNode) + + self.view.disablesInteractiveTransitionGestureRecognizerNow = { [weak self] in + guard let strongSelf = self else { + return false + } + return strongSelf.currentIndex != 0 + } + self.view.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:)))) + + let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:))) + recognizer.tapActionAtPoint = { _ in + return .keepWithSingleTap + } + recognizer.highlight = { [weak self] point in + guard let strongSelf = self, let size = strongSelf.validLayout else { + return + } + var highlightedSide: Bool? + if let point = point { + if point.x < size.width * 1.0 / 5.0 { + if strongSelf.items.count > 1 { + highlightedSide = false + } + } else if point.x > size.width * 4.0 / 5.0 { + if strongSelf.items.count > 1 { + highlightedSide = true + } + } + } + if strongSelf.highlightedSide != highlightedSide { + strongSelf.highlightedSide = highlightedSide + if let highlightedSide = highlightedSide { + strongSelf.leftHighlightNode.isHidden = highlightedSide + strongSelf.rightHighlightNode.isHidden = !highlightedSide + } else { + strongSelf.leftHighlightNode.isHidden = true + strongSelf.rightHighlightNode.isHidden = true + } + } + } + self.view.addGestureRecognizer(recognizer) + } + + deinit { + self.disposable.dispose() + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + return super.hitTest(point, with: event) + } + + func selectFirstItem() { + self.currentIndex = 0 + if let size = self.validLayout { + self.updateItems(size: size, transition: .immediate) + } + } + + @objc private func tapLongTapOrDoubleTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { + switch recognizer.state { + case .ended: + if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { + if let size = self.validLayout, case .tap = gesture { + if location.x < size.width * 1.0 / 5.0 { + if self.currentIndex != 0 { + self.currentIndex -= 1 + self.updateItems(size: size, transition: .immediate) + } else if self.items.count > 1 { + self.currentIndex = self.items.count - 1 + self.updateItems(size: size, transition: .immediate) + } + } else if location.x > size.width * 4.0 / 5.0 { + if self.currentIndex < self.items.count - 1 { + self.currentIndex += 1 + self.updateItems(size: size, transition: .immediate) + } else if self.items.count > 1 { + self.currentIndex = 0 + self.updateItems(size: size, transition: .immediate, synchronous: true) + } + } + } + } + default: + break + } + } + + @objc private func panGesture(_ recognizer: UIPanGestureRecognizer) { + switch recognizer.state { + case .changed: + let translation = recognizer.translation(in: self.view) + var transitionFraction = translation.x / self.bounds.width + if self.currentIndex <= 0 { + transitionFraction = min(0.0, transitionFraction) + } + if self.currentIndex >= self.items.count - 1 { + transitionFraction = max(0.0, transitionFraction) + } + self.transitionFraction = transitionFraction + if let size = self.validLayout { + self.updateItems(size: size, transition: .animated(duration: 0.3, curve: .spring)) + } + case .cancelled, .ended: + let translation = recognizer.translation(in: self.view) + let velocity = recognizer.velocity(in: self.view) + var directionIsToRight = false + if abs(velocity.x) > 10.0 { + directionIsToRight = velocity.x < 0.0 + } else { + directionIsToRight = translation.x > self.bounds.width / 2.0 + } + var updatedIndex = self.currentIndex + if directionIsToRight { + updatedIndex = min(updatedIndex + 1, self.items.count - 1) + } else { + updatedIndex = max(updatedIndex - 1, 0) + } + self.currentIndex = updatedIndex + self.transitionFraction = 0.0 + if let size = self.validLayout { + self.updateItems(size: size, transition: .animated(duration: 0.3, curve: .spring)) + } + default: + break + } + } + + func update(size: CGSize, peer: Peer?, transition: ContainedViewLayoutTransition) { + self.validLayout = size + + self.leftHighlightNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: floor(size.width * 1.0 / 5.0), height: size.height)) + self.rightHighlightNode.frame = CGRect(origin: CGPoint(x: size.width - floor(size.width * 1.0 / 5.0), y: 0.0), size: CGSize(width: floor(size.width * 1.0 / 5.0), height: size.height)) + + if let peer = peer, !self.initializedList { + self.initializedList = true + self.disposable.set((fetchedAvatarGalleryEntries(account: self.context.account, peer: peer) + |> deliverOnMainQueue).start(next: { [weak self] entries in + guard let strongSelf = self else { + return + } + var items: [PeerInfoAvatarListItem] = [] + for entry in entries { + switch entry { + case let .topImage(representations, _): + items.append(.topImage(representations)) + case let .image(reference, representations, _, _, _, _): + items.append(.image(reference, representations)) + } + } + strongSelf.galleryEntries = entries + strongSelf.items = items + if let size = strongSelf.validLayout { + strongSelf.updateItems(size: size, transition: .immediate) + } + if items.isEmpty { + if !strongSelf.didSetReady { + strongSelf.didSetReady = true + strongSelf.isReady.set(.single(true)) + } + } + })) + } + self.updateItems(size: size, transition: transition) + } + + private func updateItems(size: CGSize, transition: ContainedViewLayoutTransition, synchronous: Bool = false) { + var validIds: [WrappedMediaResourceId] = [] + var addedItemNodesForAdditiveTransition: [PeerInfoAvatarListItemNode] = [] + var additiveTransitionOffset: CGFloat = 0.0 + if self.currentIndex >= 0 && self.currentIndex < self.items.count { + for i in max(0, self.currentIndex - 1) ... min(self.currentIndex + 1, self.items.count - 1) { + validIds.append(self.items[i].id) + let itemNode: PeerInfoAvatarListItemNode + var wasAdded = false + if let current = self.itemNodes[self.items[i].id] { + itemNode = current + } else { + wasAdded = true + itemNode = PeerInfoAvatarListItemNode(context: self.context) + itemNode.setup(item: self.items[i], synchronous: synchronous && i == self.currentIndex) + self.itemNodes[self.items[i].id] = itemNode + self.contentNode.addSubnode(itemNode) + } + let indexOffset = CGFloat(i - self.currentIndex) + let itemFrame = CGRect(origin: CGPoint(x: indexOffset * size.width + self.transitionFraction * size.width - size.width / 2.0, y: -size.height / 2.0), size: size) + + if wasAdded { + addedItemNodesForAdditiveTransition.append(itemNode) + itemNode.frame = itemFrame + itemNode.update(size: size, transition: .immediate) + } else { + additiveTransitionOffset = itemNode.frame.minX - itemFrame.minX + transition.updateFrame(node: itemNode, frame: itemFrame) + itemNode.update(size: size, transition: transition) + } + } + } + for itemNode in addedItemNodesForAdditiveTransition { + transition.animatePositionAdditive(node: itemNode, offset: CGPoint(x: additiveTransitionOffset, y: 0.0)) + } + var removeIds: [WrappedMediaResourceId] = [] + for (id, _) in self.itemNodes { + if !validIds.contains(id) { + removeIds.append(id) + } + } + for id in removeIds { + if let itemNode = self.itemNodes.removeValue(forKey: id) { + itemNode.removeFromSupernode() + } + } + + let hadOneStripNode = self.stripNodes.count == 1 + if self.stripNodes.count != self.items.count { + if self.stripNodes.count < self.items.count { + for _ in 0 ..< self.items.count - self.stripNodes.count { + let stripNode = ASImageNode() + stripNode.displaysAsynchronously = false + stripNode.displayWithoutProcessing = true + if stripNodes.count == self.currentIndex { + stripNode.image = self.activeStripImage + } else { + stripNode.image = self.inactiveStripImage + } + self.stripNodes.append(stripNode) + self.stripContainerNode.addSubnode(stripNode) + } + } else { + for i in (self.items.count ..< self.stripNodes.count).reversed() { + self.stripNodes[i].removeFromSupernode() + self.stripNodes.remove(at: i) + } + } + } + if self.appliedStripNodeCurrentIndex != self.currentIndex { + if let appliedStripNodeCurrentIndex = self.appliedStripNodeCurrentIndex { + if appliedStripNodeCurrentIndex >= 0 && appliedStripNodeCurrentIndex < self.stripNodes.count { + self.stripNodes[appliedStripNodeCurrentIndex].image = self.inactiveStripImage + } + } + self.appliedStripNodeCurrentIndex = self.currentIndex + if self.currentIndex >= 0 && self.currentIndex < self.stripNodes.count { + self.stripNodes[self.currentIndex].image = self.activeStripImage + } + } + if hadOneStripNode && self.stripNodes.count > 1 { + self.stripContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25) + } + let stripInset: CGFloat = 5.0 + let stripSpacing: CGFloat = 4.0 + let stripWidth: CGFloat = max(5.0, floor((size.width - stripInset * 2.0 - stripSpacing * CGFloat(self.stripNodes.count - 1)) / CGFloat(self.stripNodes.count))) + var stripX: CGFloat = stripInset + for i in 0 ..< self.stripNodes.count { + if i == 0 && self.stripNodes.count == 1 { + self.stripNodes[i].isHidden = true + } else { + self.stripNodes[i].isHidden = false + } + self.stripNodes[i].frame = CGRect(origin: CGPoint(x: stripX, y: 0.0), size: CGSize(width: stripWidth, height: 2.0)) + stripX += stripWidth + stripSpacing + } + + if let item = self.items.first, let itemNode = self.itemNodes[item.id] { + if !self.didSetReady { + self.didSetReady = true + self.isReady.set(itemNode.isReady.get()) + } + } + } +} + +final class PeerInfoAvatarTransformContainerNode: ASDisplayNode { + let context: AccountContext + let avatarNode: AvatarNode + + var tapped: (() -> Void)? + + private var isFirstAvatarLoading = true + + init(context: AccountContext) { + self.context = context + let avatarFont = avatarPlaceholderFont(size: floor(100.0 * 16.0 / 37.0)) + self.avatarNode = AvatarNode(font: avatarFont) + + super.init() + + self.addSubnode(self.avatarNode) + self.avatarNode.frame = CGRect(origin: CGPoint(x: -50.0, y: -50.0), size: CGSize(width: 100.0, height: 100.0)) + + self.avatarNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:)))) + } + + @objc private func tapGesture(_ recognizer: UITapGestureRecognizer) { + if case .ended = recognizer.state { + self.tapped?() + } + } + + func update(peer: Peer?, theme: PresentationTheme) { + if let peer = peer { + var overrideImage: AvatarNodeImageOverride? + if peer.isDeleted { + overrideImage = .deletedIcon + } + self.avatarNode.setPeer(context: self.context, theme: theme, peer: peer, overrideImage: overrideImage, synchronousLoad: self.isFirstAvatarLoading, displayDimensions: CGSize(width: 100.0, height: 100.0), storeUnrounded: true) + self.isFirstAvatarLoading = false + } + } +} + +final class PeerInfoEditingAvatarNode: ASDisplayNode { + let context: AccountContext + let avatarNode: AvatarNode + + private let updatingAvatarOverlay: ASImageNode + private let activityIndicator: ActivityIndicator + + var tapped: (() -> Void)? + + init(context: AccountContext) { + self.context = context + let avatarFont = avatarPlaceholderFont(size: floor(100.0 * 16.0 / 37.0)) + self.avatarNode = AvatarNode(font: avatarFont) + + self.updatingAvatarOverlay = ASImageNode() + self.updatingAvatarOverlay.displayWithoutProcessing = true + self.updatingAvatarOverlay.displaysAsynchronously = false + self.updatingAvatarOverlay.isHidden = true + + self.activityIndicator = ActivityIndicator(type: .custom(.white, 22.0, 1.0, false)) + self.activityIndicator.isHidden = true + + super.init() + + self.addSubnode(self.avatarNode) + self.avatarNode.frame = CGRect(origin: CGPoint(x: -50.0, y: -50.0), size: CGSize(width: 100.0, height: 100.0)) + self.updatingAvatarOverlay.frame = self.avatarNode.frame + let indicatorSize = self.activityIndicator.measure(CGSize(width: 100.0, height: 100.0)) + self.activityIndicator.frame = CGRect(origin: CGPoint(x: floorToScreenPixels(self.avatarNode.frame.midX - indicatorSize.width / 2.0), y: floorToScreenPixels(self.avatarNode.frame.midY - indicatorSize.height / 2.0)), size: indicatorSize) + + self.addSubnode(self.updatingAvatarOverlay) + self.addSubnode(self.activityIndicator) + + self.avatarNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:)))) + } + + @objc private func tapGesture(_ recognizer: UITapGestureRecognizer) { + if case .ended = recognizer.state { + self.tapped?() + } + } + + func update(peer: Peer?, updatingAvatar: PeerInfoUpdatingAvatar?, theme: PresentationTheme) { + if let peer = peer { + let overrideImage: AvatarNodeImageOverride? + if canEditPeerInfo(peer: peer) { + if let updatingAvatar = updatingAvatar { + switch updatingAvatar { + case let .image(representation): + overrideImage = .image(representation) + case .none: + overrideImage = .none + } + self.activityIndicator.isHidden = false + self.updatingAvatarOverlay.isHidden = false + if self.updatingAvatarOverlay.image == nil { + self.updatingAvatarOverlay.image = generateFilledCircleImage(diameter: 100.0, color: UIColor(white: 0.0, alpha: 0.4), backgroundColor: nil) + } + } else { + overrideImage = .editAvatarIcon + self.activityIndicator.isHidden = true + self.updatingAvatarOverlay.isHidden = true + } + } else { + overrideImage = nil + self.activityIndicator.isHidden = true + self.updatingAvatarOverlay.isHidden = true + } + self.avatarNode.setPeer(context: self.context, theme: theme, peer: peer, overrideImage: overrideImage, synchronousLoad: false, displayDimensions: CGSize(width: 100.0, height: 100.0)) + } + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if self.avatarNode.frame.contains(point) { + return self.avatarNode.view + } + return super.hitTest(point, with: event) + } +} + +final class PeerInfoAvatarListNode: ASDisplayNode { + let avatarContainerNode: PeerInfoAvatarTransformContainerNode + let listContainerTransformNode: ASDisplayNode + let listContainerNode: PeerInfoAvatarListContainerNode + + let isReady = Promise() + + init(context: AccountContext, readyWhenGalleryLoads: Bool) { + self.avatarContainerNode = PeerInfoAvatarTransformContainerNode(context: context) + self.listContainerTransformNode = ASDisplayNode() + self.listContainerNode = PeerInfoAvatarListContainerNode(context: context) + self.listContainerNode.clipsToBounds = true + self.listContainerNode.isHidden = true + + super.init() + + self.addSubnode(self.avatarContainerNode) + self.listContainerTransformNode.addSubnode(self.listContainerNode) + self.addSubnode(self.listContainerTransformNode) + + let avatarReady = self.avatarContainerNode.avatarNode.ready + |> mapToSignal { _ -> Signal in + return .complete() + } + |> then(.single(true)) + + let galleryReady = self.listContainerNode.isReady.get() + |> filter { $0 } + |> take(1) + + let combinedSignal: Signal + if readyWhenGalleryLoads { + combinedSignal = combineLatest(queue: .mainQueue(), + avatarReady, + galleryReady + ) + |> map { lhs, rhs in + return lhs && rhs + } + } else { + combinedSignal = avatarReady + } + + self.isReady.set(combinedSignal + |> filter { $0 } + |> take(1)) + } + + func update(size: CGSize, isExpanded: Bool, peer: Peer?, theme: PresentationTheme, transition: ContainedViewLayoutTransition) { + self.avatarContainerNode.update(peer: peer, theme: theme) + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if !self.listContainerNode.isHidden { + if let result = self.listContainerNode.view.hitTest(self.view.convert(point, to: self.listContainerNode.view), with: event) { + return result + } + } else { + if let result = self.avatarContainerNode.avatarNode.view.hitTest(self.view.convert(point, to: self.avatarContainerNode.avatarNode.view), with: event) { + return result + } + } + + return super.hitTest(point, with: event) + } + + func animateAvatarCollapse(transition: ContainedViewLayoutTransition) { + if let currentItemNode = self.listContainerNode.currentItemNode, let unroundedImage = self.avatarContainerNode.avatarNode.unroundedImage, case let .animated(duration, curve) = transition { + let avatarCopyView = UIImageView() + avatarCopyView.image = unroundedImage + avatarCopyView.frame = self.avatarContainerNode.avatarNode.frame + avatarCopyView.center = currentItemNode.imageNode.position + currentItemNode.view.addSubview(avatarCopyView) + let scale = currentItemNode.imageNode.bounds.height / avatarCopyView.bounds.height + avatarCopyView.layer.transform = CATransform3DMakeScale(scale, scale, scale) + avatarCopyView.alpha = 0.0 + transition.updateAlpha(layer: avatarCopyView.layer, alpha: 1.0, completion: { [weak avatarCopyView] _ in + Queue.mainQueue().after(0.1, { + avatarCopyView?.removeFromSuperview() + }) + }) + } + } +} + +final class PeerInfoHeaderNavigationButton: HighlightableButtonNode { + private let regularTextNode: ImmediateTextNode + private let whiteTextNode: ImmediateTextNode + private let iconNode: ASImageNode + + private var key: PeerInfoHeaderNavigationButtonKey? + private var theme: PresentationTheme? + + var isWhite: Bool = false { + didSet { + if self.isWhite != oldValue { + self.regularTextNode.isHidden = self.isWhite + self.whiteTextNode.isHidden = !self.isWhite + } + } + } + + var action: (() -> Void)? + + override init() { + self.regularTextNode = ImmediateTextNode() + self.whiteTextNode = ImmediateTextNode() + self.whiteTextNode.isHidden = true + + self.iconNode = ASImageNode() + self.iconNode.displaysAsynchronously = false + self.iconNode.displayWithoutProcessing = true + + super.init() + + self.addSubnode(self.regularTextNode) + self.addSubnode(self.whiteTextNode) + self.addSubnode(self.iconNode) + + self.addTarget(self, action: #selector(self.pressed), forControlEvents: .touchUpInside) + } + + @objc private func pressed() { + self.action?() + } + + func update(key: PeerInfoHeaderNavigationButtonKey, presentationData: PresentationData) -> CGSize { + let textSize: CGSize + if self.key != key || self.theme !== presentationData.theme { + self.key = key + self.theme = presentationData.theme + + let text: String + var icon: UIImage? + var isBold = false + switch key { + case .edit: + text = presentationData.strings.Common_Edit + case .done, .cancel, .selectionDone: + text = presentationData.strings.Common_Done + isBold = true + case .select: + text = presentationData.strings.Common_Select + case .search: + text = "" + icon = PresentationResourcesRootController.navigationCompactSearchIcon(presentationData.theme) + } + + let font: UIFont = isBold ? Font.semibold(17.0) : Font.regular(17.0) + + self.regularTextNode.attributedText = NSAttributedString(string: text, font: font, textColor: presentationData.theme.rootController.navigationBar.accentTextColor) + self.whiteTextNode.attributedText = NSAttributedString(string: text, font: font, textColor: .white) + self.iconNode.image = icon + + textSize = self.regularTextNode.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude)) + let _ = self.whiteTextNode.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude)) + } else { + textSize = self.regularTextNode.bounds.size + } + + let inset: CGFloat = 0.0 + let height: CGFloat = 44.0 + + let textFrame = CGRect(origin: CGPoint(x: inset, y: floor((height - textSize.height) / 2.0)), size: textSize) + self.regularTextNode.frame = textFrame + self.whiteTextNode.frame = textFrame + + if let image = self.iconNode.image { + self.iconNode.frame = CGRect(origin: CGPoint(x: inset, y: floor((height - image.size.height) / 2.0)), size: image.size) + + return CGSize(width: image.size.width + inset * 2.0, height: height) + } else { + return CGSize(width: textSize.width + inset * 2.0, height: height) + } + } +} + +enum PeerInfoHeaderNavigationButtonKey { + case edit + case done + case cancel + case select + case selectionDone + case search +} + +struct PeerInfoHeaderNavigationButtonSpec: Equatable { + let key: PeerInfoHeaderNavigationButtonKey + let isForExpandedView: Bool +} + +final class PeerInfoHeaderNavigationButtonContainerNode: ASDisplayNode { + private var buttonNodes: [PeerInfoHeaderNavigationButtonKey: PeerInfoHeaderNavigationButton] = [:] + + private var currentButtons: [PeerInfoHeaderNavigationButtonSpec] = [] + + var isWhite: Bool = false { + didSet { + if self.isWhite != oldValue { + for (_, buttonNode) in self.buttonNodes { + buttonNode.isWhite = self.isWhite + } + } + } + } + + var performAction: ((PeerInfoHeaderNavigationButtonKey) -> Void)? + + override init() { + super.init() + } + + func update(size: CGSize, presentationData: PresentationData, buttons: [PeerInfoHeaderNavigationButtonSpec], expandFraction: CGFloat, transition: ContainedViewLayoutTransition) { + let maximumExpandOffset: CGFloat = 14.0 + let expandOffset: CGFloat = -expandFraction * maximumExpandOffset + if self.currentButtons != buttons { + self.currentButtons = buttons + + var nextRegularButtonOrigin = size.width - 16.0 + var nextExpandedButtonOrigin = size.width - 16.0 + for spec in buttons.reversed() { + let buttonNode: PeerInfoHeaderNavigationButton + var wasAdded = false + if let current = self.buttonNodes[spec.key] { + buttonNode = current + } else { + wasAdded = true + buttonNode = PeerInfoHeaderNavigationButton() + self.buttonNodes[spec.key] = buttonNode + self.addSubnode(buttonNode) + buttonNode.isWhite = self.isWhite + buttonNode.action = { [weak self] in + self?.performAction?(spec.key) + } + } + let buttonSize = buttonNode.update(key: spec.key, presentationData: presentationData) + var nextButtonOrigin = spec.isForExpandedView ? nextExpandedButtonOrigin : nextRegularButtonOrigin + let buttonFrame = CGRect(origin: CGPoint(x: nextButtonOrigin - buttonSize.width, y: expandOffset + (spec.isForExpandedView ? maximumExpandOffset : 0.0)), size: buttonSize) + nextButtonOrigin -= buttonSize.width + 4.0 + if spec.isForExpandedView { + nextExpandedButtonOrigin = nextButtonOrigin + } else { + nextRegularButtonOrigin = nextButtonOrigin + } + if wasAdded { + buttonNode.frame = buttonFrame + } else { + transition.updateFrameAdditiveToCenter(node: buttonNode, frame: buttonFrame) + } + let alphaFactor: CGFloat = spec.isForExpandedView ? expandFraction : (1.0 - expandFraction) + transition.updateAlpha(node: buttonNode, alpha: alphaFactor * alphaFactor) + } + var removeKeys: [PeerInfoHeaderNavigationButtonKey] = [] + for (key, _) in self.buttonNodes { + if !buttons.contains(where: { $0.key == key }) { + removeKeys.append(key) + } + } + for key in removeKeys { + if let buttonNode = self.buttonNodes.removeValue(forKey: key) { + buttonNode.removeFromSupernode() + } + } + } else { + var nextRegularButtonOrigin = size.width - 16.0 + var nextExpandedButtonOrigin = size.width - 16.0 + for spec in buttons.reversed() { + if let buttonNode = self.buttonNodes[spec.key] { + let buttonSize = buttonNode.bounds.size + var nextButtonOrigin = spec.isForExpandedView ? nextExpandedButtonOrigin : nextRegularButtonOrigin + let buttonFrame = CGRect(origin: CGPoint(x: nextButtonOrigin - buttonSize.width, y: expandOffset + (spec.isForExpandedView ? maximumExpandOffset : 0.0)), size: buttonSize) + nextButtonOrigin -= buttonSize.width + 4.0 + if spec.isForExpandedView { + nextExpandedButtonOrigin = nextButtonOrigin + } else { + nextRegularButtonOrigin = nextButtonOrigin + } + transition.updateFrameAdditiveToCenter(node: buttonNode, frame: buttonFrame) + let alphaFactor: CGFloat = spec.isForExpandedView ? expandFraction : (1.0 - expandFraction) + transition.updateAlpha(node: buttonNode, alpha: alphaFactor * alphaFactor) + } + } + } + } +} + +final class PeerInfoHeaderRegularContentNode: ASDisplayNode { + +} + +enum PeerInfoHeaderTextFieldNodeKey { + case firstName + case lastName + case title + case description +} + +protocol PeerInfoHeaderTextFieldNode: ASDisplayNode { + var text: String { get } + + func update(width: CGFloat, safeInset: CGFloat, hasPrevious: Bool, placeholder: String, isEnabled: Bool, presentationData: PresentationData, updateText: String?) -> CGFloat +} + +final class PeerInfoHeaderSingleLineTextFieldNode: ASDisplayNode, PeerInfoHeaderTextFieldNode { + private let textNode: TextFieldNode + private let topSeparator: ASDisplayNode + + private var theme: PresentationTheme? + + var text: String { + return self.textNode.textField.text ?? "" + } + + override init() { + self.textNode = TextFieldNode() + self.topSeparator = ASDisplayNode() + + super.init() + + self.addSubnode(self.textNode) + self.addSubnode(self.topSeparator) + } + + func update(width: CGFloat, safeInset: CGFloat, hasPrevious: Bool, placeholder: String, isEnabled: Bool, presentationData: PresentationData, updateText: String?) -> CGFloat { + if self.theme !== presentationData.theme { + self.theme = presentationData.theme + self.textNode.textField.textColor = presentationData.theme.list.itemPrimaryTextColor + //self.textNode.textField.keyboardAppearance = presentationData.theme.keyboardAppearance + self.textNode.textField.tintColor = presentationData.theme.list.itemAccentColor + } + + let attributedPlaceholderText = NSAttributedString(string: placeholder, font: Font.regular(17.0), textColor: presentationData.theme.list.itemPlaceholderTextColor) + if self.textNode.textField.attributedPlaceholder == nil || !self.textNode.textField.attributedPlaceholder!.isEqual(to: attributedPlaceholderText) { + self.textNode.textField.attributedPlaceholder = attributedPlaceholderText + self.textNode.textField.accessibilityHint = attributedPlaceholderText.string + } + + if let updateText = updateText { + self.textNode.textField.text = updateText + } + + self.topSeparator.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + self.topSeparator.frame = CGRect(origin: CGPoint(x: safeInset + (hasPrevious ? 16.0 : 0.0), y: 0.0), size: CGSize(width: width, height: UIScreenPixel)) + + let height: CGFloat = 44.0 + + self.textNode.frame = CGRect(origin: CGPoint(x: safeInset + 16.0, y: floor((height - 40.0) / 2.0)), size: CGSize(width: max(1.0, width - 16.0 * 2.0), height: 40.0)) + + self.textNode.isUserInteractionEnabled = isEnabled + self.textNode.alpha = isEnabled ? 1.0 : 0.6 + + return height + } +} + +/*final class PeerInfoHeaderMultiLineTextFieldNode: ASDisplayNode, PeerInfoHeaderTextFieldNode { + private let textNode: TextFieldNode + private let topSeparator: ASDisplayNode + + override init() { + self.textNode = TextFieldNode() + self.topSeparator = ASDisplayNode() + + super.init() + } + + func update(width: CGFloat, safeInset: CGFloat) -> CGFloat { + return 44.0 + } +}*/ + +final class PeerInfoHeaderEditingContentNode: ASDisplayNode { + private let context: AccountContext + let avatarNode: PeerInfoEditingAvatarNode + + var itemNodes: [PeerInfoHeaderTextFieldNodeKey: PeerInfoHeaderTextFieldNode] = [:] + + init(context: AccountContext) { + self.context = context + self.avatarNode = PeerInfoEditingAvatarNode(context: context) + + super.init() + + self.addSubnode(self.avatarNode) + } + + func editingTextForKey(_ key: PeerInfoHeaderTextFieldNodeKey) -> String? { + return self.itemNodes[key]?.text + } + + func update(width: CGFloat, safeInset: CGFloat, statusBarHeight: CGFloat, navigationHeight: CGFloat, peer: Peer?, cachedData: CachedPeerData?, isContact: Bool, presentationData: PresentationData, transition: ContainedViewLayoutTransition) -> CGFloat { + let avatarSize: CGFloat = 100.0 + let avatarFrame = CGRect(origin: CGPoint(x: floor((width - avatarSize) / 2.0), y: statusBarHeight + 10.0), size: CGSize(width: avatarSize, height: avatarSize)) + transition.updateFrameAdditiveToCenter(node: self.avatarNode, frame: CGRect(origin: avatarFrame.center, size: CGSize())) + + var contentHeight: CGFloat = statusBarHeight + 10.0 + 100.0 + 20.0 + + var fieldKeys: [PeerInfoHeaderTextFieldNodeKey] = [] + if let user = peer as? TelegramUser { + if !user.isDeleted { + fieldKeys.append(.firstName) + if user.botInfo == nil { + fieldKeys.append(.lastName) + } + } + } else if let _ = peer as? TelegramGroup { + fieldKeys.append(.title) + if canEditPeerInfo(peer: peer) { + fieldKeys.append(.description) + } + } else if let _ = peer as? TelegramChannel { + fieldKeys.append(.title) + if canEditPeerInfo(peer: peer) { + fieldKeys.append(.description) + } + } + var hasPrevious = false + for key in fieldKeys { + let itemNode: PeerInfoHeaderTextFieldNode + var updateText: String? + if let current = self.itemNodes[key] { + itemNode = current + } else { + switch key { + case .firstName: + updateText = (peer as? TelegramUser)?.firstName ?? "" + case .lastName: + updateText = (peer as? TelegramUser)?.lastName ?? "" + case .title: + updateText = peer?.debugDisplayTitle ?? "" + case .description: + if let cachedData = cachedData as? CachedChannelData { + updateText = cachedData.about ?? "" + } else if let cachedData = cachedData as? CachedGroupData { + updateText = cachedData.about ?? "" + } else { + updateText = "" + } + } + itemNode = PeerInfoHeaderSingleLineTextFieldNode() + self.itemNodes[key] = itemNode + self.addSubnode(itemNode) + } + let placeholder: String + var isEnabled = true + switch key { + case .firstName: + placeholder = "First Name" + isEnabled = isContact + case .lastName: + placeholder = "Last Name" + isEnabled = isContact + case .title: + placeholder = "Title" + isEnabled = canEditPeerInfo(peer: peer) + case .description: + placeholder = "Description" + isEnabled = canEditPeerInfo(peer: peer) + } + let itemHeight = itemNode.update(width: width, safeInset: safeInset, hasPrevious: hasPrevious, placeholder: placeholder, isEnabled: isEnabled, presentationData: presentationData, updateText: updateText) + transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: width, height: itemHeight))) + contentHeight += itemHeight + hasPrevious = true + } + var removeKeys: [PeerInfoHeaderTextFieldNodeKey] = [] + for (key, _) in self.itemNodes { + if !fieldKeys.contains(key) { + removeKeys.append(key) + } + } + for key in removeKeys { + if let itemNode = self.itemNodes.removeValue(forKey: key) { + itemNode.removeFromSupernode() + } + } + + return contentHeight + } +} + +final class PeerInfoHeaderNode: ASDisplayNode { + private var context: AccountContext + private var presentationData: PresentationData? + + private(set) var isAvatarExpanded: Bool + + let avatarListNode: PeerInfoAvatarListNode + + let regularContentNode: PeerInfoHeaderRegularContentNode + let editingContentNode: PeerInfoHeaderEditingContentNode + let titleNodeContainer: ASDisplayNode + let titleNodeRawContainer: ASDisplayNode + let titleNode: ImmediateTextNode + let titleCredibilityIconNode: ASImageNode + let subtitleNodeContainer: ASDisplayNode + let subtitleNodeRawContainer: ASDisplayNode + let subtitleNode: ImmediateTextNode + private var buttonNodes: [PeerInfoHeaderButtonKey: PeerInfoHeaderButtonNode] = [:] + private let backgroundNode: ASDisplayNode + private let expandedBackgroundNode: ASDisplayNode + let separatorNode: ASDisplayNode + let navigationButtonContainer: PeerInfoHeaderNavigationButtonContainerNode + + var performButtonAction: ((PeerInfoHeaderButtonKey) -> Void)? + var requestAvatarExpansion: (([AvatarGalleryEntry], (ASDisplayNode, CGRect, () -> (UIView?, UIView?))) -> Void)? + var requestOpenAvatarForEditing: (() -> Void)? + + var navigationTransition: PeerInfoHeaderNavigationTransition? + + init(context: AccountContext, avatarInitiallyExpanded: Bool) { + self.context = context + self.isAvatarExpanded = avatarInitiallyExpanded + + self.avatarListNode = PeerInfoAvatarListNode(context: context, readyWhenGalleryLoads: avatarInitiallyExpanded) + + self.titleNodeContainer = ASDisplayNode() + self.titleNodeRawContainer = ASDisplayNode() + self.titleNode = ImmediateTextNode() + self.titleNode.displaysAsynchronously = false + + self.titleCredibilityIconNode = ASImageNode() + self.titleCredibilityIconNode.displaysAsynchronously = false + self.titleCredibilityIconNode.displayWithoutProcessing = true + self.titleNode.addSubnode(self.titleCredibilityIconNode) + + self.subtitleNodeContainer = ASDisplayNode() + self.subtitleNodeRawContainer = ASDisplayNode() + self.subtitleNode = ImmediateTextNode() + self.subtitleNode.displaysAsynchronously = false + + self.regularContentNode = PeerInfoHeaderRegularContentNode() + self.editingContentNode = PeerInfoHeaderEditingContentNode(context: context) + self.editingContentNode.alpha = 0.0 + + self.navigationButtonContainer = PeerInfoHeaderNavigationButtonContainerNode() + + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + self.expandedBackgroundNode = ASDisplayNode() + self.expandedBackgroundNode.isLayerBacked = true + + self.separatorNode = ASDisplayNode() + self.separatorNode.isLayerBacked = true + + super.init() + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.expandedBackgroundNode) + self.addSubnode(self.separatorNode) + self.titleNodeContainer.addSubnode(self.titleNode) + self.regularContentNode.addSubnode(self.titleNodeContainer) + self.subtitleNodeContainer.addSubnode(self.subtitleNode) + self.regularContentNode.addSubnode(self.subtitleNodeContainer) + self.regularContentNode.addSubnode(self.avatarListNode) + self.regularContentNode.addSubnode(self.avatarListNode.listContainerNode.controlsClippingOffsetNode) + self.addSubnode(self.regularContentNode) + self.addSubnode(self.editingContentNode) + self.addSubnode(self.navigationButtonContainer) + + self.avatarListNode.avatarContainerNode.tapped = { [weak self] in + guard let strongSelf = self else { + return + } + let avatarNode = strongSelf.avatarListNode.avatarContainerNode.avatarNode + strongSelf.requestAvatarExpansion?(strongSelf.avatarListNode.listContainerNode.galleryEntries, (avatarNode, avatarNode.bounds, { [weak avatarNode] in + return (avatarNode?.view.snapshotContentTree(unhide: true), nil) + })) + } + self.editingContentNode.avatarNode.tapped = { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.requestOpenAvatarForEditing?() + } + } + + func updateAvatarIsHidden(_ isHidden: Bool) { + self.avatarListNode.avatarContainerNode.avatarNode.isHidden = isHidden + } + + func update(width: CGFloat, containerHeight: CGFloat, containerInset: CGFloat, statusBarHeight: CGFloat, navigationHeight: CGFloat, contentOffset: CGFloat, presentationData: PresentationData, peer: Peer?, cachedData: CachedPeerData?, notificationSettings: TelegramPeerNotificationSettings?, statusData: PeerInfoStatusData?, isContact: Bool, state: PeerInfoState, transition: ContainedViewLayoutTransition, additive: Bool) -> CGFloat { + let themeUpdated = self.presentationData?.theme !== presentationData.theme + self.presentationData = presentationData + + if themeUpdated { + self.titleCredibilityIconNode.image = PresentationResourcesItemList.verifiedPeerIcon(presentationData.theme) + } + + self.regularContentNode.alpha = state.isEditing ? 0.0 : 1.0 + self.editingContentNode.alpha = state.isEditing ? 1.0 : 0.0 + + let editingContentHeight = self.editingContentNode.update(width: width, safeInset: containerInset, statusBarHeight: statusBarHeight, navigationHeight: navigationHeight, peer: state.isEditing ? peer : nil, cachedData: cachedData, isContact: isContact, presentationData: presentationData, transition: transition) + transition.updateFrame(node: self.editingContentNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -contentOffset), size: CGSize(width: width, height: editingContentHeight))) + + var transitionSourceHeight: CGFloat = 0.0 + var transitionFraction: CGFloat = 0.0 + var transitionSourceAvatarFrame = CGRect() + var transitionSourceTitleFrame = CGRect() + var transitionSourceSubtitleFrame = CGRect() + + self.backgroundNode.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor + self.expandedBackgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor + + if let navigationTransition = self.navigationTransition, let sourceAvatarNode = (navigationTransition.sourceNavigationBar.rightButtonNode.singleCustomNode as? ChatAvatarNavigationNode)?.avatarNode { + transitionSourceHeight = navigationTransition.sourceNavigationBar.bounds.height + transitionFraction = navigationTransition.fraction + transitionSourceAvatarFrame = sourceAvatarNode.view.convert(sourceAvatarNode.view.bounds, to: navigationTransition.sourceNavigationBar.view) + transitionSourceTitleFrame = navigationTransition.sourceTitleFrame + transitionSourceSubtitleFrame = navigationTransition.sourceSubtitleFrame + + transition.updateAlpha(node: self.expandedBackgroundNode, alpha: transitionFraction) + + if self.isAvatarExpanded, case .animated = transition, transitionFraction == 1.0 { + self.avatarListNode.animateAvatarCollapse(transition: transition) + } + } else { + let backgroundTransitionFraction: CGFloat = max(0.0, min(1.0, contentOffset / (212.0))) + transition.updateAlpha(node: self.expandedBackgroundNode, alpha: backgroundTransitionFraction) + } + + self.separatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let defaultButtonSize: CGFloat = 40.0 + let defaultMaxButtonSpacing: CGFloat = 40.0 + let expandedAvatarListHeight = min(width, containerHeight - 64.0) + let expandedAvatarListSize = CGSize(width: width, height: expandedAvatarListHeight) + + let buttonKeys: [PeerInfoHeaderButtonKey] = peerInfoHeaderButtons(peer: peer, cachedData: cachedData) + + if let peer = peer { + self.titleNode.attributedText = NSAttributedString(string: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), font: Font.medium(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor) + + let subtitleString: NSAttributedString? + if let statusData = statusData { + let subtitleColor: UIColor + if statusData.isActivity { + subtitleColor = presentationData.theme.list.itemAccentColor + } else { + subtitleColor = presentationData.theme.list.itemSecondaryTextColor + } + subtitleString = NSAttributedString(string: statusData.text, font: Font.regular(15.0), textColor: subtitleColor) + } else { + subtitleString = nil + } + self.subtitleNode.attributedText = subtitleString + } + + let textSideInset: CGFloat = 16.0 + let expandedAvatarControlsHeight: CGFloat = 64.0 + let expandedAvatarHeight: CGFloat = expandedAvatarListSize.height + expandedAvatarControlsHeight + + let avatarSize: CGFloat = 100.0 + let avatarFrame = CGRect(origin: CGPoint(x: floor((width - avatarSize) / 2.0), y: statusBarHeight + 10.0), size: CGSize(width: avatarSize, height: avatarSize)) + let avatarCenter = CGPoint(x: (1.0 - transitionFraction) * avatarFrame.midX + transitionFraction * transitionSourceAvatarFrame.midX, y: (1.0 - transitionFraction) * avatarFrame.midY + transitionFraction * transitionSourceAvatarFrame.midY) + + var isVerified = false + if let peer = peer, peer.isVerified { + isVerified = true + } + + let titleSize = self.titleNode.updateLayout(CGSize(width: width - textSideInset * 2.0 - (isVerified ? 16.0 : 0.0), height: .greatestFiniteMagnitude)) + let subtitleSize = self.subtitleNode.updateLayout(CGSize(width: width - textSideInset * 2.0, height: .greatestFiniteMagnitude)) + + if let image = self.titleCredibilityIconNode.image { + transition.updateFrame(node: self.titleCredibilityIconNode, frame: CGRect(origin: CGPoint(x: titleSize.width + 4.0, y: floor((titleSize.height - image.size.height) / 2.0) + 1.0), size: image.size)) + self.titleCredibilityIconNode.isHidden = !isVerified + } + + let titleFrame: CGRect + let subtitleFrame: CGRect + if self.isAvatarExpanded { + titleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - expandedAvatarControlsHeight + 12.0 + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: titleSize) + subtitleFrame = CGRect(origin: CGPoint(x: 16.0, y: titleFrame.maxY - 5.0), size: subtitleSize) + } else { + titleFrame = CGRect(origin: CGPoint(x: floor((width - titleSize.width) / 2.0), y: avatarFrame.maxY + 10.0 + (subtitleSize.height.isZero ? 11.0 : 0.0)), size: titleSize) + subtitleFrame = CGRect(origin: CGPoint(x: floor((width - subtitleSize.width) / 2.0), y: titleFrame.maxY + 1.0), size: subtitleSize) + } + + let titleLockOffset: CGFloat = 7.0 + (subtitleSize.height.isZero ? 8.0 : 0.0) + let titleMaxLockOffset: CGFloat = 7.0 + let titleCollapseOffset = titleFrame.midY - statusBarHeight - titleLockOffset + let titleOffset = -min(titleCollapseOffset, contentOffset) + let titleCollapseFraction = max(0.0, min(1.0, contentOffset / titleCollapseOffset)) + + let titleMinScale: CGFloat = 0.7 + let subtitleMinScale: CGFloat = 0.8 + let avatarMinScale: CGFloat = 0.7 + + let apparentTitleLockOffset = (1.0 - titleCollapseFraction) * 0.0 + titleCollapseFraction * titleMaxLockOffset + + let avatarScale: CGFloat + let avatarOffset: CGFloat + if self.navigationTransition != nil { + avatarScale = ((1.0 - transitionFraction) * avatarFrame.width + transitionFraction * transitionSourceAvatarFrame.width) / avatarFrame.width + avatarOffset = 0.0 + } else { + avatarScale = 1.0 * (1.0 - titleCollapseFraction) + avatarMinScale * titleCollapseFraction + avatarOffset = apparentTitleLockOffset + 0.0 * (1.0 - titleCollapseFraction) + 10.0 * titleCollapseFraction + } + let avatarListFrame = CGRect(origin: CGPoint(), size: expandedAvatarListSize) + + if self.isAvatarExpanded { + self.avatarListNode.listContainerNode.isHidden = false + if !transitionSourceAvatarFrame.width.isZero { + transition.updateCornerRadius(node: self.avatarListNode.listContainerNode, cornerRadius: transitionFraction * transitionSourceAvatarFrame.width / 2.0) + transition.updateCornerRadius(node: self.avatarListNode.listContainerNode.controlsClippingNode, cornerRadius: transitionFraction * transitionSourceAvatarFrame.width / 2.0) + } else { + transition.updateCornerRadius(node: self.avatarListNode.listContainerNode, cornerRadius: 0.0) + transition.updateCornerRadius(node: self.avatarListNode.listContainerNode.controlsClippingNode, cornerRadius: 0.0) + } + } else if self.avatarListNode.listContainerNode.cornerRadius != 50.0 { + transition.updateCornerRadius(node: self.avatarListNode.listContainerNode.controlsClippingNode, cornerRadius: 50.0) + transition.updateCornerRadius(node: self.avatarListNode.listContainerNode, cornerRadius: 50.0, completion: { [weak self] _ in + guard let strongSelf = self else { + return + } + strongSelf.avatarListNode.listContainerNode.isHidden = true + }) + } + + self.avatarListNode.update(size: CGSize(), isExpanded: self.isAvatarExpanded, peer: peer, theme: presentationData.theme, transition: transition) + self.editingContentNode.avatarNode.update(peer: peer, updatingAvatar: state.updatingAvatar, theme: presentationData.theme) + if additive { + transition.updateSublayerTransformScaleAdditive(node: self.avatarListNode.avatarContainerNode, scale: avatarScale) + } else { + transition.updateSublayerTransformScale(node: self.avatarListNode.avatarContainerNode, scale: avatarScale) + } + let apparentAvatarFrame: CGRect + let controlsClippingFrame: CGRect + if self.isAvatarExpanded { + let expandedAvatarCenter = CGPoint(x: expandedAvatarListSize.width / 2.0, y: expandedAvatarListSize.height / 2.0 - contentOffset / 2.0) + apparentAvatarFrame = CGRect(origin: CGPoint(x: expandedAvatarCenter.x * (1.0 - transitionFraction) + transitionFraction * avatarCenter.x, y: expandedAvatarCenter.y * (1.0 - transitionFraction) + transitionFraction * avatarCenter.y), size: CGSize()) + if !transitionSourceAvatarFrame.width.isZero { + let expandedFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedAvatarListSize) + controlsClippingFrame = CGRect(origin: CGPoint(x: transitionFraction * transitionSourceAvatarFrame.minX + (1.0 - transitionFraction) * expandedFrame.minX, y: transitionFraction * transitionSourceAvatarFrame.minY + (1.0 - transitionFraction) * expandedFrame.minY), size: CGSize(width: transitionFraction * transitionSourceAvatarFrame.width + (1.0 - transitionFraction) * expandedFrame.width, height: transitionFraction * transitionSourceAvatarFrame.height + (1.0 - transitionFraction) * expandedFrame.height)) + } else { + controlsClippingFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedAvatarListSize) + } + } else { + apparentAvatarFrame = CGRect(origin: CGPoint(x: avatarCenter.x - avatarFrame.width / 2.0, y: -contentOffset + avatarOffset + avatarCenter.y - avatarFrame.height / 2.0), size: avatarFrame.size) + controlsClippingFrame = apparentAvatarFrame + } + if case let .animated(duration, curve) = transition, !transitionSourceAvatarFrame.width.isZero, false { + let previousFrame = self.avatarListNode.frame + self.avatarListNode.frame = CGRect(origin: apparentAvatarFrame.center, size: CGSize()) + let horizontalTransition: ContainedViewLayoutTransition + let verticalTransition: ContainedViewLayoutTransition + if transitionFraction < .ulpOfOne { + horizontalTransition = .animated(duration: duration * 0.85, curve: curve) + verticalTransition = .animated(duration: duration * 1.15, curve: curve) + } else { + horizontalTransition = transition + verticalTransition = .animated(duration: duration * 0.6, curve: curve) + } + horizontalTransition.animatePositionAdditive(node: self.avatarListNode, offset: CGPoint(x: previousFrame.midX - apparentAvatarFrame.midX, y: 0.0)) + verticalTransition.animatePositionAdditive(node: self.avatarListNode, offset: CGPoint(x: 0.0, y: previousFrame.midY - apparentAvatarFrame.midY)) + } else { + transition.updateFrameAdditive(node: self.avatarListNode, frame: CGRect(origin: apparentAvatarFrame.center, size: CGSize())) + } + + let avatarListContainerFrame: CGRect + let avatarListContainerScale: CGFloat + if self.isAvatarExpanded { + if !transitionSourceAvatarFrame.width.isZero { + let neutralAvatarListContainerSize = expandedAvatarListSize + let avatarListContainerSize = CGSize(width: neutralAvatarListContainerSize.width * (1.0 - transitionFraction) + transitionSourceAvatarFrame.width * transitionFraction, height: neutralAvatarListContainerSize.height * (1.0 - transitionFraction) + transitionSourceAvatarFrame.height * transitionFraction) + avatarListContainerFrame = CGRect(origin: CGPoint(x: -avatarListContainerSize.width / 2.0, y: -avatarListContainerSize.height / 2.0), size: avatarListContainerSize) + } else { + avatarListContainerFrame = CGRect(origin: CGPoint(x: -expandedAvatarListSize.width / 2.0, y: -expandedAvatarListSize.height / 2.0), size: expandedAvatarListSize) + } + avatarListContainerScale = 1.0 + max(0.0, -contentOffset / avatarListContainerFrame.height) + } else { + avatarListContainerFrame = CGRect(origin: CGPoint(x: -apparentAvatarFrame.width / 2.0, y: -apparentAvatarFrame.height / 2.0), size: apparentAvatarFrame.size) + avatarListContainerScale = avatarScale + } + transition.updateFrame(node: self.avatarListNode.listContainerNode, frame: avatarListContainerFrame) + let innerScale = avatarListContainerFrame.height / expandedAvatarListSize.height + let innerDeltaX = (avatarListContainerFrame.width - expandedAvatarListSize.width) / 2.0 + let innerDeltaY = (avatarListContainerFrame.height - expandedAvatarListSize.height) / 2.0 + transition.updateSublayerTransformScale(node: self.avatarListNode.listContainerNode, scale: innerScale) + transition.updateFrameAdditive(node: self.avatarListNode.listContainerNode.contentNode, frame: CGRect(origin: CGPoint(x: innerDeltaX + expandedAvatarListSize.width / 2.0, y: innerDeltaY + expandedAvatarListSize.height / 2.0), size: CGSize())) + + transition.updateFrameAdditive(node: self.avatarListNode.listContainerNode.controlsClippingOffsetNode, frame: CGRect(origin: controlsClippingFrame.center, size: CGSize())) + transition.updateFrame(node: self.avatarListNode.listContainerNode.controlsClippingNode, frame: CGRect(origin: CGPoint(x: -controlsClippingFrame.width / 2.0, y: -controlsClippingFrame.height / 2.0), size: controlsClippingFrame.size)) + transition.updateFrameAdditive(node: self.avatarListNode.listContainerNode.controlsContainerNode, frame: CGRect(origin: CGPoint(x: -controlsClippingFrame.minX, y: -controlsClippingFrame.minY), size: CGSize(width: expandedAvatarListSize.width, height: expandedAvatarListSize.height))) + + transition.updateFrame(node: self.avatarListNode.listContainerNode.shadowNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: expandedAvatarListSize.width, height: navigationHeight + 20.0))) + transition.updateFrame(node: self.avatarListNode.listContainerNode.stripContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: statusBarHeight + 2.0), size: CGSize(width: expandedAvatarListSize.width, height: 2.0))) + transition.updateFrame(node: self.avatarListNode.listContainerNode.highlightContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: expandedAvatarListSize.width, height: expandedAvatarListSize.height))) + transition.updateAlpha(node: self.avatarListNode.listContainerNode.controlsContainerNode, alpha: self.isAvatarExpanded ? (1.0 - transitionFraction) : 0.0) + + if additive { + transition.updateSublayerTransformScaleAdditive(node: self.avatarListNode.listContainerTransformNode, scale: avatarListContainerScale) + } else { + transition.updateSublayerTransformScale(node: self.avatarListNode.listContainerTransformNode, scale: avatarListContainerScale) + } + + self.avatarListNode.listContainerNode.update(size: expandedAvatarListSize, peer: peer, transition: transition) + + let buttonsCollapseStart = titleCollapseOffset + let buttonsCollapseEnd = 212.0 - (navigationHeight - statusBarHeight) + 10.0 + + let buttonsCollapseFraction = max(0.0, contentOffset - buttonsCollapseStart) / (buttonsCollapseEnd - buttonsCollapseStart) + + let rawHeight: CGFloat + let height: CGFloat + if self.isAvatarExpanded { + rawHeight = expandedAvatarHeight + height = max(navigationHeight, rawHeight - contentOffset) + } else { + rawHeight = navigationHeight + 212.0 + height = navigationHeight + max(0.0, 212.0 - contentOffset) + } + + let apparentHeight = (1.0 - transitionFraction) * height + transitionFraction * transitionSourceHeight + + if !titleSize.width.isZero && !titleSize.height.isZero { + if self.navigationTransition != nil { + var neutralTitleScale: CGFloat = 1.0 + var neutralSubtitleScale: CGFloat = 1.0 + if self.isAvatarExpanded { + neutralTitleScale = 0.7 + neutralSubtitleScale = 1.0 + } + + let titleScale = (transitionFraction * transitionSourceTitleFrame.height + (1.0 - transitionFraction) * titleFrame.height * neutralTitleScale) / (titleFrame.height) + let subtitleScale = max(0.01, min(10.0, (transitionFraction * transitionSourceSubtitleFrame.height + (1.0 - transitionFraction) * subtitleFrame.height * neutralSubtitleScale) / (subtitleFrame.height))) + + let titleCenter = CGPoint(x: transitionFraction * transitionSourceTitleFrame.midX + (1.0 - transitionFraction) * titleFrame.midX, y: transitionFraction * transitionSourceTitleFrame.midY + (1.0 - transitionFraction) * titleFrame.midY) + let subtitleCenter = CGPoint(x: transitionFraction * transitionSourceSubtitleFrame.midX + (1.0 - transitionFraction) * subtitleFrame.midX, y: transitionFraction * transitionSourceSubtitleFrame.midY + (1.0 - transitionFraction) * subtitleFrame.midY) + + let rawTitleFrame = CGRect(origin: CGPoint(x: titleCenter.x - titleFrame.size.width * titleScale / 2.0, y: titleCenter.y - titleFrame.size.height * titleScale / 2.0), size: CGSize(width: titleFrame.size.width * titleScale, height: titleFrame.size.height * titleScale)) + self.titleNodeRawContainer.frame = rawTitleFrame + transition.updateFrameAdditiveToCenter(node: self.titleNodeContainer, frame: CGRect(origin: rawTitleFrame.center, size: CGSize())) + transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: -titleFrame.size.width * 1.0 / titleScale / 2.0, y: -titleFrame.size.height * 1.0 / titleScale / 2.0), size: titleFrame.size)) + let rawSubtitleFrame = CGRect(origin: CGPoint(x: subtitleCenter.x - subtitleFrame.size.width / 2.0, y: subtitleCenter.y - subtitleFrame.size.height / 2.0), size: subtitleFrame.size) + self.subtitleNodeRawContainer.frame = rawSubtitleFrame + transition.updateFrameAdditiveToCenter(node: self.subtitleNodeContainer, frame: rawSubtitleFrame) + transition.updateFrame(node: self.subtitleNode, frame: CGRect(origin: CGPoint(), size: subtitleFrame.size)) + transition.updateSublayerTransformScale(node: self.titleNodeContainer, scale: titleScale) + transition.updateSublayerTransformScale(node: self.subtitleNodeContainer, scale: subtitleScale) + } else { + let titleScale: CGFloat + let subtitleScale: CGFloat + if self.isAvatarExpanded { + titleScale = 0.7 + subtitleScale = 1.0 + } else { + titleScale = (1.0 - titleCollapseFraction) * 1.0 + titleCollapseFraction * titleMinScale + subtitleScale = (1.0 - titleCollapseFraction) * 1.0 + titleCollapseFraction * subtitleMinScale + } + + let rawTitleFrame = titleFrame + self.titleNodeRawContainer.frame = rawTitleFrame + transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(), size: titleFrame.size)) + let rawSubtitleFrame = subtitleFrame + self.subtitleNodeRawContainer.frame = rawSubtitleFrame + if self.isAvatarExpanded { + transition.updateFrameAdditive(node: self.titleNodeContainer, frame: rawTitleFrame.offsetBy(dx: 0.0, dy: titleOffset + apparentTitleLockOffset).offsetBy(dx: rawTitleFrame.width * 0.5 * (titleScale - 1.0), dy: rawTitleFrame.height * 0.5 * (titleScale - 1.0))) + transition.updateFrameAdditive(node: self.subtitleNodeContainer, frame: rawSubtitleFrame.offsetBy(dx: 0.0, dy: titleOffset).offsetBy(dx: rawSubtitleFrame.width * 0.5 * (subtitleScale - 1.0), dy: rawSubtitleFrame.height * 0.5 * (subtitleScale - 1.0))) + } else { + transition.updateFrameAdditiveToCenter(node: self.titleNodeContainer, frame: rawTitleFrame.offsetBy(dx: 0.0, dy: titleOffset + apparentTitleLockOffset)) + transition.updateFrameAdditiveToCenter(node: self.subtitleNodeContainer, frame: rawSubtitleFrame.offsetBy(dx: 0.0, dy: titleOffset)) + } + transition.updateFrame(node: self.subtitleNode, frame: CGRect(origin: CGPoint(), size: subtitleFrame.size)) + transition.updateSublayerTransformScaleAdditive(node: self.titleNodeContainer, scale: titleScale) + transition.updateSublayerTransformScaleAdditive(node: self.subtitleNodeContainer, scale: subtitleScale) + } + } + + let buttonSpacing: CGFloat + if self.isAvatarExpanded { + buttonSpacing = 16.0 + } else { + buttonSpacing = min(defaultMaxButtonSpacing, width - floor(CGFloat(buttonKeys.count) * defaultButtonSize / CGFloat(buttonKeys.count + 1))) + } + + let expandedButtonSize: CGFloat = 32.0 + let buttonsWidth = buttonSpacing * CGFloat(buttonKeys.count - 1) + CGFloat(buttonKeys.count) * defaultButtonSize + var buttonRightOrigin: CGPoint + if self.isAvatarExpanded { + buttonRightOrigin = CGPoint(x: width - 16.0, y: apparentHeight - 74.0) + } else { + buttonRightOrigin = CGPoint(x: floor((width - buttonsWidth) / 2.0) + buttonsWidth, y: apparentHeight - 74.0) + } + let buttonsScale: CGFloat + let buttonsAlpha: CGFloat + let apparentButtonSize: CGFloat + let buttonsVerticalOffset: CGFloat + if self.navigationTransition != nil { + if self.isAvatarExpanded { + apparentButtonSize = expandedButtonSize + } else { + apparentButtonSize = defaultButtonSize + } + let neutralButtonsScale = apparentButtonSize / defaultButtonSize + buttonsScale = (1.0 - transitionFraction) * neutralButtonsScale + 0.2 * transitionFraction + buttonsAlpha = 1.0 - transitionFraction + + let neutralButtonsOffset: CGFloat + if self.isAvatarExpanded { + neutralButtonsOffset = 74.0 - 15.0 - defaultButtonSize + (defaultButtonSize - apparentButtonSize) / 2.0 + } else { + neutralButtonsOffset = (1.0 - buttonsScale) * apparentButtonSize + } + + buttonsVerticalOffset = (1.0 - transitionFraction) * neutralButtonsOffset + ((1.0 - buttonsScale) * apparentButtonSize) * transitionFraction + } else { + apparentButtonSize = self.isAvatarExpanded ? expandedButtonSize : defaultButtonSize + if self.isAvatarExpanded { + buttonsScale = apparentButtonSize / defaultButtonSize + buttonsVerticalOffset = 74.0 - 15.0 - defaultButtonSize + (defaultButtonSize - apparentButtonSize) / 2.0 + } else { + buttonsScale = (1.0 - buttonsCollapseFraction) * 1.0 + 0.2 * buttonsCollapseFraction + buttonsVerticalOffset = (1.0 - buttonsScale) * apparentButtonSize + } + buttonsAlpha = 1.0 - buttonsCollapseFraction + } + let buttonsScaledOffset = (defaultButtonSize - apparentButtonSize) / 2.0 + for buttonKey in buttonKeys.reversed() { + let buttonNode: PeerInfoHeaderButtonNode + var wasAdded = false + if let current = self.buttonNodes[buttonKey] { + buttonNode = current + } else { + wasAdded = true + buttonNode = PeerInfoHeaderButtonNode(key: buttonKey, action: { [weak self] buttonNode in + self?.buttonPressed(buttonNode) + }) + self.buttonNodes[buttonKey] = buttonNode + self.regularContentNode.addSubnode(buttonNode) + } + + let buttonFrame = CGRect(origin: CGPoint(x: buttonRightOrigin.x - defaultButtonSize + buttonsScaledOffset, y: buttonRightOrigin.y), size: CGSize(width: defaultButtonSize, height: defaultButtonSize)) + let buttonTransition: ContainedViewLayoutTransition = wasAdded ? .immediate : transition + + let apparentButtonFrame = buttonFrame.offsetBy(dx: 0.0, dy: buttonsVerticalOffset) + if additive { + buttonTransition.updateFrameAdditiveToCenter(node: buttonNode, frame: apparentButtonFrame) + } else { + buttonTransition.updateFrame(node: buttonNode, frame: apparentButtonFrame) + } + let buttonText: String + let buttonIcon: PeerInfoHeaderButtonIcon + switch buttonKey { + case .message: + buttonText = "Message" + buttonIcon = .message + case .discussion: + buttonText = "Discussion" + buttonIcon = .message + case .call: + buttonText = "Call" + buttonIcon = .call + case .mute: + if let notificationSettings = notificationSettings, case .muted = notificationSettings.muteState { + buttonText = "Unmute" + buttonIcon = .unmute + } else { + buttonText = "Mute" + buttonIcon = .mute + } + case .more: + buttonText = "More" + buttonIcon = .more + case .addMember: + buttonText = "Add Member" + buttonIcon = .addMember + } + buttonNode.update(size: buttonFrame.size, text: buttonText, icon: buttonIcon, isExpanded: self.isAvatarExpanded, presentationData: presentationData, transition: buttonTransition) + transition.updateSublayerTransformScaleAdditive(node: buttonNode, scale: buttonsScale) + + transition.updateAlpha(node: buttonNode, alpha: buttonsAlpha) + + let hiddenWhileExpanded: Bool + switch buttonKey { + case .mute: + hiddenWhileExpanded = true + default: + hiddenWhileExpanded = false + } + + if self.isAvatarExpanded, hiddenWhileExpanded { + if case let .animated(duration, curve) = transition { + ContainedViewLayoutTransition.animated(duration: duration * 0.3, curve: curve).updateAlpha(node: buttonNode.containerNode, alpha: 0.0) + } else { + transition.updateAlpha(node: buttonNode.containerNode, alpha: 0.0) + } + } else { + if case .mute = buttonKey, buttonNode.containerNode.alpha.isZero, additive { + if case let .animated(duration, curve) = transition { + ContainedViewLayoutTransition.animated(duration: duration * 0.3, curve: curve).updateAlpha(node: buttonNode.containerNode, alpha: 1.0) + } else { + transition.updateAlpha(node: buttonNode.containerNode, alpha: 1.0) + } + } else { + transition.updateAlpha(node: buttonNode.containerNode, alpha: 1.0) + } + buttonRightOrigin.x -= apparentButtonSize + buttonSpacing + } + } + + for key in self.buttonNodes.keys { + if !buttonKeys.contains(key) { + if let buttonNode = self.buttonNodes[key] { + self.buttonNodes.removeValue(forKey: key) + buttonNode.removeFromSupernode() + } + } + } + + let resolvedRegularHeight: CGFloat + if self.isAvatarExpanded { + resolvedRegularHeight = expandedAvatarListSize.height + expandedAvatarControlsHeight + } else { + resolvedRegularHeight = 212.0 + navigationHeight + } + + let backgroundFrame: CGRect + let separatorFrame: CGRect + + let resolvedHeight: CGFloat + if state.isEditing { + resolvedHeight = editingContentHeight + backgroundFrame = CGRect(origin: CGPoint(x: 0.0, y: -2000.0 + resolvedHeight - contentOffset), size: CGSize(width: width, height: 2000.0)) + separatorFrame = CGRect(origin: CGPoint(x: 0.0, y: resolvedHeight - contentOffset), size: CGSize(width: width, height: UIScreenPixel)) + } else { + resolvedHeight = resolvedRegularHeight + backgroundFrame = CGRect(origin: CGPoint(x: 0.0, y: -2000.0 + apparentHeight), size: CGSize(width: width, height: 2000.0)) + separatorFrame = CGRect(origin: CGPoint(x: 0.0, y: apparentHeight), size: CGSize(width: width, height: UIScreenPixel)) + } + + transition.updateFrame(node: self.regularContentNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: width, height: resolvedHeight))) + + if additive { + transition.updateFrameAdditive(node: self.backgroundNode, frame: backgroundFrame) + transition.updateFrameAdditive(node: self.expandedBackgroundNode, frame: backgroundFrame) + transition.updateFrameAdditive(node: self.separatorNode, frame: separatorFrame) + } else { + transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame) + transition.updateFrame(node: self.expandedBackgroundNode, frame: backgroundFrame) + transition.updateFrame(node: self.separatorNode, frame: separatorFrame) + } + + return resolvedHeight + } + + private func buttonPressed(_ buttonNode: PeerInfoHeaderButtonNode) { + self.performButtonAction?(buttonNode.key) + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + guard let result = super.hitTest(point, with: event) else { + return nil + } + if result.isDescendant(of: self.navigationButtonContainer.view) { + return result + } + if !self.backgroundNode.frame.contains(point) { + return nil + } + if result == self.view || result == self.regularContentNode.view || result == self.editingContentNode.view { + return nil + } + return result + } + + func updateIsAvatarExpanded(_ isAvatarExpanded: Bool, transition: ContainedViewLayoutTransition) { + if self.isAvatarExpanded != isAvatarExpanded { + self.isAvatarExpanded = isAvatarExpanded + if isAvatarExpanded { + self.avatarListNode.listContainerNode.selectFirstItem() + } + if case .animated = transition, !isAvatarExpanded { + self.avatarListNode.animateAvatarCollapse(transition: transition) + } + } + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoMembers.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoMembers.swift new file mode 100644 index 0000000000..ecc921a2c0 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoMembers.swift @@ -0,0 +1,153 @@ +import Foundation +import SwiftSignalKit +import Postbox +import SyncCore +import TelegramCore +import AccountContext +import TemporaryCachedPeerDataManager + +enum PeerInfoMember: Equatable { + case channelMember(RenderedChannelParticipant) + + var id: PeerId { + switch self { + case let .channelMember(channelMember): + return channelMember.peer.id + } + } + + var peer: Peer { + switch self { + case let .channelMember(channelMember): + return channelMember.peer + } + } + + var presence: TelegramUserPresence? { + switch self { + case let .channelMember(channelMember): + return channelMember.presences[channelMember.peer.id] as? TelegramUserPresence + } + } +} + +enum PeerInfoMembersDataState: Equatable { + case loading(isInitial: Bool) + case ready(canLoadMore: Bool) +} + +struct PeerInfoMembersState: Equatable { + var members: [PeerInfoMember] + var dataState: PeerInfoMembersDataState +} + +private final class PeerInfoMembersContextImpl { + private let queue: Queue + private let context: AccountContext + private let peerId: PeerId + + private var members: [PeerInfoMember] = [] + private var dataState: PeerInfoMembersDataState = .loading(isInitial: true) + + private let stateValue = Promise() + var state: Signal { + return self.stateValue.get() + } + private let disposable = MetaDisposable() + + private var channelMembersControl: PeerChannelMemberCategoryControl? + + init(queue: Queue, context: AccountContext, peerId: PeerId) { + self.queue = queue + self.context = context + self.peerId = peerId + + self.pushState() + + if peerId.namespace == Namespaces.Peer.CloudChannel { + let (disposable, control) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { [weak self] state in + queue.async { + guard let strongSelf = self else { + return + } + strongSelf.members = state.list.map(PeerInfoMember.channelMember) + switch state.loadingState { + case let .loading(initial): + strongSelf.dataState = .loading(isInitial: initial) + case let .ready(hasMore): + strongSelf.dataState = .ready(canLoadMore: hasMore) + } + strongSelf.pushState() + } + }) + self.disposable.set(disposable) + self.channelMembersControl = control + } else if peerId.namespace == Namespaces.Peer.CloudGroup { + disposable.set((context.account.postbox.peerView(id: peerId) + |> deliverOn(self.queue)).start(next: { [weak self] view in + guard let strongSelf = self, let cachedData = view.cachedData as? CachedGroupData, let participantsData = cachedData.participants else { + return + } + var members: [PeerInfoMember] = [] + for participant in participantsData.participants { + if let peer = view.peers[participant.peerId] { + + } + } + strongSelf.dataState = .ready(canLoadMore: false) + strongSelf.pushState() + })) + } else { + self.dataState = .ready(canLoadMore: false) + self.pushState() + } + } + + deinit { + self.disposable.dispose() + } + + private func pushState() { + self.stateValue.set(.single(PeerInfoMembersState(members: self.members, dataState: self.dataState))) + } + + func loadMore() { + if case .ready(true) = self.dataState, let channelMembersControl = self.channelMembersControl { + self.context.peerChannelMemberCategoriesContextsManager.loadMore(peerId: self.peerId, control: channelMembersControl) + } + } +} + +final class PeerInfoMembersContext: Equatable { + private let queue = Queue.mainQueue() + private let impl: QueueLocalObject + + var state: Signal { + return Signal { subscriber in + let disposable = MetaDisposable() + self.impl.with { impl in + disposable.set(impl.state.start(next: { value in + subscriber.putNext(value) + })) + } + return disposable + } + } + + init(context: AccountContext, peerId: PeerId) { + let queue = self.queue + self.impl = QueueLocalObject(queue: queue, generate: { + return PeerInfoMembersContextImpl(queue: queue, context: context, peerId: peerId) + }) + } + + func loadMore() { + self.impl.with { impl in + impl.loadMore() + } + } + + static func ==(lhs: PeerInfoMembersContext, rhs: PeerInfoMembersContext) -> Bool { + return lhs === rhs + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoPaneContainerNode.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoPaneContainerNode.swift new file mode 100644 index 0000000000..9eb080c548 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoPaneContainerNode.swift @@ -0,0 +1,567 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import SwiftSignalKit +import TelegramPresentationData +import Postbox +import SyncCore +import TelegramCore +import AccountContext +import ContextUI + +protocol PeerInfoPaneNode: ASDisplayNode { + var isReady: Signal { get } + + func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, isScrollingLockedAtTop: Bool, presentationData: PresentationData, synchronous: Bool, transition: ContainedViewLayoutTransition) + func scrollToTop() -> Bool + func transferVelocity(_ velocity: CGFloat) + func findLoadedMessage(id: MessageId) -> Message? + func transitionNodeForGallery(messageId: MessageId, media: Media) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? + func addToTransitionSurface(view: UIView) + func updateHiddenMedia() + func updateSelectedMessages(animated: Bool) +} + +final class PeerInfoPaneWrapper { + let key: PeerInfoPaneKey + let node: PeerInfoPaneNode + private var appliedParams: (CGSize, CGFloat, CGFloat, CGFloat, Bool, PresentationData)? + + init(key: PeerInfoPaneKey, node: PeerInfoPaneNode) { + self.key = key + self.node = node + } + + func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, isScrollingLockedAtTop: Bool, presentationData: PresentationData, synchronous: Bool, transition: ContainedViewLayoutTransition) { + if let (currentSize, currentSideInset, currentBottomInset, visibleHeight, currentIsScrollingLockedAtTop, currentPresentationData) = self.appliedParams { + if currentSize == size && currentSideInset == sideInset && currentBottomInset == bottomInset, currentIsScrollingLockedAtTop == isScrollingLockedAtTop && currentPresentationData === presentationData { + return + } + } + self.appliedParams = (size, sideInset, bottomInset, visibleHeight, isScrollingLockedAtTop, presentationData) + self.node.update(size: size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, isScrollingLockedAtTop: isScrollingLockedAtTop, presentationData: presentationData, synchronous: synchronous, transition: transition) + } +} + +enum PeerInfoPaneKey { + case media + case files + case links + case voice + case music + case groupsInCommon + case members +} + +final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode { + private let pressed: () -> Void + + private let titleNode: ImmediateTextNode + private let buttonNode: HighlightTrackingButtonNode + + init(pressed: @escaping () -> Void) { + self.pressed = pressed + + self.titleNode = ImmediateTextNode() + self.titleNode.displaysAsynchronously = false + + self.buttonNode = HighlightTrackingButtonNode() + + super.init() + + self.addSubnode(self.titleNode) + self.addSubnode(self.buttonNode) + + self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside) + self.buttonNode.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.titleNode.layer.removeAnimation(forKey: "opacity") + strongSelf.titleNode.alpha = 0.4 + } else { + strongSelf.titleNode.alpha = 1.0 + strongSelf.titleNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) + } + } + } + } + + @objc private func buttonPressed() { + self.pressed() + } + + func updateText(_ title: String, isSelected: Bool, presentationData: PresentationData) { + self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(14.0), textColor: isSelected ? presentationData.theme.list.itemAccentColor : presentationData.theme.list.itemSecondaryTextColor) + } + + func updateLayout(height: CGFloat) -> CGFloat { + let titleSize = self.titleNode.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude)) + self.titleNode.frame = CGRect(origin: CGPoint(x: 0.0, y: floor((height - titleSize.height) / 2.0)), size: titleSize) + return titleSize.width + } + + func updateArea(size: CGSize, sideInset: CGFloat) { + self.buttonNode.frame = CGRect(origin: CGPoint(x: -sideInset, y: 0.0), size: CGSize(width: size.width + sideInset * 2.0, height: size.height)) + } +} + +struct PeerInfoPaneSpecifier: Equatable { + var key: PeerInfoPaneKey + var title: String +} + +final class PeerInfoPaneTabsContainerNode: ASDisplayNode { + private let scrollNode: ASScrollNode + private var paneNodes: [PeerInfoPaneKey: PeerInfoPaneTabsContainerPaneNode] = [:] + private let selectedLineNode: ASImageNode + + private var currentParams: ([PeerInfoPaneSpecifier], PeerInfoPaneKey?, PresentationData)? + + var requestSelectPane: ((PeerInfoPaneKey) -> Void)? + + override init() { + self.scrollNode = ASScrollNode() + + self.selectedLineNode = ASImageNode() + self.selectedLineNode.displaysAsynchronously = false + self.selectedLineNode.displayWithoutProcessing = true + + super.init() + + self.scrollNode.view.disablesInteractiveTransitionGestureRecognizerNow = { [weak self] in + guard let strongSelf = self else { + return false + } + return strongSelf.scrollNode.view.contentOffset.x > .ulpOfOne + } + self.scrollNode.view.showsHorizontalScrollIndicator = false + self.scrollNode.view.scrollsToTop = false + if #available(iOS 11.0, *) { + self.scrollNode.view.contentInsetAdjustmentBehavior = .never + } + + self.addSubnode(self.scrollNode) + self.scrollNode.addSubnode(self.selectedLineNode) + } + + func update(size: CGSize, presentationData: PresentationData, paneList: [PeerInfoPaneSpecifier], selectedPane: PeerInfoPaneKey?, transition: ContainedViewLayoutTransition) { + transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: size)) + + let focusOnSelectedPane = self.currentParams?.1 != selectedPane + + if self.currentParams?.2.theme !== presentationData.theme { + self.selectedLineNode.image = generateImage(CGSize(width: 7.0, height: 4.0), rotatedContext: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setFillColor(presentationData.theme.list.itemAccentColor.cgColor) + context.fillEllipse(in: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.width))) + })?.stretchableImage(withLeftCapWidth: 4, topCapHeight: 1) + } + + if self.currentParams?.0 != paneList || self.currentParams?.1 != selectedPane || self.currentParams?.2 !== presentationData { + self.currentParams = (paneList, selectedPane, presentationData) + for specifier in paneList { + let paneNode: PeerInfoPaneTabsContainerPaneNode + var wasAdded = false + if let current = self.paneNodes[specifier.key] { + paneNode = current + } else { + wasAdded = true + paneNode = PeerInfoPaneTabsContainerPaneNode(pressed: { [weak self] in + self?.paneSelected(specifier.key) + }) + self.paneNodes[specifier.key] = paneNode + self.scrollNode.addSubnode(paneNode) + } + paneNode.updateText(specifier.title, isSelected: selectedPane == specifier.key, presentationData: presentationData) + } + var removeKeys: [PeerInfoPaneKey] = [] + for (key, _) in self.paneNodes { + if !paneList.contains(where: { $0.key == key }) { + removeKeys.append(key) + } + } + for key in removeKeys { + if let paneNode = self.paneNodes.removeValue(forKey: key) { + paneNode.removeFromSupernode() + } + } + } + + var tabSizes: [(CGSize, PeerInfoPaneTabsContainerPaneNode)] = [] + var totalRawTabSize: CGFloat = 0.0 + + var selectedFrame: CGRect? + for specifier in paneList { + guard let paneNode = self.paneNodes[specifier.key] else { + continue + } + let paneNodeWidth = paneNode.updateLayout(height: size.height) + let paneNodeSize = CGSize(width: paneNodeWidth, height: size.height) + tabSizes.append((paneNodeSize, paneNode)) + totalRawTabSize += paneNodeSize.width + } + + let spacing: CGFloat = 32.0 + if tabSizes.count == 1 { + for i in 0 ..< tabSizes.count { + let (paneNodeSize, paneNode) = tabSizes[i] + let leftOffset: CGFloat = 16.0 + + let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize) + paneNode.frame = paneFrame + let areaSideInset: CGFloat = 16.0 + paneNode.updateArea(size: paneFrame.size, sideInset: areaSideInset) + paneNode.hitTestSlop = UIEdgeInsets(top: 0.0, left: -areaSideInset, bottom: 0.0, right: -areaSideInset) + + if paneList[i].key == selectedPane { + selectedFrame = paneFrame + } + } + self.scrollNode.view.contentSize = CGSize(width: size.width, height: size.height) + } else if totalRawTabSize + CGFloat(tabSizes.count + 1) * spacing <= size.width { + let availableSpace = size.width + let availableSpacing = availableSpace - totalRawTabSize + let perTabSpacing = floor(availableSpacing / CGFloat(tabSizes.count + 1)) + + var leftOffset = perTabSpacing + for i in 0 ..< tabSizes.count { + let (paneNodeSize, paneNode) = tabSizes[i] + + let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize) + paneNode.frame = paneFrame + let areaSideInset = floor(perTabSpacing / 2.0) + paneNode.updateArea(size: paneFrame.size, sideInset: areaSideInset) + paneNode.hitTestSlop = UIEdgeInsets(top: 0.0, left: -areaSideInset, bottom: 0.0, right: -areaSideInset) + + leftOffset += paneNodeSize.width + perTabSpacing + + if paneList[i].key == selectedPane { + selectedFrame = paneFrame + } + } + self.scrollNode.view.contentSize = CGSize(width: size.width, height: size.height) + } else { + let sideInset: CGFloat = 16.0 + var leftOffset: CGFloat = sideInset + for i in 0 ..< tabSizes.count { + let (paneNodeSize, paneNode) = tabSizes[i] + let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize) + paneNode.frame = paneFrame + paneNode.updateArea(size: paneFrame.size, sideInset: spacing) + paneNode.hitTestSlop = UIEdgeInsets(top: 0.0, left: -spacing, bottom: 0.0, right: -spacing) + if paneList[i].key == selectedPane { + selectedFrame = paneFrame + } + leftOffset += paneNodeSize.width + spacing + } + self.scrollNode.view.contentSize = CGSize(width: leftOffset - spacing + sideInset, height: size.height) + } + + if let selectedFrame = selectedFrame { + self.selectedLineNode.isHidden = false + transition.updateFrame(node: self.selectedLineNode, frame: CGRect(origin: CGPoint(x: selectedFrame.minX, y: size.height - 4.0), size: CGSize(width: selectedFrame.width, height: 4.0))) + if focusOnSelectedPane { + if selectedPane == paneList.first?.key { + transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(), size: self.scrollNode.bounds.size)) + } else if selectedPane == paneList.last?.key { + transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(x: self.scrollNode.view.contentSize.width - self.scrollNode.bounds.width, y: 0.0), size: self.scrollNode.bounds.size)) + } else { + let contentOffsetX = max(0.0, min(self.scrollNode.view.contentSize.width - self.scrollNode.bounds.width, floor(selectedFrame.midX - self.scrollNode.bounds.width / 2.0))) + transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(x: contentOffsetX, y: 0.0), size: self.scrollNode.bounds.size)) + } + } + } else { + self.selectedLineNode.isHidden = true + } + } + + private func paneSelected(_ key: PeerInfoPaneKey) { + self.requestSelectPane?(key) + } +} + +final class PeerInfoPaneContainerNode: ASDisplayNode { + private let context: AccountContext + private let peerId: PeerId + + private let coveringBackgroundNode: ASDisplayNode + private let separatorNode: ASDisplayNode + private let tabsContainerNode: PeerInfoPaneTabsContainerNode + private let tapsSeparatorNode: ASDisplayNode + + let isReady = Promise() + var didSetIsReady = false + + private var currentParams: (size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, expansionFraction: CGFloat, presentationData: PresentationData, data: PeerInfoScreenData?)? + private(set) var currentPaneKey: PeerInfoPaneKey? + private(set) var currentPane: PeerInfoPaneWrapper? + + private var currentCandidatePaneKey: PeerInfoPaneKey? + private var candidatePane: (PeerInfoPaneWrapper, Disposable, Bool)? + + var selectionPanelNode: PeerInfoSelectionPanelNode? + + var chatControllerInteraction: ChatControllerInteraction? + var openPeerContextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)? + + var currentPaneUpdated: (() -> Void)? + + private var currentAvailablePanes: [PeerInfoPaneKey]? + + init(context: AccountContext, peerId: PeerId) { + self.context = context + self.peerId = peerId + + self.separatorNode = ASDisplayNode() + self.separatorNode.isLayerBacked = true + + self.coveringBackgroundNode = ASDisplayNode() + self.coveringBackgroundNode.isLayerBacked = true + + self.tabsContainerNode = PeerInfoPaneTabsContainerNode() + + self.tapsSeparatorNode = ASDisplayNode() + self.tapsSeparatorNode.isLayerBacked = true + + super.init() + + self.addSubnode(self.separatorNode) + self.addSubnode(self.coveringBackgroundNode) + self.addSubnode(self.tabsContainerNode) + self.addSubnode(self.tapsSeparatorNode) + + self.tabsContainerNode.requestSelectPane = { [weak self] key in + guard let strongSelf = self else { + return + } + if strongSelf.currentPaneKey == key { + strongSelf.currentPane?.node.scrollToTop() + return + } + if strongSelf.currentCandidatePaneKey == key { + return + } + strongSelf.currentCandidatePaneKey = key + + if let (size, sideInset, bottomInset, visibleHeight, expansionFraction, presentationData, data) = strongSelf.currentParams { + strongSelf.update(size: size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, expansionFraction: expansionFraction, presentationData: presentationData, data: data, transition: .immediate) + } + } + } + + func scrollToTop() -> Bool { + if let currentPane = self.currentPane { + return currentPane.node.scrollToTop() + } else { + return false + } + } + + func findLoadedMessage(id: MessageId) -> Message? { + return self.currentPane?.node.findLoadedMessage(id: id) + } + + func updateHiddenMedia() { + self.currentPane?.node.updateHiddenMedia() + } + + func transitionNodeForGallery(messageId: MessageId, media: Media) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? { + return self.currentPane?.node.transitionNodeForGallery(messageId: messageId, media: media) + } + + func updateSelectedMessageIds(_ selectedMessageIds: Set?, animated: Bool) { + self.currentPane?.node.updateSelectedMessages(animated: animated) + self.candidatePane?.0.node.updateSelectedMessages(animated: animated) + } + + func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, expansionFraction: CGFloat, presentationData: PresentationData, data: PeerInfoScreenData?, transition: ContainedViewLayoutTransition) { + let previousAvailablePanes = self.currentAvailablePanes ?? [] + let availablePanes = data?.availablePanes ?? [] + self.currentAvailablePanes = availablePanes + + if let currentPaneKey = self.currentPaneKey, !availablePanes.contains(currentPaneKey) { + var nextCandidatePaneKey: PeerInfoPaneKey? + if let index = previousAvailablePanes.index(of: currentPaneKey), index != 0 { + for i in (0 ... index - 1).reversed() { + if availablePanes.contains(previousAvailablePanes[i]) { + nextCandidatePaneKey = previousAvailablePanes[i] + } + } + } + if nextCandidatePaneKey == nil { + nextCandidatePaneKey = availablePanes.first + } + + if let nextCandidatePaneKey = nextCandidatePaneKey { + if self.currentCandidatePaneKey != nextCandidatePaneKey { + self.currentCandidatePaneKey = nextCandidatePaneKey + } + } else { + self.currentCandidatePaneKey = nil + if let (_, disposable, _) = self.candidatePane { + disposable.dispose() + self.candidatePane = nil + } + if let currentPane = self.currentPane { + self.currentPane = nil + currentPane.node.removeFromSupernode() + } + } + } else if self.currentPaneKey == nil { + self.currentCandidatePaneKey = availablePanes.first + } + + let previousCurrentPaneKey = self.currentPaneKey + + self.currentParams = (size, sideInset, bottomInset, visibleHeight, expansionFraction, presentationData, data) + + transition.updateAlpha(node: self.coveringBackgroundNode, alpha: expansionFraction) + + self.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor + self.coveringBackgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor + self.separatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + self.tapsSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let tabsHeight: CGFloat = 48.0 + + transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel))) + transition.updateFrame(node: self.coveringBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: size.width, height: tabsHeight + UIScreenPixel))) + + transition.updateFrame(node: self.tapsSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: tabsHeight - UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel))) + + let paneFrame = CGRect(origin: CGPoint(x: 0.0, y: tabsHeight), size: CGSize(width: size.width, height: size.height - tabsHeight)) + + if let currentCandidatePaneKey = self.currentCandidatePaneKey { + if self.candidatePane?.0.key != currentCandidatePaneKey { + self.candidatePane?.1.dispose() + + let paneNode: PeerInfoPaneNode + switch currentCandidatePaneKey { + case .media: + paneNode = PeerInfoVisualMediaPaneNode(context: self.context, chatControllerInteraction: self.chatControllerInteraction!, peerId: self.peerId) + case .files: + paneNode = PeerInfoListPaneNode(context: self.context, chatControllerInteraction: self.chatControllerInteraction!, peerId: self.peerId, tagMask: .file) + case .links: + paneNode = PeerInfoListPaneNode(context: self.context, chatControllerInteraction: self.chatControllerInteraction!, peerId: self.peerId, tagMask: .webPage) + case .voice: + paneNode = PeerInfoListPaneNode(context: self.context, chatControllerInteraction: self.chatControllerInteraction!, peerId: self.peerId, tagMask: .voiceOrInstantVideo) + case .music: + paneNode = PeerInfoListPaneNode(context: self.context, chatControllerInteraction: self.chatControllerInteraction!, peerId: self.peerId, tagMask: .music) + case .groupsInCommon: + paneNode = PeerInfoGroupsInCommonPaneNode(context: self.context, peerId: peerId, chatControllerInteraction: self.chatControllerInteraction!, openPeerContextAction: self.openPeerContextAction!, peers: data?.groupsInCommon ?? []) + case .members: + if case let .longList(membersContext) = data?.members { + paneNode = PeerInfoMembersPaneNode(context: self.context, membersContext: membersContext) + } else { + preconditionFailure() + } + } + + let disposable = MetaDisposable() + self.candidatePane = (PeerInfoPaneWrapper(key: currentCandidatePaneKey, node: paneNode), disposable, false) + + var shouldReLayout = false + disposable.set((paneNode.isReady + |> take(1) + |> deliverOnMainQueue).start(next: { [weak self] _ in + guard let strongSelf = self else { + return + } + if let (candidatePane, disposable, _) = strongSelf.candidatePane { + strongSelf.candidatePane = (candidatePane, disposable, true) + + if shouldReLayout { + if let (size, sideInset, bottomInset, visibleHeight, expansionFraction, presentationData, data) = strongSelf.currentParams { + strongSelf.update(size: size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, expansionFraction: expansionFraction, presentationData: presentationData, data: data, transition: strongSelf.currentPane != nil ? .animated(duration: 0.35, curve: .spring) : .immediate) + } + } + } + })) + shouldReLayout = true + } + } + + if let (candidatePane, _, isReady) = self.candidatePane, isReady { + let previousPane = self.currentPane + self.candidatePane = nil + self.currentPaneKey = candidatePane.key + self.currentCandidatePaneKey = nil + self.currentPane = candidatePane + + if let selectionPanelNode = self.selectionPanelNode { + self.insertSubnode(candidatePane.node, belowSubnode: selectionPanelNode) + } else { + self.addSubnode(candidatePane.node) + } + candidatePane.node.frame = paneFrame + candidatePane.update(size: paneFrame.size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: max(0.0, visibleHeight - paneFrame.minY), isScrollingLockedAtTop: expansionFraction < 1.0 - CGFloat.ulpOfOne, presentationData: presentationData, synchronous: true, transition: .immediate) + + if let previousPane = previousPane { + let directionToRight: Bool + if let previousIndex = availablePanes.index(of: previousPane.key), let updatedIndex = availablePanes.index(of: candidatePane.key) { + directionToRight = previousIndex < updatedIndex + } else { + directionToRight = false + } + + let offset: CGFloat = directionToRight ? previousPane.node.bounds.width : -previousPane.node.bounds.width + + transition.animatePositionAdditive(node: candidatePane.node, offset: CGPoint(x: offset, y: 0.0)) + let previousNode = previousPane.node + transition.updateFrame(node: previousNode, frame: paneFrame.offsetBy(dx: -offset, dy: 0.0), completion: { [weak previousNode] _ in + previousNode?.removeFromSupernode() + }) + } + } else if let currentPane = self.currentPane { + let paneWasAdded = currentPane.node.supernode == nil + if paneWasAdded { + self.addSubnode(currentPane.node) + } + + let paneTransition: ContainedViewLayoutTransition = paneWasAdded ? .immediate : transition + paneTransition.updateFrame(node: currentPane.node, frame: paneFrame) + currentPane.update(size: paneFrame.size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, isScrollingLockedAtTop: expansionFraction < 1.0 - CGFloat.ulpOfOne, presentationData: presentationData, synchronous: paneWasAdded, transition: paneTransition) + } + + transition.updateFrame(node: self.tabsContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: tabsHeight))) + self.tabsContainerNode.update(size: CGSize(width: size.width, height: tabsHeight), presentationData: presentationData, paneList: availablePanes.map { key in + let title: String + switch key { + case .media: + title = "Media" + case .files: + title = "Files" + case .links: + title = "Links" + case .voice: + title = "Voice Messages" + case .music: + title = "Audio" + case .groupsInCommon: + title = "Groups" + case .members: + title = "Members" + } + return PeerInfoPaneSpecifier(key: key, title: title) + }, selectedPane: self.currentPaneKey, transition: transition) + + if let (candidatePane, _, _) = self.candidatePane { + let paneTransition: ContainedViewLayoutTransition = .immediate + paneTransition.updateFrame(node: candidatePane.node, frame: paneFrame) + candidatePane.update(size: paneFrame.size, sideInset: sideInset, bottomInset: bottomInset, visibleHeight: visibleHeight, isScrollingLockedAtTop: expansionFraction < 1.0 - CGFloat.ulpOfOne, presentationData: presentationData, synchronous: true, transition: paneTransition) + } + if !self.didSetIsReady && data != nil { + if let currentPane = self.currentPane { + self.didSetIsReady = true + self.isReady.set(currentPane.node.isReady) + } else if self.candidatePane == nil { + self.didSetIsReady = true + self.isReady.set(.single(true)) + } + } + if let previousCurrentPaneKey = previousCurrentPaneKey, self.currentPaneKey != previousCurrentPaneKey { + self.currentPaneUpdated?() + } + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift new file mode 100644 index 0000000000..346f706c01 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift @@ -0,0 +1,3684 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import Postbox +import TelegramCore +import SyncCore +import SwiftSignalKit +import AccountContext +import TelegramPresentationData +import TelegramUIPreferences +import AvatarNode +import TelegramStringFormatting +import PhoneNumberFormat +import AppBundle +import PresentationDataUtils +import NotificationMuteSettingsUI +import NotificationSoundSelectionUI +import OverlayStatusController +import ShareController +import PhotoResources +import PeerAvatarGalleryUI +import TelegramIntents +import PeerInfoUI +import SearchBarNode +import SearchUI +import ContextUI +import OpenInExternalAppUI +import SafariServices +import GalleryUI +import LegacyUI +import MapResourceToAvatarSizes +import LegacyComponents +import WebSearchUI +import LocationResources +import LocationUI +import Geocoding + +protocol PeerInfoScreenItem: class { + var id: AnyHashable { get } + func node() -> PeerInfoScreenItemNode +} + +class PeerInfoScreenItemNode: ASDisplayNode { + var bringToFrontForHighlight: (() -> Void)? + + func update(width: CGFloat, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat { + preconditionFailure() + } +} + +private final class PeerInfoScreenItemSectionContainerNode: ASDisplayNode { + private let backgroundNode: ASDisplayNode + private let topSeparatorNode: ASDisplayNode + private let bottomSeparatorNode: ASDisplayNode + + private var currentItems: [PeerInfoScreenItem] = [] + private var itemNodes: [AnyHashable: PeerInfoScreenItemNode] = [:] + + override init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + + self.topSeparatorNode = ASDisplayNode() + self.topSeparatorNode.isLayerBacked = true + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.topSeparatorNode) + self.addSubnode(self.bottomSeparatorNode) + } + + func update(width: CGFloat, presentationData: PresentationData, items: [PeerInfoScreenItem], transition: ContainedViewLayoutTransition) -> CGFloat { + self.backgroundNode.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor + self.topSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + var contentHeight: CGFloat = 0.0 + var contentWithBackgroundHeight: CGFloat = 0.0 + var contentWithBackgroundOffset: CGFloat = 0.0 + + for i in 0 ..< items.count { + let item = items[i] + + let itemNode: PeerInfoScreenItemNode + var wasAdded = false + if let current = self.itemNodes[item.id] { + itemNode = current + } else { + wasAdded = true + itemNode = item.node() + self.itemNodes[item.id] = itemNode + self.addSubnode(itemNode) + itemNode.bringToFrontForHighlight = { [weak self, weak itemNode] in + guard let strongSelf = self, let itemNode = itemNode else { + return + } + strongSelf.view.bringSubviewToFront(itemNode.view) + } + } + + let itemTransition: ContainedViewLayoutTransition = wasAdded ? .immediate : transition + + let topItem: PeerInfoScreenItem? + if i == 0 { + topItem = nil + } else if items[i - 1] is PeerInfoScreenHeaderItem { + topItem = nil + } else { + topItem = items[i - 1] + } + + let bottomItem: PeerInfoScreenItem? + if i == items.count - 1 { + bottomItem = nil + } else if items[i + 1] is PeerInfoScreenCommentItem { + bottomItem = nil + } else { + bottomItem = items[i + 1] + } + + let itemHeight = itemNode.update(width: width, presentationData: presentationData, item: item, topItem: topItem, bottomItem: bottomItem, transition: itemTransition) + let itemFrame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: width, height: itemHeight)) + itemTransition.updateFrame(node: itemNode, frame: itemFrame) + if wasAdded { + itemNode.alpha = 0.0 + transition.updateAlpha(node: itemNode, alpha: 1.0) + } + + if item is PeerInfoScreenCommentItem { + } else { + contentWithBackgroundHeight += itemHeight + } + contentHeight += itemHeight + + if item is PeerInfoScreenHeaderItem { + contentWithBackgroundOffset = contentHeight + } + } + + var removeIds: [AnyHashable] = [] + for (id, _) in self.itemNodes { + if !items.contains(where: { $0.id == id }) { + removeIds.append(id) + } + } + for id in removeIds { + if let itemNode = self.itemNodes.removeValue(forKey: id) { + transition.updateAlpha(node: itemNode, alpha: 0.0, completion: { [weak itemNode] _ in + itemNode?.removeFromSupernode() + }) + } + } + + transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentWithBackgroundOffset), size: CGSize(width: width, height: max(0.0, contentWithBackgroundHeight - contentWithBackgroundOffset)))) + transition.updateFrame(node: self.topSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentWithBackgroundOffset - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel))) + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentWithBackgroundHeight), size: CGSize(width: width, height: UIScreenPixel))) + + if contentHeight.isZero { + transition.updateAlpha(node: self.topSeparatorNode, alpha: 0.0) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: 0.0) + } else { + transition.updateAlpha(node: self.topSeparatorNode, alpha: 1.0) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: 1.0) + } + + return contentHeight + } +} + +private final class PeerInfoScreenDynamicItemSectionContainerNode: ASDisplayNode { + private let backgroundNode: ASDisplayNode + private let topSeparatorNode: ASDisplayNode + private let bottomSeparatorNode: ASDisplayNode + + private var currentItems: [PeerInfoScreenItem] = [] + private var itemNodes: [AnyHashable: PeerInfoScreenItemNode] = [:] + + override init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + + self.topSeparatorNode = ASDisplayNode() + self.topSeparatorNode.isLayerBacked = true + + self.bottomSeparatorNode = ASDisplayNode() + self.bottomSeparatorNode.isLayerBacked = true + + super.init() + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.topSeparatorNode) + self.addSubnode(self.bottomSeparatorNode) + } + + func update(width: CGFloat, presentationData: PresentationData, items: [PeerInfoScreenItem], transition: ContainedViewLayoutTransition) -> CGFloat { + self.backgroundNode.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor + self.topSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + var contentHeight: CGFloat = 0.0 + var contentWithBackgroundHeight: CGFloat = 0.0 + var contentWithBackgroundOffset: CGFloat = 0.0 + + for i in 0 ..< items.count { + let item = items[i] + + let itemNode: PeerInfoScreenItemNode + var wasAdded = false + if let current = self.itemNodes[item.id] { + itemNode = current + } else { + wasAdded = true + itemNode = item.node() + self.itemNodes[item.id] = itemNode + self.addSubnode(itemNode) + itemNode.bringToFrontForHighlight = { [weak self, weak itemNode] in + guard let strongSelf = self, let itemNode = itemNode else { + return + } + strongSelf.view.bringSubviewToFront(itemNode.view) + } + } + + let itemTransition: ContainedViewLayoutTransition = wasAdded ? .immediate : transition + + let topItem: PeerInfoScreenItem? + if i == 0 { + topItem = nil + } else if items[i - 1] is PeerInfoScreenHeaderItem { + topItem = nil + } else { + topItem = items[i - 1] + } + + let bottomItem: PeerInfoScreenItem? + if i == items.count - 1 { + bottomItem = nil + } else if items[i + 1] is PeerInfoScreenCommentItem { + bottomItem = nil + } else { + bottomItem = items[i + 1] + } + + let itemHeight = itemNode.update(width: width, presentationData: presentationData, item: item, topItem: topItem, bottomItem: bottomItem, transition: itemTransition) + let itemFrame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: width, height: itemHeight)) + itemTransition.updateFrame(node: itemNode, frame: itemFrame) + if wasAdded { + itemNode.alpha = 0.0 + transition.updateAlpha(node: itemNode, alpha: 1.0) + } + + if item is PeerInfoScreenCommentItem { + } else { + contentWithBackgroundHeight += itemHeight + } + contentHeight += itemHeight + + if item is PeerInfoScreenHeaderItem { + contentWithBackgroundOffset = contentHeight + } + } + + var removeIds: [AnyHashable] = [] + for (id, _) in self.itemNodes { + if !items.contains(where: { $0.id == id }) { + removeIds.append(id) + } + } + for id in removeIds { + if let itemNode = self.itemNodes.removeValue(forKey: id) { + transition.updateAlpha(node: itemNode, alpha: 0.0, completion: { [weak itemNode] _ in + itemNode?.removeFromSupernode() + }) + } + } + + transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentWithBackgroundOffset), size: CGSize(width: width, height: max(0.0, contentWithBackgroundHeight - contentWithBackgroundOffset)))) + transition.updateFrame(node: self.topSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentWithBackgroundOffset - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel))) + transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentWithBackgroundHeight), size: CGSize(width: width, height: UIScreenPixel))) + + if contentHeight.isZero { + transition.updateAlpha(node: self.topSeparatorNode, alpha: 0.0) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: 0.0) + } else { + transition.updateAlpha(node: self.topSeparatorNode, alpha: 1.0) + transition.updateAlpha(node: self.bottomSeparatorNode, alpha: 1.0) + } + + return contentHeight + } + + func updateVisibleItems(in rect: CGRect) { + + } +} + +final class PeerInfoSelectionPanelNode: ASDisplayNode { + private let context: AccountContext + private let peerId: PeerId + + private let deleteMessages: () -> Void + private let shareMessages: () -> Void + private let forwardMessages: () -> Void + private let reportMessages: () -> Void + + let selectionPanel: ChatMessageSelectionInputPanelNode + let separatorNode: ASDisplayNode + let backgroundNode: ASDisplayNode + + init(context: AccountContext, peerId: PeerId, deleteMessages: @escaping () -> Void, shareMessages: @escaping () -> Void, forwardMessages: @escaping () -> Void, reportMessages: @escaping () -> Void) { + self.context = context + self.peerId = peerId + self.deleteMessages = deleteMessages + self.shareMessages = shareMessages + self.forwardMessages = forwardMessages + self.reportMessages = reportMessages + + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + + self.separatorNode = ASDisplayNode() + self.backgroundNode = ASDisplayNode() + + self.selectionPanel = ChatMessageSelectionInputPanelNode(theme: presentationData.theme, strings: presentationData.strings, peerMedia: true) + self.selectionPanel.context = context + self.selectionPanel.backgroundColor = presentationData.theme.chat.inputPanel.panelBackgroundColor + + let interfaceInteraction = ChatPanelInterfaceInteraction(setupReplyMessage: { _, _ in + }, setupEditMessage: { _, _ in + }, beginMessageSelection: { _, _ in + }, deleteSelectedMessages: { + deleteMessages() + }, reportSelectedMessages: { + reportMessages() + }, reportMessages: { _, _ in + }, deleteMessages: { _, _, f in + f(.default) + }, forwardSelectedMessages: { + forwardMessages() + }, forwardCurrentForwardMessages: { + }, forwardMessages: { _ in + }, shareSelectedMessages: { + shareMessages() + }, updateTextInputStateAndMode: { _ in + }, updateInputModeAndDismissedButtonKeyboardMessageId: { _ in + }, openStickers: { + }, editMessage: { + }, beginMessageSearch: { _, _ in + }, dismissMessageSearch: { + }, updateMessageSearch: { _ in + }, openSearchResults: { + }, navigateMessageSearch: { _ in + }, openCalendarSearch: { + }, toggleMembersSearch: { _ in + }, navigateToMessage: { _ in + }, navigateToChat: { _ in + }, openPeerInfo: { + }, togglePeerNotifications: { + }, sendContextResult: { _, _, _, _ in + return false + }, sendBotCommand: { _, _ in + }, sendBotStart: { _ in + }, botSwitchChatWithPayload: { _, _ in + }, beginMediaRecording: { _ in + }, finishMediaRecording: { _ in + }, stopMediaRecording: { + }, lockMediaRecording: { + }, deleteRecordedMedia: { + }, sendRecordedMedia: { + }, displayRestrictedInfo: { _, _ in + }, displayVideoUnmuteTip: { _ in + }, switchMediaRecordingMode: { + }, setupMessageAutoremoveTimeout: { + }, sendSticker: { _, _, _ in + return false + }, unblockPeer: { + }, pinMessage: { _ in + }, unpinMessage: { + }, shareAccountContact: { + }, reportPeer: { + }, presentPeerContact: { + }, dismissReportPeer: { + }, deleteChat: { + }, beginCall: { + }, toggleMessageStickerStarred: { _ in + }, presentController: { _, _ in + }, getNavigationController: { + return nil + }, presentGlobalOverlayController: { _, _ in + }, navigateFeed: { + }, openGrouping: { + }, toggleSilentPost: { + }, requestUnvoteInMessage: { _ in + }, requestStopPollInMessage: { _ in + }, updateInputLanguage: { _ in + }, unarchiveChat: { + }, openLinkEditing: { + }, reportPeerIrrelevantGeoLocation: { + }, displaySlowmodeTooltip: { _, _ in + }, displaySendMessageOptions: { _, _ in + }, openScheduledMessages: { + }, displaySearchResultsTooltip: { _, _ in + }, statuses: nil) + + self.selectionPanel.interfaceInteraction = interfaceInteraction + + super.init() + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.separatorNode) + self.addSubnode(self.selectionPanel) + } + + func update(layout: ContainerViewLayout, presentationData: PresentationData, transition: ContainedViewLayoutTransition) -> CGFloat { + self.backgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor + self.separatorNode.backgroundColor = presentationData.theme.rootController.navigationBar.separatorColor + + let interfaceState = ChatPresentationInterfaceState(chatWallpaper: .color(0), theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, limitsConfiguration: .defaultValue, fontSize: .regular, bubbleCorners: PresentationChatBubbleCorners(mainRadius: 16.0, auxiliaryRadius: 8.0, mergeBubbleCorners: true), accountPeerId: self.context.account.peerId, mode: .standard(previewing: false), chatLocation: .peer(self.peerId), isScheduledMessages: false) + let panelHeight = self.selectionPanel.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, maxHeight: 0.0, isSecondary: false, transition: transition, interfaceState: interfaceState, metrics: layout.metrics) + + transition.updateFrame(node: self.selectionPanel, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: panelHeight))) + + let panelHeightWithInset = panelHeight + layout.intrinsicInsets.bottom + + transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: panelHeightWithInset))) + transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel))) + + return panelHeightWithInset + } +} + +private enum PeerInfoBotCommand { + case settings + case help + case privacy +} + +private enum PeerInfoParticipantsSection { + case members + case admins + case banned +} + +private final class PeerInfoInteraction { + let openUsername: (String) -> Void + let openPhone: (String) -> Void + let editingOpenNotificationSettings: () -> Void + let editingOpenSoundSettings: () -> Void + let editingToggleShowMessageText: (Bool) -> Void + let requestDeleteContact: () -> Void + let openAddContact: () -> Void + let updateBlocked: (Bool) -> Void + let openReport: () -> Void + let openShareBot: () -> Void + let openAddBotToGroup: () -> Void + let performBotCommand: (PeerInfoBotCommand) -> Void + let editingOpenPublicLinkSetup: () -> Void + let editingOpenDiscussionGroupSetup: () -> Void + let editingToggleMessageSignatures: (Bool) -> Void + let openParticipantsSection: (PeerInfoParticipantsSection) -> Void + let editingOpenPreHistorySetup: () -> Void + let openPermissions: () -> Void + let editingOpenStickerPackSetup: () -> Void + let openLocation: () -> Void + let editingOpenSetupLocation: () -> Void + let openPeerInfo: (Peer) -> Void + + init( + openUsername: @escaping (String) -> Void, + openPhone: @escaping (String) -> Void, + editingOpenNotificationSettings: @escaping () -> Void, + editingOpenSoundSettings: @escaping () -> Void, + editingToggleShowMessageText: @escaping (Bool) -> Void, + requestDeleteContact: @escaping () -> Void, + openAddContact: @escaping () -> Void, + updateBlocked: @escaping (Bool) -> Void, + openReport: @escaping () -> Void, + openShareBot: @escaping () -> Void, + openAddBotToGroup: @escaping () -> Void, + performBotCommand: @escaping (PeerInfoBotCommand) -> Void, + editingOpenPublicLinkSetup: @escaping () -> Void, + editingOpenDiscussionGroupSetup: @escaping () -> Void, + editingToggleMessageSignatures: @escaping (Bool) -> Void, + openParticipantsSection: @escaping (PeerInfoParticipantsSection) -> Void, + editingOpenPreHistorySetup: @escaping () -> Void, + openPermissions: @escaping () -> Void, + editingOpenStickerPackSetup: @escaping () -> Void, + openLocation: @escaping () -> Void, + editingOpenSetupLocation: @escaping () -> Void, + openPeerInfo: @escaping (Peer) -> Void + ) { + self.openUsername = openUsername + self.openPhone = openPhone + self.editingOpenNotificationSettings = editingOpenNotificationSettings + self.editingOpenSoundSettings = editingOpenSoundSettings + self.editingToggleShowMessageText = editingToggleShowMessageText + self.requestDeleteContact = requestDeleteContact + self.openAddContact = openAddContact + self.updateBlocked = updateBlocked + self.openReport = openReport + self.openShareBot = openShareBot + self.openAddBotToGroup = openAddBotToGroup + self.performBotCommand = performBotCommand + self.editingOpenPublicLinkSetup = editingOpenPublicLinkSetup + self.editingOpenDiscussionGroupSetup = editingOpenDiscussionGroupSetup + self.editingToggleMessageSignatures = editingToggleMessageSignatures + self.openParticipantsSection = openParticipantsSection + self.editingOpenPreHistorySetup = editingOpenPreHistorySetup + self.openPermissions = openPermissions + self.editingOpenStickerPackSetup = editingOpenStickerPackSetup + self.openLocation = openLocation + self.editingOpenSetupLocation = editingOpenSetupLocation + self.openPeerInfo = openPeerInfo + } +} + +private func infoItems(data: PeerInfoScreenData?, context: AccountContext, presentationData: PresentationData, interaction: PeerInfoInteraction) -> [(AnyHashable, [PeerInfoScreenItem])] { + guard let data = data else { + return [] + } + + enum Section: Int, CaseIterable { + case groupLocation + case peerInfo + case peerMembers + } + + var items: [Section: [PeerInfoScreenItem]] = [:] + for section in Section.allCases { + items[section] = [] + } + + if let user = data.peer as? TelegramUser { + if let phone = user.phone { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 2, label: "mobile", text: "\(formatPhoneNumber(phone))", textColor: .accent, action: { + interaction.openPhone(phone) + })) + } + if let username = user.username { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 1, label: "username", text: "@\(username)", textColor: .accent, action: { + interaction.openUsername(username) + })) + } + if let cachedData = data.cachedData as? CachedUserData { + if user.isScam { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 0, label: presentationData.strings.Profile_About, text: user.botInfo != nil ? presentationData.strings.UserInfo_ScamBotWarning : presentationData.strings.UserInfo_ScamUserWarning, textColor: .primary, textBehavior: .multiLine(maxLines: 10), action: nil)) + } else if let about = cachedData.about, !about.isEmpty { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 0, label: presentationData.strings.Profile_About, text: about, textColor: .primary, textBehavior: .multiLine(maxLines: 10), action: nil)) + } + } + if !data.isContact { + if user.botInfo == nil { + items[.peerInfo]!.append(PeerInfoScreenActionItem(id: 3, text: "Add Contact", action: { + interaction.openAddContact() + })) + } + if let cachedData = data.cachedData as? CachedUserData { + if cachedData.isBlocked { + items[.peerInfo]!.append(PeerInfoScreenActionItem(id: 4, text: user.botInfo != nil ? "Restart Bot" : "Unblock", action: { + interaction.updateBlocked(false) + })) + } else { + if user.flags.contains(.isSupport) { + } else { + items[.peerInfo]!.append(PeerInfoScreenActionItem(id: 4, text: user.botInfo != nil ? "Stop Bot" : "Block User", color: .destructive, action: { + interaction.updateBlocked(true) + })) + } + } + } + if user.botInfo != nil, !user.isVerified { + items[.peerInfo]!.append(PeerInfoScreenActionItem(id: 5, text: presentationData.strings.ReportPeer_Report, action: { + interaction.openReport() + })) + } + } + } else if let channel = data.peer as? TelegramChannel { + let ItemUsername = 1 + let ItemAbout = 2 + let ItemAdmins = 3 + let ItemMembers = 4 + let ItemBanned = 5 + let ItemReport = 6 + let ItemLocationHeader = 7 + let ItemLocation = 8 + + if let location = (data.cachedData as? CachedChannelData)?.peerGeoLocation { + items[.groupLocation]!.append(PeerInfoScreenHeaderItem(id: ItemLocationHeader, text: presentationData.strings.GroupInfo_Location.uppercased())) + + let imageSignal = chatMapSnapshotImage(account: context.account, resource: MapSnapshotMediaResource(latitude: location.latitude, longitude: location.longitude, width: 90, height: 90)) + items[.groupLocation]!.append(PeerInfoScreenAddressItem( + id: ItemLocation, + label: "", + text: location.address.replacingOccurrences(of: ", ", with: "\n"), + imageSignal: imageSignal, + action: { + interaction.openLocation() + } + )) + } + + if let username = channel.username { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: ItemUsername, label: presentationData.strings.Channel_LinkItem, text: "https://t.me/\(username)", textColor: .accent, action: { + interaction.openUsername(username) + })) + } + if let cachedData = data.cachedData as? CachedChannelData { + if channel.isScam { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: ItemAbout, label: presentationData.strings.Profile_About, text: presentationData.strings.GroupInfo_ScamGroupWarning, textColor: .primary, textBehavior: .multiLine(maxLines: 10), action: nil)) + } else if let about = cachedData.about, !about.isEmpty { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: ItemAbout, label: presentationData.strings.Profile_About, text: about, textColor: .primary, textBehavior: .multiLine(maxLines: 10), action: nil)) + } + + if case .broadcast = channel.info { + var canEditMembers = false + if channel.hasPermission(.banMembers) { + canEditMembers = true + } + if canEditMembers { + if channel.adminRights != nil || channel.flags.contains(.isCreator) { + let adminCount = cachedData.participantsSummary.adminCount ?? 0 + let memberCount = cachedData.participantsSummary.memberCount ?? 0 + let bannedCount = cachedData.participantsSummary.kickedCount ?? 0 + + items[.peerInfo]!.append(PeerInfoScreenDisclosureItem(id: ItemAdmins, label: "\(adminCount == 0 ? "" : "\(presentationStringsFormattedNumber(adminCount, presentationData.dateTimeFormat.groupingSeparator))")", text: presentationData.strings.GroupInfo_Administrators, action: { + interaction.openParticipantsSection(.admins) + })) + items[.peerInfo]!.append(PeerInfoScreenDisclosureItem(id: ItemMembers, label: "\(memberCount == 0 ? "" : "\(presentationStringsFormattedNumber(memberCount, presentationData.dateTimeFormat.groupingSeparator))")", text: presentationData.strings.Channel_Info_Subscribers, action: { + interaction.openParticipantsSection(.members) + })) + items[.peerInfo]!.append(PeerInfoScreenDisclosureItem(id: ItemBanned, label: "\(bannedCount == 0 ? "" : "\(presentationStringsFormattedNumber(bannedCount, presentationData.dateTimeFormat.groupingSeparator))")", text: presentationData.strings.GroupInfo_Permissions_Removed, action: { + interaction.openParticipantsSection(.banned) + })) + } + } + } + } + } else if let group = data.peer as? TelegramGroup { + if let cachedData = data.cachedData as? CachedGroupData { + if group.isScam { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 0, label: presentationData.strings.Profile_About, text: presentationData.strings.GroupInfo_ScamGroupWarning, textColor: .primary, textBehavior: .multiLine(maxLines: 10), action: nil)) + } else if let about = cachedData.about, !about.isEmpty { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 0, label: presentationData.strings.Profile_About, text: about, textColor: .primary, textBehavior: .multiLine(maxLines: 10), action: nil)) + } + } + } + + if let members = data.members, case let .shortList(memberList) = members { + for member in memberList { + var presence = member.presence + if member.id == context.account.peerId { + presence = TelegramUserPresence(status: .present(until: Int32.max - 1), lastActivity: 0) + } + items[.peerMembers]!.append(PeerInfoScreenMemberItem(id: member.id, context: context, peer: member.peer, presence: presence, action: { + interaction.openPeerInfo(member.peer) + })) + } + } + + var result: [(AnyHashable, [PeerInfoScreenItem])] = [] + for section in Section.allCases { + if let sectionItems = items[section], !sectionItems.isEmpty { + result.append((section, sectionItems)) + } + } + return result +} + +private func editingItems(data: PeerInfoScreenData?, context: AccountContext, presentationData: PresentationData, interaction: PeerInfoInteraction) -> [(AnyHashable, [PeerInfoScreenItem])] { + enum Section: Int, CaseIterable { + case notifications + case groupLocation + case peerPublicSettings + case peerSettings + } + + var items: [Section: [PeerInfoScreenItem]] = [:] + for section in Section.allCases { + items[section] = [] + } + + if let data = data, let notificationSettings = data.notificationSettings { + let notificationsLabel: String + let soundLabel: String + let notificationSettings = notificationSettings as? TelegramPeerNotificationSettings ?? TelegramPeerNotificationSettings.defaultSettings + if case let .muted(until) = notificationSettings.muteState, until >= Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970) { + if until < Int32.max - 1 { + notificationsLabel = stringForRemainingMuteInterval(strings: presentationData.strings, muteInterval: until) + } else { + notificationsLabel = presentationData.strings.UserInfo_NotificationsDisabled + } + } else { + notificationsLabel = presentationData.strings.UserInfo_NotificationsEnabled + } + + let globalNotificationSettings: GlobalNotificationSettings = data.globalNotificationSettings ?? GlobalNotificationSettings.defaultSettings + soundLabel = localizedPeerNotificationSoundString(strings: presentationData.strings, sound: notificationSettings.messageSound, default: globalNotificationSettings.effective.privateChats.sound) + + items[.notifications]!.append(PeerInfoScreenDisclosureItem(id: 0, label: notificationsLabel, text: "Notifications", action: { + interaction.editingOpenNotificationSettings() + })) + items[.notifications]!.append(PeerInfoScreenDisclosureItem(id: 1, label: soundLabel, text: "Sound", action: { + interaction.editingOpenSoundSettings() + })) + items[.notifications]!.append(PeerInfoScreenSwitchItem(id: 2, text: "Show Message Text", value: notificationSettings.displayPreviews != .hide, toggled: { value in + interaction.editingToggleShowMessageText(value) + })) + } + + if let data = data { + if let user = data.peer as? TelegramUser { + let ItemDelete = 0 + if data.isContact { + items[.peerSettings]!.append(PeerInfoScreenActionItem(id: ItemDelete, text: presentationData.strings.UserInfo_DeleteContact, color: .destructive, action: { + interaction.requestDeleteContact() + })) + } + } else if let channel = data.peer as? TelegramChannel { + let ItemUsername = 1 + let ItemDiscussionGroup = 2 + let ItemSignMessages = 3 + let ItemSignMessagesHelp = 4 + + switch channel.info { + case .broadcast: + if channel.flags.contains(.isCreator) { + let linkText: String + if let username = channel.username { + linkText = "@\(username)" + } else { + linkText = presentationData.strings.Channel_Setup_TypePrivate + } + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemUsername, label: linkText, text: presentationData.strings.Channel_TypeSetup_Title, action: { + interaction.editingOpenPublicLinkSetup() + })) + + let discussionGroupTitle: String + if let cachedData = data.cachedData as? CachedChannelData { + if let peer = data.linkedDiscussionPeer { + if let addressName = peer.addressName, !addressName.isEmpty { + discussionGroupTitle = "@\(addressName)" + } else { + discussionGroupTitle = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) + } + } else { + discussionGroupTitle = presentationData.strings.Channel_DiscussionGroupAdd + } + } else { + discussionGroupTitle = "..." + } + + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemDiscussionGroup, label: discussionGroupTitle, text: presentationData.strings.Channel_DiscussionGroup, action: { + interaction.editingOpenDiscussionGroupSetup() + })) + + let messagesShouldHaveSignatures: Bool + switch channel.info { + case let .broadcast(info): + messagesShouldHaveSignatures = info.flags.contains(.messagesShouldHaveSignatures) + default: + messagesShouldHaveSignatures = false + } + items[.peerSettings]!.append(PeerInfoScreenSwitchItem(id: ItemSignMessages, text: presentationData.strings.Channel_SignMessages, value: messagesShouldHaveSignatures, toggled: { value in + interaction.editingToggleMessageSignatures(value) + })) + items[.peerSettings]!.append(PeerInfoScreenCommentItem(id: ItemSignMessagesHelp, text: presentationData.strings.Channel_SignMessages_Help)) + } + case .group: + let ItemUsername = 1 + let ItemLinkedChannel = 2 + let ItemPreHistory = 3 + let ItemStickerPack = 4 + let ItemPermissions = 5 + let ItemAdmins = 6 + let ItemLocationHeader = 7 + let ItemLocation = 8 + let ItemLocationSetup = 9 + + let isCreator = channel.flags.contains(.isCreator) + let isPublic = channel.username != nil + + if let cachedData = data.cachedData as? CachedChannelData { + if isCreator, let location = cachedData.peerGeoLocation { + items[.groupLocation]!.append(PeerInfoScreenHeaderItem(id: ItemLocationHeader, text: presentationData.strings.GroupInfo_Location.uppercased())) + + let imageSignal = chatMapSnapshotImage(account: context.account, resource: MapSnapshotMediaResource(latitude: location.latitude, longitude: location.longitude, width: 90, height: 90)) + items[.groupLocation]!.append(PeerInfoScreenAddressItem( + id: ItemLocation, + label: "", + text: location.address.replacingOccurrences(of: ", ", with: "\n"), + imageSignal: imageSignal, + action: { + interaction.openLocation() + } + )) + if cachedData.flags.contains(.canChangePeerGeoLocation) { + items[.groupLocation]!.append(PeerInfoScreenActionItem(id: ItemLocationSetup, text: presentationData.strings.Group_Location_ChangeLocation, action: { + interaction.editingOpenSetupLocation() + })) + } + } + + if isCreator || (channel.adminRights != nil && channel.hasPermission(.pinMessages)) { + if cachedData.peerGeoLocation != nil { + if isCreator { + let linkText: String + if let username = channel.username { + linkText = "@\(username)" + } else { + linkText = presentationData.strings.GroupInfo_PublicLinkAdd + } + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemUsername, label: linkText, text: presentationData.strings.GroupInfo_PublicLink, action: { + interaction.editingOpenPublicLinkSetup() + })) + } + } else { + if cachedData.flags.contains(.canChangeUsername) { + items[.peerPublicSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemUsername, label: isPublic ? presentationData.strings.Channel_Setup_TypePublic : presentationData.strings.Channel_Setup_TypePrivate, text: presentationData.strings.GroupInfo_GroupType, action: { + interaction.editingOpenPublicLinkSetup() + })) + + if let linkedDiscussionPeer = data.linkedDiscussionPeer { + let peerTitle: String + if let addressName = linkedDiscussionPeer.addressName, !addressName.isEmpty { + peerTitle = "@\(addressName)" + } else { + peerTitle = linkedDiscussionPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) + } + items[.peerPublicSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemLinkedChannel, label: peerTitle, text: presentationData.strings.Group_LinkedChannel, action: { + interaction.editingOpenDiscussionGroupSetup() + })) + } + } + if !isPublic && cachedData.linkedDiscussionPeerId == nil { + items[.peerPublicSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemPreHistory, label: cachedData.flags.contains(.preHistoryEnabled) ? presentationData.strings.GroupInfo_GroupHistoryVisible : presentationData.strings.GroupInfo_GroupHistoryHidden, text: presentationData.strings.GroupInfo_GroupHistory, action: { + interaction.editingOpenPreHistorySetup() + })) + } + } + } + + if cachedData.flags.contains(.canSetStickerSet) && canEditPeerInfo(peer: channel) { + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemStickerPack, label: cachedData.stickerPack?.title ?? presentationData.strings.GroupInfo_SharedMediaNone, text: presentationData.strings.Stickers_GroupStickers, action: { + interaction.editingOpenStickerPackSetup() + })) + } + + var canViewAdminsAndBanned = false + if let adminRights = channel.adminRights, !adminRights.isEmpty { + canViewAdminsAndBanned = true + } else if channel.flags.contains(.isCreator) { + canViewAdminsAndBanned = true + } + + if canViewAdminsAndBanned { + var activePermissionCount: Int? + if let defaultBannedRights = channel.defaultBannedRights { + var count = 0 + for (right, _) in allGroupPermissionList { + if !defaultBannedRights.flags.contains(right) { + count += 1 + } + } + activePermissionCount = count + } + + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemPermissions, label: activePermissionCount.flatMap({ "\($0)/\(allGroupPermissionList.count)" }) ?? "", text: presentationData.strings.GroupInfo_Permissions, action: { + interaction.openPermissions() + })) + + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemAdmins, label: cachedData.participantsSummary.adminCount.flatMap { "\(presentationStringsFormattedNumber($0, presentationData.dateTimeFormat.groupingSeparator))" } ?? "", text: presentationData.strings.GroupInfo_Administrators, action: { + interaction.openParticipantsSection(.admins) + })) + } + } + } + } else if let group = data.peer as? TelegramGroup { + let ItemUsername = 1 + let ItemPreHistory = 2 + let ItemPermissions = 3 + let ItemAdmins = 4 + + if case .creator = group.role { + if let cachedData = data.cachedData as? CachedGroupData { + if cachedData.flags.contains(.canChangeUsername) { + items[.peerPublicSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemUsername, label: presentationData.strings.Group_Setup_TypePrivate, text: presentationData.strings.GroupInfo_GroupType, action: { + interaction.editingOpenPublicLinkSetup() + })) + } + } + items[.peerPublicSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemPreHistory, label: presentationData.strings.GroupInfo_GroupHistoryHidden, text: presentationData.strings.GroupInfo_GroupHistory, action: { + interaction.editingOpenPreHistorySetup() + })) + var activePermissionCount: Int? + if let defaultBannedRights = group.defaultBannedRights { + var count = 0 + for (right, _) in allGroupPermissionList { + if !defaultBannedRights.flags.contains(right) { + count += 1 + } + } + activePermissionCount = count + } + + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemPermissions, label: activePermissionCount.flatMap({ "\($0)/\(allGroupPermissionList.count)" }) ?? "", text: presentationData.strings.GroupInfo_Permissions, action: { + interaction.openPermissions() + })) + + items[.peerSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemAdmins, label: "", text: presentationData.strings.GroupInfo_Administrators, action: { + interaction.openParticipantsSection(.admins) + })) + } + } + } + + var result: [(AnyHashable, [PeerInfoScreenItem])] = [] + for section in Section.allCases { + if let sectionItems = items[section], !sectionItems.isEmpty { + result.append((section, sectionItems)) + } + } + return result +} + +private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewDelegate { + private weak var controller: PeerInfoScreen? + + private let context: AccountContext + private let peerId: PeerId + private var presentationData: PresentationData + let scrollNode: ASScrollNode + + let headerNode: PeerInfoHeaderNode + private var regularSections: [AnyHashable: PeerInfoScreenItemSectionContainerNode] = [:] + private var editingSections: [AnyHashable: PeerInfoScreenItemSectionContainerNode] = [:] + private let paneContainerNode: PeerInfoPaneContainerNode + private var ignoreScrolling: Bool = false + private var hapticFeedback: HapticFeedback? + + private var searchDisplayController: SearchDisplayController? + + private var _interaction: PeerInfoInteraction? + private var interaction: PeerInfoInteraction { + return self._interaction! + } + + private var _chatInterfaceInteraction: ChatControllerInteraction? + private var chatInterfaceInteraction: ChatControllerInteraction { + return self._chatInterfaceInteraction! + } + private var hiddenMediaDisposable: Disposable? + private let hiddenAvatarRepresentationDisposable = MetaDisposable() + + private(set) var validLayout: (ContainerViewLayout, CGFloat)? + private(set) var data: PeerInfoScreenData? + private(set) var state = PeerInfoState( + isEditing: false, + selectedMessageIds: nil, + updatingAvatar: nil + ) + private var dataDisposable: Disposable? + + private let activeActionDisposable = MetaDisposable() + private let resolveUrlDisposable = MetaDisposable() + private let toggleShouldChannelMessagesSignaturesDisposable = MetaDisposable() + + private let updateAvatarDisposable = MetaDisposable() + private let currentAvatarMixin = Atomic(value: nil) + + private let _ready = Promise() + var ready: Promise { + return self._ready + } + private var didSetReady = false + + init(controller: PeerInfoScreen, context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool) { + self.controller = controller + self.context = context + self.peerId = peerId + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + + self.scrollNode = ASScrollNode() + self.scrollNode.view.delaysContentTouches = false + + self.headerNode = PeerInfoHeaderNode(context: context, avatarInitiallyExpanded: avatarInitiallyExpanded) + self.paneContainerNode = PeerInfoPaneContainerNode(context: context, peerId: peerId) + + super.init() + + self._interaction = PeerInfoInteraction( + openUsername: { [weak self] value in + self?.openUsername(value: value) + }, + openPhone: { [weak self] value in + self?.openPhone(value: value) + }, + editingOpenNotificationSettings: { [weak self] in + self?.editingOpenNotificationSettings() + }, + editingOpenSoundSettings: { [weak self] in + self?.editingOpenSoundSettings() + }, + editingToggleShowMessageText: { [weak self] value in + self?.editingToggleShowMessageText(value: value) + }, + requestDeleteContact: { [weak self] in + self?.requestDeleteContact() + }, + openAddContact: { [weak self] in + self?.openAddContact() + }, + updateBlocked: { [weak self] block in + self?.updateBlocked(block: block) + }, + openReport: { [weak self] in + self?.openReport() + }, + openShareBot: { [weak self] in + self?.openShareBot() + }, + openAddBotToGroup: { [weak self] in + self?.openAddBotToGroup() + }, + performBotCommand: { [weak self] command in + self?.performBotCommand(command: command) + }, + editingOpenPublicLinkSetup: { [weak self] in + self?.editingOpenPublicLinkSetup() + }, + editingOpenDiscussionGroupSetup: { [weak self] in + self?.editingOpenDiscussionGroupSetup() + }, + editingToggleMessageSignatures: { [weak self] value in + self?.editingToggleMessageSignatures(value: value) + }, + openParticipantsSection: { [weak self] section in + self?.openParticipantsSection(section: section) + }, + editingOpenPreHistorySetup: { [weak self] in + self?.editingOpenPreHistorySetup() + }, + openPermissions: { [weak self] in + self?.openPermissions() + }, + editingOpenStickerPackSetup: { [weak self] in + self?.editingOpenStickerPackSetup() + }, + openLocation: { [weak self] in + self?.openLocation() + }, + editingOpenSetupLocation: { [weak self] in + self?.editingOpenSetupLocation() + }, + openPeerInfo: { [weak self] peer in + self?.openPeerInfo(peer: peer) + } + ) + + self._chatInterfaceInteraction = ChatControllerInteraction(openMessage: { [weak self] message, mode in + guard let strongSelf = self else { + return false + } + return strongSelf.openMessage(id: message.id) + }, openPeer: { [weak self] id, navigation, _ in + if let id = id { + self?.openPeer(peerId: id, navigation: navigation) + } + }, openPeerMention: { _ in + }, openMessageContextMenu: { [weak self] message, _, _, _, _ in + guard let strongSelf = self else { + return + } + let items = (chatAvailableMessageActionsImpl(postbox: strongSelf.context.account.postbox, accountPeerId: strongSelf.context.account.peerId, messageIds: [message.id]) + |> deliverOnMainQueue).start(next: { actions in + var messageIds = Set() + messageIds.insert(message.id) + + if let strongSelf = self { + if let message = strongSelf.paneContainerNode.findLoadedMessage(id: message.id) { + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) + var items: [ActionSheetButtonItem] = [] + + items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.SharedMedia_ViewInChat, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController { + strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(strongSelf.peerId), subject: .message(message.id))) + } + })) + items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_ContextMenuForward, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.forwardMessages(messageIds: messageIds) + } + })) + if actions.options.contains(.deleteLocally) || actions.options.contains(.deleteGlobally) { + items.append( ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_ContextMenuDelete, color: .destructive, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.deleteMessages(messageIds: Set(messageIds)) + } + })) + } + actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + }) + ])]) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + } + } + }) + }, openMessageContextActions: { [weak self] message, node, rect, gesture in + guard let strongSelf = self else { + gesture?.cancel() + return + } + + let _ = (chatMediaListPreviewControllerData(context: strongSelf.context, message: message, standalone: false, reverseMessageGalleryOrder: false, navigationController: strongSelf.controller?.navigationController as? NavigationController) + |> deliverOnMainQueue).start(next: { previewData in + guard let strongSelf = self else { + gesture?.cancel() + return + } + if let previewData = previewData { + let context = strongSelf.context + let strings = strongSelf.presentationData.strings + let items = chatAvailableMessageActionsImpl(postbox: strongSelf.context.account.postbox, accountPeerId: strongSelf.context.account.peerId, messageIds: [message.id]) + |> map { actions -> [ContextMenuItem] in + var items: [ContextMenuItem] = [] + + items.append(.action(ContextMenuActionItem(text: strings.SharedMedia_ViewInChat, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/GoToMessage"), color: theme.contextMenu.primaryColor) }, action: { c, f in + c.dismiss(completion: { + if let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController { + strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(strongSelf.peerId), subject: .message(message.id))) + } + }) + }))) + + items.append(.action(ContextMenuActionItem(text: strings.Conversation_ContextMenuForward, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Forward"), color: theme.contextMenu.primaryColor) }, action: { c, f in + c.dismiss(completion: { + if let strongSelf = self { + strongSelf.forwardMessages(messageIds: [message.id]) + } + }) + }))) + + if actions.options.contains(.deleteLocally) || actions.options.contains(.deleteGlobally) { + items.append(.action(ContextMenuActionItem(text: strings.Conversation_ContextMenuDelete, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor) }, action: { c, f in + c.setItems(context.account.postbox.transaction { transaction -> [ContextMenuItem] in + var items: [ContextMenuItem] = [] + let messageIds = [message.id] + + if let peer = transaction.getPeer(message.id.peerId) { + var personalPeerName: String? + var isChannel = false + if let user = peer as? TelegramUser { + personalPeerName = user.compactDisplayTitle + } else if let channel = peer as? TelegramChannel, case .broadcast = channel.info { + isChannel = true + } + + if actions.options.contains(.deleteGlobally) { + let globalTitle: String + if isChannel { + globalTitle = strongSelf.presentationData.strings.Conversation_DeleteMessagesForMe + } else if let personalPeerName = personalPeerName { + globalTitle = strongSelf.presentationData.strings.Conversation_DeleteMessagesFor(personalPeerName).0 + } else { + globalTitle = strongSelf.presentationData.strings.Conversation_DeleteMessagesForEveryone + } + items.append(.action(ContextMenuActionItem(text: globalTitle, textColor: .destructive, icon: { _ in nil }, action: { c, f in + c.dismiss(completion: { + if let strongSelf = self { + strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone) + let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start() + } + }) + }))) + } + + if actions.options.contains(.deleteLocally) { + var localOptionText = strongSelf.presentationData.strings.Conversation_DeleteMessagesForMe + if strongSelf.context.account.peerId == strongSelf.peerId { + if messageIds.count == 1 { + localOptionText = strongSelf.presentationData.strings.Conversation_Moderate_Delete + } else { + localOptionText = strongSelf.presentationData.strings.Conversation_DeleteManyMessages + } + } + items.append(.action(ContextMenuActionItem(text: localOptionText, textColor: .destructive, icon: { _ in nil }, action: { c, f in + c.dismiss(completion: { + if let strongSelf = self { + strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone) + let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forLocalPeer).start() + } + }) + }))) + } + } + + return items + }) + }))) + } + + return items + } + + switch previewData { + case let .gallery(gallery): + gallery.setHintWillBePresentedInPreviewingContext(true) + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: gallery, sourceNode: node)), items: items, reactionItems: [], gesture: gesture) + strongSelf.controller?.presentInGlobalOverlay(contextController) + case .instantPage: + break + } + } + }) + }, navigateToMessage: { fromId, id in + }, tapMessage: nil, clickThroughMessage: { + }, toggleMessagesSelection: { [weak self] ids, value in + guard let strongSelf = self else { + return + } + if var selectedMessageIds = strongSelf.state.selectedMessageIds { + for id in ids { + if value { + selectedMessageIds.insert(id) + } else { + selectedMessageIds.remove(id) + } + } + strongSelf.state = strongSelf.state.withSelectedMessageIds(selectedMessageIds) + } else { + strongSelf.state = strongSelf.state.withSelectedMessageIds(value ? Set(ids) : Set()) + } + strongSelf.chatInterfaceInteraction.selectionState = strongSelf.state.selectedMessageIds.flatMap { ChatInterfaceSelectionState(selectedIds: $0) } + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.4, curve: .spring), additive: false) + } + strongSelf.paneContainerNode.updateSelectedMessageIds(strongSelf.state.selectedMessageIds, animated: true) + }, sendCurrentMessage: { _ in + }, sendMessage: { _ in + }, sendSticker: { _, _, _, _ in + return false + }, sendGif: { _, _, _ in + return false + }, requestMessageActionCallback: { _, _, _ in + }, requestMessageActionUrlAuth: { _, _, _ in + }, activateSwitchInline: { _, _ in + }, openUrl: { [weak self] url, _, external, _ in + guard let strongSelf = self else { + return + } + strongSelf.openUrl(url: url, external: external ?? false) + }, shareCurrentLocation: { + }, shareAccountContact: { + }, sendBotCommand: { _, _ in + }, openInstantPage: { [weak self] message, associatedData in + guard let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController else { + return + } + var foundGalleryMessage: Message? + if let searchContentNode = strongSelf.searchDisplayController?.contentNode as? ChatHistorySearchContainerNode { + if let galleryMessage = searchContentNode.messageForGallery(message.id) { + let _ = (strongSelf.context.account.postbox.transaction { transaction -> Void in + if transaction.getMessage(galleryMessage.id) == nil { + storeMessageFromSearch(transaction: transaction, message: galleryMessage) + } + }).start() + foundGalleryMessage = galleryMessage + } + } + if foundGalleryMessage == nil, let galleryMessage = strongSelf.paneContainerNode.findLoadedMessage(id: message.id) { + foundGalleryMessage = galleryMessage + } + + if let foundGalleryMessage = foundGalleryMessage { + openChatInstantPage(context: strongSelf.context, message: foundGalleryMessage, sourcePeerType: associatedData?.automaticDownloadPeerType, navigationController: navigationController) + } + }, openWallpaper: { _ in + }, openTheme: { _ in + }, openHashtag: { _, _ in + }, updateInputState: { _ in + }, updateInputMode: { _ in + }, openMessageShareMenu: { _ in + }, presentController: { _, _ in + }, navigationController: { + return nil + }, chatControllerNode: { + return nil + }, reactionContainerNode: { + return nil + }, presentGlobalOverlayController: { _, _ in }, callPeer: { _ in + }, longTap: { [weak self] content, _ in + guard let strongSelf = self else { + return + } + strongSelf.view.endEditing(true) + switch content { + case let .url(url): + let canOpenIn = availableOpenInOptions(context: strongSelf.context, item: .url(url: url)).count > 1 + let openText = canOpenIn ? strongSelf.presentationData.strings.Conversation_FileOpenIn : strongSelf.presentationData.strings.Conversation_LinkDialogOpen + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) + actionSheet.setItemGroups([ActionSheetItemGroup(items: [ + ActionSheetTextItem(title: url), + ActionSheetButtonItem(title: openText, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + if canOpenIn { + let actionSheet = OpenInActionSheetController(context: strongSelf.context, item: .url(url: url), openUrl: { [weak self] url in + if let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController { + strongSelf.context.sharedContext.openExternalUrl(context: strongSelf.context, urlContext: .generic, url: url, forceExternal: true, presentationData: strongSelf.presentationData, navigationController: navigationController, dismissInput: { + }) + } + }) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + } else { + strongSelf.context.sharedContext.applicationBindings.openUrl(url) + } + } + }), + ActionSheetButtonItem(title: strongSelf.presentationData.strings.ShareMenu_CopyShareLink, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + UIPasteboard.general.string = url + }), + ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_AddToReadingList, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let link = URL(string: url) { + let _ = try? SSReadingList.default()?.addItem(with: link, title: nil, previewText: nil) + } + }) + ]), ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + }) + ])]) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + default: + break + } + }, openCheckoutOrReceipt: { _ in + }, openSearch: { + }, setupReply: { _ in + }, canSetupReply: { _ in + return false + }, navigateToFirstDateMessage: { _ in + }, requestRedeliveryOfFailedMessages: { _ in + }, addContact: { _ in + }, rateCall: { _, _ in + }, requestSelectMessagePollOptions: { _, _ in + }, requestOpenMessagePollResults: { _, _ in + }, openAppStorePage: { + }, displayMessageTooltip: { _, _, _, _ in + }, seekToTimecode: { _, _, _ in + }, scheduleCurrentMessage: { + }, sendScheduledMessagesNow: { _ in + }, editScheduledMessagesTime: { _ in + }, performTextSelectionAction: { _, _, _ in + }, updateMessageReaction: { _, _ in + }, openMessageReactions: { _ in + }, displaySwipeToReplyHint: { + }, dismissReplyMarkupMessage: { _ in + }, openMessagePollResults: { _, _ in + }, openPollCreation: { _ in + }, requestMessageUpdate: { _ in + }, cancelInteractiveKeyboardGestures: { + }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings, + pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false)) + self.hiddenMediaDisposable = context.sharedContext.mediaManager.galleryHiddenMediaManager.hiddenIds().start(next: { [weak self] ids in + guard let strongSelf = self else { + return + } + var hiddenMedia: [MessageId: [Media]] = [:] + for id in ids { + if case let .chat(accountId, messageId, media) = id, accountId == strongSelf.context.account.id { + hiddenMedia[messageId] = [media] + } + } + strongSelf.chatInterfaceInteraction.hiddenMedia = hiddenMedia + strongSelf.paneContainerNode.updateHiddenMedia() + }) + + self.backgroundColor = self.presentationData.theme.list.blocksBackgroundColor + + self.scrollNode.view.showsVerticalScrollIndicator = false + if #available(iOS 11.0, *) { + self.scrollNode.view.contentInsetAdjustmentBehavior = .never + } + self.scrollNode.view.alwaysBounceVertical = true + self.scrollNode.view.scrollsToTop = false + self.scrollNode.view.delegate = self + self.addSubnode(self.scrollNode) + self.scrollNode.addSubnode(self.paneContainerNode) + self.addSubnode(self.headerNode) + + self.paneContainerNode.chatControllerInteraction = self.chatInterfaceInteraction + self.paneContainerNode.openPeerContextAction = { [weak self] peer, node, gesture in + guard let strongSelf = self, let controller = strongSelf.controller else { + return + } + let presentationData = strongSelf.presentationData + let chatController = strongSelf.context.sharedContext.makeChatController(context: context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true)) + chatController.canReadHistory.set(false) + let items: [ContextMenuItem] = [ + .action(ContextMenuActionItem(text: presentationData.strings.Conversation_LinkDialogOpen, icon: { _ in nil }, action: { _, f in + f(.dismissWithoutContent) + self?.chatInterfaceInteraction.openPeer(peer.id, .default, nil) + })) + ] + let contextController = ContextController(account: strongSelf.context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) + controller.presentInGlobalOverlay(contextController) + } + + self.paneContainerNode.currentPaneUpdated = { [weak self] in + guard let strongSelf = self else { + return + } + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + strongSelf.scrollNode.view.setContentOffset(CGPoint(x: 0.0, y: strongSelf.paneContainerNode.frame.minY - navigationHeight), animated: true) + } + } + + self.headerNode.performButtonAction = { [weak self] key in + self?.performButtonAction(key: key) + } + + self.headerNode.requestAvatarExpansion = { [weak self] entries, transitionNode in + guard let strongSelf = self, let peer = strongSelf.data?.peer, peer.smallProfileImage != nil else { + return + } + + let entriesPromise = Promise<[AvatarGalleryEntry]>(entries) + let galleryController = AvatarGalleryController(context: strongSelf.context, peer: peer, remoteEntries: entriesPromise, replaceRootController: { controller, ready in + }) + strongSelf.hiddenAvatarRepresentationDisposable.set((galleryController.hiddenMedia |> deliverOnMainQueue).start(next: { entry in + if entry == entries.first { + self?.headerNode.updateAvatarIsHidden(true) + } else { + self?.headerNode.updateAvatarIsHidden(false) + } + })) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(galleryController, in: .window(.root), with: AvatarGalleryControllerPresentationArguments(transitionArguments: { _ in + return GalleryTransitionArguments(transitionNode: transitionNode, addToTransitionSurface: { _ in + }) + })) + } + + self.headerNode.requestOpenAvatarForEditing = { [weak self] in + self?.openAvatarForEditing() + } + + self.headerNode.navigationButtonContainer.performAction = { [weak self] key in + guard let strongSelf = self else { + return + } + switch key { + case .edit: + strongSelf.state = strongSelf.state.withIsEditing(true) + if strongSelf.headerNode.isAvatarExpanded { + strongSelf.headerNode.updateIsAvatarExpanded(false, transition: .immediate) + strongSelf.updateNavigationExpansionPresentation(isExpanded: false, animated: true) + } + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.scrollNode.view.setContentOffset(CGPoint(), animated: false) + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + UIView.transition(with: strongSelf.view, duration: 0.3, options: [.transitionCrossDissolve], animations: { + }, completion: nil) + strongSelf.controller?.navigationItem.setLeftBarButton(UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, style: .plain, target: strongSelf, action: #selector(strongSelf.editingCancelPressed)), animated: true) + case .done, .cancel: + if case .done = key { + guard let data = strongSelf.data else { + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + return + } + if let peer = data.peer as? TelegramUser { + if data.isContact { + let firstName = strongSelf.headerNode.editingContentNode.editingTextForKey(.firstName) ?? "" + let lastName = strongSelf.headerNode.editingContentNode.editingTextForKey(.lastName) ?? "" + + if peer.firstName != firstName || peer.lastName != lastName { + strongSelf.activeActionDisposable.set((updateContactName(account: context.account, peerId: peer.id, firstName: firstName, lastName: lastName) + |> deliverOnMainQueue).start(error: { _ in + guard let strongSelf = self else { + return + } + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + }, completed: { + guard let strongSelf = self else { + return + } + let context = strongSelf.context + let _ = (getUserPeer(postbox: strongSelf.context.account.postbox, peerId: peer.id) + |> mapToSignal { peer, _ -> Signal in + guard let peer = peer as? TelegramUser, let phone = peer.phone, !phone.isEmpty else { + return .complete() + } + return (context.sharedContext.contactDataManager?.basicDataForNormalizedPhoneNumber(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) ?? .single([])) + |> take(1) + |> mapToSignal { records -> Signal in + var signals: [Signal] = [] + if let contactDataManager = context.sharedContext.contactDataManager { + for (id, basicData) in records { + signals.append(contactDataManager.appendContactData(DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: firstName, lastName: lastName, phoneNumbers: basicData.phoneNumbers), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: [], note: ""), to: id)) + } + } + return combineLatest(signals) + |> mapToSignal { _ -> Signal in + return .complete() + } + } + }).start() + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + })) + } else { + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + } + } else { + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + } + } else if let group = data.peer as? TelegramGroup, canEditPeerInfo(peer: group) { + let title = strongSelf.headerNode.editingContentNode.editingTextForKey(.title) ?? "" + + } else if let channel = data.peer as? TelegramChannel, canEditPeerInfo(peer: channel) { + let title = strongSelf.headerNode.editingContentNode.editingTextForKey(.title) ?? "" + let description = strongSelf.headerNode.editingContentNode.editingTextForKey(.description) ?? "" + + var updateDataSignals: [Signal] = [] + + if title != channel.title { + updateDataSignals.append( + updatePeerTitle(account: strongSelf.context.account, peerId: channel.id, title: title) + |> ignoreValues + |> mapError { _ in return Void() } + ) + } + if description != (data.cachedData as? CachedChannelData)?.about { + updateDataSignals.append( + updatePeerDescription(account: strongSelf.context.account, peerId: channel.id, description: description.isEmpty ? nil : description) + |> ignoreValues + |> mapError { _ in return Void() } + ) + } + strongSelf.activeActionDisposable.set((combineLatest(updateDataSignals) + |> deliverOnMainQueue).start(error: { _ in + guard let strongSelf = self else { + return + } + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + }, completed: { + guard let strongSelf = self else { + return + } + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + })) + } else { + strongSelf.headerNode.navigationButtonContainer.performAction?(.cancel) + } + } else { + strongSelf.state = strongSelf.state.withIsEditing(false) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.scrollNode.view.setContentOffset(CGPoint(), animated: false) + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + UIView.transition(with: strongSelf.view, duration: 0.3, options: [.transitionCrossDissolve], animations: { + }, completion: nil) + strongSelf.controller?.navigationItem.setLeftBarButton(nil, animated: true) + } + case .select: + strongSelf.state = strongSelf.state.withSelectedMessageIds(Set()) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.4, curve: .spring), additive: false) + } + strongSelf.chatInterfaceInteraction.selectionState = strongSelf.state.selectedMessageIds.flatMap { ChatInterfaceSelectionState(selectedIds: $0) } + strongSelf.paneContainerNode.updateSelectedMessageIds(strongSelf.state.selectedMessageIds, animated: true) + case .selectionDone: + strongSelf.state = strongSelf.state.withSelectedMessageIds(nil) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.4, curve: .spring), additive: false) + } + strongSelf.chatInterfaceInteraction.selectionState = strongSelf.state.selectedMessageIds.flatMap { ChatInterfaceSelectionState(selectedIds: $0) } + strongSelf.paneContainerNode.updateSelectedMessageIds(strongSelf.state.selectedMessageIds, animated: true) + case .search: + strongSelf.activateSearch() + } + } + + self.dataDisposable = (peerInfoScreenData(context: context, peerId: peerId, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat) + |> deliverOnMainQueue).start(next: { [weak self] data in + guard let strongSelf = self else { + return + } + strongSelf.updateData(data) + }) + } + + deinit { + self.dataDisposable?.dispose() + self.hiddenMediaDisposable?.dispose() + self.activeActionDisposable.dispose() + self.resolveUrlDisposable.dispose() + self.hiddenAvatarRepresentationDisposable.dispose() + self.toggleShouldChannelMessagesSignaturesDisposable.dispose() + self.updateAvatarDisposable.dispose() + } + + override func didLoad() { + super.didLoad() + } + + private func updateData(_ data: PeerInfoScreenData) { + self.data = data + if let (layout, navigationHeight) = self.validLayout { + self.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate) + } + } + + func scrollToTop() { + if !self.paneContainerNode.scrollToTop() { + self.scrollNode.view.setContentOffset(CGPoint(), animated: true) + } + } + + @objc private func editingCancelPressed() { + self.headerNode.navigationButtonContainer.performAction?(.cancel) + } + + private func openMessage(id: MessageId) -> Bool { + guard let controller = self.controller, let navigationController = controller.navigationController as? NavigationController else { + return false + } + var foundGalleryMessage: Message? + if let searchContentNode = self.searchDisplayController?.contentNode as? ChatHistorySearchContainerNode { + if let galleryMessage = searchContentNode.messageForGallery(id) { + let _ = (self.context.account.postbox.transaction { transaction -> Void in + if transaction.getMessage(galleryMessage.id) == nil { + storeMessageFromSearch(transaction: transaction, message: galleryMessage) + } + }).start() + foundGalleryMessage = galleryMessage + } + } + if foundGalleryMessage == nil, let galleryMessage = self.paneContainerNode.findLoadedMessage(id: id) { + foundGalleryMessage = galleryMessage + } + + guard let galleryMessage = foundGalleryMessage else { + return false + } + self.view.endEditing(true) + + return self.context.sharedContext.openChatMessage(OpenChatMessageParams(context: self.context, message: galleryMessage, standalone: false, reverseMessageGalleryOrder: true, navigationController: navigationController, dismissInput: { [weak self] in + self?.view.endEditing(true) + }, present: { [weak self] c, a in + self?.controller?.present(c, in: .window(.root), with: a, blockInteraction: true) + }, transitionNode: { [weak self] messageId, media in + guard let strongSelf = self else { + return nil + } + return strongSelf.paneContainerNode.transitionNodeForGallery(messageId: messageId, media: media) + }, addToTransitionSurface: { [weak self] view in + guard let strongSelf = self else { + return + } + strongSelf.paneContainerNode.currentPane?.node.addToTransitionSurface(view: view) + }, openUrl: { [weak self] url in + self?.openUrl(url: url, external: false) + }, openPeer: { [weak self] peer, navigation in + self?.openPeer(peerId: peer.id, navigation: navigation) + }, callPeer: { peerId in + //self?.controllerInteraction?.callPeer(peerId) + }, enqueueMessage: { _ in + }, sendSticker: nil, setupTemporaryHiddenMedia: { _, _, _ in }, chatAvatarHiddenMedia: { _, _ in })) + } + + private func openUrl(url: String, external: Bool) { + let disposable = self.resolveUrlDisposable + + let resolvedUrl: Signal + if external { + resolvedUrl = .single(.externalUrl(url)) + } else { + resolvedUrl = self.context.sharedContext.resolveUrl(account: self.context.account, url: url) + } + + disposable.set((resolvedUrl + |> deliverOnMainQueue).start(next: { [weak self] result in + guard let strongSelf = self else { + return + } + strongSelf.context.sharedContext.openResolvedUrl(result, context: strongSelf.context, urlContext: .generic, navigationController: strongSelf.controller?.navigationController as? NavigationController, openPeer: { peerId, navigation in + self?.openPeer(peerId: peerId, navigation: navigation) + }, sendFile: nil, + sendSticker: nil, + present: { c, a in + self?.controller?.present(c, in: .window(.root), with: a) + }, dismissInput: { + self?.view.endEditing(true) + }, contentContext: nil) + })) + } + + private func openPeer(peerId: PeerId, navigation: ChatControllerInteractionNavigateToPeer) { + switch navigation { + case .default: + if let navigationController = self.controller?.navigationController as? NavigationController { + self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(peerId), keepStack: .always)) + } + case let .chat(_, subject): + if let navigationController = self.controller?.navigationController as? NavigationController { + self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(peerId), subject: subject, keepStack: .always)) + } + case .info: + self.resolveUrlDisposable.set((self.context.account.postbox.loadedPeerWithId(peerId) + |> take(1) + |> deliverOnMainQueue).start(next: { [weak self] peer in + if let strongSelf = self, peer.restrictionText(platform: "ios", contentSettings: strongSelf.context.currentContentSettings.with { $0 }) == nil { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { + (strongSelf.controller?.navigationController as? NavigationController)?.pushViewController(infoController) + } + } + })) + case let .withBotStartPayload(startPayload): + if let navigationController = self.controller?.navigationController as? NavigationController { + self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(peerId), botStart: startPayload)) + } + default: + break + } + } + + private func performButtonAction(key: PeerInfoHeaderButtonKey) { + guard let controller = self.controller else { + return + } + switch key { + case .message: + if let navigationController = controller.navigationController as? NavigationController { + self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(self.peerId))) + } + case .discussion: + if let cachedData = self.data?.cachedData as? CachedChannelData, let linkedDiscussionPeerId = cachedData.linkedDiscussionPeerId { + if let navigationController = controller.navigationController as? NavigationController { + self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(linkedDiscussionPeerId))) + } + } + case .call: + self.requestCall() + case .mute: + let peerId = self.peerId + let _ = (self.context.account.postbox.transaction { transaction -> (TelegramPeerNotificationSettings, GlobalNotificationSettings) in + let peerSettings: TelegramPeerNotificationSettings = (transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings) ?? TelegramPeerNotificationSettings.defaultSettings + let globalSettings: GlobalNotificationSettings = (transaction.getPreferencesEntry(key: PreferencesKeys.globalNotifications) as? GlobalNotificationSettings) ?? GlobalNotificationSettings.defaultSettings + return (peerSettings, globalSettings) + } + |> deliverOnMainQueue).start(next: { [weak self] peerSettings, globalSettings in + guard let strongSelf = self else { + return + } + let soundSettings: NotificationSoundSettings? + if case .default = peerSettings.messageSound { + soundSettings = NotificationSoundSettings(value: nil) + } else { + soundSettings = NotificationSoundSettings(value: peerSettings.messageSound) + } + let muteSettingsController = notificationMuteSettingsController(presentationData: strongSelf.presentationData, notificationSettings: globalSettings.effective.groupChats, soundSettings: soundSettings, openSoundSettings: { + guard let strongSelf = self else { + return + } + let soundController = notificationSoundSelectionController(context: strongSelf.context, isModal: true, currentSound: peerSettings.messageSound, defaultSound: globalSettings.effective.groupChats.sound, completion: { sound in + guard let strongSelf = self else { + return + } + let _ = updatePeerNotificationSoundInteractive(account: strongSelf.context.account, peerId: strongSelf.peerId, sound: sound).start() + }) + strongSelf.controller?.present(soundController, in: .window(.root)) + }, updateSettings: { value in + guard let strongSelf = self else { + return + } + let _ = updatePeerMuteSetting(account: strongSelf.context.account, peerId: strongSelf.peerId, muteInterval: value).start() + }) + strongSelf.controller?.present(muteSettingsController, in: .window(.root)) + }) + case .more: + guard let data = self.data, let peer = data.peer else { + return + } + let actionSheet = ActionSheetController(presentationData: self.presentationData) + let dismissAction: () -> Void = { [weak actionSheet] in + actionSheet?.dismissAnimated() + } + var items: [ActionSheetItem] = [] + items.append(ActionSheetButtonItem(title: presentationData.strings.ChatSearch_SearchPlaceholder, color: .accent, action: { [weak self] in + dismissAction() + self?.openChatWithMessageSearch() + })) + if let user = peer as? TelegramUser { + if let botInfo = user.botInfo { + if botInfo.flags.contains(.worksWithGroups) { + items.append(ActionSheetButtonItem(title: presentationData.strings.UserInfo_InviteBotToGroup, color: .accent, action: { [weak self] in + dismissAction() + self?.openAddBotToGroup() + })) + } + if user.username != nil { + items.append(ActionSheetButtonItem(title: presentationData.strings.UserInfo_ShareBot, color: .accent, action: { [weak self] in + dismissAction() + self?.openShareBot() + })) + } + + if let cachedData = data.cachedData as? CachedUserData, let botInfo = cachedData.botInfo { + for command in botInfo.commands { + if command.text == "settings" { + items.append(ActionSheetButtonItem(title: presentationData.strings.UserInfo_BotSettings, color: .accent, action: { [weak self] in + dismissAction() + self?.performBotCommand(command: .settings) + })) + } else if command.text == "help" { + items.append(ActionSheetButtonItem(title: presentationData.strings.UserInfo_BotHelp, color: .accent, action: { [weak self] in + dismissAction() + self?.performBotCommand(command: .help) + })) + } else if command.text == "privacy" { + items.append(ActionSheetButtonItem(title: presentationData.strings.UserInfo_BotPrivacy, color: .accent, action: { [weak self] in + dismissAction() + self?.performBotCommand(command: .privacy) + })) + } + } + } + } + + if user.botInfo == nil && !user.flags.contains(.isSupport) { + items.append(ActionSheetButtonItem(title: presentationData.strings.UserInfo_StartSecretChat, color: .accent, action: { [weak self] in + dismissAction() + self?.openStartSecretChat() + })) + } + } else if let channel = peer as? TelegramChannel { + var canReport = true + if channel.isVerified { + canReport = false + } + if channel.adminRights != nil { + canReport = false + } + if channel.flags.contains(.isCreator) { + canReport = false + } + if canReport { + items.append(ActionSheetButtonItem(title: presentationData.strings.ReportPeer_Report, color: .destructive, action: { [weak self] in + dismissAction() + self?.openReport() + })) + } + + switch channel.info { + case .broadcast: + if channel.flags.contains(.isCreator) { + items.append(ActionSheetButtonItem(title: presentationData.strings.ChannelInfo_DeleteChannel, color: .destructive, action: { [weak self] in + dismissAction() + self?.openDeletePeer() + })) + } else { + if case .member = channel.participationStatus { + items.append(ActionSheetButtonItem(title: presentationData.strings.Channel_LeaveChannel, color: .destructive, action: { [weak self] in + dismissAction() + self?.openLeavePeer() + })) + } + } + case .group: + if channel.flags.contains(.isCreator) { + items.append(ActionSheetButtonItem(title: presentationData.strings.ChannelInfo_DeleteGroup, color: .destructive, action: { [weak self] in + dismissAction() + self?.openDeletePeer() + })) + } else { + if case .member = channel.participationStatus { + items.append(ActionSheetButtonItem(title: presentationData.strings.Group_LeaveGroup, color: .destructive, action: { [weak self] in + dismissAction() + self?.openLeavePeer() + })) + } + } + } + } else if let group = peer as? TelegramGroup { + if case .Member = group.membership { + items.append(ActionSheetButtonItem(title: presentationData.strings.Group_LeaveGroup, color: .destructive, action: { [weak self] in + dismissAction() + self?.openLeavePeer() + })) + } + } + actionSheet.setItemGroups([ + ActionSheetItemGroup(items: items), + ActionSheetItemGroup(items: [ActionSheetButtonItem(title: self.presentationData.strings.Common_Cancel, action: { dismissAction() })]) + ]) + self.view.endEditing(true) + controller.present(actionSheet, in: .window(.root)) + case .addMember: + break + } + } + + private func openChatWithMessageSearch() { + if let navigationController = (self.controller?.navigationController as? NavigationController) { + self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(self.peerId), activateMessageSearch: true)) + } + } + + private func openStartSecretChat() { + let peerId = self.peerId + let _ = (self.context.account.postbox.transaction { transaction -> (Peer?, PeerId?) in + let peer = transaction.getPeer(peerId) + let filteredPeerIds = Array(transaction.getAssociatedPeerIds(peerId)).filter { $0.namespace == Namespaces.Peer.SecretChat } + var activeIndices: [ChatListIndex] = [] + for associatedId in filteredPeerIds { + if let state = (transaction.getPeer(associatedId) as? TelegramSecretChat)?.embeddedState { + switch state { + case .active, .handshake: + if let (_, index) = transaction.getPeerChatListIndex(associatedId) { + activeIndices.append(index) + } + default: + break + } + } + } + activeIndices.sort() + if let index = activeIndices.last { + return (peer, index.messageIndex.id.peerId) + } else { + return (peer, nil) + } + } + |> deliverOnMainQueue).start(next: { [weak self] peer, currentPeerId in + guard let strongSelf = self else { + return + } + if let currentPeerId = currentPeerId { + if let navigationController = (strongSelf.controller?.navigationController as? NavigationController) { + strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(currentPeerId))) + } + } else if let controller = strongSelf.controller { + let displayTitle = peer?.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder) ?? "" + controller.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.UserInfo_StartSecretChatConfirmation(displayTitle).0, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.UserInfo_StartSecretChatStart, action: { + guard let strongSelf = self else { + return + } + var createSignal = createSecretChat(account: strongSelf.context.account, peerId: peerId) + var cancelImpl: (() -> Void)? + let progressSignal = Signal { subscriber in + if let strongSelf = self { + let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: { + cancelImpl?() + })) + strongSelf.controller?.present(statusController, in: .window(.root)) + return ActionDisposable { [weak statusController] in + Queue.mainQueue().async() { + statusController?.dismiss() + } + } + } else { + return EmptyDisposable + } + } + |> runOn(Queue.mainQueue()) + |> delay(0.15, queue: Queue.mainQueue()) + let progressDisposable = progressSignal.start() + + createSignal = createSignal + |> afterDisposed { + Queue.mainQueue().async { + progressDisposable.dispose() + } + } + let createSecretChatDisposable = MetaDisposable() + cancelImpl = { + createSecretChatDisposable.set(nil) + } + + createSecretChatDisposable.set((createSignal + |> deliverOnMainQueue).start(next: { peerId in + guard let strongSelf = self else { + return + } + if let navigationController = (strongSelf.controller?.navigationController as? NavigationController) { + strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId))) + } + }, error: { _ in + guard let strongSelf = self else { + return + } + strongSelf.controller?.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + })) + })]), in: .window(.root)) + } + }) + } + + private func openUsername(value: String) { + let shareController = ShareController(context: context, subject: .url("\(value)")) + self.view.endEditing(true) + self.controller?.present(shareController, in: .window(.root)) + } + + private func requestCall() { + guard let peer = self.data?.peer as? TelegramUser, let cachedUserData = self.data?.cachedData as? CachedUserData else { + return + } + if cachedUserData.callsPrivate { + self.controller?.present(textAlertController(context: self.context, title: self.presentationData.strings.Call_ConnectionErrorTitle, text: self.presentationData.strings.Call_PrivacyErrorMessage(peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + return + } + + let callResult = self.context.sharedContext.callManager?.requestCall(account: self.context.account, peerId: peer.id, endCurrentIfAny: false) + if let callResult = callResult, case let .alreadyInProgress(currentPeerId) = callResult { + if currentPeerId == peer.id { + self.context.sharedContext.navigateToCurrentCall() + } else { + let _ = (self.context.account.postbox.transaction { transaction -> (Peer?, Peer?) in + return (transaction.getPeer(peer.id), transaction.getPeer(currentPeerId)) + } + |> deliverOnMainQueue).start(next: { [weak self] peer, current in + guard let strongSelf = self else { + return + } + if let peer = peer, let current = current { + strongSelf.controller?.present(textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Call_CallInProgressTitle, text: strongSelf.presentationData.strings.Call_CallInProgressMessage(current.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: { + guard let strongSelf = self else { + return + } + let _ = strongSelf.context.sharedContext.callManager?.requestCall(account: strongSelf.context.account, peerId: peer.id, endCurrentIfAny: true) + })]), in: .window(.root)) + } + }) + } + } + } + + private func openPhone(value: String) { + let _ = (getUserPeer(postbox: self.context.account.postbox, peerId: peerId) + |> deliverOnMainQueue).start(next: { [weak self] peer, _ in + guard let strongSelf = self else { + return + } + if let peer = peer as? TelegramUser, let peerPhoneNumber = peer.phone, formatPhoneNumber(value) == formatPhoneNumber(peerPhoneNumber) { + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) + let dismissAction: () -> Void = { [weak actionSheet] in + actionSheet?.dismissAnimated() + } + actionSheet.setItemGroups([ + ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: strongSelf.presentationData.strings.UserInfo_TelegramCall, action: { + dismissAction() + self?.requestCall() + }), + ActionSheetButtonItem(title: strongSelf.presentationData.strings.UserInfo_PhoneCall, action: { + dismissAction() + + guard let strongSelf = self else { + return + } + strongSelf.context.sharedContext.applicationBindings.openUrl("tel:\(formatPhoneNumber(value).replacingOccurrences(of: " ", with: ""))") + }), + ]), + ActionSheetItemGroup(items: [ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, action: { dismissAction() })]) + ]) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + } else { + strongSelf.context.sharedContext.applicationBindings.openUrl("tel:\(formatPhoneNumber(value).replacingOccurrences(of: " ", with: ""))") + } + }) + } + + private func editingOpenNotificationSettings() { + let peerId = self.peerId + let _ = (self.context.account.postbox.transaction { transaction -> (TelegramPeerNotificationSettings, GlobalNotificationSettings) in + let peerSettings: TelegramPeerNotificationSettings = (transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings) ?? TelegramPeerNotificationSettings.defaultSettings + let globalSettings: GlobalNotificationSettings = (transaction.getPreferencesEntry(key: PreferencesKeys.globalNotifications) as? GlobalNotificationSettings) ?? GlobalNotificationSettings.defaultSettings + return (peerSettings, globalSettings) + } + |> deliverOnMainQueue).start(next: { [weak self] peerSettings, globalSettings in + guard let strongSelf = self else { + return + } + let soundSettings: NotificationSoundSettings? + if case .default = peerSettings.messageSound { + soundSettings = NotificationSoundSettings(value: nil) + } else { + soundSettings = NotificationSoundSettings(value: peerSettings.messageSound) + } + let muteSettingsController = notificationMuteSettingsController(presentationData: strongSelf.presentationData, notificationSettings: globalSettings.effective.groupChats, soundSettings: nil, openSoundSettings: { + guard let strongSelf = self else { + return + } + let soundController = notificationSoundSelectionController(context: strongSelf.context, isModal: true, currentSound: peerSettings.messageSound, defaultSound: globalSettings.effective.groupChats.sound, completion: { sound in + guard let strongSelf = self else { + return + } + let _ = updatePeerNotificationSoundInteractive(account: strongSelf.context.account, peerId: strongSelf.peerId, sound: sound).start() + }) + strongSelf.controller?.push(soundController) + }, updateSettings: { value in + guard let strongSelf = self else { + return + } + let _ = updatePeerMuteSetting(account: strongSelf.context.account, peerId: strongSelf.peerId, muteInterval: value).start() + }) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(muteSettingsController, in: .window(.root)) + }) + } + + private func editingOpenSoundSettings() { + let peerId = self.peerId + let _ = (self.context.account.postbox.transaction { transaction -> (TelegramPeerNotificationSettings, GlobalNotificationSettings) in + let peerSettings: TelegramPeerNotificationSettings = (transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings) ?? TelegramPeerNotificationSettings.defaultSettings + let globalSettings: GlobalNotificationSettings = (transaction.getPreferencesEntry(key: PreferencesKeys.globalNotifications) as? GlobalNotificationSettings) ?? GlobalNotificationSettings.defaultSettings + return (peerSettings, globalSettings) + } + |> deliverOnMainQueue).start(next: { [weak self] peerSettings, globalSettings in + guard let strongSelf = self else { + return + } + let soundSettings: NotificationSoundSettings? + if case .default = peerSettings.messageSound { + soundSettings = NotificationSoundSettings(value: nil) + } else { + soundSettings = NotificationSoundSettings(value: peerSettings.messageSound) + } + + let soundController = notificationSoundSelectionController(context: strongSelf.context, isModal: true, currentSound: peerSettings.messageSound, defaultSound: globalSettings.effective.groupChats.sound, completion: { sound in + guard let strongSelf = self else { + return + } + let _ = updatePeerNotificationSoundInteractive(account: strongSelf.context.account, peerId: strongSelf.peerId, sound: sound).start() + }) + strongSelf.controller?.push(soundController) + }) + } + + private func editingToggleShowMessageText(value: Bool) { + let _ = (getUserPeer(postbox: self.context.account.postbox, peerId: self.peerId) + |> deliverOnMainQueue).start(next: { [weak self] peer, _ in + guard let strongSelf = self, let peer = peer else { + return + } + let _ = updatePeerDisplayPreviewsSetting(account: strongSelf.context.account, peerId: peer.id, displayPreviews: value ? .show : .hide).start() + }) + } + + private func requestDeleteContact() { + let actionSheet = ActionSheetController(presentationData: self.presentationData) + let dismissAction: () -> Void = { [weak actionSheet] in + actionSheet?.dismissAnimated() + } + actionSheet.setItemGroups([ + ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: self.presentationData.strings.UserInfo_DeleteContact, color: .destructive, action: { [weak self] in + dismissAction() + guard let strongSelf = self else { + return + } + let _ = (getUserPeer(postbox: strongSelf.context.account.postbox, peerId: strongSelf.peerId) + |> deliverOnMainQueue).start(next: { peer, _ in + guard let peer = peer, let strongSelf = self else { + return + } + let deleteContactFromDevice: Signal + if let contactDataManager = strongSelf.context.sharedContext.contactDataManager { + deleteContactFromDevice = contactDataManager.deleteContactWithAppSpecificReference(peerId: peer.id) + } else { + deleteContactFromDevice = .complete() + } + + var deleteSignal = deleteContactPeerInteractively(account: strongSelf.context.account, peerId: peer.id) + |> then(deleteContactFromDevice) + + let progressSignal = Signal { subscriber in + guard let strongSelf = self else { + return EmptyDisposable + } + let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } + let statusController = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil)) + strongSelf.controller?.present(statusController, in: .window(.root)) + return ActionDisposable { [weak statusController] in + Queue.mainQueue().async() { + statusController?.dismiss() + } + } + } + |> runOn(Queue.mainQueue()) + |> delay(0.15, queue: Queue.mainQueue()) + let progressDisposable = progressSignal.start() + + deleteSignal = deleteSignal + |> afterDisposed { + Queue.mainQueue().async { + progressDisposable.dispose() + } + } + + strongSelf.activeActionDisposable.set((deleteSignal + |> deliverOnMainQueue).start(completed: { + self?.controller?.dismiss() + })) + + deleteSendMessageIntents(peerId: strongSelf.peerId) + }) + }) + ]), + ActionSheetItemGroup(items: [ActionSheetButtonItem(title: self.presentationData.strings.Common_Cancel, action: { dismissAction() })]) + ]) + self.view.endEditing(true) + self.controller?.present(actionSheet, in: .window(.root)) + } + + private func openAddContact() { + let _ = (getUserPeer(postbox: self.context.account.postbox, peerId: self.peerId) + |> deliverOnMainQueue).start(next: { [weak self] peer, _ in + guard let strongSelf = self, let peer = peer else { + return + } + openAddPersonContactImpl(context: strongSelf.context, peerId: peer.id, pushController: { c in + self?.controller?.push(c) + }, present: { c, a in + self?.controller?.present(c, in: .window(.root), with: a) + }) + }) + } + + private func updateBlocked(block: Bool) { + let _ = (getUserPeer(postbox: self.context.account.postbox, peerId: self.peerId) + |> take(1) + |> deliverOnMainQueue).start(next: { [weak self] peer, _ in + guard let strongSelf = self, let peer = peer else { + return + } + + let presentationData = strongSelf.presentationData + if let peer = peer as? TelegramUser, let _ = peer.botInfo { + strongSelf.activeActionDisposable.set(requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: block).start()) + if !block { + let _ = enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start() + if let navigationController = strongSelf.controller?.navigationController as? NavigationController { + strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id))) + } + } + } else { + if block { + let presentationData = strongSelf.presentationData + let actionSheet = ActionSheetController(presentationData: presentationData) + let dismissAction: () -> Void = { [weak actionSheet] in + actionSheet?.dismissAnimated() + } + var reportSpam = false + var deleteChat = false + actionSheet.setItemGroups([ + ActionSheetItemGroup(items: [ + ActionSheetTextItem(title: presentationData.strings.UserInfo_BlockConfirmationTitle(peer.compactDisplayTitle).0), + ActionSheetButtonItem(title: presentationData.strings.UserInfo_BlockActionTitle(peer.compactDisplayTitle).0, color: .destructive, action: { + dismissAction() + guard let strongSelf = self else { + return + } + + strongSelf.activeActionDisposable.set(requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: true).start()) + if deleteChat { + let _ = removePeerChat(account: strongSelf.context.account, peerId: strongSelf.peerId, reportChatSpam: reportSpam).start() + (strongSelf.controller?.navigationController as? NavigationController)?.popToRoot(animated: true) + } else if reportSpam { + let _ = reportPeer(account: strongSelf.context.account, peerId: strongSelf.peerId, reason: .spam).start() + } + + deleteSendMessageIntents(peerId: strongSelf.peerId) + }) + ]), + ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })]) + ]) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + } else { + let text: String + if block { + text = presentationData.strings.UserInfo_BlockConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0 + } else { + text = presentationData.strings.UserInfo_UnblockConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0 + } + strongSelf.controller?.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_No, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Yes, action: { + guard let strongSelf = self else { + return + } + strongSelf.activeActionDisposable.set(requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: block).start()) + })]), in: .window(.root)) + } + } + }) + } + + private func openReport() { + guard let controller = self.controller else { + return + } + self.view.endEditing(true) + controller.present(peerReportOptionsController(context: self.context, subject: .peer(self.peerId), present: { [weak controller] c, a in + controller?.present(c, in: .window(.root), with: a) + }, push: { [weak controller] c in + controller?.push(c) + }, completion: { _ in }), in: .window(.root)) + } + + private func openShareBot() { + let _ = (getUserPeer(postbox: self.context.account.postbox, peerId: self.peerId) + |> deliverOnMainQueue).start(next: { [weak self] peer, _ in + guard let strongSelf = self else { + return + } + if let peer = peer as? TelegramUser, let username = peer.username { + let shareController = ShareController(context: strongSelf.context, subject: .url("https://t.me/\(username)")) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(shareController, in: .window(.root)) + } + }) + } + + private func openAddBotToGroup() { + guard let controller = self.controller else { + return + } + context.sharedContext.openResolvedUrl(.groupBotStart(peerId: peerId, payload: ""), context: self.context, urlContext: .generic, navigationController: controller.navigationController as? NavigationController, openPeer: { id, navigation in + }, sendFile: nil, + sendSticker: nil, + present: { [weak controller] c, a in + controller?.present(c, in: .window(.root), with: a) + }, dismissInput: { [weak controller] in + controller?.view.endEditing(true) + }, contentContext: nil) + } + + private func performBotCommand(command: PeerInfoBotCommand) { + let _ = (self.context.account.postbox.loadedPeerWithId(peerId) + |> deliverOnMainQueue).start(next: { [weak self] peer in + guard let strongSelf = self else { + return + } + let text: String + switch command { + case .settings: + text = "/settings" + case .privacy: + text = "/privacy" + case .help: + text = "/help" + } + let _ = enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: [.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start() + + if let navigationController = strongSelf.controller?.navigationController as? NavigationController { + strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(strongSelf.peerId))) + } + }) + } + + private func editingOpenPublicLinkSetup() { + self.controller?.push(channelVisibilityController(context: self.context, peerId: self.peerId, mode: .generic, upgradedToSupergroup: { _, f in f() })) + } + + private func editingOpenDiscussionGroupSetup() { + guard let data = self.data, let peer = data.peer else { + return + } + self.controller?.push(channelDiscussionGroupSetupController(context: self.context, peerId: peer.id)) + } + + private func editingToggleMessageSignatures(value: Bool) { + self.toggleShouldChannelMessagesSignaturesDisposable.set(toggleShouldChannelMessagesSignatures(account: self.context.account, peerId: self.peerId, enabled: value).start()) + } + + private func openParticipantsSection(section: PeerInfoParticipantsSection) { + guard let data = self.data, let peer = data.peer else { + return + } + switch section { + case .members: + self.controller?.push(channelMembersController(context: self.context, peerId: self.peerId)) + case .admins: + if peer is TelegramGroup { + self.controller?.push(channelAdminsController(context: self.context, peerId: self.peerId)) + } else if peer is TelegramChannel { + self.controller?.push(channelAdminsController(context: self.context, peerId: self.peerId)) + } + case .banned: + self.controller?.push(channelBlacklistController(context: self.context, peerId: self.peerId)) + } + } + + private func editingOpenPreHistorySetup() { + guard let data = self.data, let peer = data.peer else { + return + } + self.controller?.push(groupPreHistorySetupController(context: self.context, peerId: peer.id, upgradedToSupergroup: { _, f in f() })) + } + + private func openPermissions() { + guard let data = self.data, let peer = data.peer else { + return + } + self.controller?.push(channelPermissionsController(context: self.context, peerId: peer.id)) + } + + private func editingOpenStickerPackSetup() { + guard let data = self.data, let peer = data.peer, let cachedData = data.cachedData as? CachedChannelData else { + return + } + self.controller?.push(groupStickerPackSetupController(context: self.context, peerId: peer.id, currentPackInfo: cachedData.stickerPack)) + } + + private func openLocation() { + guard let data = self.data, let peer = data.peer, let cachedData = data.cachedData as? CachedChannelData, let location = cachedData.peerGeoLocation else { + return + } + let context = self.context + let presentationData = self.presentationData + let mapMedia = TelegramMediaMap(latitude: location.latitude, longitude: location.longitude, geoPlace: nil, venue: MapVenue(title: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), address: location.address, provider: nil, id: nil, type: nil), liveBroadcastingTimeout: nil) + let locationController = legacyLocationController(message: nil, mapMedia: mapMedia, context: context, openPeer: { _ in }, sendLiveLocation: { _, _ in }, stopLiveLocation: {}, openUrl: { url in + context.sharedContext.applicationBindings.openUrl(url) + }) + self.controller?.push(locationController) + } + + private func editingOpenSetupLocation() { + guard let data = self.data, let peer = data.peer else { + return + } + let presentationData = self.presentationData + let locationController = legacyLocationPickerController(context: self.context, selfPeer: peer, peer: peer, sendLocation: { [weak self] coordinate, _, address in + guard let strongSelf = self else { + return + } + let addressSignal: Signal + if let address = address { + addressSignal = .single(address) + } else { + addressSignal = reverseGeocodeLocation(latitude: coordinate.latitude, longitude: coordinate.longitude) + |> map { placemark in + if let placemark = placemark { + return placemark.fullAddress + } else { + return "\(coordinate.latitude), \(coordinate.longitude)" + } + } + } + + let context = strongSelf.context + let _ = (addressSignal + |> mapToSignal { address -> Signal in + return updateChannelGeoLocation(postbox: context.account.postbox, network: context.account.network, channelId: peer.id, coordinate: (coordinate.latitude, coordinate.longitude), address: address) + } + |> deliverOnMainQueue).start(error: { errror in + guard let strongSelf = self else { + return + } + strongSelf.controller?.present(textAlertController(context: context, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + }) + }, sendLiveLocation: { _, _ in }, theme: presentationData.theme, customLocationPicker: true, presentationCompleted: { + }) + self.controller?.push(locationController) + } + + private func openPeerInfo(peer: Peer) { + if let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { + (self.controller?.navigationController as? NavigationController)?.pushViewController(infoController) + } + } + + private func openDeletePeer() { + let peerId = self.peerId + let _ = (self.context.account.postbox.transaction { transaction -> Peer? in + return transaction.getPeer(peerId) + } + |> deliverOnMainQueue).start(next: { [weak self] peer in + guard let strongSelf = self, let peer = peer else { + return + } + var isGroup = false + if let channel = peer as? TelegramChannel { + if case .group = channel.info { + isGroup = true + } + } else if peer is TelegramGroup { + isGroup = true + } + let presentationData = strongSelf.presentationData + let actionSheet = ActionSheetController(presentationData: presentationData) + let dismissAction: () -> Void = { [weak actionSheet] in + actionSheet?.dismissAnimated() + } + actionSheet.setItemGroups([ + ActionSheetItemGroup(items: [ + ActionSheetTextItem(title: isGroup ? presentationData.strings.ChannelInfo_DeleteGroupConfirmation : presentationData.strings.ChannelInfo_DeleteChannelConfirmation), + ActionSheetButtonItem(title: isGroup ? presentationData.strings.ChannelInfo_DeleteGroup : presentationData.strings.ChannelInfo_DeleteChannel, color: .destructive, action: { + dismissAction() + self?.deletePeerChat(peer: peer, globally: true) + }), + ]), + ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })]) + ]) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + }) + } + + private func openLeavePeer() { + let peerId = self.peerId + let _ = (self.context.account.postbox.transaction { transaction -> Peer? in + return transaction.getPeer(peerId) + } + |> deliverOnMainQueue).start(next: { [weak self] peer in + guard let strongSelf = self, let peer = peer else { + return + } + var isGroup = false + if let channel = peer as? TelegramChannel { + if case .group = channel.info { + isGroup = true + } + } else if peer is TelegramGroup { + isGroup = true + } + let presentationData = strongSelf.presentationData + let actionSheet = ActionSheetController(presentationData: presentationData) + let dismissAction: () -> Void = { [weak actionSheet] in + actionSheet?.dismissAnimated() + } + actionSheet.setItemGroups([ + ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: isGroup ? presentationData.strings.Group_LeaveGroup : presentationData.strings.Channel_LeaveChannel, color: .destructive, action: { + dismissAction() + self?.deletePeerChat(peer: peer, globally: false) + }), + ]), + ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })]) + ]) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + }) + } + + private func deletePeerChat(peer: Peer, globally: Bool) { + guard let controller = self.controller, let navigationController = controller.navigationController as? NavigationController else { + return + } + guard let tabController = navigationController.viewControllers.first as? TabBarController else { + return + } + for childController in tabController.controllers { + if let chatListController = childController as? ChatListController { + chatListController.maybeAskForPeerChatRemoval(peer: RenderedPeer(peer: peer), deleteGloballyIfPossible: globally, completion: { [weak navigationController] deleted in + if deleted { + navigationController?.popToRoot(animated: true) + } + }, removed: { + }) + break + } + } + } + + private func openAvatarForEditing() { + guard let peer = self.data?.peer, canEditPeerInfo(peer: peer) else { + return + } + + let peerId = self.peerId + let _ = (self.context.account.postbox.transaction { transaction -> (Peer?, SearchBotsConfiguration) in + return (transaction.getPeer(peerId), currentSearchBotsConfiguration(transaction: transaction)) + } + |> deliverOnMainQueue).start(next: { [weak self] peer, searchBotsConfiguration in + guard let strongSelf = self, let peer = peer else { + return + } + + let presentationData = strongSelf.presentationData + + let legacyController = LegacyController(presentation: .custom, theme: presentationData.theme) + legacyController.statusBar.statusBarStyle = .Ignore + + let emptyController = LegacyEmptyController(context: legacyController.context)! + let navigationController = makeLegacyNavigationController(rootController: emptyController) + navigationController.setNavigationBarHidden(true, animated: false) + navigationController.navigationBar.transform = CGAffineTransform(translationX: -1000.0, y: 0.0) + + legacyController.bind(controller: navigationController) + + strongSelf.view.endEditing(true) + strongSelf.controller?.present(legacyController, in: .window(.root)) + + var hasPhotos = false + if !peer.profileImageRepresentations.isEmpty { + hasPhotos = true + } + + let completedImpl: (UIImage) -> Void = { image in + guard let strongSelf = self, let data = image.jpegData(compressionQuality: 0.6) else { + return + } + + let resource = LocalFileMediaResource(fileId: arc4random64()) + strongSelf.context.account.postbox.mediaBox.storeResourceData(resource.id, data: data) + let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource) + + strongSelf.state = strongSelf.state.withUpdatingAvatar(.image(representation)) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + + let postbox = strongSelf.context.account.postbox + strongSelf.updateAvatarDisposable.set((updatePeerPhoto(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, stateManager: strongSelf.context.account.stateManager, accountPeerId: strongSelf.context.account.peerId, peerId: strongSelf.peerId, photo: uploadedPeerPhoto(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, resource: resource), mapResourceToAvatarSizes: { resource, representations in + return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations) + }) + |> deliverOnMainQueue).start(next: { result in + guard let strongSelf = self else { + return + } + switch result { + case .complete: + strongSelf.state = strongSelf.state.withUpdatingAvatar(nil) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + case .progress: + break + } + })) + } + + let mixin = TGMediaAvatarMenuMixin(context: legacyController.context, parentController: emptyController, hasSearchButton: true, hasDeleteButton: hasPhotos, hasViewButton: false, personalPhoto: false, saveEditedPhotos: false, saveCapturedMedia: false, signup: false)! + let _ = strongSelf.currentAvatarMixin.swap(mixin) + mixin.requestSearchController = { assetsController in + guard let strongSelf = self else { + return + } + let controller = WebSearchController(context: strongSelf.context, peer: peer, configuration: searchBotsConfiguration, mode: .avatar(initialQuery: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), completion: { result in + assetsController?.dismiss() + completedImpl(result) + })) + strongSelf.controller?.present(controller, in: .window(.root)) + } + mixin.didFinishWithImage = { image in + if let image = image { + completedImpl(image) + } + } + mixin.didFinishWithDelete = { + guard let strongSelf = self else { + return + } + + let _ = strongSelf.currentAvatarMixin.swap(nil) + if let profileImage = peer.smallProfileImage { + strongSelf.state = strongSelf.state.withUpdatingAvatar(.none) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + } + let postbox = strongSelf.context.account.postbox + strongSelf.updateAvatarDisposable.set((updatePeerPhoto(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, stateManager: strongSelf.context.account.stateManager, accountPeerId: strongSelf.context.account.peerId, peerId: strongSelf.peerId, photo: nil, mapResourceToAvatarSizes: { resource, representations in + return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations) + }) + |> deliverOnMainQueue).start(next: { result in + guard let strongSelf = self else { + return + } + switch result { + case .complete: + strongSelf.state = strongSelf.state.withUpdatingAvatar(nil) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + case .progress: + break + } + })) + } + mixin.didDismiss = { [weak legacyController] in + guard let strongSelf = self else { + return + } + let _ = strongSelf.currentAvatarMixin.swap(nil) + legacyController?.dismiss() + } + let menuController = mixin.present() + if let menuController = menuController { + menuController.customRemoveFromParentViewController = { [weak legacyController] in + legacyController?.dismiss() + } + } + }) + } + + func deleteMessages(messageIds: Set?) { + if let messageIds = messageIds ?? self.state.selectedMessageIds, !messageIds.isEmpty { + self.activeActionDisposable.set((self.context.sharedContext.chatAvailableMessageActions(postbox: self.context.account.postbox, accountPeerId: self.context.account.peerId, messageIds: messageIds) + |> deliverOnMainQueue).start(next: { [weak self] actions in + if let strongSelf = self, let peer = strongSelf.data?.peer, !actions.options.isEmpty { + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) + var items: [ActionSheetItem] = [] + var personalPeerName: String? + var isChannel = false + if let user = peer as? TelegramUser { + personalPeerName = user.compactDisplayTitle + } else if let channel = peer as? TelegramChannel, case .broadcast = channel.info { + isChannel = true + } + + if actions.options.contains(.deleteGlobally) { + let globalTitle: String + if isChannel { + globalTitle = strongSelf.presentationData.strings.Conversation_DeleteMessagesForMe + } else if let personalPeerName = personalPeerName { + globalTitle = strongSelf.presentationData.strings.Conversation_DeleteMessagesFor(personalPeerName).0 + } else { + globalTitle = strongSelf.presentationData.strings.Conversation_DeleteMessagesForEveryone + } + items.append(ActionSheetButtonItem(title: globalTitle, color: .destructive, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone) + let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start() + } + })) + } + if actions.options.contains(.deleteLocally) { + var localOptionText = strongSelf.presentationData.strings.Conversation_DeleteMessagesForMe + if strongSelf.context.account.peerId == strongSelf.peerId { + if messageIds.count == 1 { + localOptionText = strongSelf.presentationData.strings.Conversation_Moderate_Delete + } else { + localOptionText = strongSelf.presentationData.strings.Conversation_DeleteManyMessages + } + } + items.append(ActionSheetButtonItem(title: localOptionText, color: .destructive, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone) + let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forLocalPeer).start() + } + })) + } + actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + }) + ])]) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(actionSheet, in: .window(.root)) + } + })) + } + } + + func forwardMessages(messageIds: Set?) { + if let messageIds = messageIds ?? self.state.selectedMessageIds, !messageIds.isEmpty { + let peerSelectionController = self.context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: self.context, filter: [.onlyWriteable, .excludeDisabled])) + peerSelectionController.peerSelected = { [weak self, weak peerSelectionController] peerId in + if let strongSelf = self, let _ = peerSelectionController { + if peerId == strongSelf.context.account.peerId { + strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone) + + let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messageIds.map { id -> EnqueueMessage in + return .forward(source: id, grouping: .auto, attributes: []) + }) + |> deliverOnMainQueue).start(next: { [weak self] messageIds in + if let strongSelf = self { + let signals: [Signal] = messageIds.compactMap({ id -> Signal? in + guard let id = id else { + return nil + } + return strongSelf.context.account.pendingMessageManager.pendingMessageStatus(id) + |> mapToSignal { status, _ -> Signal in + if status != nil { + return .never() + } else { + return .single(true) + } + } + |> take(1) + }) + strongSelf.activeActionDisposable.set((combineLatest(signals) + |> deliverOnMainQueue).start(completed: { + guard let strongSelf = self else { + return + } + strongSelf.controller?.present(OverlayStatusController(theme: strongSelf.presentationData.theme, type: .success), in: .window(.root)) + })) + } + }) + if let peerSelectionController = peerSelectionController { + peerSelectionController.dismiss() + } + } else { + let _ = (strongSelf.context.account.postbox.transaction({ transaction -> Void in + transaction.updatePeerChatInterfaceState(peerId, update: { currentState in + if let currentState = currentState as? ChatInterfaceState { + return currentState.withUpdatedForwardMessageIds(Array(messageIds)) + } else { + return ChatInterfaceState().withUpdatedForwardMessageIds(Array(messageIds)) + } + }) + }) |> deliverOnMainQueue).start(completed: { + if let strongSelf = self { + strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone) + + let ready = ValuePromise() + strongSelf.activeActionDisposable.set((ready.get() |> take(1) |> deliverOnMainQueue).start(next: { _ in + if let peerSelectionController = peerSelectionController { + peerSelectionController.dismiss() + } + })) + + (strongSelf.controller?.navigationController as? NavigationController)?.replaceTopController(ChatControllerImpl(context: strongSelf.context, chatLocation: .peer(peerId)), animated: false, ready: ready) + } + }) + } + } + } + self.controller?.push(peerSelectionController) + } + } + + private func activateSearch() { + guard let (layout, navigationBarHeight) = self.validLayout else { + return + } + + if let _ = self.searchDisplayController { + return + } + + var tagMask: MessageTags = .file + if let currentPaneKey = self.paneContainerNode.currentPaneKey { + switch currentPaneKey { + case .links: + tagMask = .webPage + case .music: + tagMask = .music + default: + break + } + } + + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Common_Search, contentNode: ChatHistorySearchContainerNode(context: self.context, peerId: self.peerId, tagMask: tagMask, interfaceInteraction: self.chatInterfaceInteraction), cancel: { [weak self] in + self?.deactivateSearch() + }) + let transition: ContainedViewLayoutTransition = .animated(duration: 0.2, curve: .easeInOut) + if let navigationBar = self.controller?.navigationBar { + transition.updateAlpha(node: navigationBar, alpha: 0.0) + } + + self.searchDisplayController?.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate) + self.searchDisplayController?.activate(insertSubnode: { [weak self] subnode, isSearchBar in + if let strongSelf = self, let navigationBar = strongSelf.controller?.navigationBar { + strongSelf.insertSubnode(subnode, belowSubnode: navigationBar) + } + }, placeholder: nil) + + if let (layout, navigationHeight) = self.validLayout { + self.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate) + } + } + + private func deactivateSearch() { + guard let searchDisplayController = self.searchDisplayController else { + return + } + self.searchDisplayController = nil + searchDisplayController.deactivate(placeholder: nil) + + let transition: ContainedViewLayoutTransition = .animated(duration: 0.35, curve: .easeInOut) + if let navigationBar = self.controller?.navigationBar { + transition.updateAlpha(node: navigationBar, alpha: 1.0) + } + } + + func updatePresentationData(_ presentationData: PresentationData) { + self.presentationData = presentationData + + self.backgroundColor = self.presentationData.theme.list.blocksBackgroundColor + + self.updateNavigationExpansionPresentation(isExpanded: self.headerNode.isAvatarExpanded, animated: false) + + if let (layout, navigationHeight) = self.validLayout { + self.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate) + } + } + + func containerLayoutUpdated(layout: ContainerViewLayout, navigationHeight: CGFloat, transition: ContainedViewLayoutTransition, additive: Bool = false) { + self.validLayout = (layout, navigationHeight) + + if let searchDisplayController = self.searchDisplayController { + searchDisplayController.containerLayoutUpdated(layout, navigationBarHeight: navigationHeight, transition: transition) + if !searchDisplayController.isDeactivating { + //vanillaInsets.top += (layout.statusBarHeight ?? 0.0) - navigationBarHeightDelta + } + } + + self.ignoreScrolling = true + + transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + + let sectionSpacing: CGFloat = 24.0 + + var contentHeight: CGFloat = 0.0 + + let headerHeight = self.headerNode.update(width: layout.size.width, containerHeight: layout.size.height, containerInset: layout.safeInsets.left, statusBarHeight: layout.statusBarHeight ?? 0.0, navigationHeight: navigationHeight, contentOffset: self.scrollNode.view.contentOffset.y, presentationData: self.presentationData, peer: self.data?.peer, cachedData: self.data?.cachedData, notificationSettings: self.data?.notificationSettings, statusData: self.data?.status, isContact: self.data?.isContact ?? false, state: self.state, transition: transition, additive: additive) + let headerFrame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: layout.size.width, height: headerHeight)) + if additive { + transition.updateFrameAdditive(node: self.headerNode, frame: headerFrame) + } else { + transition.updateFrame(node: self.headerNode, frame: headerFrame) + } + contentHeight += headerHeight + contentHeight += sectionSpacing + + var validRegularSections: [AnyHashable] = [] + for (sectionId, sectionItems) in infoItems(data: self.data, context: self.context, presentationData: self.presentationData, interaction: self.interaction) { + validRegularSections.append(sectionId) + + let sectionNode: PeerInfoScreenItemSectionContainerNode + if let current = self.regularSections[sectionId] { + sectionNode = current + } else { + sectionNode = PeerInfoScreenItemSectionContainerNode() + self.regularSections[sectionId] = sectionNode + self.scrollNode.addSubnode(sectionNode) + } + + let sectionHeight = sectionNode.update(width: layout.size.width, presentationData: self.presentationData, items: sectionItems, transition: transition) + let sectionFrame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: layout.size.width, height: sectionHeight)) + if additive { + transition.updateFrameAdditive(node: sectionNode, frame: sectionFrame) + } else { + transition.updateFrame(node: sectionNode, frame: sectionFrame) + } + + transition.updateAlpha(node: sectionNode, alpha: self.state.isEditing ? 0.0 : 1.0) + if !sectionHeight.isZero && !self.state.isEditing { + contentHeight += sectionHeight + contentHeight += sectionSpacing + } + } + var removeRegularSections: [AnyHashable] = [] + for (sectionId, sectionNode) in self.regularSections { + if !validRegularSections.contains(sectionId) { + removeRegularSections.append(sectionId) + } + } + for sectionId in removeRegularSections { + if let sectionNode = self.regularSections.removeValue(forKey: sectionId) { + sectionNode.removeFromSupernode() + } + } + + var validEditingSections: [AnyHashable] = [] + for (sectionId, sectionItems) in editingItems(data: self.data, context: self.context, presentationData: self.presentationData, interaction: self.interaction) { + validEditingSections.append(sectionId) + + let sectionNode: PeerInfoScreenItemSectionContainerNode + if let current = self.editingSections[sectionId] { + sectionNode = current + } else { + sectionNode = PeerInfoScreenItemSectionContainerNode() + self.editingSections[sectionId] = sectionNode + self.scrollNode.addSubnode(sectionNode) + } + + let sectionHeight = sectionNode.update(width: layout.size.width, presentationData: self.presentationData, items: sectionItems, transition: transition) + let sectionFrame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: layout.size.width, height: sectionHeight)) + if additive { + transition.updateFrameAdditive(node: sectionNode, frame: sectionFrame) + } else { + transition.updateFrame(node: sectionNode, frame: sectionFrame) + } + + transition.updateAlpha(node: sectionNode, alpha: self.state.isEditing ? 1.0 : 0.0) + if !sectionHeight.isZero && self.state.isEditing { + contentHeight += sectionHeight + contentHeight += sectionSpacing + } + } + var removeEditingSections: [AnyHashable] = [] + for (sectionId, sectionNode) in self.editingSections { + if !validEditingSections.contains(sectionId) { + removeEditingSections.append(sectionId) + } + } + for sectionId in removeEditingSections { + if let sectionNode = self.editingSections.removeValue(forKey: sectionId) { + sectionNode.removeFromSupernode() + } + } + + let paneContainerSize = CGSize(width: layout.size.width, height: layout.size.height - navigationHeight) + var restoreContentOffset: CGPoint? + if additive { + restoreContentOffset = self.scrollNode.view.contentOffset + } + + let paneContainerFrame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: paneContainerSize) + if self.state.isEditing || (self.data?.availablePanes ?? []).isEmpty { + transition.updateAlpha(node: self.paneContainerNode, alpha: 0.0) + } else { + contentHeight += layout.size.height - navigationHeight + transition.updateAlpha(node: self.paneContainerNode, alpha: 1.0) + } + + if let selectedMessageIds = self.state.selectedMessageIds { + var wasAdded = false + let selectionPanelNode: PeerInfoSelectionPanelNode + if let current = self.paneContainerNode.selectionPanelNode { + selectionPanelNode = current + } else { + wasAdded = true + selectionPanelNode = PeerInfoSelectionPanelNode(context: self.context, peerId: self.peerId, deleteMessages: { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.deleteMessages(messageIds: nil) + }, shareMessages: { [weak self] in + guard let strongSelf = self, let messageIds = strongSelf.state.selectedMessageIds, !messageIds.isEmpty else { + return + } + let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Message] in + var messages: [Message] = [] + for id in messageIds { + if let message = transaction.getMessage(id) { + messages.append(message) + } + } + return messages + } + |> deliverOnMainQueue).start(next: { messages in + if let strongSelf = self, !messages.isEmpty { + strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone) + + let shareController = ShareController(context: strongSelf.context, subject: .messages(messages.sorted(by: { lhs, rhs in + return lhs.index < rhs.index + })), externalShare: true, immediateExternalShare: true) + strongSelf.view.endEditing(true) + strongSelf.controller?.present(shareController, in: .window(.root)) + } + }) + }, forwardMessages: { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.forwardMessages(messageIds: nil) + }, reportMessages: { [weak self] in + guard let strongSelf = self, let messageIds = strongSelf.state.selectedMessageIds, !messageIds.isEmpty else { + return + } + strongSelf.view.endEditing(true) + strongSelf.controller?.present(peerReportOptionsController(context: strongSelf.context, subject: .messages(Array(messageIds).sorted()), present: { c, a in + self?.controller?.present(c, in: .window(.root), with: a) + }, push: { c in + self?.controller?.push(c) + }, completion: { _ in }), in: .window(.root)) + }) + self.paneContainerNode.selectionPanelNode = selectionPanelNode + self.paneContainerNode.addSubnode(selectionPanelNode) + } + selectionPanelNode.selectionPanel.selectedMessages = selectedMessageIds + let panelHeight = selectionPanelNode.update(layout: layout, presentationData: self.presentationData, transition: wasAdded ? .immediate : transition) + let panelFrame = CGRect(origin: CGPoint(x: 0.0, y: paneContainerSize.height - panelHeight), size: CGSize(width: layout.size.width, height: panelHeight)) + if wasAdded { + selectionPanelNode.frame = panelFrame + transition.animatePositionAdditive(node: selectionPanelNode, offset: CGPoint(x: 0.0, y: panelHeight)) + } else { + transition.updateFrame(node: selectionPanelNode, frame: panelFrame) + } + } else if let selectionPanelNode = self.paneContainerNode.selectionPanelNode { + self.paneContainerNode.selectionPanelNode = nil + transition.updateFrame(node: selectionPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height), size: selectionPanelNode.bounds.size), completion: { [weak selectionPanelNode] _ in + selectionPanelNode?.removeFromSupernode() + }) + } + + self.scrollNode.view.contentSize = CGSize(width: layout.size.width, height: contentHeight) + if let restoreContentOffset = restoreContentOffset { + self.scrollNode.view.contentOffset = restoreContentOffset + } + + if additive { + transition.updateFrameAdditive(node: self.paneContainerNode, frame: paneContainerFrame) + } else { + transition.updateFrame(node: self.paneContainerNode, frame: paneContainerFrame) + } + + self.ignoreScrolling = false + self.updateNavigation(transition: transition, additive: additive) + + if !self.didSetReady && self.data != nil { + self.didSetReady = true + let avatarReady = self.headerNode.avatarListNode.isReady.get() + let combinedSignal = combineLatest(queue: .mainQueue(), + avatarReady, + self.paneContainerNode.isReady.get() + ) + |> map { lhs, rhs in + return lhs && rhs + } + self._ready.set(combinedSignal + |> filter { $0 } + |> take(1)) + } + } + + private func updateNavigation(transition: ContainedViewLayoutTransition, additive: Bool) { + let offsetY = self.scrollNode.view.contentOffset.y + + if self.state.isEditing || offsetY <= 50.0 || self.paneContainerNode.alpha.isZero { + if !self.scrollNode.view.bounces { + self.scrollNode.view.bounces = true + self.scrollNode.view.alwaysBounceVertical = true + } + } else { + if self.scrollNode.view.bounces { + self.scrollNode.view.bounces = false + self.scrollNode.view.alwaysBounceVertical = false + } + } + + if let (layout, navigationHeight) = self.validLayout { + if !additive { + self.headerNode.update(width: layout.size.width, containerHeight: layout.size.height, containerInset: layout.safeInsets.left, statusBarHeight: layout.statusBarHeight ?? 0.0, navigationHeight: navigationHeight, contentOffset: offsetY, presentationData: self.presentationData, peer: self.data?.peer, cachedData: self.data?.cachedData, notificationSettings: self.data?.notificationSettings, statusData: self.data?.status, isContact: self.data?.isContact ?? false, state: self.state, transition: transition, additive: additive) + } + + let paneAreaExpansionDistance: CGFloat = 32.0 + var paneAreaExpansionDelta = (self.paneContainerNode.frame.minY - navigationHeight) - self.scrollNode.view.contentOffset.y + paneAreaExpansionDelta = max(0.0, min(paneAreaExpansionDelta, paneAreaExpansionDistance)) + + let paneAreaExpansionFraction: CGFloat = 1.0 - paneAreaExpansionDelta / paneAreaExpansionDistance + + let effectiveAreaExpansionFraction: CGFloat + if self.state.isEditing { + effectiveAreaExpansionFraction = 0.0 + } else { + effectiveAreaExpansionFraction = paneAreaExpansionFraction + } + + transition.updateAlpha(node: self.headerNode.separatorNode, alpha: 1.0 - effectiveAreaExpansionFraction) + + let visibleHeight = self.scrollNode.view.contentOffset.y + self.scrollNode.view.bounds.height - self.paneContainerNode.frame.minY + + var bottomInset = layout.intrinsicInsets.bottom + if let selectionPanelNode = self.paneContainerNode.selectionPanelNode { + bottomInset = max(bottomInset, selectionPanelNode.bounds.height) + } + + self.paneContainerNode.update(size: self.paneContainerNode.bounds.size, sideInset: layout.safeInsets.left, bottomInset: bottomInset, visibleHeight: visibleHeight, expansionFraction: paneAreaExpansionFraction, presentationData: self.presentationData, data: self.data, transition: transition) + self.headerNode.navigationButtonContainer.frame = CGRect(origin: CGPoint(x: layout.safeInsets.left, y: layout.statusBarHeight ?? 0.0), size: CGSize(width: layout.size.width - layout.safeInsets.left * 2.0, height: 44.0)) + self.headerNode.navigationButtonContainer.isWhite = self.headerNode.isAvatarExpanded + + var navigationButtons: [PeerInfoHeaderNavigationButtonSpec] = [] + if self.state.isEditing { + navigationButtons.append(PeerInfoHeaderNavigationButtonSpec(key: .done, isForExpandedView: false)) + } else { + if peerInfoCanEdit(peer: self.data?.peer, cachedData: self.data?.cachedData) { + navigationButtons.append(PeerInfoHeaderNavigationButtonSpec(key: .edit, isForExpandedView: false)) + } + if self.state.selectedMessageIds == nil { + if let currentPaneKey = self.paneContainerNode.currentPaneKey { + switch currentPaneKey { + case .files, .music, .links: + navigationButtons.append(PeerInfoHeaderNavigationButtonSpec(key: .search, isForExpandedView: true)) + default: + break + } + switch currentPaneKey { + case .media, .files, .music, .links, .voice: + navigationButtons.append(PeerInfoHeaderNavigationButtonSpec(key: .select, isForExpandedView: true)) + default: + break + } + } + } else { + navigationButtons.append(PeerInfoHeaderNavigationButtonSpec(key: .selectionDone, isForExpandedView: true)) + } + } + self.headerNode.navigationButtonContainer.update(size: CGSize(width: layout.size.width - layout.safeInsets.left * 2.0, height: 44.0), presentationData: self.presentationData, buttons: navigationButtons, expandFraction: effectiveAreaExpansionFraction, transition: transition) + } + } + + private var canUpdateAvatarExpansion = false + + func scrollViewWillBeginDragging(_ scrollView: UIScrollView) { + self.canUpdateAvatarExpansion = true + } + + private var previousVelocityM1: CGFloat = 0.0 + private var previousVelocity: CGFloat = 0.0 + + private let velocityKey: String = encodeText("`wfsujdbmWfmpdjuz", -1) + + func scrollViewDidScroll(_ scrollView: UIScrollView) { + if self.ignoreScrolling { + return + } + self.updateNavigation(transition: .immediate, additive: false) + + if !self.state.isEditing { + self.previousVelocityM1 = self.previousVelocity + if let value = (scrollView.value(forKey: self.velocityKey) as? NSNumber)?.doubleValue { + //print("previousVelocity \(CGFloat(value))") + self.previousVelocity = CGFloat(value) + } + + let offsetY = self.scrollNode.view.contentOffset.y + var shouldBeExpanded: Bool? + if offsetY <= -32.0 && scrollView.isDragging && scrollView.isTracking { + if let peer = self.data?.peer, peer.smallProfileImage != nil { + shouldBeExpanded = true + } + } else if offsetY >= 1.0 { + shouldBeExpanded = false + } + if let shouldBeExpanded = shouldBeExpanded, shouldBeExpanded != self.headerNode.isAvatarExpanded { + let transition: ContainedViewLayoutTransition = .animated(duration: 0.35, curve: .spring) + + if self.hapticFeedback == nil { + self.hapticFeedback = HapticFeedback() + } + if shouldBeExpanded { + self.hapticFeedback?.impact() + } else { + self.hapticFeedback?.tap() + } + + self.headerNode.updateIsAvatarExpanded(shouldBeExpanded, transition: transition) + self.updateNavigationExpansionPresentation(isExpanded: shouldBeExpanded, animated: true) + + if let (layout, navigationHeight) = self.validLayout { + self.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: transition, additive: true) + } + } + } + } + + func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) { + guard let (_, navigationHeight) = self.validLayout else { + return + } + + let paneAreaExpansionFinalPoint: CGFloat = self.paneContainerNode.frame.minY - navigationHeight + if abs(scrollView.contentOffset.y - paneAreaExpansionFinalPoint) < .ulpOfOne { + self.paneContainerNode.currentPane?.node.transferVelocity(self.previousVelocityM1) + } + } + + private func updateNavigationExpansionPresentation(isExpanded: Bool, animated: Bool) { + if let controller = self.controller { + controller.statusBar.updateStatusBarStyle(isExpanded ? .White : self.presentationData.theme.rootController.statusBarStyle.style, animated: animated) + + if animated { + UIView.transition(with: controller.controllerNode.headerNode.navigationButtonContainer.view, duration: 0.3, options: [.transitionCrossDissolve], animations: { + }, completion: nil) + } + + let baseNavigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData) + let navigationBarPresentationData = NavigationBarPresentationData( + theme: NavigationBarTheme( + buttonColor: isExpanded ? .white : baseNavigationBarPresentationData.theme.buttonColor, + disabledButtonColor: baseNavigationBarPresentationData.theme.disabledButtonColor, + primaryTextColor: baseNavigationBarPresentationData.theme.primaryTextColor, + backgroundColor: .clear, + separatorColor: .clear, + badgeBackgroundColor: baseNavigationBarPresentationData.theme.badgeBackgroundColor, + badgeStrokeColor: baseNavigationBarPresentationData.theme.badgeStrokeColor, + badgeTextColor: baseNavigationBarPresentationData.theme.badgeTextColor + ), strings: baseNavigationBarPresentationData.strings) + + if let navigationBar = controller.navigationBar { + if animated { + UIView.transition(with: navigationBar.view, duration: 0.3, options: [.transitionCrossDissolve], animations: { + }, completion: nil) + } + navigationBar.updatePresentationData(navigationBarPresentationData) + } + } + } + + func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer) { + guard let (_, navigationHeight) = self.validLayout else { + return + } + if !self.state.isEditing { + if targetContentOffset.pointee.y < 212.0 { + if targetContentOffset.pointee.y < 212.0 / 2.0 { + targetContentOffset.pointee.y = 0.0 + } else { + targetContentOffset.pointee.y = 212.0 + } + } + let paneAreaExpansionDistance: CGFloat = 32.0 + let paneAreaExpansionFinalPoint: CGFloat = self.paneContainerNode.frame.minY - navigationHeight + if targetContentOffset.pointee.y > paneAreaExpansionFinalPoint - paneAreaExpansionDistance && targetContentOffset.pointee.y < paneAreaExpansionFinalPoint { + targetContentOffset.pointee.y = paneAreaExpansionFinalPoint + } + } + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + guard let result = super.hitTest(point, with: event) else { + return nil + } + var currentParent: UIView? = result + var enableScrolling = true + while true { + if currentParent == nil || currentParent === self.view { + break + } + if let scrollView = currentParent as? UIScrollView { + if scrollView === self.scrollNode.view { + break + } + if scrollView.isDecelerating && scrollView.contentOffset.y < -scrollView.contentInset.top { + return self.scrollNode.view + } + } else if let listView = currentParent as? ListViewBackingView, let listNode = listView.target { + if listNode.scroller.isDecelerating && listNode.scroller.contentOffset.y < listNode.scroller.contentInset.top { + return self.scrollNode.view + } + } + currentParent = currentParent?.superview + } + return result + } +} + +public final class PeerInfoScreen: ViewController { + private let context: AccountContext + private let peerId: PeerId + private let avatarInitiallyExpanded: Bool + + private var presentationData: PresentationData + private var presentationDataDisposable: Disposable? + + fileprivate var controllerNode: PeerInfoScreenNode { + return self.displayNode as! PeerInfoScreenNode + } + + private let _ready = Promise() + override public var ready: Promise { + return self._ready + } + + public init(context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool = false) { + self.context = context + self.peerId = peerId + self.avatarInitiallyExpanded = avatarInitiallyExpanded + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + + let baseNavigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData) + super.init(navigationBarPresentationData: NavigationBarPresentationData( + theme: NavigationBarTheme( + buttonColor: avatarInitiallyExpanded ? .white : baseNavigationBarPresentationData.theme.buttonColor, + disabledButtonColor: baseNavigationBarPresentationData.theme.disabledButtonColor, + primaryTextColor: baseNavigationBarPresentationData.theme.primaryTextColor, + backgroundColor: .clear, + separatorColor: .clear, + badgeBackgroundColor: baseNavigationBarPresentationData.theme.badgeBackgroundColor, + badgeStrokeColor: baseNavigationBarPresentationData.theme.badgeStrokeColor, + badgeTextColor: baseNavigationBarPresentationData.theme.badgeTextColor + ), strings: baseNavigationBarPresentationData.strings)) + self.navigationBar?.makeCustomTransitionNode = { [weak self] other, isInteractive in + guard let strongSelf = self else { + return nil + } + if strongSelf.navigationItem.leftBarButtonItem != nil { + return nil + } + if strongSelf.controllerNode.scrollNode.view.contentOffset.y > .ulpOfOne { + return nil + } + if isInteractive && strongSelf.controllerNode.headerNode.isAvatarExpanded { + return nil + } + if other.contentNode != nil { + return nil + } + if let tag = other.userInfo as? PeerInfoNavigationSourceTag, tag.peerId == peerId { + return PeerInfoNavigationTransitionNode(screenNode: strongSelf.controllerNode, presentationData: strongSelf.presentationData, headerNode: strongSelf.controllerNode.headerNode) + } + return nil + } + + self.statusBar.statusBarStyle = avatarInitiallyExpanded ? .White : self.presentationData.theme.rootController.statusBarStyle.style + + self.scrollToTop = { [weak self] in + self?.controllerNode.scrollToTop() + } + + self.presentationDataDisposable = (context.sharedContext.presentationData + |> deliverOnMainQueue).start(next: { [weak self] presentationData in + if let strongSelf = self { + let previousTheme = strongSelf.presentationData.theme + let previousStrings = strongSelf.presentationData.strings + + strongSelf.presentationData = presentationData + + if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings { + strongSelf.controllerNode.updatePresentationData(strongSelf.presentationData) + } + } + }) + } + + required init(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + deinit { + self.presentationDataDisposable?.dispose() + } + + override public func loadDisplayNode() { + self.displayNode = PeerInfoScreenNode(controller: self, context: self.context, peerId: self.peerId, avatarInitiallyExpanded: self.avatarInitiallyExpanded) + + self._ready.set(self.controllerNode.ready.get()) + + super.displayNodeDidLoad() + } + + override public func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + } + + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.controllerNode.containerLayoutUpdated(layout: layout, navigationHeight: self.navigationHeight, transition: transition) + } +} + +private func getUserPeer(postbox: Postbox, peerId: PeerId) -> Signal<(Peer?, CachedPeerData?), NoError> { + return postbox.transaction { transaction -> (Peer?, CachedPeerData?) in + guard let peer = transaction.getPeer(peerId) else { + return (nil, nil) + } + var resultPeer: Peer? + if let peer = peer as? TelegramSecretChat { + resultPeer = transaction.getPeer(peer.regularPeerId) + } else { + resultPeer = peer + } + return (resultPeer, resultPeer.flatMap({ transaction.getPeerCachedData(peerId: $0.id) })) + } +} + +final class PeerInfoNavigationSourceTag { + let peerId: PeerId + + init(peerId: PeerId) { + self.peerId = peerId + } +} + +private final class PeerInfoNavigationTransitionNode: ASDisplayNode, CustomNavigationTransitionNode { + private let screenNode: PeerInfoScreenNode + private let presentationData: PresentationData + + private var topNavigationBar: NavigationBar? + private var bottomNavigationBar: NavigationBar? + private var reverseFraction: Bool = false + + private let headerNode: PeerInfoHeaderNode + + private var previousBackButtonArrow: ASDisplayNode? + private var previousBackButton: ASDisplayNode? + private var currentBackButtonArrow: ASDisplayNode? + private var previousBackButtonBadge: ASDisplayNode? + private var currentBackButton: ASDisplayNode? + + private var previousTitleNode: (ASDisplayNode, TextNode)? + private var previousStatusNode: (ASDisplayNode, ASDisplayNode)? + + private var didSetup: Bool = false + + init(screenNode: PeerInfoScreenNode, presentationData: PresentationData, headerNode: PeerInfoHeaderNode) { + self.screenNode = screenNode + self.presentationData = presentationData + self.headerNode = headerNode + + super.init() + + self.addSubnode(headerNode) + } + + func setup(topNavigationBar: NavigationBar, bottomNavigationBar: NavigationBar) { + if let _ = bottomNavigationBar.userInfo as? PeerInfoNavigationSourceTag { + self.topNavigationBar = topNavigationBar + self.bottomNavigationBar = bottomNavigationBar + } else { + self.topNavigationBar = bottomNavigationBar + self.bottomNavigationBar = topNavigationBar + self.reverseFraction = true + } + + topNavigationBar.isHidden = true + bottomNavigationBar.isHidden = true + + if let topNavigationBar = self.topNavigationBar, let bottomNavigationBar = self.bottomNavigationBar { + if let previousBackButtonArrow = bottomNavigationBar.makeTransitionBackArrowNode(accentColor: self.presentationData.theme.rootController.navigationBar.accentTextColor) { + self.previousBackButtonArrow = previousBackButtonArrow + self.addSubnode(previousBackButtonArrow) + } + if let previousBackButton = bottomNavigationBar.makeTransitionBackButtonNode(accentColor: self.presentationData.theme.rootController.navigationBar.accentTextColor) { + self.previousBackButton = previousBackButton + self.addSubnode(previousBackButton) + } + if self.screenNode.headerNode.isAvatarExpanded, let currentBackButtonArrow = topNavigationBar.makeTransitionBackArrowNode(accentColor: self.screenNode.headerNode.isAvatarExpanded ? .white : self.presentationData.theme.rootController.navigationBar.accentTextColor) { + self.currentBackButtonArrow = currentBackButtonArrow + self.addSubnode(currentBackButtonArrow) + } + if let previousBackButtonBadge = bottomNavigationBar.makeTransitionBadgeNode() { + self.previousBackButtonBadge = previousBackButtonBadge + self.addSubnode(previousBackButtonBadge) + } + if let currentBackButton = topNavigationBar.makeTransitionBackButtonNode(accentColor: self.screenNode.headerNode.isAvatarExpanded ? .white : self.presentationData.theme.rootController.navigationBar.accentTextColor) { + self.currentBackButton = currentBackButton + self.addSubnode(currentBackButton) + } + if let previousTitleView = bottomNavigationBar.titleView as? ChatTitleView { + let previousTitleNode = previousTitleView.titleNode.makeCopy() + let previousTitleContainerNode = ASDisplayNode() + previousTitleContainerNode.addSubnode(previousTitleNode) + previousTitleNode.frame = previousTitleNode.frame.offsetBy(dx: -previousTitleNode.frame.width / 2.0, dy: -previousTitleNode.frame.height / 2.0) + self.previousTitleNode = (previousTitleContainerNode, previousTitleNode) + self.addSubnode(previousTitleContainerNode) + + let previousStatusNode = previousTitleView.activityNode.makeCopy() + let previousStatusContainerNode = ASDisplayNode() + previousStatusContainerNode.addSubnode(previousStatusNode) + previousStatusNode.frame = previousStatusNode.frame.offsetBy(dx: -previousStatusNode.frame.width / 2.0, dy: -previousStatusNode.frame.height / 2.0) + self.previousStatusNode = (previousStatusContainerNode, previousStatusNode) + self.addSubnode(previousStatusContainerNode) + } + } + } + + func update(containerSize: CGSize, fraction: CGFloat, transition: ContainedViewLayoutTransition) { + guard let topNavigationBar = self.topNavigationBar, let bottomNavigationBar = self.bottomNavigationBar else { + return + } + + let fraction = self.reverseFraction ? (1.0 - fraction) : fraction + + if let previousBackButtonArrow = self.previousBackButtonArrow { + let previousBackButtonArrowFrame = bottomNavigationBar.backButtonArrow.view.convert(bottomNavigationBar.backButtonArrow.view.bounds, to: bottomNavigationBar.view) + previousBackButtonArrow.frame = previousBackButtonArrowFrame + } + + if let previousBackButton = self.previousBackButton { + let previousBackButtonFrame = bottomNavigationBar.backButtonNode.view.convert(bottomNavigationBar.backButtonNode.view.bounds, to: bottomNavigationBar.view) + previousBackButton.frame = previousBackButtonFrame + transition.updateAlpha(node: previousBackButton, alpha: fraction) + } + + if let currentBackButtonArrow = self.currentBackButtonArrow { + let currentBackButtonArrowFrame = topNavigationBar.backButtonArrow.view.convert(topNavigationBar.backButtonArrow.view.bounds, to: topNavigationBar.view) + currentBackButtonArrow.frame = currentBackButtonArrowFrame + + transition.updateAlpha(node: currentBackButtonArrow, alpha: 1.0 - fraction) + if let previousBackButtonArrow = self.previousBackButtonArrow { + transition.updateAlpha(node: previousBackButtonArrow, alpha: fraction) + } + } + + if let previousBackButtonBadge = self.previousBackButtonBadge { + let previousBackButtonBadgeFrame = bottomNavigationBar.badgeNode.view.convert(bottomNavigationBar.badgeNode.view.bounds, to: bottomNavigationBar.view) + previousBackButtonBadge.frame = previousBackButtonBadgeFrame + + transition.updateAlpha(node: previousBackButtonBadge, alpha: fraction) + } + + if let currentBackButton = self.currentBackButton { + let currentBackButtonFrame = topNavigationBar.backButtonNode.view.convert(topNavigationBar.backButtonNode.view.bounds, to: topNavigationBar.view) + //transition.updateFrame(node: currentBackButton, frame: currentBackButtonFrame.offsetBy(dx: fraction * 12.0, dy: 0.0)) + + transition.updateAlpha(node: currentBackButton, alpha: (1.0 - fraction)) + } + + if let previousTitleView = bottomNavigationBar.titleView as? ChatTitleView, let _ = (bottomNavigationBar.rightButtonNode.singleCustomNode as? ChatAvatarNavigationNode)?.avatarNode, let (previousTitleContainerNode, previousTitleNode) = self.previousTitleNode, let (previousStatusContainerNode, previousStatusNode) = self.previousStatusNode { + let previousTitleFrame = previousTitleView.titleNode.view.convert(previousTitleView.titleNode.bounds, to: bottomNavigationBar.view) + let previousStatusFrame = previousTitleView.activityNode.view.convert(previousTitleView.activityNode.bounds, to: bottomNavigationBar.view) + + self.headerNode.navigationTransition = PeerInfoHeaderNavigationTransition(sourceNavigationBar: bottomNavigationBar, sourceTitleView: previousTitleView, sourceTitleFrame: previousTitleFrame, sourceSubtitleFrame: previousStatusFrame, fraction: fraction) + if let (layout, navigationHeight) = self.screenNode.validLayout { + self.headerNode.update(width: layout.size.width, containerHeight: layout.size.height, containerInset: layout.safeInsets.left, statusBarHeight: layout.statusBarHeight ?? 0.0, navigationHeight: topNavigationBar.bounds.height, contentOffset: 0.0, presentationData: self.presentationData, peer: self.screenNode.data?.peer, cachedData: self.screenNode.data?.cachedData, notificationSettings: self.screenNode.data?.notificationSettings, statusData: self.screenNode.data?.status, isContact: self.screenNode.data?.isContact ?? false, state: self.screenNode.state, transition: transition, additive: false) + } + + let titleScale = (fraction * previousTitleNode.bounds.height + (1.0 - fraction) * self.headerNode.titleNode.bounds.height) / previousTitleNode.bounds.height + let subtitleScale = max(0.01, min(10.0, (fraction * previousStatusNode.bounds.height + (1.0 - fraction) * self.headerNode.subtitleNode.bounds.height) / previousStatusNode.bounds.height)) + + transition.updateFrame(node: previousTitleContainerNode, frame: CGRect(origin: self.headerNode.titleNodeRawContainer.frame.center, size: CGSize())) + transition.updateFrame(node: previousTitleNode, frame: CGRect(origin: CGPoint(x: -previousTitleFrame.width / 2.0, y: -previousTitleFrame.height / 2.0), size: previousTitleFrame.size)) + transition.updateFrame(node: previousStatusContainerNode, frame: CGRect(origin: self.headerNode.subtitleNodeRawContainer.frame.center, size: CGSize())) + transition.updateFrame(node: previousStatusNode, frame: CGRect(origin: CGPoint(x: -previousStatusFrame.size.width / 2.0, y: -previousStatusFrame.size.height / 2.0), size: previousStatusFrame.size)) + + transition.updateSublayerTransformScale(node: previousTitleContainerNode, scale: titleScale) + transition.updateSublayerTransformScale(node: previousStatusContainerNode, scale: subtitleScale) + + transition.updateAlpha(node: self.headerNode.titleNode, alpha: (1.0 - fraction)) + transition.updateAlpha(node: previousTitleNode, alpha: fraction) + transition.updateAlpha(node: self.headerNode.subtitleNode, alpha: (1.0 - fraction)) + transition.updateAlpha(node: previousStatusNode, alpha: fraction) + + transition.updateAlpha(node: self.headerNode.navigationButtonContainer, alpha: (1.0 - fraction)) + } + } + + func restore() { + guard let topNavigationBar = self.topNavigationBar, let bottomNavigationBar = self.bottomNavigationBar else { + return + } + + topNavigationBar.isHidden = false + bottomNavigationBar.isHidden = false + self.headerNode.navigationTransition = nil + self.screenNode.insertSubnode(self.headerNode, aboveSubnode: self.screenNode.scrollNode) + } +} + +private func encodeText(_ string: String, _ key: Int) -> String { + var result = "" + for c in string.unicodeScalars { + result.append(Character(UnicodeScalar(UInt32(Int(c.value) + key))!)) + } + return result +} + +private final class ContextControllerContentSourceImpl: ContextControllerContentSource { + let controller: ViewController + weak var sourceNode: ASDisplayNode? + + let navigationController: NavigationController? = nil + + let passthroughTouches: Bool = false + + init(controller: ViewController, sourceNode: ASDisplayNode?) { + self.controller = controller + self.sourceNode = sourceNode + } + + func transitionInfo() -> ContextControllerTakeControllerInfo? { + let sourceNode = self.sourceNode + return ContextControllerTakeControllerInfo(contentAreaInScreenSpace: CGRect(origin: CGPoint(), size: CGSize(width: 10.0, height: 10.0)), sourceNode: { [weak sourceNode] in + if let sourceNode = sourceNode { + return (sourceNode, sourceNode.bounds) + } else { + return nil + } + }) + } + + func animatedIn() { + self.controller.didAppearInContextPreview() + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift index 6863ff66a1..7374fc9577 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift @@ -759,7 +759,7 @@ public class PeerMediaCollectionController: TelegramBaseController { |> take(1) |> deliverOnMainQueue).start(next: { [weak self] peer in if let strongSelf = self, peer.restrictionText(platform: "ios", contentSettings: strongSelf.context.currentContentSettings.with { $0 }) == nil { - if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic) { + if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { (strongSelf.navigationController as? NavigationController)?.pushViewController(infoController) } } diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift index 43b2d14d1d..cae95a602a 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift @@ -155,7 +155,7 @@ class PeerMediaCollectionControllerNode: ASDisplayNode { self.historyEmptyNode = PeerMediaCollectionEmptyNode(mode: self.mediaCollectionInterfaceState.mode, theme: self.presentationData.theme, strings: self.presentationData.strings) self.historyEmptyNode.isHidden = true - self.chatPresentationInterfaceState = ChatPresentationInterfaceState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, limitsConfiguration: .defaultValue, fontSize: self.presentationData.listsFontSize, accountPeerId: context.account.peerId, mode: .standard(previewing: false), chatLocation: .peer(self.peerId), isScheduledMessages: false) + self.chatPresentationInterfaceState = ChatPresentationInterfaceState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, limitsConfiguration: .defaultValue, fontSize: self.presentationData.listsFontSize, bubbleCorners: self.presentationData.chatBubbleCorners, accountPeerId: context.account.peerId, mode: .standard(previewing: false), chatLocation: .peer(self.peerId), isScheduledMessages: false) super.init() diff --git a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift index b41cc27c8e..45938193a8 100644 --- a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift @@ -216,6 +216,8 @@ final class PeerSelectionControllerNode: ASDisplayNode { if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch { requestOpenPeerFromSearch(peer) } + }, openDisabledPeer: { [weak self] peer in + self?.requestOpenDisabledPeer?(peer) }, openRecentPeerOptions: { _ in }, openMessage: { [weak self] peer, messageId in if let requestOpenMessageFromSearch = self?.requestOpenMessageFromSearch { diff --git a/submodules/TelegramUI/TelegramUI/PollResultsController.swift b/submodules/TelegramUI/TelegramUI/PollResultsController.swift index 177ca29828..a1a24b756a 100644 --- a/submodules/TelegramUI/TelegramUI/PollResultsController.swift +++ b/submodules/TelegramUI/TelegramUI/PollResultsController.swift @@ -303,7 +303,7 @@ public func pollResultsController(context: AccountContext, messageId: MessageId, }) }, openPeer: { peer in if let peer = peer.peers[peer.peerId] { - if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { pushControllerImpl?(controller) } } diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 97d55f8f57..65d4ae5d0d 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/SharedAccountContext.swift b/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift index a934012199..8a475cb359 100644 --- a/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift +++ b/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift @@ -1004,8 +1004,8 @@ public final class SharedAccountContextImpl: SharedAccountContext { handleTextLinkActionImpl(context: context, peerId: peerId, navigateDisposable: navigateDisposable, controller: controller, action: action, itemLink: itemLink) } - public func makePeerInfoController(context: AccountContext, peer: Peer, mode: PeerInfoControllerMode) -> ViewController? { - let controller = peerInfoControllerImpl(context: context, peer: peer, mode: mode) + public func makePeerInfoController(context: AccountContext, peer: Peer, mode: PeerInfoControllerMode, avatarInitiallyExpanded: Bool) -> ViewController? { + let controller = peerInfoControllerImpl(context: context, peer: peer, mode: mode, avatarInitiallyExpanded: avatarInitiallyExpanded) controller?.navigationPresentation = .modalInLargeLayout return controller } @@ -1094,7 +1094,7 @@ public final class SharedAccountContextImpl: SharedAccountContext { return PeerSelectionControllerImpl(params) } - public func makeChatMessagePreviewItem(context: AccountContext, message: Message, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)? = nil, clickThroughMessage: (() -> Void)? = nil) -> ListViewItem { + public func makeChatMessagePreviewItem(context: AccountContext, message: Message, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)? = nil, clickThroughMessage: (() -> Void)? = nil) -> ListViewItem { let controllerInteraction: ChatControllerInteraction if tapMessage != nil || clickThroughMessage != nil { controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in @@ -1139,11 +1139,11 @@ public final class SharedAccountContextImpl: SharedAccountContext { controllerInteraction = defaultChatControllerInteraction } - return ChatMessageItem(presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, animatedEmojiScale: 1.0, isPreview: true), context: context, chatLocation: .peer(message.id.peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false, isScheduledMessages: false, contactsPeerIds: Set(), animatedEmojiStickers: [:], forcedResourceStatus: forcedResourceStatus), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes()), disableDate: true, additionalContent: nil) + return ChatMessageItem(presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, chatBubbleCorners: chatBubbleCorners, animatedEmojiScale: 1.0, isPreview: true), context: context, chatLocation: .peer(message.id.peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false, isScheduledMessages: false, contactsPeerIds: Set(), animatedEmojiStickers: [:], forcedResourceStatus: forcedResourceStatus), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes()), disableDate: true, additionalContent: nil) } - public func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader { - return ChatMessageDateHeader(timestamp: timestamp, scheduled: false, presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, animatedEmojiScale: 1.0, isPreview: true), context: context) + public func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader { + return ChatMessageDateHeader(timestamp: timestamp, scheduled: false, presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, chatBubbleCorners: chatBubbleCorners, animatedEmojiScale: 1.0, isPreview: true), context: context) } public func openWallet(context: AccountContext, walletContext: OpenWalletContext, present: @escaping (ViewController) -> Void) { @@ -1244,3 +1244,24 @@ public final class SharedAccountContextImpl: SharedAccountContext { } private let defaultChatControllerInteraction = ChatControllerInteraction.default + +private func peerInfoControllerImpl(context: AccountContext, peer: Peer, mode: PeerInfoControllerMode, avatarInitiallyExpanded: Bool) -> ViewController? { + if let _ = peer as? TelegramGroup { + return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded) + + return groupInfoController(context: context, peerId: peer.id) + } else if let channel = peer as? TelegramChannel { + return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded) + + if case .group = channel.info { + return groupInfoController(context: context, peerId: peer.id) + } else { + return channelInfoController(context: context, peerId: peer.id) + } + } else if peer is TelegramUser { + return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded) + } else if peer is TelegramSecretChat { + return userInfoController(context: context, peerId: peer.id, mode: mode) + } + return nil +} diff --git a/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift b/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift index 962ac8a234..638751b63f 100644 --- a/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift +++ b/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift @@ -315,7 +315,7 @@ public final class SharedWakeupManager { if let taskId = self.beginBackgroundTask("background-wakeup", { handleExpiration() }) { - let timer = SwiftSignalKit.Timer(timeout: min(30.0, self.backgroundTimeRemaining()), repeat: false, completion: { + let timer = SwiftSignalKit.Timer(timeout: min(30.0, max(0.0, self.backgroundTimeRemaining() - 5.0)), repeat: false, completion: { handleExpiration() }, queue: Queue.mainQueue()) self.currentTask = (taskId, currentTime, timer) diff --git a/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift b/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift index cc46c4172e..d8d1fd0fb2 100644 --- a/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift +++ b/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift @@ -32,7 +32,7 @@ func handleTextLinkActionImpl(context: AccountContext, peerId: PeerId?, navigate peerSignal = context.account.postbox.loadedPeerWithId(peerId) |> map(Optional.init) navigateDisposable.set((peerSignal |> take(1) |> deliverOnMainQueue).start(next: { peer in if let controller = controller, let peer = peer { - if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic) { + if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false) { (controller.navigationController as? NavigationController)?.pushViewController(infoController) } } diff --git a/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift b/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift index 3051fa73ed..2371c501a3 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift @@ -139,7 +139,7 @@ final class ThemeUpdateManagerImpl: ThemeUpdateManager { theme = updatedTheme } - return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) }).start() } diff --git a/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift b/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift index 9f20c48e3e..0527746dd8 100644 --- a/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift +++ b/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift @@ -133,7 +133,7 @@ final class WallpaperUploadManagerImpl: WallpaperUploadManager { var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers themeSpecificChatWallpapers[themeReference.index] = updatedWallpaper themeSpecificChatWallpapers[coloredThemeIndex(reference: themeReference, accentColor: current.themeSpecificAccentColors[themeReference.index])] = updatedWallpaper - return PresentationThemeSettings(theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) })).start() } diff --git a/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift b/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift index e1c47d10f7..3da4f51362 100644 --- a/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift @@ -1,6 +1,7 @@ import Foundation import Postbox import SwiftSignalKit +import SyncCore public enum TotalUnreadCountDisplayStyle: Int32 { case filtered = 0 @@ -38,7 +39,7 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable { public var displayNotificationsFromAllAccounts: Bool public static var defaultSettings: InAppNotificationSettings { - return InAppNotificationSettings(playSounds: true, vibrate: false, displayPreviews: true, totalUnreadCountDisplayStyle: .filtered, totalUnreadCountDisplayCategory: .messages, totalUnreadCountIncludeTags: [.regularChatsAndPrivateGroups], displayNameOnLockscreen: true, displayNotificationsFromAllAccounts: true) + return InAppNotificationSettings(playSounds: true, vibrate: false, displayPreviews: true, totalUnreadCountDisplayStyle: .filtered, totalUnreadCountDisplayCategory: .messages, totalUnreadCountIncludeTags: [.privateChat, .secretChat, .bot, .privateGroup], displayNameOnLockscreen: true, displayNotificationsFromAllAccounts: true) } public init(playSounds: Bool, vibrate: Bool, displayPreviews: Bool, totalUnreadCountDisplayStyle: TotalUnreadCountDisplayStyle, totalUnreadCountDisplayCategory: TotalUnreadCountDisplayCategory, totalUnreadCountIncludeTags: PeerSummaryCounterTags, displayNameOnLockscreen: Bool, displayNotificationsFromAllAccounts: Bool) { @@ -58,10 +59,25 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable { self.displayPreviews = decoder.decodeInt32ForKey("p", orElse: 0) != 0 self.totalUnreadCountDisplayStyle = TotalUnreadCountDisplayStyle(rawValue: decoder.decodeInt32ForKey("cds", orElse: 0)) ?? .filtered self.totalUnreadCountDisplayCategory = TotalUnreadCountDisplayCategory(rawValue: decoder.decodeInt32ForKey("totalUnreadCountDisplayCategory", orElse: 1)) ?? .messages - if let value = decoder.decodeOptionalInt32ForKey("totalUnreadCountIncludeTags") { + if let value = decoder.decodeOptionalInt32ForKey("totalUnreadCountIncludeTags_2") { self.totalUnreadCountIncludeTags = PeerSummaryCounterTags(rawValue: value) + } else if let value = decoder.decodeOptionalInt32ForKey("totalUnreadCountIncludeTags") { + var resultTags: PeerSummaryCounterTags = [] + for legacyTag in LegacyPeerSummaryCounterTags(rawValue: value) { + if legacyTag == .regularChatsAndPrivateGroups { + resultTags.insert(.privateChat) + resultTags.insert(.secretChat) + resultTags.insert(.bot) + resultTags.insert(.privateGroup) + } else if legacyTag == .publicGroups { + resultTags.insert(.publicGroup) + } else if legacyTag == .channels { + resultTags.insert(.channel) + } + } + self.totalUnreadCountIncludeTags = resultTags } else { - self.totalUnreadCountIncludeTags = [.regularChatsAndPrivateGroups] + self.totalUnreadCountIncludeTags = [.privateChat, .secretChat, .bot, .privateGroup] } self.displayNameOnLockscreen = decoder.decodeInt32ForKey("displayNameOnLockscreen", orElse: 1) != 0 self.displayNotificationsFromAllAccounts = decoder.decodeInt32ForKey("displayNotificationsFromAllAccounts", orElse: 1) != 0 @@ -73,7 +89,7 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable { encoder.encodeInt32(self.displayPreviews ? 1 : 0, forKey: "p") encoder.encodeInt32(self.totalUnreadCountDisplayStyle.rawValue, forKey: "cds") encoder.encodeInt32(self.totalUnreadCountDisplayCategory.rawValue, forKey: "totalUnreadCountDisplayCategory") - encoder.encodeInt32(self.totalUnreadCountIncludeTags.rawValue, forKey: "totalUnreadCountIncludeTags") + encoder.encodeInt32(self.totalUnreadCountIncludeTags.rawValue, forKey: "totalUnreadCountIncludeTags_2") encoder.encodeInt32(self.displayNameOnLockscreen ? 1 : 0, forKey: "displayNameOnLockscreen") encoder.encodeInt32(self.displayNotificationsFromAllAccounts ? 1 : 0, forKey: "displayNotificationsFromAllAccounts") } diff --git a/submodules/TelegramUIPreferences/Sources/PostboxKeys.swift b/submodules/TelegramUIPreferences/Sources/PostboxKeys.swift index 52ac48e6e7..17f712a5e0 100644 --- a/submodules/TelegramUIPreferences/Sources/PostboxKeys.swift +++ b/submodules/TelegramUIPreferences/Sources/PostboxKeys.swift @@ -6,11 +6,13 @@ import Postbox private enum ApplicationSpecificPreferencesKeyValues: Int32 { case voipDerivedState = 16 case chatArchiveSettings = 17 + case chatListFilterSettings = 18 } public struct ApplicationSpecificPreferencesKeys { public static let voipDerivedState = applicationSpecificPreferencesKey(ApplicationSpecificPreferencesKeyValues.voipDerivedState.rawValue) public static let chatArchiveSettings = applicationSpecificPreferencesKey(ApplicationSpecificPreferencesKeyValues.chatArchiveSettings.rawValue) + public static let chatListFilterSettings = applicationSpecificPreferencesKey(ApplicationSpecificPreferencesKeyValues.chatListFilterSettings.rawValue) } private enum ApplicationSpecificSharedDataKeyValues: Int32 { diff --git a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift index f78a460341..ab9d7e7291 100644 --- a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift @@ -531,6 +531,32 @@ public struct PresentationThemeAccentColor: PostboxCoding, Equatable { } } +public struct PresentationChatBubbleSettings: PostboxCoding, Equatable { + public var mainRadius: Int32 + public var auxiliaryRadius: Int32 + public var mergeBubbleCorners: Bool + + public static var `default`: PresentationChatBubbleSettings = PresentationChatBubbleSettings(mainRadius: 16, auxiliaryRadius: 8, mergeBubbleCorners: true) + + public init(mainRadius: Int32, auxiliaryRadius: Int32, mergeBubbleCorners: Bool) { + self.mainRadius = mainRadius + self.auxiliaryRadius = auxiliaryRadius + self.mergeBubbleCorners = mergeBubbleCorners + } + + public init(decoder: PostboxDecoder) { + self.mainRadius = decoder.decodeInt32ForKey("mainRadius", orElse: 16) + self.auxiliaryRadius = decoder.decodeInt32ForKey("auxiliaryRadius", orElse: 8) + self.mergeBubbleCorners = decoder.decodeInt32ForKey("mergeBubbleCorners", orElse: 1) != 0 + } + + public func encode(_ encoder: PostboxEncoder) { + encoder.encodeInt32(self.mainRadius, forKey: "mainRadius") + encoder.encodeInt32(self.auxiliaryRadius, forKey: "auxiliaryRadius") + encoder.encodeInt32(self.mergeBubbleCorners ? 1 : 0, forKey: "mergeBubbleCorners") + } +} + public struct PresentationThemeSettings: PreferencesEntry { public var theme: PresentationThemeReference public var themeSpecificAccentColors: [Int64: PresentationThemeAccentColor] @@ -538,6 +564,7 @@ public struct PresentationThemeSettings: PreferencesEntry { public var useSystemFont: Bool public var fontSize: PresentationFontSize public var listsFontSize: PresentationFontSize + public var chatBubbleSettings: PresentationChatBubbleSettings public var automaticThemeSwitchSetting: AutomaticThemeSwitchSetting public var largeEmoji: Bool public var disableAnimations: Bool @@ -578,16 +605,17 @@ public struct PresentationThemeSettings: PreferencesEntry { } public static var defaultSettings: PresentationThemeSettings { - return PresentationThemeSettings(theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], useSystemFont: true, fontSize: .regular, listsFontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)), largeEmoji: true, disableAnimations: true) + return PresentationThemeSettings(theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], useSystemFont: true, fontSize: .regular, listsFontSize: .regular, chatBubbleSettings: .default, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)), largeEmoji: true, disableAnimations: true) } - public init(theme: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], themeSpecificChatWallpapers: [Int64: TelegramWallpaper], useSystemFont: Bool, fontSize: PresentationFontSize, listsFontSize: PresentationFontSize, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting, largeEmoji: Bool, disableAnimations: Bool) { + public init(theme: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], themeSpecificChatWallpapers: [Int64: TelegramWallpaper], useSystemFont: Bool, fontSize: PresentationFontSize, listsFontSize: PresentationFontSize, chatBubbleSettings: PresentationChatBubbleSettings, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting, largeEmoji: Bool, disableAnimations: Bool) { self.theme = theme self.themeSpecificAccentColors = themeSpecificAccentColors self.themeSpecificChatWallpapers = themeSpecificChatWallpapers self.useSystemFont = useSystemFont self.fontSize = fontSize self.listsFontSize = listsFontSize + self.chatBubbleSettings = chatBubbleSettings self.automaticThemeSwitchSetting = automaticThemeSwitchSetting self.largeEmoji = largeEmoji self.disableAnimations = disableAnimations @@ -612,6 +640,7 @@ public struct PresentationThemeSettings: PreferencesEntry { let fontSize = PresentationFontSize(rawValue: decoder.decodeInt32ForKey("f", orElse: PresentationFontSize.regular.rawValue)) ?? .regular self.fontSize = fontSize self.listsFontSize = PresentationFontSize(rawValue: decoder.decodeInt32ForKey("lf", orElse: PresentationFontSize.regular.rawValue)) ?? fontSize + self.chatBubbleSettings = decoder.decodeObjectForKey("chatBubbleSettings", decoder: { PresentationChatBubbleSettings(decoder: $0) }) as? PresentationChatBubbleSettings ?? PresentationChatBubbleSettings.default self.automaticThemeSwitchSetting = (decoder.decodeObjectForKey("automaticThemeSwitchSetting", decoder: { AutomaticThemeSwitchSetting(decoder: $0) }) as? AutomaticThemeSwitchSetting) ?? AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)) self.largeEmoji = decoder.decodeBoolForKey("largeEmoji", orElse: true) self.disableAnimations = decoder.decodeBoolForKey("disableAnimations", orElse: true) @@ -628,6 +657,7 @@ public struct PresentationThemeSettings: PreferencesEntry { encoder.encodeInt32(self.useSystemFont ? 1 : 0, forKey: "useSystemFont") encoder.encodeInt32(self.fontSize.rawValue, forKey: "f") encoder.encodeInt32(self.listsFontSize.rawValue, forKey: "lf") + encoder.encodeObject(self.chatBubbleSettings, forKey: "chatBubbleSettings") encoder.encodeObject(self.automaticThemeSwitchSetting, forKey: "automaticThemeSwitchSetting") encoder.encodeBool(self.largeEmoji, forKey: "largeEmoji") encoder.encodeBool(self.disableAnimations, forKey: "disableAnimations") @@ -642,39 +672,43 @@ public struct PresentationThemeSettings: PreferencesEntry { } public static func ==(lhs: PresentationThemeSettings, rhs: PresentationThemeSettings) -> Bool { - return lhs.theme == rhs.theme && lhs.themeSpecificAccentColors == rhs.themeSpecificAccentColors && lhs.themeSpecificChatWallpapers == rhs.themeSpecificChatWallpapers && lhs.useSystemFont == rhs.useSystemFont && lhs.fontSize == rhs.fontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.automaticThemeSwitchSetting == rhs.automaticThemeSwitchSetting && lhs.largeEmoji == rhs.largeEmoji && lhs.disableAnimations == rhs.disableAnimations + return lhs.theme == rhs.theme && lhs.themeSpecificAccentColors == rhs.themeSpecificAccentColors && lhs.themeSpecificChatWallpapers == rhs.themeSpecificChatWallpapers && lhs.useSystemFont == rhs.useSystemFont && lhs.fontSize == rhs.fontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.chatBubbleSettings == rhs.chatBubbleSettings && lhs.automaticThemeSwitchSetting == rhs.automaticThemeSwitchSetting && lhs.largeEmoji == rhs.largeEmoji && lhs.disableAnimations == rhs.disableAnimations } public func withUpdatedTheme(_ theme: PresentationThemeReference) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedThemeSpecificAccentColors(_ themeSpecificAccentColors: [Int64: PresentationThemeAccentColor]) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedThemeSpecificChatWallpapers(_ themeSpecificChatWallpapers: [Int64: TelegramWallpaper]) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedUseSystemFont(_ useSystemFont: Bool) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedFontSizes(fontSize: PresentationFontSize, listsFontSize: PresentationFontSize) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: fontSize, listsFontSize: listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: fontSize, listsFontSize: listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + } + + public func withUpdatedChatBubbleSettings(_ chatBubbleSettings: PresentationChatBubbleSettings) -> PresentationThemeSettings { + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedAutomaticThemeSwitchSetting(_ automaticThemeSwitchSetting: AutomaticThemeSwitchSetting) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedLargeEmoji(_ largeEmoji: Bool) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedDisableAnimations(_ disableAnimations: Bool) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: disableAnimations) } } diff --git a/submodules/WalletUI/Resources/WalletStrings.mapping b/submodules/WalletUI/Resources/WalletStrings.mapping index 589c6fe85e..9f7c348920 100644 Binary files a/submodules/WalletUI/Resources/WalletStrings.mapping and b/submodules/WalletUI/Resources/WalletStrings.mapping differ diff --git a/submodules/WalletUI/Sources/WalletStrings.swift b/submodules/WalletUI/Sources/WalletStrings.swift index c572929515..9d5c0af52d 100644 --- a/submodules/WalletUI/Sources/WalletStrings.swift +++ b/submodules/WalletUI/Sources/WalletStrings.swift @@ -448,12 +448,12 @@ public final class WalletStrings: Equatable { public var Wallet_SecureStorageReset_Title: String { return self._s[218]! } public var Wallet_Receive_CommentHeader: String { return self._s[219]! } public var Wallet_Info_ReceiveGrams: String { return self._s[220]! } - public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { + public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } - public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue)