diff --git a/Config/app_configuration.bzl b/Config/app_configuration.bzl index dbc6f547a5..da3e824e1e 100644 --- a/Config/app_configuration.bzl +++ b/Config/app_configuration.bzl @@ -2,7 +2,7 @@ def appConfig(): apiId = native.read_config("custom", "apiId") apiHash = native.read_config("custom", "apiHash") - hockeyAppId = native.read_config("custom", "hockeyAppId") + appCenterId = native.read_config("custom", "appCenterId") isInternalBuild = native.read_config("custom", "isInternalBuild") isAppStoreBuild = native.read_config("custom", "isAppStoreBuild") appStoreId = native.read_config("custom", "appStoreId") @@ -11,7 +11,7 @@ def appConfig(): return { "apiId": apiId, "apiHash": apiHash, - "hockeyAppId": hockeyAppId, + "appCenterId": appCenterId, "isInternalBuild": isInternalBuild, "isAppStoreBuild": isAppStoreBuild, "appStoreId": appStoreId, diff --git a/Makefile b/Makefile index ff68b48e5b..fccbd74086 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ BUCK_OPTIONS=\ --config custom.baseApplicationBundleId="${BUNDLE_ID}" \ --config custom.apiId="${API_ID}" \ --config custom.apiHash="${API_HASH}" \ - --config custom.hockeyAppId="${HOCKEYAPP_ID}" \ + --config custom.appCenterId="${APP_CENTER_ID}" \ --config custom.isInternalBuild="${IS_INTERNAL_BUILD}" \ --config custom.isAppStoreBuild="${IS_APPSTORE_BUILD}" \ --config custom.appStoreId="${APPSTORE_ID}" \ diff --git a/NotificationService/Serialization.m b/NotificationService/Serialization.m index 00a0621e3e..f7eea7807e 100644 --- a/NotificationService/Serialization.m +++ b/NotificationService/Serialization.m @@ -3,7 +3,7 @@ @implementation Serialization - (NSUInteger)currentLayer { - return 109; + return 110; } - (id _Nullable)parseMessage:(NSData * _Nullable)data { 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/Resources/Compass.tgs b/Telegram-iOS/Resources/Compass.tgs new file mode 100644 index 0000000000..535e4362bf Binary files /dev/null and b/Telegram-iOS/Resources/Compass.tgs differ diff --git a/Telegram-iOS/Resources/Dice_1.tgs b/Telegram-iOS/Resources/Dice_1.tgs new file mode 100644 index 0000000000..e078e6b6de Binary files /dev/null and b/Telegram-iOS/Resources/Dice_1.tgs differ diff --git a/Telegram-iOS/Resources/Dice_2.tgs b/Telegram-iOS/Resources/Dice_2.tgs new file mode 100644 index 0000000000..c350c4d88c Binary files /dev/null and b/Telegram-iOS/Resources/Dice_2.tgs differ diff --git a/Telegram-iOS/Resources/Dice_3.tgs b/Telegram-iOS/Resources/Dice_3.tgs new file mode 100644 index 0000000000..388043434d Binary files /dev/null and b/Telegram-iOS/Resources/Dice_3.tgs differ diff --git a/Telegram-iOS/Resources/Dice_4.tgs b/Telegram-iOS/Resources/Dice_4.tgs new file mode 100644 index 0000000000..0cc05f7cea Binary files /dev/null and b/Telegram-iOS/Resources/Dice_4.tgs differ diff --git a/Telegram-iOS/Resources/Dice_5.tgs b/Telegram-iOS/Resources/Dice_5.tgs new file mode 100644 index 0000000000..2005eef2f4 Binary files /dev/null and b/Telegram-iOS/Resources/Dice_5.tgs differ diff --git a/Telegram-iOS/Resources/Dice_6.tgs b/Telegram-iOS/Resources/Dice_6.tgs new file mode 100644 index 0000000000..6c298dde36 Binary files /dev/null and b/Telegram-iOS/Resources/Dice_6.tgs differ diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 2a8e328ead..8338a6be74 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -262,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"; @@ -5298,3 +5303,30 @@ Any member of this group will be able to see messages in the channel."; "Appearance.BubbleCorners.Apply" = "Set"; "Conversation.LiveLocationYouAndOther" = "**You** and %@"; + +"PeopleNearby.MakeVisible" = "Make Myself Visible"; +"PeopleNearby.MakeInvisible" = "Stop Showing Me"; + +"PeopleNearby.ShowMorePeople_0" = "Show %@ More People"; +"PeopleNearby.ShowMorePeople_1" = "Show %@ More People"; +"PeopleNearby.ShowMorePeople_2" = "Show %@ More People"; +"PeopleNearby.ShowMorePeople_3_10" = "Show %@ More People"; +"PeopleNearby.ShowMorePeople_many" = "Show %@ More People"; +"PeopleNearby.ShowMorePeople_any" = "Show %@ More People"; + +"PeopleNearby.VisibleUntil" = "visible until %@"; + +"PeopleNearby.MakeVisibleTitle" = "Make Myself Visible"; +"PeopleNearby.MakeVisibleDescription" = "Users nearby will be able to view your profile and send you messages. This may help you find new friends, but could also attract excessive attention. You can stop sharing your profile at any time.\n\nYour phone number will remain hidden."; + +"PeopleNearby.DiscoverDescription" = "Exchange contact info with people nearby\nand find new friends."; + +"Time.TomorrowAt" = "tomorrow at %@"; + +"PeerInfo.ButtonMessage" = "Message"; +"PeerInfo.ButtonDiscuss" = "Discuss"; +"PeerInfo.ButtonCall" = "Call"; +"PeerInfo.ButtonMute" = "Mute"; +"PeerInfo.ButtonUnmute" = "Unmute"; +"PeerInfo.ButtonMore" = "More"; +"PeerInfo.ButtonAddMember" = "Add Members"; 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 831b3539d4..ba71d63b0c 100644 --- a/submodules/AccountContext/Sources/AccountContext.swift +++ b/submodules/AccountContext/Sources/AccountContext.swift @@ -202,12 +202,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 @@ -219,6 +220,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 @@ -447,7 +449,7 @@ 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, fromChat: Bool) -> ViewController? func makeDeviceContactInfoController(context: AccountContext, subject: DeviceContactInfoSubject, completed: (() -> Void)?, cancelled: (() -> Void)?) -> ViewController func makePeersNearbyController(context: AccountContext) -> ViewController func makeComposeController(context: AccountContext) -> ViewController diff --git a/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift b/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift index f21f09f4a8..173646c596 100644 --- a/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift +++ b/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift @@ -42,9 +42,15 @@ public enum AnimatedStickerMode { case direct } +public enum AnimatedStickerPlaybackPosition { + case start + case end +} + public enum AnimatedStickerPlaybackMode { case once case loop + case still(AnimatedStickerPlaybackPosition) } private final class AnimatedStickerFrame { @@ -72,6 +78,7 @@ private protocol AnimatedStickerFrameSource: class { var frameCount: Int { get } func takeFrame() -> AnimatedStickerFrame? + func skipToEnd() } private final class AnimatedStickerFrameSourceWrapper { @@ -244,6 +251,9 @@ private final class AnimatedStickerCachedFrameSource: AnimatedStickerFrameSource self.data = data self.dataComplete = complete } + + func skipToEnd() { + } } private final class AnimatedStickerDirectFrameSource: AnimatedStickerFrameSource { @@ -289,6 +299,10 @@ private final class AnimatedStickerDirectFrameSource: AnimatedStickerFrameSource } return AnimatedStickerFrame(data: frameData, type: .argb, width: self.width, height: self.height, bytesPerRow: self.bytesPerRow, index: frameIndex, isLastFrame: frameIndex == self.frameCount - 1) } + + func skipToEnd() { + self.currentFrame = self.frameCount - 1 + } } private final class AnimatedStickerFrameQueue { @@ -383,7 +397,7 @@ public final class AnimatedStickerNode: ASDisplayNode { private var renderer: (AnimationRenderer & ASDisplayNode)? - private var isPlaying: Bool = false + public var isPlaying: Bool = false private var canDisplayFirstFrame: Bool = false private var playbackMode: AnimatedStickerPlaybackMode = .loop @@ -456,7 +470,9 @@ public final class AnimatedStickerNode: ASDisplayNode { if let directData = try? Data(contentsOf: URL(fileURLWithPath: path), options: [.mappedRead]) { strongSelf.directData = (directData, path, width, height) } - if strongSelf.isPlaying { + if case let .still(position) = playbackMode { + strongSelf.seekTo(position) + } else if strongSelf.isPlaying { strongSelf.play() } else if strongSelf.canDisplayFirstFrame { strongSelf.play(firstFrame: true) @@ -597,11 +613,11 @@ public final class AnimatedStickerNode: ASDisplayNode { self.reportedStarted = false self.timer.swap(nil)?.invalidate() if self.playToCompletionOnStop { - self.seekToStart() + self.seekTo(.start) } } - public func seekToStart() { + public func seekTo(_ position: AnimatedStickerPlaybackPosition) { self.isPlaying = false let directData = self.directData @@ -612,6 +628,9 @@ public final class AnimatedStickerNode: ASDisplayNode { var maybeFrameSource: AnimatedStickerFrameSource? if let directData = directData { maybeFrameSource = AnimatedStickerDirectFrameSource(queue: queue, data: directData.0, width: directData.2, height: directData.3) + if position == .end { + maybeFrameSource?.skipToEnd() + } } else if let (cachedData, cachedDataComplete) = cachedData { if #available(iOS 9.0, *) { maybeFrameSource = AnimatedStickerCachedFrameSource(queue: queue, data: cachedData, complete: cachedDataComplete, notifyUpdated: {}) 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/BuildConfig/BUCK b/submodules/BuildConfig/BUCK index 6298c2a05c..91dd26cf19 100644 --- a/submodules/BuildConfig/BUCK +++ b/submodules/BuildConfig/BUCK @@ -9,7 +9,7 @@ static_library( compiler_flags = [ '-DAPP_CONFIG_API_ID=' + appConfig()["apiId"], '-DAPP_CONFIG_API_HASH="' + appConfig()["apiHash"] + '"', - '-DAPP_CONFIG_HOCKEYAPP_ID="' + appConfig()["hockeyAppId"] + '"', + '-DAPP_CONFIG_APP_CENTER_ID="' + appConfig()["appCenterId"] + '"', '-DAPP_CONFIG_IS_INTERNAL_BUILD=' + appConfig()["isInternalBuild"], '-DAPP_CONFIG_IS_APPSTORE_BUILD=' + appConfig()["isAppStoreBuild"], '-DAPP_CONFIG_APPSTORE_ID=' + appConfig()["appStoreId"], diff --git a/submodules/BuildConfig/Sources/BuildConfig.h b/submodules/BuildConfig/Sources/BuildConfig.h index d13c28dc3f..562a63ce27 100644 --- a/submodules/BuildConfig/Sources/BuildConfig.h +++ b/submodules/BuildConfig/Sources/BuildConfig.h @@ -11,7 +11,7 @@ - (instancetype _Nonnull)initWithBaseAppBundleId:(NSString * _Nonnull)baseAppBundleId; -@property (nonatomic, strong, readonly) NSString * _Nullable hockeyAppId; +@property (nonatomic, strong, readonly) NSString * _Nullable appCenterId; @property (nonatomic, readonly) int32_t apiId; @property (nonatomic, strong, readonly) NSString * _Nonnull apiHash; @property (nonatomic, readonly) bool isInternalBuild; diff --git a/submodules/BuildConfig/Sources/BuildConfig.m b/submodules/BuildConfig/Sources/BuildConfig.m index 6c17f8f9eb..f4808b26cb 100644 --- a/submodules/BuildConfig/Sources/BuildConfig.m +++ b/submodules/BuildConfig/Sources/BuildConfig.m @@ -72,7 +72,7 @@ API_AVAILABLE(ios(10)) NSData * _Nullable _bundleData; int32_t _apiId; NSString * _Nonnull _apiHash; - NSString * _Nullable _hockeyAppId; + NSString * _Nullable _appCenterId; NSMutableDictionary * _Nonnull _dataDict; } @@ -129,7 +129,7 @@ API_AVAILABLE(ios(10)) if (self != nil) { _apiId = APP_CONFIG_API_ID; _apiHash = @(APP_CONFIG_API_HASH); - _hockeyAppId = @(APP_CONFIG_HOCKEYAPP_ID); + _appCenterId = @(APP_CONFIG_APP_CENTER_ID); _dataDict = [[NSMutableDictionary alloc] init]; @@ -163,8 +163,8 @@ API_AVAILABLE(ios(10)) return _apiHash; } -- (NSString * _Nullable)hockeyAppId { - return _hockeyAppId; +- (NSString * _Nullable)appCenterId { + return _appCenterId; } - (bool)isInternalBuild { diff --git a/submodules/CallListUI/Sources/CallListController.swift b/submodules/CallListUI/Sources/CallListController.swift index 8de824eba8..573847c575 100644 --- a/submodules/CallListUI/Sources/CallListController.swift +++ b/submodules/CallListUI/Sources/CallListController.swift @@ -59,7 +59,12 @@ public final class CallListController: ViewController { if case .tab = self.mode { self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationCallIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.callPressed)) - let icon = UIImage(bundleImageName: "Chat List/Tabs/IconCalls") + let icon: UIImage? + if useSpecialTabBarIcons() { + icon = UIImage(bundleImageName: "Chat List/Tabs/Holiday/IconCalls") + } else { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconCalls") + } self.tabBarItem.title = self.presentationData.strings.Calls_TabTitle self.tabBarItem.image = icon self.tabBarItem.selectedImage = icon @@ -149,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, fromChat: false) { (strongSelf.navigationController as? NavigationController)?.pushViewController(controller) } }) diff --git a/submodules/Charts/BUCK b/submodules/Charts/BUCK new file mode 100644 index 0000000000..79bf8180b8 --- /dev/null +++ b/submodules/Charts/BUCK @@ -0,0 +1,31 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "Charts", + srcs = glob([ + "Sources/**/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/SyncCore:SyncCore#shared", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/AccountContext:AccountContext", + "//submodules/ItemListUI:ItemListUI", + "//submodules/AvatarNode:AvatarNode", + "//submodules/TelegramStringFormatting:TelegramStringFormatting", + "//submodules/AlertUI:AlertUI", + "//submodules/PresentationDataUtils:PresentationDataUtils", + "//submodules/TelegramNotices:TelegramNotices", + "//submodules/MergeLists:MergeLists", + "//submodules/AppBundle:AppBundle", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/Charts/Info.plist b/submodules/Charts/Info.plist new file mode 100644 index 0000000000..e1fe4cfb7b --- /dev/null +++ b/submodules/Charts/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/submodules/Charts/Sources/Chart Screen/ChartDetailsView.swift b/submodules/Charts/Sources/Chart Screen/ChartDetailsView.swift new file mode 100644 index 0000000000..7232c594c3 --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartDetailsView.swift @@ -0,0 +1,258 @@ +// +// ChartDetailsView.swift +// GraphTest +// +// Created by Andrew Solovey on 14/03/2019. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private let cornerRadius: CGFloat = 5 +private let verticalMargins: CGFloat = 8 +private var labelHeight: CGFloat = 18 +private var margin: CGFloat = 10 +private var prefixLabelWidth: CGFloat = 27 +private var textLabelWidth: CGFloat = 60 +private var valueLabelWidth: CGFloat = 65 + +struct ChartDetailsViewModel { + struct Value { + let prefix: String? + let title: String + let value: String + let color: UIColor + let visible: Bool + } + + var title: String + var showArrow: Bool + var showPrefixes: Bool + var values: [Value] + var totalValue: Value? + var tapAction: (() -> Void)? + + static let blank = ChartDetailsViewModel(title: "", showArrow: false, showPrefixes: false, values: [], totalValue: nil, tapAction: nil) +} + +class ChartDetailsView: UIControl { + let titleLabel = UILabel() + let arrowView = UIImageView() + + var prefixViews: [UILabel] = [] + var labelsViews: [UILabel] = [] + var valuesViews: [UILabel] = [] + + private var viewModel: ChartDetailsViewModel? + private var colorMode: ColorMode = .day + + static func fromNib() -> ChartDetailsView { + return Bundle.main.loadNibNamed("ChartDetailsView", owner: nil, options: nil)?.first as! ChartDetailsView + } + + override init(frame: CGRect) { + super.init(frame: frame) + + layer.cornerRadius = cornerRadius + clipsToBounds = true + + addTarget(self, action: #selector(didTap), for: .touchUpInside) + titleLabel.font = UIFont.systemFont(ofSize: 12, weight: .bold) + arrowView.image = UIImage.arrowRight + arrowView.contentMode = .scaleAspectFill + + addSubview(titleLabel) + addSubview(arrowView) + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func setup(viewModel: ChartDetailsViewModel, animated: Bool) { + self.viewModel = viewModel + + titleLabel.setText(viewModel.title, animated: animated) + titleLabel.setVisible(!viewModel.title.isEmpty, animated: animated) + arrowView.setVisible(viewModel.showArrow, animated: animated) + + let width: CGFloat = margin * 2 + (viewModel.showPrefixes ? (prefixLabelWidth + margin) : 0) + textLabelWidth + valueLabelWidth + var y: CGFloat = verticalMargins + + if (!viewModel.title.isEmpty || viewModel.showArrow) { + titleLabel.frame = CGRect(x: margin, y: y, width: width, height: labelHeight) + arrowView.frame = CGRect(x: width - 6 - margin, y: margin, width: 6, height: 10) + y += labelHeight + } + let labelsCount: Int = viewModel.values.count + ((viewModel.totalValue == nil) ? 0 : 1) + + setLabelsCount(array: &prefixViews, + count: viewModel.showPrefixes ? labelsCount : 0, + font: UIFont.systemFont(ofSize: 12, weight: .bold)) + setLabelsCount(array: &labelsViews, + count: labelsCount, + font: UIFont.systemFont(ofSize: 12, weight: .regular), + textAlignment: .left) + setLabelsCount(array: &valuesViews, + count: labelsCount, + font: UIFont.systemFont(ofSize: 12, weight: .bold)) + + UIView.perform(animated: animated, animations: { + for (index, value) in viewModel.values.enumerated() { + var x: CGFloat = margin + if viewModel.showPrefixes { + let prefixLabel = self.prefixViews[index] + prefixLabel.textColor = self.colorMode.chartDetailsTextColor + prefixLabel.setText(value.prefix, animated: false) + prefixLabel.frame = CGRect(x: x, y: y, width: prefixLabelWidth, height: labelHeight) + x += prefixLabelWidth + margin + prefixLabel.alpha = value.visible ? 1 : 0 + } + let titleLabel = self.labelsViews[index] + titleLabel.setTextColor(self.colorMode.chartDetailsTextColor, animated: false) + titleLabel.setText(value.title, animated: false) + titleLabel.frame = CGRect(x: x, y: y, width: textLabelWidth, height: labelHeight) + titleLabel.alpha = value.visible ? 1 : 0 + x += textLabelWidth + + let valueLabel = self.valuesViews[index] + valueLabel.setTextColor(value.color, animated: false) + valueLabel.setText(value.value, animated: false) + valueLabel.frame = CGRect(x: x, y: y, width: valueLabelWidth, height: labelHeight) + valueLabel.alpha = value.visible ? 1 : 0 + + if value.visible { + y += labelHeight + } + } + if let value = viewModel.totalValue { + var x: CGFloat = margin + if viewModel.showPrefixes { + let prefixLabel = self.prefixViews[viewModel.values.count] + prefixLabel.textColor = self.colorMode.chartDetailsTextColor + prefixLabel.setText(value.prefix, animated: false) + prefixLabel.frame = CGRect(x: x, y: y, width: prefixLabelWidth, height: labelHeight) + prefixLabel.alpha = value.visible ? 1 : 0 + x += prefixLabelWidth + margin + } + let titleLabel = self.labelsViews[viewModel.values.count] + titleLabel.setTextColor(self.colorMode.chartDetailsTextColor, animated: false) + titleLabel.setText(value.title, animated: false) + titleLabel.frame = CGRect(x: x, y: y, width: textLabelWidth, height: labelHeight) + titleLabel.alpha = value.visible ? 1 : 0 + x += textLabelWidth + + let valueLabel = self.valuesViews[viewModel.values.count] + valueLabel.setTextColor(self.colorMode.chartDetailsTextColor, animated: false) + valueLabel.setText(value.value, animated: false) + valueLabel.frame = CGRect(x: x, y: y, width: valueLabelWidth, height: labelHeight) + valueLabel.alpha = value.visible ? 1 : 0 + } + }) + } + + override var intrinsicContentSize: CGSize { + if let viewModel = viewModel { + let height = ((!viewModel.title.isEmpty || viewModel.showArrow) ? labelHeight : 0) + + (CGFloat(viewModel.values.filter({ $0.visible }).count) * labelHeight) + + (viewModel.totalValue?.visible == true ? labelHeight : 0) + + verticalMargins * 2 + let width: CGFloat = margin * 2 + + (viewModel.showPrefixes ? (prefixLabelWidth + margin) : 0) + + textLabelWidth + + valueLabelWidth + + return CGSize(width: width, + height: height) + } else { + return CGSize(width: 140, + height: labelHeight + verticalMargins) + } + } + + @objc private func didTap() { + viewModel?.tapAction?() + } + + func setLabelsCount(array: inout [UILabel], + count: Int, + font: UIFont, + textAlignment: NSTextAlignment = .right) { + while array.count > count { + let subview = array.removeLast() + subview.removeFromSuperview() + } + while array.count < count { + let label = UILabel() + label.font = font + label.adjustsFontSizeToFitWidth = true + label.minimumScaleFactor = 0.5 + label.textAlignment = textAlignment + addSubview(label) + array.append(label) + } + } +} + +extension ChartDetailsView: ColorModeContainer { + func apply(colorMode: ColorMode, animated: Bool) { + self.colorMode = colorMode + self.titleLabel.setTextColor(colorMode.chartDetailsTextColor, animated: animated) + if let viewModel = self.viewModel { + self.setup(viewModel: viewModel, animated: animated) + } + UIView.perform(animated: animated) { + self.arrowView.tintColor = colorMode.chartDetailsArrowColor + self.backgroundColor = colorMode.chartDetailsViewColor + } + } +} + +// MARK: UIStackView+removeAllArrangedSubviews +public extension UIStackView { + func setLabelsCount(_ count: Int, + font: UIFont, + huggingPriority: UILayoutPriority, + textAlignment: NSTextAlignment = .right) { + while arrangedSubviews.count > count { + let subview = arrangedSubviews.last! + removeArrangedSubview(subview) + subview.removeFromSuperview() + } + while arrangedSubviews.count < count { + let label = UILabel() + label.font = font + label.textAlignment = textAlignment + label.setContentHuggingPriority(huggingPriority, for: .horizontal) + label.setContentHuggingPriority(huggingPriority, for: .vertical) + label.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 999), for: .horizontal) + label.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 999), for: .vertical) + addArrangedSubview(label) + } + } + + func label(at index: Int) -> UILabel { + return arrangedSubviews[index] as! UILabel + } + + func removeAllArrangedSubviews() { + for subview in arrangedSubviews { + removeArrangedSubview(subview) + subview.removeFromSuperview() + } + } +} + +// MARK: UIStackView+addArrangedSubviews +public extension UIStackView { + func addArrangedSubviews(_ views: [UIView]) { + views.forEach({ addArrangedSubview($0) }) + } +} + +// MARK: UIStackView+insertArrangedSubviews +public extension UIStackView { + func insertArrangedSubviews(_ views: [UIView], at index: Int) { + views.reversed().forEach({ insertArrangedSubview($0, at: index) }) + } +} diff --git a/submodules/Charts/Sources/Chart Screen/ChartStackSection.swift b/submodules/Charts/Sources/Chart Screen/ChartStackSection.swift new file mode 100644 index 0000000000..bef1a574f4 --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartStackSection.swift @@ -0,0 +1,199 @@ +// +// ChartStackSection.swift +// GraphTest +// +// Created by Andrei Salavei on 4/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private enum Constants { + static let chartViewHeightFraction: CGFloat = 0.55 +} + +class ChartStackSection: UIView, ColorModeContainer { + var chartView: ChartView + var rangeView: RangeChartView + var visibilityView: ChartVisibilityView + var sectionContainerView: UIView + var separators: [UIView] = [] + + var headerLabel: UILabel! + var titleLabel: UILabel! + var backButton: UIButton! + + var controller: BaseChartController! + + init() { + sectionContainerView = UIView() + chartView = ChartView() + rangeView = RangeChartView() + visibilityView = ChartVisibilityView() + headerLabel = UILabel() + titleLabel = UILabel() + backButton = UIButton() + + super.init(frame: CGRect()) + + self.addSubview(sectionContainerView) + sectionContainerView.addSubview(chartView) + sectionContainerView.addSubview(rangeView) + sectionContainerView.addSubview(visibilityView) + + headerLabel.font = UIFont.systemFont(ofSize: 14, weight: .regular) + titleLabel.font = UIFont.systemFont(ofSize: 14, weight: .bold) + visibilityView.clipsToBounds = true + backButton.isExclusiveTouch = true + + backButton.setVisible(false, animated: false) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func awakeFromNib() { + super.awakeFromNib() + + headerLabel.font = UIFont.systemFont(ofSize: 14, weight: .regular) + titleLabel.font = UIFont.systemFont(ofSize: 14, weight: .bold) + visibilityView.clipsToBounds = true + backButton.isExclusiveTouch = true + + backButton.setVisible(false, animated: false) + } + + func apply(colorMode: ColorMode, animated: Bool) { + UIView.perform(animated: animated && self.isVisibleInWindow) { + self.backgroundColor = colorMode.tableBackgroundColor + + self.sectionContainerView.backgroundColor = colorMode.chartBackgroundColor + self.rangeView.backgroundColor = colorMode.chartBackgroundColor + self.visibilityView.backgroundColor = colorMode.chartBackgroundColor + + self.backButton.tintColor = colorMode.actionButtonColor + self.backButton.setTitleColor(colorMode.actionButtonColor, for: .normal) + + for separator in self.separators { + separator.backgroundColor = colorMode.tableSeparatorColor + } + } + + if rangeView.isVisibleInWindow || chartView.isVisibleInWindow { + chartView.loadDetailsViewIfNeeded() + chartView.apply(colorMode: colorMode, animated: animated && chartView.isVisibleInWindow) + controller.apply(colorMode: colorMode, animated: animated) + rangeView.apply(colorMode: colorMode, animated: animated && rangeView.isVisibleInWindow) + } else { + DispatchQueue.main.asyncAfter(deadline: .now() + TimeInterval.random(in: 0...0.1)) { + self.chartView.loadDetailsViewIfNeeded() + self.controller.apply(colorMode: colorMode, animated: false) + self.chartView.apply(colorMode: colorMode, animated: false) + self.rangeView.apply(colorMode: colorMode, animated: false) + } + } + + self.titleLabel.setTextColor(colorMode.chartTitleColor, animated: animated && titleLabel.isVisibleInWindow) + self.headerLabel.setTextColor(colorMode.sectionTitleColor, animated: animated && headerLabel.isVisibleInWindow) + } + + @IBAction func didTapBackButton() { + controller.didTapZoomOut() + } + + func setBackButtonVisible(_ visible: Bool, animated: Bool) { + backButton.setVisible(visible, animated: animated) + layoutIfNeeded(animated: animated) + } + + func updateToolViews(animated: Bool) { + rangeView.setRange(controller.currentChartHorizontalRangeFraction, animated: animated) + rangeView.setRangePaging(enabled: controller.isChartRangePagingEnabled, + minimumSize: controller.minimumSelectedChartRange) + visibilityView.setVisible(controller.drawChartVisibity, animated: animated) + if controller.drawChartVisibity { + visibilityView.isExpanded = true + visibilityView.items = controller.actualChartsCollection.chartValues.map { value in + return ChartVisibilityItem(title: value.name, color: value.color) + } + visibilityView.setItemsSelection(controller.actualChartVisibility) + visibilityView.setNeedsLayout() + visibilityView.layoutIfNeeded() + } else { + visibilityView.isExpanded = false + } + superview?.superview?.layoutIfNeeded(animated: animated) + } + + override func layoutSubviews() { + super.layoutSubviews() + + let bounds = self.bounds + self.sectionContainerView.frame = CGRect(origin: CGPoint(), size: CGSize(width: bounds.width, height: 350.0)) + self.chartView.frame = CGRect(origin: CGPoint(), size: CGSize(width: bounds.width, height: 250.0)) + self.rangeView.frame = CGRect(origin: CGPoint(x: 0.0, y: 250.0), size: CGSize(width: bounds.width, height: 48.0)) + self.visibilityView.frame = CGRect(origin: CGPoint(x: 0.0, y: 308.0), size: CGSize(width: bounds.width, height: 122.0)) + } + + func setup(controller: BaseChartController, title: String) { + self.controller = controller + self.headerLabel.text = title + + // Chart + chartView.renderers = controller.mainChartRenderers + chartView.userDidSelectCoordinateClosure = { [unowned self] point in + self.controller.chartInteractionDidBegin(point: point) + } + chartView.userDidDeselectCoordinateClosure = { [unowned self] in + self.controller.chartInteractionDidEnd() + } + controller.cartViewBounds = { [unowned self] in + return self.chartView.bounds + } + controller.chartFrame = { [unowned self] in + return self.chartView.chartFrame + } + controller.setDetailsViewModel = { [unowned self] viewModel, animated in + self.chartView.setDetailsViewModel(viewModel: viewModel, animated: animated) + } + controller.setDetailsChartVisibleClosure = { [unowned self] visible, animated in + self.chartView.setDetailsChartVisible(visible, animated: animated) + } + controller.setDetailsViewPositionClosure = { [unowned self] position in + self.chartView.detailsViewPosition = position + } + controller.setChartTitleClosure = { [unowned self] title, animated in + self.titleLabel.setText(title, animated: animated) + } + controller.setBackButtonVisibilityClosure = { [unowned self] visible, animated in + self.setBackButtonVisible(visible, animated: animated) + } + controller.refreshChartToolsClosure = { [unowned self] animated in + self.updateToolViews(animated: animated) + } + + // Range view + rangeView.chartView.renderers = controller.navigationRenderers + rangeView.rangeDidChangeClosure = { range in + controller.updateChartRange(range) + } + rangeView.touchedOutsideClosure = { + controller.cancelChartInteraction() + } + controller.chartRangeUpdatedClosure = { [unowned self] (range, animated) in + self.rangeView.setRange(range, animated: animated) + } + controller.chartRangePagingClosure = { [unowned self] (isEnabled, pageSize) in + self.rangeView.setRangePaging(enabled: isEnabled, minimumSize: pageSize) + } + + // Visibility view + visibilityView.selectionCallbackClosure = { [unowned self] visibility in + self.controller.updateChartsVisibility(visibility: visibility, animated: true) + } + + controller.initializeChart() + updateToolViews(animated: false) + } +} diff --git a/submodules/Charts/Sources/Chart Screen/ChartStackSection.xib b/submodules/Charts/Sources/Chart Screen/ChartStackSection.xib new file mode 100644 index 0000000000..fc883dd96c --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartStackSection.xib @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/submodules/Charts/Sources/Chart Screen/ChartView.swift b/submodules/Charts/Sources/Chart Screen/ChartView.swift new file mode 100644 index 0000000000..39b93d9fa0 --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartView.swift @@ -0,0 +1,158 @@ +// +// ChartView.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +public protocol ChartViewRenderer: class { + var containerViews: [UIView] { get set } + func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) +} + +class ChartView: UIView { + override init(frame: CGRect) { + super.init(frame: frame) + + setupView() + } + + required init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder) + + setupView() + } + + var chartInsets: UIEdgeInsets = UIEdgeInsets(top: 40, left: 16, bottom: 35, right: 16) { + didSet { + setNeedsDisplay() + } + } + + var renderers: [ChartViewRenderer] = [] { + willSet { + renderers.forEach { $0.containerViews.removeAll(where: { $0 == self }) } + } + didSet { + renderers.forEach { $0.containerViews.append(self) } + setNeedsDisplay() + } + } + + var chartFrame: CGRect { + let chartBound = self.bounds + return CGRect(x: chartInsets.left, + y: chartInsets.top, + width: max(1, chartBound.width - chartInsets.left - chartInsets.right), + height: max(1, chartBound.height - chartInsets.top - chartInsets.bottom)) + } + + override func draw(_ rect: CGRect) { + guard let context = UIGraphicsGetCurrentContext() else { return } + let chartBounds = self.bounds + let chartFrame = self.chartFrame + + for renderer in renderers { + renderer.render(context: context, bounds: chartBounds, chartFrame: chartFrame) + } + } + + var userDidSelectCoordinateClosure: ((CGPoint) -> Void)? + var userDidDeselectCoordinateClosure: (() -> Void)? + + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + if let point = touches.first?.location(in: self) { + let fractionPoint = CGPoint(x: (point.x - chartFrame.origin.x) / chartFrame.width, + y: (point.y - chartFrame.origin.y) / chartFrame.height) + userDidSelectCoordinateClosure?(fractionPoint) + } + } + + override func touchesMoved(_ touches: Set, with event: UIEvent?) { + if let point = touches.first?.location(in: self) { + let fractionPoint = CGPoint(x: (point.x - chartFrame.origin.x) / chartFrame.width, + y: (point.y - chartFrame.origin.y) / chartFrame.height) + userDidSelectCoordinateClosure?(fractionPoint) + } + } + + override func touchesEnded(_ touches: Set, with event: UIEvent?) { + userDidDeselectCoordinateClosure?() + } + + override func touchesCancelled(_ touches: Set, with event: UIEvent?) { + userDidDeselectCoordinateClosure?() + } + + // MARK: Details View + + private var detailsView: ChartDetailsView! + private var maxDetailsViewWidth: CGFloat = 0 + func loadDetailsViewIfNeeded() { + if detailsView == nil { + let detailsView = ChartDetailsView(frame: bounds) + addSubview(detailsView) + detailsView.alpha = 0 + self.detailsView = detailsView + } + } + + private var detailsTableTopOffset: CGFloat = 5 + private var detailsTableLeftOffset: CGFloat = 8 + private var isDetailsViewVisible: Bool = false + + var detailsViewPosition: CGFloat = 0 { + didSet { + loadDetailsViewIfNeeded() + let detailsViewSize = detailsView.intrinsicContentSize + maxDetailsViewWidth = max(maxDetailsViewWidth, detailsViewSize.width) + if maxDetailsViewWidth + detailsTableLeftOffset > detailsViewPosition { + detailsView.frame = CGRect(x: min(detailsViewPosition + detailsTableLeftOffset, bounds.width - maxDetailsViewWidth), + y: chartInsets.top + detailsTableTopOffset, + width: maxDetailsViewWidth, + height: detailsViewSize.height) + } else { + detailsView.frame = CGRect(x: detailsViewPosition - maxDetailsViewWidth - detailsTableLeftOffset, + y: chartInsets.top + detailsTableTopOffset, + width: maxDetailsViewWidth, + height: detailsViewSize.height) + } + } + } + + func setDetailsChartVisible(_ visible: Bool, animated: Bool) { + guard isDetailsViewVisible != visible else { + return + } + isDetailsViewVisible = visible + loadDetailsViewIfNeeded() + detailsView.setVisible(visible, animated: animated) + if !visible { + maxDetailsViewWidth = 0 + } + } + + func setDetailsViewModel(viewModel: ChartDetailsViewModel, animated: Bool) { + loadDetailsViewIfNeeded() + detailsView.setup(viewModel: viewModel, animated: animated) + UIView.perform(animated: animated, animations: { + let position = self.detailsViewPosition + self.detailsViewPosition = position + }) + } + + func setupView() { + backgroundColor = .clear + layer.drawsAsynchronously = true + } +} + + +extension ChartView: ColorModeContainer { + func apply(colorMode: ColorMode, animated: Bool) { + detailsView?.apply(colorMode: colorMode, animated: animated && (detailsView?.isVisibleInWindow ?? false)) + } +} diff --git a/submodules/Charts/Sources/Chart Screen/ChartVisibilityItemView.swift b/submodules/Charts/Sources/Chart Screen/ChartVisibilityItemView.swift new file mode 100644 index 0000000000..2476526f1a --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartVisibilityItemView.swift @@ -0,0 +1,95 @@ +// +// ChartVisibilityItemCell.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class ChartVisibilityItemView: UIView { + static let textFont = UIFont.systemFont(ofSize: 14, weight: .medium) + + let checkButton: UIButton = UIButton(type: .system) + + override init(frame: CGRect) { + super.init(frame: frame) + + setupView() + } + + required init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder) + } + + override func awakeFromNib() { + super.awakeFromNib() + setupView() + } + + func setupView() { + checkButton.frame = bounds + checkButton.titleLabel?.font = ChartVisibilityItemView.textFont + checkButton.layer.cornerRadius = 6 + checkButton.layer.masksToBounds = true + checkButton.addTarget(self, action: #selector(didTapButton), for: .touchUpInside) + let pressRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(didRecognizedLongPress(recognizer:))) + pressRecognizer.cancelsTouchesInView = true + checkButton.addGestureRecognizer(pressRecognizer) + addSubview(checkButton) + } + + var tapClosure: (() -> Void)? + var longTapClosure: (() -> Void)? + + private func updateStyle(animated: Bool) { + guard let item = item else { + return + } + UIView.perform(animated: animated, animations: { + if self.isChecked { + self.checkButton.setTitleColor(.white, for: .normal) + self.checkButton.backgroundColor = item.color + self.checkButton.layer.borderColor = nil + self.checkButton.layer.borderWidth = 0 + self.checkButton.setTitle("✓ " + item.title, for: .normal) + } else { + self.checkButton.backgroundColor = .clear + self.checkButton.layer.borderColor = item.color.cgColor + self.checkButton.layer.borderWidth = 1 + self.checkButton.setTitleColor(item.color, for: .normal) + self.checkButton.setTitle(item.title, for: .normal) + } + + }) + } + + override func layoutSubviews() { + super.layoutSubviews() + + checkButton.frame = bounds + } + + @objc private func didTapButton() { + tapClosure?() + } + + @objc private func didRecognizedLongPress(recognizer: UIGestureRecognizer) { + if recognizer.state == .began { + longTapClosure?() + } + } + + var item: ChartVisibilityItem? = nil { + didSet { + updateStyle(animated: false) + } + } + + private(set) var isChecked: Bool = true + func setChecked(isChecked: Bool, animated: Bool) { + self.isChecked = isChecked + updateStyle(animated: true) + } +} diff --git a/submodules/Charts/Sources/Chart Screen/ChartVisibilityView.swift b/submodules/Charts/Sources/Chart Screen/ChartVisibilityView.swift new file mode 100644 index 0000000000..fda3c3901f --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartVisibilityView.swift @@ -0,0 +1,147 @@ +// +// ChartVisibilityView.swift +// GraphTest +// +// Created by Andrei Salavei on 4/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private enum Constants { + static let itemHeight: CGFloat = 30 + static let itemSpacing: CGFloat = 8 + static let labelTextApproxInsets: CGFloat = 40 + static let insets = UIEdgeInsets(top: 0, left: 16, bottom: 16, right: 16) +} + +struct ChartVisibilityItem { + var title: String + var color: UIColor +} + +class ChartVisibilityView: UIView { + var items: [ChartVisibilityItem] = [] { + didSet { + selectedItems = items.map { _ in true } + while selectionViews.count > selectedItems.count { + selectionViews.last?.removeFromSuperview() + selectionViews.removeLast() + } + while selectionViews.count < selectedItems.count { + let view = ChartVisibilityItemView(frame: bounds) + addSubview(view) + selectionViews.append(view) + } + + for (index, item) in items.enumerated() { + let view = selectionViews[index] + view.item = item + view.tapClosure = { [weak self] in + guard let self = self else { return } + self.setItemSelected(!self.selectedItems[index], at: index, animated: true) + self.notifyItemSelection() + } + + view.longTapClosure = { [weak self] in + guard let self = self else { return } + let hasSelectedItem = self.selectedItems.enumerated().contains(where: { $0.element && $0.offset != index }) + if hasSelectedItem { + for (itemIndex, _) in self.items.enumerated() { + self.setItemSelected(itemIndex == index, at: itemIndex, animated: true) + } + } else { + for (itemIndex, _) in self.items.enumerated() { + self.setItemSelected(true, at: itemIndex, animated: true) + } + } + self.notifyItemSelection() + } + } + } + } + + private (set) var selectedItems: [Bool] = [] + var isExpanded: Bool = true { + didSet { + invalidateIntrinsicContentSize() + setNeedsUpdateConstraints() + } + } + + private var selectionViews: [ChartVisibilityItemView] = [] + + private func generateItemsFrames(frame: CGRect) -> [CGRect] { + var previousPoint = CGPoint(x: Constants.insets.left, y: Constants.insets.top) + var frames: [CGRect] = [] + + for item in items { + let labelSize = (item.title as NSString).size(withAttributes: [.font: ChartVisibilityItemView.textFont]) + let width = (labelSize.width + Constants.labelTextApproxInsets).rounded(.up) + if previousPoint.x + width < (frame.width - Constants.insets.left - Constants.insets.right) { + frames.append(CGRect(origin: previousPoint, size: CGSize(width: width, height: Constants.itemHeight))) + } else if previousPoint.x <= Constants.insets.left { + frames.append(CGRect(origin: previousPoint, size: CGSize(width: width, height: Constants.itemHeight))) + } else { + previousPoint.y += Constants.itemHeight + Constants.itemSpacing + previousPoint.x = Constants.insets.left + frames.append(CGRect(origin: previousPoint, size: CGSize(width: width, height: Constants.itemHeight))) + } + previousPoint.x += width + Constants.itemSpacing + } + + return frames + } + + var selectionCallbackClosure: (([Bool]) -> Void)? + + func setItemSelected(_ selected: Bool, at index: Int, animated: Bool) { + self.selectedItems[index] = selected + self.selectionViews[index].setChecked(isChecked: selected, animated: animated) + } + + func setItemsSelection(_ selection: [Bool]) { + assert(selection.count == items.count) + self.selectedItems = selection + for (index, selected) in self.selectedItems.enumerated() { + selectionViews[index].setChecked(isChecked: selected, animated: false) + } + } + + private func notifyItemSelection() { + selectionCallbackClosure?(selectedItems) + } + + override func layoutSubviews() { + super.layoutSubviews() + + updateFrames() + } + + private func updateFrames() { + for (index, frame) in generateItemsFrames(frame: bounds).enumerated() { + selectionViews[index].frame = frame + } + } + + override var intrinsicContentSize: CGSize { + guard isExpanded else { + var size = self.bounds.size + size.height = 0 + return size + } + let frames = generateItemsFrames(frame: UIScreen.main.bounds) + guard let lastFrame = frames.last else { return .zero } + let size = CGSize(width: frame.width, height: lastFrame.maxY + Constants.insets.bottom) + return size + } +} + +extension ChartVisibilityView: ColorModeContainer { + func apply(colorMode: ColorMode, animated: Bool) { + UIView.perform(animated: animated) { + self.backgroundColor = colorMode.chartBackgroundColor + self.tintColor = colorMode.descriptionActionColor + } + } +} diff --git a/submodules/Charts/Sources/Chart Screen/ChartsDataLoader.swift b/submodules/Charts/Sources/Chart Screen/ChartsDataLoader.swift new file mode 100644 index 0000000000..085e4689bd --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartsDataLoader.swift @@ -0,0 +1,51 @@ +// +// ChartsDataLoader.swift +// GraphTest +// +// Created by Andrei Salavei on 4/8/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import Foundation + +enum ChartsDataType: String { + case generalLines = "1" + case twoAxisLines = "2" + case stackedBars = "3" + case dailyBars = "4" + case percentPie = "5" +} + +private enum Constants { + static let overviewFilename = "overview.json" + static let dataDir = "data" +} + +class ChartsDataLoader { + static var documentDirectoryURL: URL { + let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask) + let documentsDirectory = paths[0] + return documentsDirectory + } + + static func overviewData(type: ChartsDataType, extraCopiesCount: Int = 0, sync: Bool = false, success: @escaping (ChartsCollection) -> Void) { + let path = Bundle.main.bundleURL + .appendingPathComponent(Constants.dataDir) + .appendingPathComponent(type.rawValue) + .appendingPathComponent(Constants.overviewFilename) + ChartsDataManager().readChart(file: path, extraCopiesCount: extraCopiesCount, sync: sync, success: success, failure: { _ in }) + } + + static func detaildData(type: ChartsDataType, extraCopiesCount: Int = 0, date: Date, success: @escaping (ChartsCollection) -> Void, failure: @escaping (Error) -> Void) { + let dateComponents = Calendar.utc.dateComponents([.day, .month, .year], from: date) + let yearMonth = String(format: "%04d-%02d", dateComponents.year ?? 0, dateComponents.month ?? 0) + let day = String(format: "%02d.json", dateComponents.day ?? 0) + + let path = Bundle.main.bundleURL + .appendingPathComponent(Constants.dataDir) + .appendingPathComponent(type.rawValue) + .appendingPathComponent(yearMonth) + .appendingPathComponent(day) + ChartsDataManager().readChart(file: path, extraCopiesCount: extraCopiesCount, sync: false, success: success, failure: failure) + } +} diff --git a/submodules/Charts/Sources/Chart Screen/ChartsStackViewController.swift b/submodules/Charts/Sources/Chart Screen/ChartsStackViewController.swift new file mode 100644 index 0000000000..e8c22e6453 --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/ChartsStackViewController.swift @@ -0,0 +1,222 @@ +// +// ChartsStackViewController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class ChartsStackViewController: UIViewController { + @IBOutlet private var stackView: UIStackView! + @IBOutlet private var scrollView: UIScrollView! + @IBOutlet private var psLabel: UILabel! + @IBOutlet private var ppsLabel: UILabel! + @IBOutlet private var animationButton: ChartVisibilityItemView! + + private var sections: [ChartStackSection] = [] + + private var colorMode: ColorMode = .night + private var colorModeButton: UIBarButtonItem! + private var performFastAnimation: Bool = false + + override func viewDidLoad() { + super.viewDidLoad() + + title = "Statistics" + colorModeButton = UIBarButtonItem(title: colorMode.switchTitle, style: .plain, target: self, action: #selector(didTapSwitchColorMode)) + navigationItem.rightBarButtonItem = colorModeButton + + apply(colorMode: colorMode, animated: false) + + self.navigationController?.navigationBar.barStyle = .black + self.navigationController?.navigationBar.isTranslucent = false + + self.view.isUserInteractionEnabled = false + animationButton.backgroundColor = .clear + animationButton.tapClosure = { [weak self] in + guard let self = self else { return } + self.setSlowAnimationEnabled(!self.animationButton.isChecked) + } + self.setSlowAnimationEnabled(false) + + loadChart1() + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + DispatchQueue.main.async { + self.view.setNeedsUpdateConstraints() + self.view.setNeedsLayout() + } + } + + func loadChart1() { + ChartsDataLoader.overviewData(type: .generalLines, sync: true, success: { collection in + let generalLinesChartController = GeneralLinesChartController(chartsCollection: collection) + self.addSection(controller: generalLinesChartController, title: "FOLLOWERS") + generalLinesChartController.getDetailsData = { date, completion in + ChartsDataLoader.detaildData(type: .generalLines, date: date, success: { collection in + completion(collection) + }, failure: { error in + completion(nil) + }) + } + DispatchQueue.main.async { + self.loadChart2() + } + }) + } + + func loadChart2() { + ChartsDataLoader.overviewData(type: .twoAxisLines, success: { collection in + let twoAxisLinesChartController = TwoAxisLinesChartController(chartsCollection: collection) + self.addSection(controller: twoAxisLinesChartController, title: "INTERACTIONS") + twoAxisLinesChartController.getDetailsData = { date, completion in + ChartsDataLoader.detaildData(type: .twoAxisLines, date: date, success: { collection in + completion(collection) + }, failure: { error in + completion(nil) + }) + } + DispatchQueue.main.async { + self.loadChart3() + } + }) + } + + func loadChart3() { + ChartsDataLoader.overviewData(type: .stackedBars, success: { collection in + let stackedBarsChartController = StackedBarsChartController(chartsCollection: collection) + self.addSection(controller: stackedBarsChartController, title: "FRUITS") + stackedBarsChartController.getDetailsData = { date, completion in + ChartsDataLoader.detaildData(type: .stackedBars, date: date, success: { collection in + completion(collection) + }, failure: { error in + completion(nil) + }) + } + DispatchQueue.main.async { + self.loadChart4() + } + }) + } + + func loadChart4() { + ChartsDataLoader.overviewData(type: .dailyBars, success: { collection in + let dailyBarsChartController = DailyBarsChartController(chartsCollection: collection) + self.addSection(controller: dailyBarsChartController, title: "VIEWS") + dailyBarsChartController.getDetailsData = { date, completion in + ChartsDataLoader.detaildData(type: .dailyBars, date: date, success: { collection in + completion(collection) + }, failure: { error in + completion(nil) + }) + } + DispatchQueue.main.async { + self.loadChart5() + } + }) + } + + func loadChart5() { + ChartsDataLoader.overviewData(type: .percentPie, success: { collection in + let percentPieChartController = PercentPieChartController(chartsCollection: collection) + self.addSection(controller: percentPieChartController, title: "MORE FRUITS") + self.finalizeChartsLoading() + }) + } + + func setSlowAnimationEnabled(_ isEnabled: Bool) { + animationButton.setChecked(isChecked: isEnabled, animated: true) + if isEnabled { + TimeInterval.animationDurationMultipler = 5 + } else { + TimeInterval.animationDurationMultipler = 1 + } + } + + func finalizeChartsLoading() { + self.view.isUserInteractionEnabled = true + } + + func addSection(controller: BaseChartController, title: String) { + let section = Bundle.main.loadNibNamed("ChartStackSection", owner: nil, options: nil)?.first as! ChartStackSection + section.frame = UIScreen.main.bounds + section.layoutIfNeeded() + section.setup(controller: controller, title: title) + section.apply(colorMode: colorMode, animated: false) + stackView.addArrangedSubview(section) + sections.append(section) + } + + override var preferredStatusBarStyle: UIStatusBarStyle { + return (colorMode == .day) ? .default : .lightContent + } + + override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation { + return .fade + } + + @objc private func didTapSwitchColorMode() { + self.colorMode = self.colorMode == .day ? .night : .day + apply(colorMode: self.colorMode, animated: !performFastAnimation) + colorModeButton.title = colorMode.switchTitle + } +} + +extension ChartsStackViewController: UIScrollViewDelegate { + func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) { + performFastAnimation = decelerate + } + + func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) { + performFastAnimation = false + } +} + +extension ChartsStackViewController: ColorModeContainer { + func apply(colorMode: ColorMode, animated: Bool) { + + UIView.perform(animated: animated) { + self.psLabel.setTextColor(colorMode.sectionTitleColor, animated: animated && self.psLabel.isVisibleInWindow) + self.ppsLabel.setTextColor(colorMode.sectionTitleColor, animated: animated && self.ppsLabel.isVisibleInWindow) + self.animationButton.item = ChartVisibilityItem(title: "Enable slow animations", + color: colorMode.sectionTitleColor) + + self.view.backgroundColor = colorMode.tableBackgroundColor + + if (animated) { + let animation = CATransition() + animation.timingFunction = CAMediaTimingFunction.init(name: .linear) + animation.type = .fade + animation.duration = .defaultDuration + self.navigationController?.navigationBar.layer.add(animation, forKey: "kCATransitionColorFade") + } + + self.navigationController?.navigationBar.tintColor = colorMode.actionButtonColor + self.navigationController?.navigationBar.barTintColor = colorMode.chartBackgroundColor + self.navigationController?.navigationBar.titleTextAttributes = [.font: UIFont.systemFont(ofSize: 17, weight: .medium), + .foregroundColor: colorMode.viewTintColor] + self.view.layoutIfNeeded() + } + self.setNeedsStatusBarAppearanceUpdate() + + for section in sections { + section.apply(colorMode: colorMode, animated: animated && section.isVisibleInWindow) + } + } +} + +extension ColorMode { + var switchTitle: String { + switch self { + case .day: + return "Night Mode" + case .night: + return "Day Mode" + } + } +} diff --git a/submodules/Charts/Sources/Chart Screen/RangeChartView.swift b/submodules/Charts/Sources/Chart Screen/RangeChartView.swift new file mode 100644 index 0000000000..91089c1de8 --- /dev/null +++ b/submodules/Charts/Sources/Chart Screen/RangeChartView.swift @@ -0,0 +1,291 @@ +// +// RangeChartView.swift +// GraphTest +// +// Created by Andrei Salavei on 3/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// +import UIKit + +private enum Constants { + static let cropIndocatorLineWidth: CGFloat = 1 + static let markerSelectionRange: CGFloat = 25 + static let defaultMinimumRangeDistance: CGFloat = 0.05 + static let titntAreaWidth: CGFloat = 10 + static let horizontalContentMargin: CGFloat = 16 + static let cornerRadius: CGFloat = 5 +} + +class RangeChartView: UIControl { + private enum Marker { + case lower + case upper + case center + } + public var lowerBound: CGFloat = 0 { + didSet { + setNeedsLayout() + } + } + public var upperBound: CGFloat = 1 { + didSet { + setNeedsLayout() + } + } + public var selectionColor: UIColor = .blue + public var defaultColor: UIColor = .lightGray + + public var minimumRangeDistance: CGFloat = Constants.defaultMinimumRangeDistance + + private let lowerBoundTintView = UIView() + private let upperBoundTintView = UIView() + private let cropFrameView = UIImageView() + + private var selectedMarker: Marker? + private var selectedMarkerHorizontalOffet: CGFloat = 0 + private var isBoundCropHighlighted: Bool = false + private var isRangePagingEnabled: Bool = false + + public let chartView = ChartView() + + override init(frame: CGRect) { + super.init(frame: frame) + + layoutMargins = UIEdgeInsets(top: Constants.cropIndocatorLineWidth, + left: Constants.horizontalContentMargin, + bottom: Constants.cropIndocatorLineWidth, + right: Constants.horizontalContentMargin) + + self.setup() + } + + func setup() { + isMultipleTouchEnabled = false + + chartView.chartInsets = .zero + chartView.backgroundColor = .clear + + addSubview(chartView) + addSubview(lowerBoundTintView) + addSubview(upperBoundTintView) + addSubview(cropFrameView) + cropFrameView.isUserInteractionEnabled = false + chartView.isUserInteractionEnabled = false + lowerBoundTintView.isUserInteractionEnabled = false + upperBoundTintView.isUserInteractionEnabled = false + + chartView.layer.cornerRadius = 5 + upperBoundTintView.layer.cornerRadius = 5 + lowerBoundTintView.layer.cornerRadius = 5 + + chartView.layer.masksToBounds = true + upperBoundTintView.layer.masksToBounds = true + lowerBoundTintView.layer.masksToBounds = true + + layoutViews() + } + + override func awakeFromNib() { + super.awakeFromNib() + + self.setup() + } + + public var rangeDidChangeClosure: ((ClosedRange) -> Void)? + public var touchedOutsideClosure: (() -> Void)? + + required init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder) + } + + func setRangePaging(enabled: Bool, minimumSize: CGFloat) { + isRangePagingEnabled = enabled + minimumRangeDistance = minimumSize + } + + func setRange(_ range: ClosedRange, animated: Bool) { + UIView.perform(animated: animated) { + self.lowerBound = range.lowerBound + self.upperBound = range.upperBound + self.layoutIfNeeded() + } + } + + override func layoutSubviews() { + super.layoutSubviews() + + layoutViews() + } + + override var isEnabled: Bool { + get { + return super.isEnabled + } + set { + if newValue == false { + selectedMarker = nil + } + super.isEnabled = newValue + } + } + + // MARK: - Touches + + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + guard isEnabled else { return } + guard let point = touches.first?.location(in: self) else { return } + + if abs(locationInView(for: upperBound) - point.x + Constants.markerSelectionRange / 2) < Constants.markerSelectionRange { + selectedMarker = .upper + selectedMarkerHorizontalOffet = point.x - locationInView(for: upperBound) + isBoundCropHighlighted = true + } else if abs(locationInView(for: lowerBound) - point.x - Constants.markerSelectionRange / 2) < Constants.markerSelectionRange { + selectedMarker = .lower + selectedMarkerHorizontalOffet = point.x - locationInView(for: lowerBound) + isBoundCropHighlighted = true + } else if point.x > locationInView(for: lowerBound) && point.x < locationInView(for: upperBound) { + selectedMarker = .center + selectedMarkerHorizontalOffet = point.x - locationInView(for: lowerBound) + isBoundCropHighlighted = true + } else { + selectedMarker = nil + return + } + + sendActions(for: .touchDown) + } + + override func touchesMoved(_ touches: Set, with event: UIEvent?) { + guard isEnabled else { return } + guard let selectedMarker = selectedMarker else { return } + guard let point = touches.first?.location(in: self) else { return } + + let horizontalPosition = point.x - selectedMarkerHorizontalOffet + let fraction = fractionFor(offsetX: horizontalPosition) + updateMarkerOffset(selectedMarker, fraction: fraction) + + sendActions(for: .valueChanged) + } + + override func touchesEnded(_ touches: Set, with event: UIEvent?) { + guard isEnabled else { return } + guard let selectedMarker = selectedMarker else { + touchedOutsideClosure?() + return + } + guard let point = touches.first?.location(in: self) else { return } + + let horizontalPosition = point.x - selectedMarkerHorizontalOffet + let fraction = fractionFor(offsetX: horizontalPosition) + updateMarkerOffset(selectedMarker, fraction: fraction) + + self.selectedMarker = nil + self.isBoundCropHighlighted = false + if bounds.contains(point) { + sendActions(for: .touchUpInside) + } else { + sendActions(for: .touchUpOutside) + } + rangeDidChangeClosure?(lowerBound...upperBound) + } + + override func touchesCancelled(_ touches: Set, with event: UIEvent?) { + self.selectedMarker = nil + self.isBoundCropHighlighted = false + sendActions(for: .touchCancel) + } +} + +private extension RangeChartView { + var contentFrame: CGRect { + return CGRect(x: layoutMargins.right, + y: layoutMargins.top, + width: (bounds.width - layoutMargins.right - layoutMargins.left), + height: bounds.height - layoutMargins.top - layoutMargins.bottom) + } + + func locationInView(for fraction: CGFloat) -> CGFloat { + return contentFrame.minX + contentFrame.width * fraction + } + + func locationInView(for fraction: Double) -> CGFloat { + return locationInView(for: CGFloat(fraction)) + } + + func fractionFor(offsetX: CGFloat) -> CGFloat { + guard contentFrame.width > 0 else { + return 0 + } + + return crop(0, CGFloat((offsetX - contentFrame.minX ) / contentFrame.width), 1) + } + + private func updateMarkerOffset(_ marker: Marker, fraction: CGFloat, notifyDelegate: Bool = true) { + let fractionToCount: CGFloat + if isRangePagingEnabled { + guard let minValue = stride(from: CGFloat(0.0), through: CGFloat(1.0), by: minimumRangeDistance).min(by: { abs($0 - fraction) < abs($1 - fraction) }) else { return } + fractionToCount = minValue + } else { + fractionToCount = fraction + } + + switch marker { + case .lower: + lowerBound = min(fractionToCount, upperBound - minimumRangeDistance) + case .upper: + upperBound = max(fractionToCount, lowerBound + minimumRangeDistance) + case .center: + let distance = upperBound - lowerBound + lowerBound = max(0, min(fractionToCount, 1 - distance)) + upperBound = lowerBound + distance + } + if notifyDelegate { + rangeDidChangeClosure?(lowerBound...upperBound) + } + UIView.animate(withDuration: isRangePagingEnabled ? 0.1 : 0) { + self.layoutIfNeeded() + } + } + + // MARK: - Layout + + func layoutViews() { + cropFrameView.frame = CGRect(x: locationInView(for: lowerBound), + y: contentFrame.minY - Constants.cropIndocatorLineWidth, + width: locationInView(for: upperBound) - locationInView(for: lowerBound), + height: contentFrame.height + Constants.cropIndocatorLineWidth * 2) + + if chartView.frame != contentFrame { + chartView.frame = contentFrame + } + + lowerBoundTintView.frame = CGRect(x: contentFrame.minX, + y: contentFrame.minY, + width: max(0, locationInView(for: lowerBound) - contentFrame.minX + Constants.titntAreaWidth), + height: contentFrame.height) + + upperBoundTintView.frame = CGRect(x: locationInView(for: upperBound) - Constants.titntAreaWidth, + y: contentFrame.minY, + width: max(0, contentFrame.maxX - locationInView(for: upperBound) + Constants.titntAreaWidth), + height: contentFrame.height) + } +} + +extension RangeChartView: ColorModeContainer { + func apply(colorMode: ColorMode, animated: Bool) { + let colusre = { + self.lowerBoundTintView.backgroundColor = colorMode.rangeViewTintColor + self.upperBoundTintView.backgroundColor = colorMode.rangeViewTintColor + } + + self.cropFrameView.setImage(colorMode.rangeCropImage, animated: animated) + + // self.chartView.apply(colorMode: colorMode, animated: animated) + + if animated { + UIView.animate(withDuration: .defaultDuration, animations: colusre) + } else { + colusre() + } + } +} diff --git a/submodules/Charts/Sources/ChartNode.swift b/submodules/Charts/Sources/ChartNode.swift new file mode 100644 index 0000000000..b6c6da436c --- /dev/null +++ b/submodules/Charts/Sources/ChartNode.swift @@ -0,0 +1,48 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import AppBundle + +public final class ChartNode: ASDisplayNode { + private var chartView: ChartStackSection { + return self.view as! ChartStackSection + } + + public override init() { + super.init() + + self.setViewBlock({ + return ChartStackSection() + }) + } + + public override func didLoad() { + super.didLoad() + + self.view.disablesInteractiveTransitionGestureRecognizer = true + } + + public func setup(_ data: String, bar: Bool = false) { + if let data = data.data(using: .utf8) { + ChartsDataManager().readChart(data: data, extraCopiesCount: 0, sync: true, success: { [weak self] collection in + let controller: BaseChartController + if bar { + controller = DailyBarsChartController(chartsCollection: collection) + } else { + controller = GeneralLinesChartController(chartsCollection: collection) + } + if let strongSelf = self { + strongSelf.chartView.setup(controller: controller, title: "") + strongSelf.chartView.apply(colorMode: .day, animated: false) + } + }) { error in + + } + } + } + + required public init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +} diff --git a/submodules/Charts/Sources/Charts Reader/ChartsCollection.swift b/submodules/Charts/Sources/Charts Reader/ChartsCollection.swift new file mode 100644 index 0000000000..f3ecd8215d --- /dev/null +++ b/submodules/Charts/Sources/Charts Reader/ChartsCollection.swift @@ -0,0 +1,91 @@ +// +// ChardData.swift +// GraphTest +// +// Created by Andrei Salavei on 3/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import Foundation +import UIKit + +struct ChartsCollection { + struct Chart { + var color: UIColor + var name: String + var values: [Double] + } + + var axisValues: [Date] + var chartValues: [Chart] + + static let blank = ChartsCollection(axisValues: [], chartValues: []) + var isBlank: Bool { + return axisValues.isEmpty || chartValues.isEmpty + } +} + +extension ChartsCollection { + public init(from decodedData: [String: Any]) throws { + guard let columns = decodedData["columns"] as? [[Any]] else { + throw ChartsError.generalConversion("Unable to get columns from: \(decodedData)") + } + guard let types = decodedData["types"] as? [String: String] else { + throw ChartsError.generalConversion("Unable to get types from: \(decodedData)") + } + guard let names = decodedData["names"] as? [String: String] else { + throw ChartsError.generalConversion("Unable to get names from: \(decodedData)") + } + guard let colors = decodedData["colors"] as? [String: String] else { + throw ChartsError.generalConversion("Unable to get colors from: \(decodedData)") + } + +// chart.colors – Color for each variable in 6-hex-digit format (e.g. "#AAAAAA"). +// chart.names – Name for each variable. +// chart.percentage – true for percentage based values. +// chart.stacked – true for values stacking on top of each other. +// chart.y_scaled – true for charts with 2 Y axes. + + var axixValuesToSetup: [Date] = [] + var chartToSetup: [Chart] = [] + for column in columns { + guard let columnId = column.first as? String else { + throw ChartsError.generalConversion("Unable to get column name from: \(column)") + } + guard let typeString = types[columnId], let type = ColumnType(rawValue: typeString) else { + throw ChartsError.generalConversion("Unable to get column type from: \(types) - \(columnId)") + } + switch type { + case .axix: + axixValuesToSetup = try column.dropFirst().map { Date(timeIntervalSince1970: try Convert.doubleFrom($0) / 1000) } + case .chart, .bar, .area: + guard let colorString = colors[columnId], + let color = UIColor(hexString: colorString) else { + throw ChartsError.generalConversion("Unable to get color name from: \(colors) - \(columnId)") + } + guard let name = names[columnId] else { + throw ChartsError.generalConversion("Unable to get column name from: \(names) - \(columnId)") + } + let values = try column.dropFirst().map { try Convert.doubleFrom($0) } + chartToSetup.append(Chart(color: color, + name: name, + values: values)) + } + } + + guard axixValuesToSetup.isEmpty == false, + chartToSetup.isEmpty == false, + chartToSetup.firstIndex(where: { $0.values.count != axixValuesToSetup.count }) == nil else { + throw ChartsError.generalConversion("Saniazing: Invalid number of items: \(axixValuesToSetup), \(chartToSetup)") + } + self.axisValues = axixValuesToSetup + self.chartValues = chartToSetup + } +} + +private enum ColumnType: String { + case axix = "x" + case chart = "line" + case area = "area" + case bar = "bar" +} diff --git a/submodules/Charts/Sources/Charts Reader/ChartsDataManager.swift b/submodules/Charts/Sources/Charts Reader/ChartsDataManager.swift new file mode 100644 index 0000000000..1a32f9bcee --- /dev/null +++ b/submodules/Charts/Sources/Charts Reader/ChartsDataManager.swift @@ -0,0 +1,191 @@ +// +// ChartsDataManager.swift +// GraphTest +// +// Created by Andrei Salavei on 3/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import Foundation + +class ChartsDataManager { + func readChart(item: [String: Any], extraCopiesCount: Int = 0, sync: Bool, success: @escaping (ChartsCollection) -> Void, failure: @escaping (Error) -> Void) { + let workItem: (() -> Void) = { + do { + var collection = try ChartsCollection(from: item) + for _ in 0.. Void, failure: @escaping (Error) -> Void) { + let workItem: (() -> Void) = { + do { + let decoded = try JSONSerialization.jsonObject(with: data, options: []) + guard let item = decoded as? [String: Any] else { + throw ChartsError.invalidJson + } + var collection = try ChartsCollection(from: item) + for _ in 0.. Void, failure: @escaping (Error) -> Void) { + let workItem: (() -> Void) = { + do { + let data = try Data(contentsOf: file) + let decoded = try JSONSerialization.jsonObject(with: data, options: []) + guard let item = decoded as? [String: Any] else { + throw ChartsError.invalidJson + } + var collection = try ChartsCollection(from: item) + for _ in 0.. Void, failure: @escaping (Error) -> Void) { + let workItem: (() -> Void) = { + do { + let data = try Data(contentsOf: file) + let decoded = try JSONSerialization.jsonObject(with: data, options: []) + guard let items = decoded as? [[String: Any]] else { + throw ChartsError.invalidJson + } + var collections = try items.map { try ChartsCollection(from: $0) } + for _ in 0.. Double { + guard let double = try doubleFrom(value, lenientCast: false) else { + throw ChartsError.generalConversion("Unable to cast \(String(describing: value)) to \(Double.self)") + } + return double + } + + public static func doubleFrom(_ value: Any?, lenientCast: Bool = false) throws -> Double? { + guard let value = value else { + return nil + } + if let intValue = value as? Int { + return Double(intValue) + } else if let floatValue = value as? Float { + return Double(floatValue) + } else if let int64Value = value as? Int64 { + return Double(int64Value) + } else if let intValue = value as? Int { + return Double(intValue) + } else if let stringValue = value as? String { + if let doubleValue = Double(stringValue) { + return doubleValue + } + } + if lenientCast { + return nil + } else { + throw ChartsError.generalConversion("Unable to cast \(String(describing: value)) to \(Double.self)") + } + } +} diff --git a/submodules/Charts/Sources/Charts.h b/submodules/Charts/Sources/Charts.h new file mode 100644 index 0000000000..89573b3f16 --- /dev/null +++ b/submodules/Charts/Sources/Charts.h @@ -0,0 +1,19 @@ +// +// StatisticsUI.h +// StatisticsUI +// +// Created by Peter on 8/13/19. +// Copyright © 2019 Telegram Messenger LLP. All rights reserved. +// + +#import + +//! Project version number for StatisticsUI. +FOUNDATION_EXPORT double StatisticsUIVersionNumber; + +//! Project version string for StatisticsUI. +FOUNDATION_EXPORT const unsigned char StatisticsUIVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/submodules/Charts/Sources/Charts/Controllers/BaseChartController.swift b/submodules/Charts/Sources/Charts/Controllers/BaseChartController.swift new file mode 100644 index 0000000000..7f91e50ea5 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/BaseChartController.swift @@ -0,0 +1,166 @@ +// +// BaseChartController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +enum BaseConstants { + static let defaultRange: ClosedRange = 0...1 + static let minimumAxisYLabelsDistance: CGFloat = 90 + static let monthDayDateFormatter = DateFormatter.utc(format: "MMM d") + static let timeDateFormatter = DateFormatter.utc(format: "HH:mm") + static let headerFullRangeFormatter: DateFormatter = { + let formatter = DateFormatter.utc() + formatter.calendar = Calendar.utc + formatter.dateStyle = .long + return formatter + }() + static let headerMediumRangeFormatter: DateFormatter = { + let formatter = DateFormatter.utc() + formatter.dateStyle = .medium + return formatter + }() + static let headerFullZoomedFormatter: DateFormatter = { + let formatter = DateFormatter.utc() + formatter.dateStyle = .full + return formatter + }() + + static let verticalBaseAnchors: [CGFloat] = [8, 5, 2.5, 2, 1] + static let defaultVerticalBaseAnchor: CGFloat = 1 + + static let mainChartLineWidth: CGFloat = 2 + static let previewChartLineWidth: CGFloat = 1 + + static let previewLinesChartOptimizationLevel: CGFloat = 1.5 + static let linesChartOptimizationLevel: CGFloat = 1.0 + static let barsChartOptimizationLevel: CGFloat = 0.75 + + static let defaultRangePresetLength = TimeInterval.day * 60 + + static let chartNumberFormatter: ScalesNumberFormatter = { + let numberFormatter = ScalesNumberFormatter() + numberFormatter.allowsFloats = true + numberFormatter.numberStyle = .decimal + numberFormatter.usesGroupingSeparator = true + numberFormatter.groupingSeparator = " " + numberFormatter.minimumIntegerDigits = 1 + numberFormatter.minimumFractionDigits = 0 + numberFormatter.maximumFractionDigits = 2 + return numberFormatter + }() + + static let detailsNumberFormatter: NumberFormatter = { + let detailsNumberFormatter = NumberFormatter() + detailsNumberFormatter.allowsFloats = false + detailsNumberFormatter.numberStyle = .decimal + detailsNumberFormatter.usesGroupingSeparator = true + detailsNumberFormatter.groupingSeparator = " " + return detailsNumberFormatter + }() +} + +class BaseChartController: ColorModeContainer { + //let performanceRenderer = PerformanceRenderer() + var initialChartsCollection: ChartsCollection + var isZoomed: Bool = false + + var chartTitle: String = "" + + init(chartsCollection: ChartsCollection) { + self.initialChartsCollection = chartsCollection + } + + var mainChartRenderers: [ChartViewRenderer] { + fatalError("Abstract") + } + + var navigationRenderers: [ChartViewRenderer] { + fatalError("Abstract") + } + + var cartViewBounds: (() -> CGRect) = { fatalError() } + var chartFrame: (() -> CGRect) = { fatalError() } + + func initializeChart() { + fatalError("Abstract") + } + + func chartInteractionDidBegin(point: CGPoint) { + fatalError("Abstract") + } + + func chartInteractionDidEnd() { + fatalError("Abstract") + } + + func cancelChartInteraction() { + fatalError("Abstract") + } + + func didTapZoomOut() { + fatalError("Abstract") + } + + func updateChartsVisibility(visibility: [Bool], animated: Bool) { + fatalError("Abstract") + } + + var currentHorizontalRange: ClosedRange { + fatalError("Abstract") + } + + var isChartRangePagingEnabled: Bool = false + var minimumSelectedChartRange: CGFloat = 0.05 + var chartRangePagingClosure: ((Bool, CGFloat) -> Void)? // isEnabled, PageSize + func setChartRangePagingEnabled(isEnabled: Bool, minimumSelectionSize: CGFloat) { + isChartRangePagingEnabled = isEnabled + minimumSelectedChartRange = minimumSelectionSize + chartRangePagingClosure?(isChartRangePagingEnabled, minimumSelectedChartRange) + } + + var chartRangeUpdatedClosure: ((ClosedRange, Bool) -> Void)? + var currentChartHorizontalRangeFraction: ClosedRange { + fatalError("Abstract") + } + + func updateChartRange(_ rangeFraction: ClosedRange) { + fatalError("Abstract") + } + + var actualChartVisibility: [Bool] { + fatalError("Abstract") + } + + var actualChartsCollection: ChartsCollection { + fatalError("Abstract") + } + + var drawChartVisibity: Bool { + return true + } + + var drawChartNavigation: Bool { + return true + } + + var setDetailsViewPositionClosure: ((CGFloat) -> Void)? + var setDetailsChartVisibleClosure: ((Bool, Bool) -> Void)? + var setDetailsViewModel: ((ChartDetailsViewModel, Bool) -> Void)? + var getDetailsData: ((Date, @escaping (ChartsCollection?) -> Void) -> Void)? + var setChartTitleClosure: ((String, Bool) -> Void)? + var setBackButtonVisibilityClosure: ((Bool, Bool) -> Void)? + var refreshChartToolsClosure: ((Bool) -> Void)? + + func didTapZoomIn(date: Date) { + fatalError("Abstract") + } + + func apply(colorMode: ColorMode, animated: Bool) { + + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/GeneralChartComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/GeneralChartComponentController.swift new file mode 100644 index 0000000000..284be92d3b --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/GeneralChartComponentController.swift @@ -0,0 +1,328 @@ +// +// GeneralChartComponentController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +enum GeneralChartComponentConstants { + static let defaultInitialRangeLength = CGFloat(TimeInterval.day * 60) + static let defaultZoomedRangeLength = CGFloat(TimeInterval.day) +} + +class GeneralChartComponentController: ColorModeContainer { + var chartsCollection: ChartsCollection = ChartsCollection.blank + var chartVisibility: [Bool] = [] + var lastChartInteractionPoint: CGPoint = .zero + var isChartInteractionBegun: Bool = false + var isChartInteracting: Bool = false + let isZoomed: Bool + + var colorMode: ColorMode = .day + var totalHorizontalRange: ClosedRange = BaseConstants.defaultRange + var totalVerticalRange: ClosedRange = BaseConstants.defaultRange + var initialHorizontalRange: ClosedRange = BaseConstants.defaultRange + var initialVerticalRange: ClosedRange = BaseConstants.defaultRange + + var cartViewBounds: (() -> CGRect) = { fatalError() } + var chartFrame: (() -> CGRect) = { fatalError() } + + init(isZoomed: Bool) { + self.isZoomed = isZoomed + } + + func initialize(chartsCollection: ChartsCollection, + initialDate: Date, + totalHorizontalRange: ClosedRange, + totalVerticalRange: ClosedRange) { + self.chartsCollection = chartsCollection + self.chartVisibility = Array(repeating: true, count: chartsCollection.chartValues.count) + self.totalHorizontalRange = totalHorizontalRange + self.totalVerticalRange = totalVerticalRange + self.initialHorizontalRange = totalHorizontalRange + self.initialVerticalRange = totalVerticalRange + + didLoad() + setupInitialChartRange(initialDate: initialDate) + } + + func didLoad() { + hideDetailsView(animated: false) + } + func willAppear(animated: Bool) { + updateChartRangeTitle(animated: animated) + setupChartRangePaging() + } + func willDisappear(animated: Bool) { + } + + func setupInitialChartRange(initialDate: Date) { + guard let first = chartsCollection.axisValues.first?.timeIntervalSince1970, + let last = chartsCollection.axisValues.last?.timeIntervalSince1970 else { return } + + let rangeStart = CGFloat(first) + let rangeEnd = CGFloat(last) + + if isZoomed { + let initalDate = CGFloat(initialDate.timeIntervalSince1970) + + initialHorizontalRange = max(initalDate, rangeStart)...min(initalDate + GeneralChartComponentConstants.defaultZoomedRangeLength, rangeEnd) + initialVerticalRange = totalVerticalRange + } else { + initialHorizontalRange = max(rangeStart, rangeEnd - GeneralChartComponentConstants.defaultInitialRangeLength)...rangeEnd + initialVerticalRange = totalVerticalRange + } + } + func setupChartRangePaging() { + chartRangePagingClosure?(false, 0.05) + } + + var visibleHorizontalMainChartRange: ClosedRange { + return currentMainRangeRenderer.verticalRange.current + } + var visibleVerticalMainChartRange: ClosedRange { + return currentMainRangeRenderer.verticalRange.current + } + var currentHorizontalMainChartRange: ClosedRange { + return currentMainRangeRenderer.horizontalRange.end + } + var currentVerticalMainChartRange: ClosedRange { + return currentMainRangeRenderer.verticalRange.end + } + var currentMainRangeRenderer: BaseChartRenderer { + fatalError("Abstract") + } + + var visiblePreviewHorizontalRange: ClosedRange { + return currentPreviewRangeRenderer.verticalRange.current + } + var visiblePreviewVerticalRange: ClosedRange { + return currentPreviewRangeRenderer.verticalRange.current + } + var currentPreviewHorizontalRange: ClosedRange { + return currentPreviewRangeRenderer.horizontalRange.end + } + var currentPreviewVerticalRange: ClosedRange { + return currentPreviewRangeRenderer.verticalRange.end + } + var currentPreviewRangeRenderer: BaseChartRenderer { + fatalError("Abstract") + } + + var mainChartRenderers: [ChartViewRenderer] { + fatalError("Abstract") + } + var previewRenderers: [ChartViewRenderer] { + fatalError("Abstract") + } + + func updateChartsVisibility(visibility: [Bool], animated: Bool) { + self.chartVisibility = visibility + if isChartInteractionBegun { + chartInteractionDidBegin(point: lastChartInteractionPoint) + } + } + + var currentChartHorizontalRangeFraction: ClosedRange { + let lowerPercent = (currentHorizontalMainChartRange.lowerBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + let upperPercent = (currentHorizontalMainChartRange.upperBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + return lowerPercent...upperPercent + } + + func chartRangeFractionDidUpdated(_ rangeFraction: ClosedRange) { + let horizontalRange = ClosedRange(uncheckedBounds: + (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, + upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) + chartRangeDidUpdated(horizontalRange) + updateChartRangeTitle(animated: true) + } + + func chartRangeDidUpdated(_ updatedRange: ClosedRange) { + hideDetailsView(animated: true) + + if isChartInteractionBegun { + chartInteractionDidBegin(point: lastChartInteractionPoint) + } + } + + // MARK: - Details & Interaction + func findClosestDateTo(dateToFind: Date) -> (Date, Int)? { + guard chartsCollection.axisValues.count > 0 else { return nil } + var closestDate = chartsCollection.axisValues[0] + var minIndex = 0 + for (index, date) in chartsCollection.axisValues.enumerated() { + if abs(dateToFind.timeIntervalSince(date)) < abs(dateToFind.timeIntervalSince(closestDate)) { + closestDate = date + minIndex = index + } + } + return (closestDate, minIndex) + } + + func chartInteractionDidBegin(point: CGPoint) { + let chartFrame = self.chartFrame() + guard chartFrame.width > 0 else { return } + let horizontalRange = currentHorizontalMainChartRange + let dateToFind = Date(timeIntervalSince1970: TimeInterval(horizontalRange.distance * point.x + horizontalRange.lowerBound)) + guard let (closestDate, minIndex) = findClosestDateTo(dateToFind: dateToFind) else { return } + + let chartWasInteracting = isChartInteractionBegun + lastChartInteractionPoint = point + isChartInteractionBegun = true + isChartInteracting = true + + let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) + let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX + showDetailsView(at: chartValue, detailsViewPosition: detailsViewPosition, dataIndex: minIndex, date: closestDate, animted: chartWasInteracting) + } + + func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { + setDetailsViewModel?(chartDetailsViewModel(closestDate: date, pointIndex: dataIndex), animted) + setDetailsChartVisibleClosure?(true, true) + setDetailsViewPositionClosure?(detailsViewPosition) + } + + func chartInteractionDidEnd() { + isChartInteracting = false + } + + func hideDetailsView(animated: Bool) { + isChartInteractionBegun = false + setDetailsChartVisibleClosure?(false, animated) + } + + var visibleDetailsChartValues: [ChartsCollection.Chart] { + let visibleCharts: [ChartsCollection.Chart] = chartVisibility.enumerated().compactMap { args in + args.element ? chartsCollection.chartValues[args.offset] : nil + } + return visibleCharts + } + + var updatePreviewRangeClosure: ((ClosedRange, Bool) -> Void)? + var zoomInOnDateClosure: ((Date) -> Void)? + var setChartTitleClosure: ((String, Bool) -> Void)? + var setDetailsViewPositionClosure: ((CGFloat) -> Void)? + var setDetailsChartVisibleClosure: ((Bool, Bool) -> Void)? + var setDetailsViewModel: ((ChartDetailsViewModel, Bool) -> Void)? + var chartRangePagingClosure: ((Bool, CGFloat) -> Void)? // isEnabled, PageSize + + func apply(colorMode: ColorMode, animated: Bool) { + self.colorMode = colorMode + } + +// MARK: - Helpers + var prevoiusHorizontalStrideInterval: Int = -1 + func updateHorizontalLimitLabels(horizontalScalesRenderer: HorizontalScalesRenderer, + horizontalRange: ClosedRange, + scaleType: ChartScaleType, + forceUpdate: Bool, + animated: Bool) { + let scaleTimeInterval: TimeInterval + if chartsCollection.axisValues.count >= 1 { + scaleTimeInterval = chartsCollection.axisValues[1].timeIntervalSince1970 - chartsCollection.axisValues[0].timeIntervalSince1970 + } else { + scaleTimeInterval = scaleType.timeInterval + } + + let numberOfItems = horizontalRange.distance / CGFloat(scaleTimeInterval) + let maximumNumberOfItems = chartFrame().width / scaleType.minimumAxisXDistance + let tempStride = max(1, Int((numberOfItems / maximumNumberOfItems).rounded(.up))) + var strideInterval = 1 + while strideInterval < tempStride { + strideInterval *= 2 + } + + if forceUpdate || (strideInterval != prevoiusHorizontalStrideInterval && strideInterval > 0) { + var labels: [LinesChartLabel] = [] + for index in stride(from: chartsCollection.axisValues.count - 1, to: -1, by: -strideInterval).reversed() { + let date = chartsCollection.axisValues[index] + labels.append(LinesChartLabel(value: CGFloat(date.timeIntervalSince1970), + text: scaleType.dateFormatter.string(from: date))) + } + prevoiusHorizontalStrideInterval = strideInterval + horizontalScalesRenderer.setup(labels: labels, animated: animated) + } + } + + func verticalLimitsLabels(verticalRange: ClosedRange) -> (ClosedRange, [LinesChartLabel]) { + let ditance = verticalRange.distance + let chartHeight = chartFrame().height + + guard ditance > 0, chartHeight > 0 else { return (BaseConstants.defaultRange, []) } + + let approximateNumberOfChartValues = (chartHeight / BaseConstants.minimumAxisYLabelsDistance) + + var numberOfOffsetsPerItem = ditance / approximateNumberOfChartValues + var multiplier: CGFloat = 1.0 + while numberOfOffsetsPerItem > 10 { + numberOfOffsetsPerItem /= 10 + multiplier *= 10 + } + var dividor: CGFloat = 1.0 + var maximumNumberOfDecimals = 2 + while numberOfOffsetsPerItem < 1 { + numberOfOffsetsPerItem *= 10 + dividor *= 10 + maximumNumberOfDecimals += 1 + } + + var base: CGFloat = BaseConstants.verticalBaseAnchors.first { numberOfOffsetsPerItem > $0 } ?? BaseConstants.defaultVerticalBaseAnchor + base = base * multiplier / dividor + + var verticalLabels: [LinesChartLabel] = [] + var verticalValue = (verticalRange.lowerBound / base).rounded(.down) * base + let lowerBound = verticalValue + + let numberFormatter = BaseConstants.chartNumberFormatter + numberFormatter.maximumFractionDigits = maximumNumberOfDecimals + while verticalValue < verticalRange.upperBound { + let text: String = numberFormatter.string(from: NSNumber(value: Double(verticalValue))) ?? "" + + verticalLabels.append(LinesChartLabel(value: verticalValue, text: text)) + verticalValue += base + } + let updatedRange = lowerBound...verticalValue + + return (updatedRange, verticalLabels) + } + + func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { + let values: [ChartDetailsViewModel.Value] = chartsCollection.chartValues.enumerated().map { arg in + let (index, component) = arg + return ChartDetailsViewModel.Value(prefix: nil, + title: component.name, + value: BaseConstants.detailsNumberFormatter.string(from: NSNumber(value: component.values[pointIndex])) ?? "", + color: component.color, + visible: chartVisibility[index]) + } + let dateString: String + if isZoomed { + dateString = BaseConstants.timeDateFormatter.string(from: closestDate) + } else { + dateString = BaseConstants.headerMediumRangeFormatter.string(from: closestDate) + } + let viewModel = ChartDetailsViewModel(title: dateString, + showArrow: !self.isZoomed, + showPrefixes: false, + values: values, + totalValue: nil, + tapAction: { [weak self] in + self?.zoomInOnDateClosure?(closestDate) }) + return viewModel + } + + func updateChartRangeTitle(animated: Bool) { + let fromDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.lowerBound) + 1) + let toDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.upperBound)) + if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { + let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) + self.setChartTitleClosure?(stirng, animated) + } else { + let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" + self.setChartTitleClosure?(stirng, animated) + } + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift new file mode 100644 index 0000000000..60d5069d10 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift @@ -0,0 +1,236 @@ +// +// BaseLinesChartController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/14/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class BaseLinesChartController: BaseChartController { + var chartVisibility: [Bool] + var zoomChartVisibility: [Bool] + var lastChartInteractionPoint: CGPoint = .zero + var isChartInteractionBegun: Bool = false + + var initialChartRange: ClosedRange = BaseConstants.defaultRange + var zoomedChartRange: ClosedRange = BaseConstants.defaultRange + + override init(chartsCollection: ChartsCollection) { + self.chartVisibility = Array(repeating: true, count: chartsCollection.chartValues.count) + self.zoomChartVisibility = [] + super.init(chartsCollection: chartsCollection) + } + + func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { + if animated { + TimeInterval.setDefaultSuration(.expandAnimationDuration) + DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { + TimeInterval.setDefaultSuration(.osXDuration) + } + } + + self.initialChartsCollection = chartsCollection + self.isZoomed = isZoomed + + self.setBackButtonVisibilityClosure?(isZoomed, animated) + + updateChartRangeTitle(animated: animated) + } + + func updateChartRangeTitle(animated: Bool) { + let fromDate = Date(timeIntervalSince1970: TimeInterval(zoomedChartRange.lowerBound) + .hour) + let toDate = Date(timeIntervalSince1970: TimeInterval(zoomedChartRange.upperBound)) + if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { + let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) + self.setChartTitleClosure?(stirng, animated) + } else { + let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" + self.setChartTitleClosure?(stirng, animated) + } + } + + override func chartInteractionDidBegin(point: CGPoint) { + lastChartInteractionPoint = point + isChartInteractionBegun = true + } + + override func chartInteractionDidEnd() { + + } + + override func cancelChartInteraction() { + isChartInteractionBegun = false + } + + override func updateChartRange(_ rangeFraction: ClosedRange) { + + } + + override var actualChartVisibility: [Bool] { + return isZoomed ? zoomChartVisibility : chartVisibility + } + + override var actualChartsCollection: ChartsCollection { + return initialChartsCollection + } + + var visibleChartValues: [ChartsCollection.Chart] { + let visibleCharts: [ChartsCollection.Chart] = actualChartVisibility.enumerated().compactMap { args in + args.element ? initialChartsCollection.chartValues[args.offset] : nil + } + return visibleCharts + } + + + func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { + let values: [ChartDetailsViewModel.Value] = actualChartsCollection.chartValues.enumerated().map { arg in + let (index, component) = arg + return ChartDetailsViewModel.Value(prefix: nil, + title: component.name, + value: BaseConstants.detailsNumberFormatter.string(from: component.values[pointIndex]), + color: component.color, + visible: actualChartVisibility[index]) + } + let dateString: String + if isZoomed { + dateString = BaseConstants.timeDateFormatter.string(from: closestDate) + } else { + dateString = BaseConstants.headerMediumRangeFormatter.string(from: closestDate) + } + let viewModel = ChartDetailsViewModel(title: dateString, + showArrow: !self.isZoomed, + showPrefixes: false, + values: values, + totalValue: nil, + tapAction: { [weak self] in self?.didTapZoomIn(date: closestDate) }) + return viewModel + } + + override func didTapZoomIn(date: Date) { + guard isZoomed == false else { return } + cancelChartInteraction() + self.getDetailsData?(date, { updatedCollection in + if let updatedCollection = updatedCollection { + self.initialChartRange = self.currentHorizontalRange + if let startDate = updatedCollection.axisValues.first, + let endDate = updatedCollection.axisValues.last { + self.zoomedChartRange = CGFloat(max(date.timeIntervalSince1970, startDate.timeIntervalSince1970))...CGFloat(min(date.timeIntervalSince1970 + .day - .hour, endDate.timeIntervalSince1970)) + } else { + self.zoomedChartRange = CGFloat(date.timeIntervalSince1970)...CGFloat(date.timeIntervalSince1970 + .day - 1) + } + self.setupChartCollection(chartsCollection: updatedCollection, animated: true, isZoomed: true) + } + }) + } + + func horizontalLimitsLabels(horizontalRange: ClosedRange, + scaleType: ChartScaleType, + prevoiusHorizontalStrideInterval: Int) -> (Int, [LinesChartLabel])? { + let numberOfItems = horizontalRange.distance / CGFloat(scaleType.timeInterval) + let maximumNumberOfItems = chartFrame().width / scaleType.minimumAxisXDistance + let tempStride = max(1, Int((numberOfItems / maximumNumberOfItems).rounded(.up))) + var strideInterval = 1 + while strideInterval < tempStride { + strideInterval *= 2 + } + + if strideInterval != prevoiusHorizontalStrideInterval && strideInterval > 0 { + var labels: [LinesChartLabel] = [] + for index in stride(from: initialChartsCollection.axisValues.count - 1, to: -1, by: -strideInterval).reversed() { + let date = initialChartsCollection.axisValues[index] + labels.append(LinesChartLabel(value: CGFloat(date.timeIntervalSince1970), + text: scaleType.dateFormatter.string(from: date))) + } + return (strideInterval, labels) + } + return nil + } + + func findClosestDateTo(dateToFind: Date) -> (Date, Int)? { + guard initialChartsCollection.axisValues.count > 0 else { return nil } + var closestDate = initialChartsCollection.axisValues[0] + var minIndex = 0 + for (index, date) in initialChartsCollection.axisValues.enumerated() { + if abs(dateToFind.timeIntervalSince(date)) < abs(dateToFind.timeIntervalSince(closestDate)) { + closestDate = date + minIndex = index + } + } + return (closestDate, minIndex) + } + + func verticalLimitsLabels(verticalRange: ClosedRange) -> (ClosedRange, [LinesChartLabel]) { + let ditance = verticalRange.distance + let chartHeight = chartFrame().height + + guard ditance > 0, chartHeight > 0 else { return (BaseConstants.defaultRange, []) } + + let approximateNumberOfChartValues = (chartHeight / BaseConstants.minimumAxisYLabelsDistance) + + var numberOfOffsetsPerItem = ditance / approximateNumberOfChartValues + var multiplier: CGFloat = 1.0 + while numberOfOffsetsPerItem > 10 { + numberOfOffsetsPerItem /= 10 + multiplier *= 10 + } + var dividor: CGFloat = 1.0 + var maximumNumberOfDecimals = 2 + while numberOfOffsetsPerItem < 1 { + numberOfOffsetsPerItem *= 10 + dividor *= 10 + maximumNumberOfDecimals += 1 + } + + var base: CGFloat = BaseConstants.verticalBaseAnchors.first { numberOfOffsetsPerItem > $0 } ?? BaseConstants.defaultVerticalBaseAnchor + base = base * multiplier / dividor + + var verticalLabels: [LinesChartLabel] = [] + var verticalValue = (verticalRange.lowerBound / base).rounded(.down) * base + let lowerBound = verticalValue + + let numberFormatter = BaseConstants.chartNumberFormatter + numberFormatter.maximumFractionDigits = maximumNumberOfDecimals + while verticalValue < verticalRange.upperBound { + let text: String = numberFormatter.string(from: NSNumber(value: Double(verticalValue))) ?? "" + + verticalLabels.append(LinesChartLabel(value: verticalValue, text: text)) + verticalValue += base + } + let updatedRange = lowerBound...verticalValue + + return (updatedRange, verticalLabels) + } +} + +enum ChartScaleType { + case day + case hour + case minutes5 +} + +extension ChartScaleType { + var timeInterval: TimeInterval { + switch self { + case .day: return .day + case .hour: return .hour + case .minutes5: return .minute * 5 + } + } + + var minimumAxisXDistance: CGFloat { + switch self { + case .day: return 50 + case .hour: return 40 + case .minutes5: return 40 + } + } + var dateFormatter: DateFormatter { + switch self { + case .day: return BaseConstants.monthDayDateFormatter + case .hour: return BaseConstants.timeDateFormatter + case .minutes5: return BaseConstants.timeDateFormatter + } + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift new file mode 100644 index 0000000000..3d52888d72 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift @@ -0,0 +1,247 @@ +// +// LinesChartController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private enum Constants { + static let defaultRange: ClosedRange = 0...1 +} + +class GeneralLinesChartController: BaseLinesChartController { + private let initialChartCollection: ChartsCollection + + private let mainLinesRenderer = LinesChartRenderer() + private let horizontalScalesRenderer = HorizontalScalesRenderer() + private let verticalScalesRenderer = VerticalScalesRenderer() + private let verticalLineRenderer = VerticalLinesRenderer() + private let lineBulletsRenerer = LineBulletsRenerer() + + private let previewLinesRenderer = LinesChartRenderer() + + private var totalVerticalRange: ClosedRange = Constants.defaultRange + private var totalHorizontalRange: ClosedRange = Constants.defaultRange + + private var prevoiusHorizontalStrideInterval: Int = 1 + + private (set) var chartLines: [LinesChartRenderer.LineData] = [] + + override init(chartsCollection: ChartsCollection) { + self.initialChartCollection = chartsCollection + self.mainLinesRenderer.lineWidth = 2 + self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel + self.previewLinesRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel + + self.lineBulletsRenerer.isEnabled = false + + super.init(chartsCollection: chartsCollection) + self.zoomChartVisibility = chartVisibility + } + + override func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { + super.setupChartCollection(chartsCollection: chartsCollection, animated: animated, isZoomed: isZoomed) + + self.chartLines = chartsCollection.chartValues.map { chart in + let points = chart.values.enumerated().map({ (arg) -> CGPoint in + return CGPoint(x: chartsCollection.axisValues[arg.offset].timeIntervalSince1970, + y: arg.element) + }) + return LinesChartRenderer.LineData(color: chart.color, points: points) + } + + self.prevoiusHorizontalStrideInterval = -1 + self.totalVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: chartLines) ?? Constants.defaultRange + self.totalHorizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: chartLines) ?? Constants.defaultRange + self.lineBulletsRenerer.bullets = self.chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, + color: $0.color)} + + let chartRange: ClosedRange + if isZoomed { + chartRange = zoomedChartRange + } else { + chartRange = initialChartRange + } + + self.previewLinesRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) + self.previewLinesRenderer.setup(verticalRange: totalVerticalRange, animated: animated) + + self.mainLinesRenderer.setLines(lines: chartLines, animated: animated) + self.previewLinesRenderer.setLines(lines: chartLines, animated: animated) + + updateHorizontalLimists(horizontalRange: chartRange, animated: animated) + updateMainChartHorizontalRange(range: chartRange, animated: animated) + updateVerticalLimitsAndRange(horizontalRange: chartRange, animated: animated) + + self.chartRangeUpdatedClosure?(currentChartHorizontalRangeFraction, animated) + } + + override func initializeChart() { + if let first = initialChartCollection.axisValues.first?.timeIntervalSince1970, + let last = initialChartCollection.axisValues.last?.timeIntervalSince1970 { + initialChartRange = CGFloat(max(first, last - BaseConstants.defaultRangePresetLength))...CGFloat(last) + } + setupChartCollection(chartsCollection: initialChartCollection, animated: false, isZoomed: false) + } + + override var mainChartRenderers: [ChartViewRenderer] { + return [//performanceRenderer, + mainLinesRenderer, + horizontalScalesRenderer, + verticalScalesRenderer, + verticalLineRenderer, + lineBulletsRenerer + ] + } + + override var navigationRenderers: [ChartViewRenderer] { + return [previewLinesRenderer] + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + chartVisibility = visibility + zoomChartVisibility = visibility + for (index, isVisible) in visibility.enumerated() { + mainLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) + previewLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) + lineBulletsRenerer.setLineVisible(isVisible, at: index, animated: animated) + } + + updateVerticalLimitsAndRange(horizontalRange: currentHorizontalRange, animated: true) + + if isChartInteractionBegun { + chartInteractionDidBegin(point: lastChartInteractionPoint) + } + } + + override func chartInteractionDidBegin(point: CGPoint) { + let horizontalRange = mainLinesRenderer.horizontalRange.current + let chartFrame = self.chartFrame() + guard chartFrame.width > 0 else { return } + let chartInteractionWasBegin = isChartInteractionBegun + + let dateToFind = Date(timeIntervalSince1970: TimeInterval(horizontalRange.distance * point.x + horizontalRange.lowerBound)) + guard let (closestDate, minIndex) = findClosestDateTo(dateToFind: dateToFind) else { return } + + super.chartInteractionDidBegin(point: point) + + self.lineBulletsRenerer.bullets = chartLines.compactMap { chart in + return LineBulletsRenerer.Bullet(coordinate: chart.points[minIndex], color: chart.color) + } + self.lineBulletsRenerer.isEnabled = true + + let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) + let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX + self.setDetailsViewModel?(chartDetailsViewModel(closestDate: closestDate, pointIndex: minIndex), chartInteractionWasBegin) + self.setDetailsChartVisibleClosure?(true, true) + self.setDetailsViewPositionClosure?(detailsViewPosition) + self.verticalLineRenderer.values = [chartValue] + } + + + override var currentChartHorizontalRangeFraction: ClosedRange { + let lowerPercent = (currentHorizontalRange.lowerBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + let upperPercent = (currentHorizontalRange.upperBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + return lowerPercent...upperPercent + } + + override var currentHorizontalRange: ClosedRange { + return mainLinesRenderer.horizontalRange.end + } + + override func cancelChartInteraction() { + super.cancelChartInteraction() + self.lineBulletsRenerer.isEnabled = false + + self.setDetailsChartVisibleClosure?(false, true) + self.verticalLineRenderer.values = [] + } + + override func didTapZoomOut() { + cancelChartInteraction() + self.setupChartCollection(chartsCollection: initialChartCollection, animated: true, isZoomed: false) + } + + var visibleCharts: [LinesChartRenderer.LineData] { + let visibleCharts: [LinesChartRenderer.LineData] = chartVisibility.enumerated().compactMap { args in + args.element ? chartLines[args.offset] : nil + } + return visibleCharts + } + + override func updateChartRange(_ rangeFraction: ClosedRange) { + cancelChartInteraction() + + let horizontalRange = ClosedRange(uncheckedBounds: + (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, + upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) + + zoomedChartRange = horizontalRange + updateChartRangeTitle(animated: true) + + updateMainChartHorizontalRange(range: horizontalRange, animated: false) + updateHorizontalLimists(horizontalRange: horizontalRange, animated: true) + updateVerticalLimitsAndRange(horizontalRange: horizontalRange, animated: true) + } + + func updateMainChartHorizontalRange(range: ClosedRange, animated: Bool) { + mainLinesRenderer.setup(horizontalRange: range, animated: animated) + horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) + verticalScalesRenderer.setup(horizontalRange: range, animated: animated) + verticalLineRenderer.setup(horizontalRange: range, animated: animated) + lineBulletsRenerer.setup(horizontalRange: range, animated: animated) + } + + func updateMainChartVerticalRange(range: ClosedRange, animated: Bool) { + mainLinesRenderer.setup(verticalRange: range, animated: animated) + horizontalScalesRenderer.setup(verticalRange: range, animated: animated) + verticalScalesRenderer.setup(verticalRange: range, animated: animated) + verticalLineRenderer.setup(verticalRange: range, animated: animated) + lineBulletsRenerer.setup(verticalRange: range, animated: animated) + } + + func updateHorizontalLimists(horizontalRange: ClosedRange, animated: Bool) { + if let (stride, labels) = horizontalLimitsLabels(horizontalRange: horizontalRange, + scaleType: isZoomed ? .hour : .day, + prevoiusHorizontalStrideInterval: prevoiusHorizontalStrideInterval) { + self.horizontalScalesRenderer.setup(labels: labels, animated: animated) + self.prevoiusHorizontalStrideInterval = stride + } + } + + func updateVerticalLimitsAndRange(horizontalRange: ClosedRange, animated: Bool) { + if let verticalRange = LinesChartRenderer.LineData.verticalRange(lines: visibleCharts, + calculatingRange: horizontalRange, + addBounds: true) { + + + let (range, labels) = verticalLimitsLabels(verticalRange: verticalRange) + + if verticalScalesRenderer.verticalRange.end != range { + verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: animated) + updateMainChartVerticalRange(range: range, animated: animated) + } + verticalScalesRenderer.setVisible(true, animated: animated) + } else { + verticalScalesRenderer.setVisible(false, animated: animated) + } + + guard let previewVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: visibleCharts) else { return } + + if previewLinesRenderer.verticalRange.end != previewVerticalRange { + previewLinesRenderer.setup(verticalRange: previewVerticalRange, animated: animated) + } + } + + override func apply(colorMode: ColorMode, animated: Bool) { + horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor + verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor + lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) + verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift new file mode 100644 index 0000000000..251e76271e --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift @@ -0,0 +1,306 @@ +// +// TwoAxisLinesChartController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private enum Constants { + static let verticalBaseAnchors: [CGFloat] = [8, 5, 4, 2.5, 2, 1] + static let defaultRange: ClosedRange = 0...1 +} + +class TwoAxisLinesChartController: BaseLinesChartController { + class GraphController { + let mainLinesRenderer = LinesChartRenderer() + let verticalScalesRenderer = VerticalScalesRenderer() + let lineBulletsRenerer = LineBulletsRenerer() + let previewLinesRenderer = LinesChartRenderer() + + var chartLines: [LinesChartRenderer.LineData] = [] + + var totalVerticalRange: ClosedRange = Constants.defaultRange + + init() { + self.mainLinesRenderer.lineWidth = 2 + self.previewLinesRenderer.lineWidth = 1 + self.lineBulletsRenerer.isEnabled = false + + self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel + self.previewLinesRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel + } + + func updateMainChartVerticalRange(range: ClosedRange, animated: Bool) { + mainLinesRenderer.setup(verticalRange: range, animated: animated) + verticalScalesRenderer.setup(verticalRange: range, animated: animated) + lineBulletsRenerer.setup(verticalRange: range, animated: animated) + } + } + + private var graphControllers: [GraphController] = [] + private let verticalLineRenderer = VerticalLinesRenderer() + private let horizontalScalesRenderer = HorizontalScalesRenderer() + + var totalHorizontalRange: ClosedRange = Constants.defaultRange + + private let initialChartCollection: ChartsCollection + + private var prevoiusHorizontalStrideInterval: Int = 1 + + override init(chartsCollection: ChartsCollection) { + self.initialChartCollection = chartsCollection + graphControllers = chartsCollection.chartValues.map { _ in GraphController() } + + super.init(chartsCollection: chartsCollection) + self.zoomChartVisibility = chartVisibility + } + + override func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { + super.setupChartCollection(chartsCollection: chartsCollection, animated: animated, isZoomed: isZoomed) + + for (index, controller) in self.graphControllers.enumerated() { + let chart = chartsCollection.chartValues[index] + let points = chart.values.enumerated().map({ (arg) -> CGPoint in + return CGPoint(x: chartsCollection.axisValues[arg.offset].timeIntervalSince1970, + y: arg.element) + }) + let chartLines = [LinesChartRenderer.LineData(color: chart.color, points: points)] + controller.chartLines = [LinesChartRenderer.LineData(color: chart.color, points: points)] + controller.verticalScalesRenderer.labelsColor = chart.color + controller.totalVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: chartLines) ?? Constants.defaultRange + self.totalHorizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: chartLines) ?? Constants.defaultRange + controller.lineBulletsRenerer.bullets = chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, + color: $0.color) } + controller.previewLinesRenderer.setup(horizontalRange: self.totalHorizontalRange, animated: animated) + controller.previewLinesRenderer.setup(verticalRange: controller.totalVerticalRange, animated: animated) + controller.mainLinesRenderer.setLines(lines: chartLines, animated: animated) + controller.previewLinesRenderer.setLines(lines: chartLines, animated: animated) + + controller.verticalScalesRenderer.setHorizontalLinesVisible((index == 0), animated: animated) + controller.verticalScalesRenderer.isRightAligned = (index != 0) + } + + self.prevoiusHorizontalStrideInterval = -1 + + let chartRange: ClosedRange + if isZoomed { + chartRange = zoomedChartRange + } else { + chartRange = initialChartRange + } + + updateHorizontalLimists(horizontalRange: chartRange, animated: animated) + updateMainChartHorizontalRange(range: chartRange, animated: animated) + updateVerticalLimitsAndRange(horizontalRange: chartRange, animated: animated) + + self.chartRangeUpdatedClosure?(currentChartHorizontalRangeFraction, animated) + } + + override func initializeChart() { + if let first = initialChartCollection.axisValues.first?.timeIntervalSince1970, + let last = initialChartCollection.axisValues.last?.timeIntervalSince1970 { + initialChartRange = CGFloat(max(first, last - BaseConstants.defaultRangePresetLength))...CGFloat(last) + } + setupChartCollection(chartsCollection: initialChartCollection, animated: false, isZoomed: false) + } + + override var mainChartRenderers: [ChartViewRenderer] { + return graphControllers.map { $0.mainLinesRenderer } + + graphControllers.flatMap { [$0.verticalScalesRenderer, $0.lineBulletsRenerer] } + + [horizontalScalesRenderer, verticalLineRenderer, +// performanceRenderer + ] + } + + override var navigationRenderers: [ChartViewRenderer] { + return graphControllers.map { $0.previewLinesRenderer } + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + chartVisibility = visibility + zoomChartVisibility = visibility + let firstIndex = visibility.firstIndex(where: { $0 }) + for (index, isVisible) in visibility.enumerated() { + let graph = graphControllers[index] + for graphIndex in graph.chartLines.indices { + graph.mainLinesRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) + graph.previewLinesRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) + graph.lineBulletsRenerer.setLineVisible(isVisible, at: graphIndex, animated: animated) + } + graph.verticalScalesRenderer.setVisible(isVisible, animated: animated) + if let firstIndex = firstIndex { + graph.verticalScalesRenderer.setHorizontalLinesVisible(index == firstIndex, animated: animated) + } + } + + updateVerticalLimitsAndRange(horizontalRange: currentHorizontalRange, animated: true) + + if isChartInteractionBegun { + chartInteractionDidBegin(point: lastChartInteractionPoint) + } + } + + override func chartInteractionDidBegin(point: CGPoint) { + let horizontalRange = currentHorizontalRange + let chartFrame = self.chartFrame() + guard chartFrame.width > 0 else { return } + + let dateToFind = Date(timeIntervalSince1970: TimeInterval(horizontalRange.distance * point.x + horizontalRange.lowerBound)) + guard let (closestDate, minIndex) = findClosestDateTo(dateToFind: dateToFind) else { return } + + let chartInteractionWasBegin = isChartInteractionBegun + super.chartInteractionDidBegin(point: point) + + for graphController in graphControllers { + graphController.lineBulletsRenerer.bullets = graphController.chartLines.map { chart in + LineBulletsRenerer.Bullet(coordinate: chart.points[minIndex], color: chart.color) + } + graphController.lineBulletsRenerer.isEnabled = true + } + + let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) + let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX + self.setDetailsViewModel?(chartDetailsViewModel(closestDate: closestDate, pointIndex: minIndex), chartInteractionWasBegin) + self.setDetailsChartVisibleClosure?(true, true) + self.setDetailsViewPositionClosure?(detailsViewPosition) + self.verticalLineRenderer.values = [chartValue] + } + + override var currentChartHorizontalRangeFraction: ClosedRange { + let lowerPercent = (currentHorizontalRange.lowerBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + let upperPercent = (currentHorizontalRange.upperBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + return lowerPercent...upperPercent + } + + override var currentHorizontalRange: ClosedRange { + return graphControllers.first?.mainLinesRenderer.horizontalRange.end ?? Constants.defaultRange + } + + override func cancelChartInteraction() { + super.cancelChartInteraction() + for graphController in graphControllers { + graphController.lineBulletsRenerer.isEnabled = false + } + + self.setDetailsChartVisibleClosure?(false, true) + self.verticalLineRenderer.values = [] + } + + override func didTapZoomOut() { + cancelChartInteraction() + self.setupChartCollection(chartsCollection: initialChartCollection, animated: true, isZoomed: false) + } + + override func updateChartRange(_ rangeFraction: ClosedRange) { + cancelChartInteraction() + + let horizontalRange = ClosedRange(uncheckedBounds: + (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, + upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) + + zoomedChartRange = horizontalRange + updateChartRangeTitle(animated: true) + + updateMainChartHorizontalRange(range: horizontalRange, animated: false) + updateHorizontalLimists(horizontalRange: horizontalRange, animated: true) + updateVerticalLimitsAndRange(horizontalRange: horizontalRange, animated: true) + } + + func updateMainChartHorizontalRange(range: ClosedRange, animated: Bool) { + for controller in graphControllers { + controller.mainLinesRenderer.setup(horizontalRange: range, animated: animated) + controller.verticalScalesRenderer.setup(horizontalRange: range, animated: animated) + controller.lineBulletsRenerer.setup(horizontalRange: range, animated: animated) + } + horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) + verticalLineRenderer.setup(horizontalRange: range, animated: animated) + } + + func updateHorizontalLimists(horizontalRange: ClosedRange, animated: Bool) { + if let (stride, labels) = horizontalLimitsLabels(horizontalRange: horizontalRange, + scaleType: isZoomed ? .hour : .day, + prevoiusHorizontalStrideInterval: prevoiusHorizontalStrideInterval) { + self.horizontalScalesRenderer.setup(labels: labels, animated: animated) + self.prevoiusHorizontalStrideInterval = stride + } + } + + func updateVerticalLimitsAndRange(horizontalRange: ClosedRange, animated: Bool) { + let chartHeight = chartFrame().height + let approximateNumberOfChartValues = (chartHeight / BaseConstants.minimumAxisYLabelsDistance) + + var dividorsAndMultiplers: [(startValue: CGFloat, base: CGFloat, count: Int, maximumNumberOfDecimals: Int)] = graphControllers.enumerated().map { arg in + let (index, controller) = arg + let verticalRange = LinesChartRenderer.LineData.verticalRange(lines: controller.chartLines, + calculatingRange: horizontalRange, + addBounds: true) ?? controller.totalVerticalRange + + var numberOfOffsetsPerItem = verticalRange.distance / approximateNumberOfChartValues + + var multiplier: CGFloat = 1.0 + while numberOfOffsetsPerItem > 10 { + numberOfOffsetsPerItem /= 10 + multiplier *= 10 + } + var dividor: CGFloat = 1.0 + var maximumNumberOfDecimals = 2 + while numberOfOffsetsPerItem < 1 { + numberOfOffsetsPerItem *= 10 + dividor *= 10 + maximumNumberOfDecimals += 1 + } + + let generalBase = Constants.verticalBaseAnchors.first { numberOfOffsetsPerItem > $0 } ?? BaseConstants.defaultVerticalBaseAnchor + let base = generalBase * multiplier / dividor + + var verticalValue = (verticalRange.lowerBound / base).rounded(.down) * base + let startValue = verticalValue + var count = 0 + if chartVisibility[index] { + while verticalValue < verticalRange.upperBound { + count += 1 + verticalValue += base + } + } + return (startValue: startValue, base: base, count: count, maximumNumberOfDecimals: maximumNumberOfDecimals) + } + + let totalCount = dividorsAndMultiplers.map { $0.count }.max() ?? 0 + guard totalCount > 0 else { return } + + let numberFormatter = BaseConstants.chartNumberFormatter + for (index, controller) in graphControllers.enumerated() { + + let (startValue, base, _, maximumNumberOfDecimals) = dividorsAndMultiplers[index] + + let updatedRange = startValue...(startValue + base * CGFloat(totalCount)) + if controller.verticalScalesRenderer.verticalRange.end != updatedRange { + numberFormatter.maximumFractionDigits = maximumNumberOfDecimals + + var verticalLabels: [LinesChartLabel] = [] + for multipler in 0...(totalCount - 1) { + let verticalValue = startValue + base * CGFloat(multipler) + let text: String = numberFormatter.string(from: NSNumber(value: Double(verticalValue))) ?? "" + verticalLabels.append(LinesChartLabel(value: verticalValue, text: text)) + } + + controller.verticalScalesRenderer.setup(verticalLimitsLabels: verticalLabels, animated: animated) + controller.updateMainChartVerticalRange(range: updatedRange, animated: animated) + } + } + } + + override func apply(colorMode: ColorMode, animated: Bool) { + horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor + + for controller in graphControllers { + controller.verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor + controller.lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) + controller.verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor + } + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift new file mode 100644 index 0000000000..d75ba09d91 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift @@ -0,0 +1,195 @@ +// +// PercentChartComponentController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/14/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class PercentChartComponentController: GeneralChartComponentController { + let mainPecentChartRenderer: PecentChartRenderer + let horizontalScalesRenderer: HorizontalScalesRenderer + let verticalScalesRenderer: VerticalScalesRenderer + let verticalLineRenderer: VerticalLinesRenderer + let previewPercentChartRenderer: PecentChartRenderer + var percentageData: PecentChartRenderer.PercentageData = .blank + + init(isZoomed: Bool, + mainPecentChartRenderer: PecentChartRenderer, + horizontalScalesRenderer: HorizontalScalesRenderer, + verticalScalesRenderer: VerticalScalesRenderer, + verticalLineRenderer: VerticalLinesRenderer, + previewPercentChartRenderer: PecentChartRenderer) { + self.mainPecentChartRenderer = mainPecentChartRenderer + self.horizontalScalesRenderer = horizontalScalesRenderer + self.verticalScalesRenderer = verticalScalesRenderer + self.verticalLineRenderer = verticalLineRenderer + self.previewPercentChartRenderer = previewPercentChartRenderer + + super.init(isZoomed: isZoomed) + } + + override func initialize(chartsCollection: ChartsCollection, initialDate: Date, totalHorizontalRange _: ClosedRange, totalVerticalRange _: ClosedRange) { + let components = chartsCollection.chartValues.map { PecentChartRenderer.PercentageData.Component(color: $0.color, + values: $0.values.map { CGFloat($0) }) } + self.percentageData = PecentChartRenderer.PercentageData(locations: chartsCollection.axisValues.map { CGFloat($0.timeIntervalSince1970) }, + components: components) + let totalHorizontalRange = PecentChartRenderer.PercentageData.horizontalRange(data: self.percentageData) ?? BaseConstants.defaultRange + let totalVerticalRange = BaseConstants.defaultRange + + super.initialize(chartsCollection: chartsCollection, + initialDate: initialDate, + totalHorizontalRange: totalHorizontalRange, + totalVerticalRange: totalVerticalRange) + + mainPecentChartRenderer.percentageData = self.percentageData + previewPercentChartRenderer.percentageData = self.percentageData + + let axisValues: [CGFloat] = [0, 25, 50, 75, 100] + let labels: [LinesChartLabel] = axisValues.map { value in + return LinesChartLabel(value: value / 100, text: BaseConstants.detailsNumberFormatter.string(from: NSNumber(value: Double(value))) ?? "") + } + verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: false) + + setupMainChart(horizontalRange: initialHorizontalRange, animated: false) + setupMainChart(verticalRange: initialVerticalRange, animated: false) + previewPercentChartRenderer.setup(verticalRange: totalVerticalRange, animated: false) + previewPercentChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: false) + updateHorizontalLimitLabels(animated: false) + } + + override func willAppear(animated: Bool) { + previewPercentChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) + previewPercentChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) + + setConponentsVisible(visible: true, animated: true) + + setupMainChart(verticalRange: initialVerticalRange, animated: animated) + setupMainChart(horizontalRange: initialHorizontalRange, animated: animated) + + updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) + + super.willAppear(animated: animated) + } + + override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { + super.chartRangeDidUpdated(updatedRange) + + initialHorizontalRange = updatedRange + setupMainChart(horizontalRange: updatedRange, animated: false) + updateHorizontalLimitLabels(animated: true) + } + + func updateHorizontalLimitLabels(animated: Bool) { + updateHorizontalLimitLabels(horizontalScalesRenderer: horizontalScalesRenderer, + horizontalRange: initialHorizontalRange, + scaleType: isZoomed ? .hour : .day, + forceUpdate: false, + animated: animated) + } + + func prepareAppearanceAnimation(horizontalRnage: ClosedRange) { + setupMainChart(horizontalRange: horizontalRnage, animated: false) + setConponentsVisible(visible: false, animated: false) + } + + func setConponentsVisible(visible: Bool, animated: Bool) { + mainPecentChartRenderer.setVisible(visible, animated: animated) + horizontalScalesRenderer.setVisible(visible, animated: animated) + verticalScalesRenderer.setVisible(visible, animated: animated) + verticalLineRenderer.setVisible(visible, animated: animated) + previewPercentChartRenderer.setVisible(visible, animated: animated) + } + + func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { + mainPecentChartRenderer.setup(horizontalRange: horizontalRange, animated: animated) + horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + verticalLineRenderer.setup(horizontalRange: horizontalRange, animated: animated) + } + + func setupMainChart(verticalRange: ClosedRange, animated: Bool) { + mainPecentChartRenderer.setup(verticalRange: verticalRange, animated: animated) + horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) + verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) + verticalLineRenderer.setup(verticalRange: verticalRange, animated: animated) + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + super.updateChartsVisibility(visibility: visibility, animated: animated) + for (index, isVisible) in visibility.enumerated() { + mainPecentChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) + previewPercentChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) + } + verticalScalesRenderer.setVisible(visibility.contains(true), animated: animated) + } + + override func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { + let visibleValues = visibleDetailsChartValues + + let total = visibleValues.map { $0.values[pointIndex] }.reduce(0, +) + + let values: [ChartDetailsViewModel.Value] = chartsCollection.chartValues.enumerated().map { arg in + let (index, component) = arg + return ChartDetailsViewModel.Value(prefix: PercentConstants.percentValueFormatter.string(from: component.values[pointIndex] / total * 100), + title: component.name, + value: BaseConstants.detailsNumberFormatter.string(from: component.values[pointIndex]), + color: component.color, + visible: chartVisibility[index]) + } + let dateString: String + if isZoomed { + dateString = BaseConstants.timeDateFormatter.string(from: closestDate) + } else { + dateString = BaseConstants.headerMediumRangeFormatter.string(from: closestDate) + } + let viewModel = ChartDetailsViewModel(title: dateString, + showArrow: !self.isZoomed, + showPrefixes: true, + values: values, + totalValue: nil, + tapAction: { [weak self] in + self?.hideDetailsView(animated: true) + self?.zoomInOnDateClosure?(closestDate) }) + return viewModel + } + + var currentlyVisiblePercentageData: PecentChartRenderer.PercentageData { + var currentPercentageData = percentageData + currentPercentageData.components = chartVisibility.enumerated().compactMap { $0.element ? currentPercentageData.components[$0.offset] : nil } + return currentPercentageData + } + + override var currentMainRangeRenderer: BaseChartRenderer { + return mainPecentChartRenderer + } + + override var currentPreviewRangeRenderer: BaseChartRenderer { + return previewPercentChartRenderer + } + + override func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { + super.showDetailsView(at: chartPosition, detailsViewPosition: detailsViewPosition, dataIndex: dataIndex, date: date, animted: animted) + verticalLineRenderer.values = [chartPosition] + verticalLineRenderer.isEnabled = true + } + + override func hideDetailsView(animated: Bool) { + super.hideDetailsView(animated: animated) + + verticalLineRenderer.values = [] + verticalLineRenderer.isEnabled = false + } + + override func apply(colorMode: ColorMode, animated: Bool) { + super.apply(colorMode: colorMode, animated: animated) + + horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.axisXColor = colorMode.barChartStrongLinesColor + verticalScalesRenderer.horizontalLinesColor = colorMode.barChartStrongLinesColor + verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift new file mode 100644 index 0000000000..484d8a2f11 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift @@ -0,0 +1,281 @@ +// +// PercentPieChartController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +enum PercentConstants { + static let percentValueFormatter: NumberFormatter = { + let formatter = NumberFormatter() + formatter.positiveSuffix = "%" + return formatter + }() +} + +private enum Constants { + static let zoomedRange = 7 +} + +class PercentPieChartController: BaseChartController { + let percentController: PercentChartComponentController + let pieController: PieChartComponentController + let transitionRenderer: PercentPieAnimationRenderer + + override init(chartsCollection: ChartsCollection) { + transitionRenderer = PercentPieAnimationRenderer() + percentController = PercentChartComponentController(isZoomed: false, + mainPecentChartRenderer: PecentChartRenderer(), + horizontalScalesRenderer: HorizontalScalesRenderer(), + verticalScalesRenderer: VerticalScalesRenderer(), + verticalLineRenderer: VerticalLinesRenderer(), + previewPercentChartRenderer: PecentChartRenderer()) + pieController = PieChartComponentController(isZoomed: true, + pieChartRenderer: PieChartRenderer(), + previewBarChartRenderer: BarChartRenderer()) + + super.init(chartsCollection: chartsCollection) + + [percentController, pieController].forEach { controller in + controller.chartFrame = { [unowned self] in self.chartFrame() } + controller.cartViewBounds = { [unowned self] in self.cartViewBounds() } + controller.zoomInOnDateClosure = { [unowned self] date in + self.didTapZoomIn(date: date) + } + controller.setChartTitleClosure = { [unowned self] (title, animated) in + self.setChartTitleClosure?(title, animated) + } + controller.setDetailsViewPositionClosure = { [unowned self] (position) in + self.setDetailsViewPositionClosure?(position) + } + controller.setDetailsChartVisibleClosure = { [unowned self] (visible, animated) in + self.setDetailsChartVisibleClosure?(visible, animated) + } + controller.setDetailsViewModel = { [unowned self] (viewModel, animated) in + self.setDetailsViewModel?(viewModel, animated) + } + controller.updatePreviewRangeClosure = { [unowned self] (fraction, animated) in + self.chartRangeUpdatedClosure?(fraction, animated) + } + controller.chartRangePagingClosure = { [unowned self] (isEnabled, pageSize) in + self.setChartRangePagingEnabled(isEnabled: isEnabled, minimumSelectionSize: pageSize) + } + } + transitionRenderer.isEnabled = false + } + + override var mainChartRenderers: [ChartViewRenderer] { + return [percentController.mainPecentChartRenderer, + transitionRenderer, + percentController.horizontalScalesRenderer, + percentController.verticalScalesRenderer, + percentController.verticalLineRenderer, + pieController.pieChartRenderer, +// performanceRenderer + ] + } + + override var navigationRenderers: [ChartViewRenderer] { + return [percentController.previewPercentChartRenderer, + pieController.previewBarChartRenderer] + } + + override func initializeChart() { + percentController.initialize(chartsCollection: initialChartsCollection, + initialDate: Date(), + totalHorizontalRange: BaseConstants.defaultRange, + totalVerticalRange: BaseConstants.defaultRange) + switchToChart(chartsCollection: percentController.chartsCollection, isZoomed: false, animated: false) + } + + func switchToChart(chartsCollection: ChartsCollection, isZoomed: Bool, animated: Bool) { + if animated { + TimeInterval.setDefaultSuration(.expandAnimationDuration) + DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { + TimeInterval.setDefaultSuration(.osXDuration) + } + } + + super.isZoomed = isZoomed + if isZoomed { + let toHorizontalRange = pieController.initialHorizontalRange + + pieController.updateChartsVisibility(visibility: percentController.chartVisibility, animated: false) + pieController.pieChartRenderer.setup(horizontalRange: percentController.currentHorizontalMainChartRange, animated: false) + pieController.previewBarChartRenderer.setup(horizontalRange: percentController.currentPreviewHorizontalRange, animated: false) + pieController.pieChartRenderer.setVisible(false, animated: false) + pieController.previewBarChartRenderer.setVisible(true, animated: false) + + pieController.willAppear(animated: animated) + percentController.willDisappear(animated: animated) + + pieController.pieChartRenderer.drawPie = false + percentController.mainPecentChartRenderer.isEnabled = false + + setupTransitionRenderer() + + percentController.setupMainChart(horizontalRange: toHorizontalRange, animated: animated) + percentController.previewPercentChartRenderer.setup(horizontalRange: toHorizontalRange, animated: animated) + percentController.setConponentsVisible(visible: false, animated: animated) + + transitionRenderer.animate(fromDataToPie: true, animated: animated) { [weak self] in + self?.pieController.pieChartRenderer.drawPie = true + self?.percentController.mainPecentChartRenderer.isEnabled = true + } + } else { + if !pieController.chartsCollection.isBlank { + let fromHorizontalRange = pieController.currentHorizontalMainChartRange + let toHorizontalRange = percentController.initialHorizontalRange + + pieController.pieChartRenderer.setup(horizontalRange: toHorizontalRange, animated: animated) + pieController.previewBarChartRenderer.setup(horizontalRange: toHorizontalRange, animated: animated) + pieController.pieChartRenderer.setVisible(false, animated: animated) + pieController.previewBarChartRenderer.setVisible(false, animated: animated) + + percentController.updateChartsVisibility(visibility: pieController.chartVisibility, animated: false) + percentController.setupMainChart(horizontalRange: fromHorizontalRange, animated: false) + percentController.previewPercentChartRenderer.setup(horizontalRange: fromHorizontalRange, animated: false) + percentController.setConponentsVisible(visible: false, animated: false) + } + + percentController.willAppear(animated: animated) + pieController.willDisappear(animated: animated) + + if animated { + pieController.pieChartRenderer.drawPie = false + percentController.mainPecentChartRenderer.isEnabled = false + + setupTransitionRenderer() + + transitionRenderer.animate(fromDataToPie: false, animated: true) { + self.pieController.pieChartRenderer.drawPie = true + self.percentController.mainPecentChartRenderer.isEnabled = true + } + } + } + + self.setBackButtonVisibilityClosure?(isZoomed, animated) + } + + func setupTransitionRenderer() { + transitionRenderer.setup(verticalRange: percentController.currentVerticalMainChartRange, animated: false) + transitionRenderer.setup(horizontalRange: percentController.currentHorizontalMainChartRange, animated: false) + transitionRenderer.visiblePieComponents = pieController.visiblePieDataWithCurrentPreviewRange + transitionRenderer.visiblePercentageData = percentController.currentlyVisiblePercentageData + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + if isZoomed { + pieController.updateChartsVisibility(visibility: visibility, animated: animated) + } else { + percentController.updateChartsVisibility(visibility: visibility, animated: animated) + } + } + + var visibleChartValues: [ChartsCollection.Chart] { + let visibility = isZoomed ? pieController.chartVisibility : percentController.chartVisibility + let collection = isZoomed ? pieController.chartsCollection : percentController.chartsCollection + let visibleCharts: [ChartsCollection.Chart] = visibility.enumerated().compactMap { args in + args.element ? collection.chartValues[args.offset] : nil + } + return visibleCharts + } + + override var actualChartVisibility: [Bool] { + return isZoomed ? pieController.chartVisibility : percentController.chartVisibility + } + + override var actualChartsCollection: ChartsCollection { + return isZoomed ? pieController.chartsCollection : percentController.chartsCollection + } + + override func chartInteractionDidBegin(point: CGPoint) { + if isZoomed { + pieController.chartInteractionDidBegin(point: point) + } else { + percentController.chartInteractionDidBegin(point: point) + } + } + + override func chartInteractionDidEnd() { + if isZoomed { + pieController.chartInteractionDidEnd() + } else { + percentController.chartInteractionDidEnd() + } + } + + override var drawChartVisibity: Bool { + return true + } + + override var currentChartHorizontalRangeFraction: ClosedRange { + if isZoomed { + return pieController.currentChartHorizontalRangeFraction + } else { + return percentController.currentChartHorizontalRangeFraction + } + } + + override func cancelChartInteraction() { + if isZoomed { + return pieController.hideDetailsView(animated: true) + } else { + return percentController.hideDetailsView(animated: true) + } + } + + override func didTapZoomIn(date: Date) { + guard isZoomed == false else { return } + cancelChartInteraction() + let currentCollection = percentController.chartsCollection + let range: Int = Constants.zoomedRange + guard let (foundDate, index) = percentController.findClosestDateTo(dateToFind: date) else { return } + var lowIndex = max(0, index - range / 2) + var highIndex = min(currentCollection.axisValues.count - 1, index + range / 2) + if lowIndex == 0 { + highIndex = lowIndex + (range - 1) + } else if highIndex == currentCollection.axisValues.count - 1 { + lowIndex = highIndex - (range - 1) + } + + let newValues = currentCollection.chartValues.map { chart in + return ChartsCollection.Chart(color: chart.color, + name: chart.name, + values: Array(chart.values[(lowIndex...highIndex)])) + } + let newCollection = ChartsCollection(axisValues: Array(currentCollection.axisValues[(lowIndex...highIndex)]), + chartValues: newValues) + let selectedRange = CGFloat(foundDate.timeIntervalSince1970 - .day)...CGFloat(foundDate.timeIntervalSince1970) + pieController.initialize(chartsCollection: newCollection, initialDate: date, totalHorizontalRange: 0...1, totalVerticalRange: 0...1) + pieController.initialHorizontalRange = selectedRange + + switchToChart(chartsCollection: newCollection, isZoomed: true, animated: true) + } + + override func didTapZoomOut() { + self.pieController.deselectSegment(completion: { [weak self] in + guard let self = self else { return } + self.switchToChart(chartsCollection: self.percentController.chartsCollection, isZoomed: false, animated: true) + }) + } + + override func updateChartRange(_ rangeFraction: ClosedRange) { + if isZoomed { + return pieController.chartRangeFractionDidUpdated(rangeFraction) + } else { + return percentController.chartRangeFractionDidUpdated(rangeFraction) + } + } + + override func apply(colorMode: ColorMode, animated: Bool) { + super.apply(colorMode: colorMode, animated: animated) + + pieController.apply(colorMode: colorMode, animated: animated) + percentController.apply(colorMode: colorMode, animated: animated) + transitionRenderer.backgroundColor = colorMode.chartBackgroundColor + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift new file mode 100644 index 0000000000..68c3541912 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift @@ -0,0 +1,198 @@ +// +// PieChartComponentController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/14/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class PieChartComponentController: GeneralChartComponentController { + let pieChartRenderer: PieChartRenderer + let previewBarChartRenderer: BarChartRenderer + var barWidth: CGFloat = 1 + + var chartBars: BarChartRenderer.BarsData = .blank + + init(isZoomed: Bool, + pieChartRenderer: PieChartRenderer, + previewBarChartRenderer: BarChartRenderer) { + self.pieChartRenderer = pieChartRenderer + self.previewBarChartRenderer = previewBarChartRenderer + super.init(isZoomed: isZoomed) + } + + override func initialize(chartsCollection: ChartsCollection, initialDate: Date, totalHorizontalRange _: ClosedRange, totalVerticalRange _: ClosedRange) { + let (width, chartBars, totalHorizontalRange, _) = BarChartRenderer.BarsData.initialComponents(chartsCollection: chartsCollection) + self.barWidth = width + self.chartBars = chartBars + super.initialize(chartsCollection: chartsCollection, + initialDate: initialDate, + totalHorizontalRange: totalHorizontalRange, + totalVerticalRange: BaseConstants.defaultRange) + + self.previewBarChartRenderer.bars = chartBars + self.previewBarChartRenderer.fillToTop = true + + pieChartRenderer.valuesFormatter = PercentConstants.percentValueFormatter + pieChartRenderer.setup(horizontalRange: initialHorizontalRange, animated: false) + previewBarChartRenderer.setup(verticalRange: initialVerticalRange, animated: false) + previewBarChartRenderer.setup(horizontalRange: initialHorizontalRange, animated: false) + + pieChartRenderer.updatePercentageData(pieDataWithCurrentPreviewRange, animated: false) + pieChartRenderer.selectSegmentAt(at: nil, animated: false) + } + + private var pieDataWithCurrentPreviewRange: [PieChartRenderer.PieComponent] { + let range = currentHorizontalMainChartRange + var pieComponents = chartsCollection.chartValues.map { PieChartRenderer.PieComponent(color: $0.color, + value: 0) } + guard var valueIndex = chartsCollection.axisValues.firstIndex(where: { CGFloat($0.timeIntervalSince1970) > (range.lowerBound + 1)}) else { + return pieComponents + } + var count = 0 + while valueIndex < chartsCollection.axisValues.count, CGFloat(chartsCollection.axisValues[valueIndex].timeIntervalSince1970) <= range.upperBound { + count += 1 + for pieIndex in pieComponents.indices { + pieComponents[pieIndex].value += CGFloat(chartsCollection.chartValues[pieIndex].values[valueIndex]) + } + valueIndex += 1 + } + return pieComponents + } + + var visiblePieDataWithCurrentPreviewRange: [PieChartRenderer.PieComponent] { + let currentData = pieDataWithCurrentPreviewRange + return chartVisibility.enumerated().compactMap { $0.element ? currentData[$0.offset] : nil } + } + + override func willAppear(animated: Bool) { + pieChartRenderer.setup(horizontalRange: initialHorizontalRange, animated: animated) + pieChartRenderer.setVisible(true, animated: animated) + + previewBarChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) + previewBarChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) + previewBarChartRenderer.setVisible(true, animated: animated) + + updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) + pieChartRenderer.updatePercentageData(pieDataWithCurrentPreviewRange, animated: false) + + super.willAppear(animated: animated) + } + + override func setupChartRangePaging() { + let valuesCount = chartsCollection.axisValues.count + guard valuesCount > 0 else { return } + chartRangePagingClosure?(true, 1.0 / CGFloat(valuesCount)) + } + + override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { + if isChartInteractionBegun { + chartInteractionDidBegin(point: lastChartInteractionPoint) + } + initialHorizontalRange = updatedRange + + setupMainChart(horizontalRange: updatedRange, animated: true) + updateSelectedDataLabelIfNeeded() + } + + func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { + pieChartRenderer.setup(horizontalRange: horizontalRange, animated: animated) + pieChartRenderer.updatePercentageData(pieDataWithCurrentPreviewRange, animated: animated) + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + super.updateChartsVisibility(visibility: visibility, animated: animated) + for (index, isVisible) in visibility.enumerated() { + pieChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) + previewBarChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) + } + if let segment = pieChartRenderer.selectedSegment { + if !visibility[segment] { + pieChartRenderer.selectSegmentAt(at: nil, animated: true) + } + } + updateSelectedDataLabelIfNeeded() + } + + func deselectSegment(completion: @escaping () -> Void) { + if pieChartRenderer.hasSelectedSegments { + hideDetailsView(animated: true) + pieChartRenderer.selectSegmentAt(at: nil, animated: true) + DispatchQueue.main.asyncAfter(deadline: .now() + .defaultDuration / 2) { + completion() + } + } else { + completion() + } + } + + func updateSelectedDataLabelIfNeeded() { + if let segment = pieChartRenderer.selectedSegment { + self.setDetailsChartVisibleClosure?(true, true) + self.setDetailsViewModel?(chartDetailsViewModel(segmentInde: segment), false) + self.setDetailsViewPositionClosure?(chartFrame().width / 4) + } else { + self.setDetailsChartVisibleClosure?(false, true) + } + } + + func chartDetailsViewModel(segmentInde: Int) -> ChartDetailsViewModel { + let pieItem = pieDataWithCurrentPreviewRange[segmentInde] + let title = chartsCollection.chartValues[segmentInde].name + let valueString = BaseConstants.detailsNumberFormatter.string(from: pieItem.value) + let viewModel = ChartDetailsViewModel(title: "", + showArrow: false, + showPrefixes: false, + values: [ChartDetailsViewModel.Value(prefix: nil, + title: title, + value: valueString, + color: pieItem.color, + visible: true)], + totalValue: nil, + tapAction: nil) + return viewModel + } + + override var currentMainRangeRenderer: BaseChartRenderer { + return pieChartRenderer + } + + override var currentPreviewRangeRenderer: BaseChartRenderer { + return previewBarChartRenderer + } + + var lastInteractionPoint: CGPoint = .zero + override func chartInteractionDidBegin(point: CGPoint) { + lastInteractionPoint = point + } + + override func chartInteractionDidEnd() { + if let segment = pieChartRenderer.selectedItemIndex(at: lastInteractionPoint) { + if pieChartRenderer.selectedSegment == segment { + pieChartRenderer.selectSegmentAt(at: nil, animated: true) + } else { + pieChartRenderer.selectSegmentAt(at: segment, animated: true) + } + updateSelectedDataLabelIfNeeded() + } + } + + override func hideDetailsView(animated: Bool) { + pieChartRenderer.selectSegmentAt(at: nil, animated: animated) + updateSelectedDataLabelIfNeeded() + } + + override func updateChartRangeTitle(animated: Bool) { + let fromDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.lowerBound) + .day + 1) + let toDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.upperBound)) + if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { + let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) + self.setChartTitleClosure?(stirng, animated) + } else { + let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" + self.setChartTitleClosure?(stirng, animated) + } + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift new file mode 100644 index 0000000000..2e1894465b --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift @@ -0,0 +1,226 @@ +// +// BarsComponentController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/14/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class BarsComponentController: GeneralChartComponentController { + let mainBarsRenderer: BarChartRenderer + let horizontalScalesRenderer: HorizontalScalesRenderer + let verticalScalesRenderer: VerticalScalesRenderer + + let previewBarsChartRenderer: BarChartRenderer + private(set) var barsWidth: CGFloat = 1 + + private (set) var chartBars: BarChartRenderer.BarsData = .blank + + init(isZoomed: Bool, + mainBarsRenderer: BarChartRenderer, + horizontalScalesRenderer: HorizontalScalesRenderer, + verticalScalesRenderer: VerticalScalesRenderer, + previewBarsChartRenderer: BarChartRenderer) { + self.mainBarsRenderer = mainBarsRenderer + self.horizontalScalesRenderer = horizontalScalesRenderer + self.verticalScalesRenderer = verticalScalesRenderer + self.previewBarsChartRenderer = previewBarsChartRenderer + + self.mainBarsRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel + self.previewBarsChartRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel + + super.init(isZoomed: isZoomed) + } + + override func initialize(chartsCollection: ChartsCollection, initialDate: Date, totalHorizontalRange _: ClosedRange, totalVerticalRange _: ClosedRange) { + let (width, chartBars, totalHorizontalRange, totalVerticalRange) = BarChartRenderer.BarsData.initialComponents(chartsCollection: chartsCollection) + self.chartBars = chartBars + self.barsWidth = width + + super.initialize(chartsCollection: chartsCollection, + initialDate: initialDate, + totalHorizontalRange: totalHorizontalRange, + totalVerticalRange: totalVerticalRange) + } + + override func setupInitialChartRange(initialDate: Date) { + guard let first = chartsCollection.axisValues.first?.timeIntervalSince1970, + let last = chartsCollection.axisValues.last?.timeIntervalSince1970 else { return } + + let rangeStart = CGFloat(first) + let rangeEnd = CGFloat(last) + + if isZoomed { + let initalDate = CGFloat(initialDate.timeIntervalSince1970) + + initialHorizontalRange = max(initalDate - barsWidth, rangeStart)...min(initalDate + GeneralChartComponentConstants.defaultZoomedRangeLength - barsWidth, rangeEnd) + initialVerticalRange = totalVerticalRange + } else { + super.setupInitialChartRange(initialDate: initialDate) + } + } + + + override func willAppear(animated: Bool) { + mainBarsRenderer.bars = self.chartBars + previewBarsChartRenderer.bars = self.chartBars + + previewBarsChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) + previewBarsChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) + + setupMainChart(verticalRange: initialVerticalRange, animated: animated) + setupMainChart(horizontalRange: initialHorizontalRange, animated: animated) + + updateChartVerticalRanges(horizontalRange: initialHorizontalRange, animated: animated) + + super.willAppear(animated: animated) + + updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) + setConponentsVisible(visible: true, animated: animated) + updateHorizontalLimitLabels(animated: animated, forceUpdate: true) + } + + override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { + super.chartRangeDidUpdated(updatedRange) + if !isZoomed { + initialHorizontalRange = updatedRange + } + setupMainChart(horizontalRange: updatedRange, animated: false) + updateHorizontalLimitLabels(animated: true, forceUpdate: false) + updateChartVerticalRanges(horizontalRange: updatedRange, animated: true) + } + + func updateHorizontalLimitLabels(animated: Bool, forceUpdate: Bool) { + updateHorizontalLimitLabels(horizontalScalesRenderer: horizontalScalesRenderer, + horizontalRange: currentHorizontalMainChartRange, + scaleType: isZoomed ? .hour : .day, + forceUpdate: forceUpdate, + animated: animated) + } + + func prepareAppearanceAnimation(horizontalRnage: ClosedRange) { + setupMainChart(horizontalRange: horizontalRnage, animated: false) + setConponentsVisible(visible: false, animated: false) + } + + func setConponentsVisible(visible: Bool, animated: Bool) { + mainBarsRenderer.setVisible(visible, animated: animated) + horizontalScalesRenderer.setVisible(visible, animated: animated) + verticalScalesRenderer.setVisible(visible, animated: animated) + previewBarsChartRenderer.setVisible(visible, animated: animated) + } + + func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { + mainBarsRenderer.setup(horizontalRange: horizontalRange, animated: animated) + horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + } + + var visibleBars: BarChartRenderer.BarsData { + let visibleComponents: [BarChartRenderer.BarsData.Component] = chartVisibility.enumerated().compactMap { args in + args.element ? chartBars.components[args.offset] : nil + } + return BarChartRenderer.BarsData(barWidth: chartBars.barWidth, + locations: chartBars.locations, + components: visibleComponents) + } + + func updateChartVerticalRanges(horizontalRange: ClosedRange, animated: Bool) { + if let range = BarChartRenderer.BarsData.verticalRange(bars: visibleBars, + calculatingRange: horizontalRange, + addBounds: true) { + let (range, labels) = verticalLimitsLabels(verticalRange: range) + if verticalScalesRenderer.verticalRange.end != range { + verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: animated) + } + verticalScalesRenderer.setVisible(true, animated: animated) + + setupMainChart(verticalRange: range, animated: animated) + } else { + verticalScalesRenderer.setVisible(false, animated: animated) + } + + if let range = BarChartRenderer.BarsData.verticalRange(bars: visibleBars) { + previewBarsChartRenderer.setup(verticalRange: range, animated: animated) + } + } + + func setupMainChart(verticalRange: ClosedRange, animated: Bool) { + mainBarsRenderer.setup(verticalRange: verticalRange, animated: animated) + horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) + verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + super.updateChartsVisibility(visibility: visibility, animated: animated) + for (index, isVisible) in visibility.enumerated() { + mainBarsRenderer.setComponentVisible(isVisible, at: index, animated: animated) + previewBarsChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) + } + updateChartVerticalRanges(horizontalRange: currentHorizontalMainChartRange, animated: true) + } + + var visibleChartValues: [ChartsCollection.Chart] { + let visibleCharts: [ChartsCollection.Chart] = chartVisibility.enumerated().compactMap { args in + args.element ? chartsCollection.chartValues[args.offset] : nil + } + return visibleCharts + } + + override func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { + var viewModel = super.chartDetailsViewModel(closestDate: closestDate, pointIndex: pointIndex) + let visibleChartValues = self.visibleChartValues + let totalSumm: CGFloat = visibleChartValues.map { CGFloat($0.values[pointIndex]) }.reduce(0, +) + + viewModel.totalValue = ChartDetailsViewModel.Value(prefix: nil, + title: "Total", + value: BaseConstants.detailsNumberFormatter.string(from: totalSumm), + color: .white, + visible: visibleChartValues.count > 1) + return viewModel + } + + override var currentMainRangeRenderer: BaseChartRenderer { + return mainBarsRenderer + } + + override var currentPreviewRangeRenderer: BaseChartRenderer { + return previewBarsChartRenderer + } + + override func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { + let rangeWithOffset = detailsViewPosition - barsWidth / currentHorizontalMainChartRange.distance * chartFrame().width / 2 + super.showDetailsView(at: chartPosition, detailsViewPosition: rangeWithOffset, dataIndex: dataIndex, date: date, animted: animted) + mainBarsRenderer.setSelectedIndex(dataIndex, animated: true) + } + + override func hideDetailsView(animated: Bool) { + super.hideDetailsView(animated: animated) + + mainBarsRenderer.setSelectedIndex(nil, animated: animated) + } + override func apply(colorMode: ColorMode, animated: Bool) { + super.apply(colorMode: colorMode, animated: animated) + + horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.axisXColor = colorMode.barChartStrongLinesColor + verticalScalesRenderer.horizontalLinesColor = colorMode.barChartStrongLinesColor + mainBarsRenderer.update(backgroundColor: colorMode.chartBackgroundColor, animated: false) + previewBarsChartRenderer.update(backgroundColor: colorMode.chartBackgroundColor, animated: false) + } + + override func updateChartRangeTitle(animated: Bool) { + let fromDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.lowerBound + barsWidth)) + let toDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.upperBound)) + if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { + let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) + self.setChartTitleClosure?(stirng, animated) + } else { + let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" + self.setChartTitleClosure?(stirng, animated) + } + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift new file mode 100644 index 0000000000..ae83803bb1 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift @@ -0,0 +1,249 @@ +// +// DailyBarsChartController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class DailyBarsChartController: BaseChartController { + let barsController: BarsComponentController + let linesController: LinesComponentController + + override init(chartsCollection: ChartsCollection) { + let horizontalScalesRenderer = HorizontalScalesRenderer() + let verticalScalesRenderer = VerticalScalesRenderer() + barsController = BarsComponentController(isZoomed: false, + mainBarsRenderer: BarChartRenderer(), + horizontalScalesRenderer: horizontalScalesRenderer, + verticalScalesRenderer: verticalScalesRenderer, + previewBarsChartRenderer: BarChartRenderer()) + linesController = LinesComponentController(isZoomed: true, + userLinesTransitionAnimation: false, + mainLinesRenderer: LinesChartRenderer(), + horizontalScalesRenderer: horizontalScalesRenderer, + verticalScalesRenderer: verticalScalesRenderer, + verticalLineRenderer: VerticalLinesRenderer(), + lineBulletsRenerer: LineBulletsRenerer(), + previewLinesChartRenderer: LinesChartRenderer()) + + super.init(chartsCollection: chartsCollection) + + [barsController, linesController].forEach { controller in + controller.chartFrame = { [unowned self] in self.chartFrame() } + controller.cartViewBounds = { [unowned self] in self.cartViewBounds() } + controller.zoomInOnDateClosure = { [unowned self] date in + self.didTapZoomIn(date: date) + } + controller.setChartTitleClosure = { [unowned self] (title, animated) in + self.setChartTitleClosure?(title, animated) + } + controller.setDetailsViewPositionClosure = { [unowned self] (position) in + self.setDetailsViewPositionClosure?(position) + } + controller.setDetailsChartVisibleClosure = { [unowned self] (visible, animated) in + self.setDetailsChartVisibleClosure?(visible, animated) + } + controller.setDetailsViewModel = { [unowned self] (viewModel, animated) in + self.setDetailsViewModel?(viewModel, animated) + } + controller.updatePreviewRangeClosure = { [unowned self] (fraction, animated) in + self.chartRangeUpdatedClosure?(fraction, animated) + } + controller.chartRangePagingClosure = { [unowned self] (isEnabled, pageSize) in + self.setChartRangePagingEnabled(isEnabled: isEnabled, minimumSelectionSize: pageSize) + } + } + } + + override var mainChartRenderers: [ChartViewRenderer] { + return [barsController.mainBarsRenderer, + linesController.mainLinesRenderer, + barsController.horizontalScalesRenderer, + barsController.verticalScalesRenderer, + linesController.verticalLineRenderer, + linesController.lineBulletsRenerer, +// performanceRenderer + ] + } + + override var navigationRenderers: [ChartViewRenderer] { + return [barsController.previewBarsChartRenderer, + linesController.previewLinesChartRenderer] + } + + override func initializeChart() { + barsController.initialize(chartsCollection: initialChartsCollection, + initialDate: Date(), + totalHorizontalRange: BaseConstants.defaultRange, + totalVerticalRange: BaseConstants.defaultRange) + switchToChart(chartsCollection: barsController.chartsCollection, isZoomed: false, animated: false) + } + + func switchToChart(chartsCollection: ChartsCollection, isZoomed: Bool, animated: Bool) { + if animated { + TimeInterval.setDefaultSuration(.expandAnimationDuration) + DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { + TimeInterval.setDefaultSuration(.osXDuration) + } + } + + super.isZoomed = isZoomed + if isZoomed { + let toHorizontalRange = linesController.initialHorizontalRange + let destinationHorizontalRange = (toHorizontalRange.lowerBound - barsController.barsWidth)...(toHorizontalRange.upperBound - barsController.barsWidth) + let initialChartVerticalRange = lineProportionAnimationRange() + + linesController.mainLinesRenderer.setup(horizontalRange: barsController.currentHorizontalMainChartRange, animated: false) + linesController.previewLinesChartRenderer.setup(horizontalRange: barsController.currentPreviewHorizontalRange, animated: false) + linesController.mainLinesRenderer.setup(verticalRange: initialChartVerticalRange, animated: false) + linesController.previewLinesChartRenderer.setup(verticalRange: initialChartVerticalRange, animated: false) + linesController.mainLinesRenderer.setVisible(false, animated: false) + linesController.previewLinesChartRenderer.setVisible(false, animated: false) + + barsController.setupMainChart(horizontalRange: destinationHorizontalRange, animated: animated) + barsController.previewBarsChartRenderer.setup(horizontalRange: linesController.totalHorizontalRange, animated: animated) + barsController.mainBarsRenderer.setVisible(false, animated: animated) + barsController.previewBarsChartRenderer.setVisible(false, animated: animated) + + linesController.willAppear(animated: animated) + barsController.willDisappear(animated: animated) + + linesController.updateChartsVisibility(visibility: linesController.chartLines.map { _ in true }, animated: false) + } else { + if !linesController.chartsCollection.isBlank { + barsController.hideDetailsView(animated: false) + let visibleVerticalRange = BarChartRenderer.BarsData.verticalRange(bars: barsController.visibleBars, + calculatingRange: barsController.initialHorizontalRange) ?? BaseConstants.defaultRange + barsController.mainBarsRenderer.setup(verticalRange: visibleVerticalRange, animated: false) + + let toHorizontalRange = barsController.initialHorizontalRange + let destinationChartVerticalRange = lineProportionAnimationRange() + + linesController.setupMainChart(horizontalRange: toHorizontalRange, animated: animated) + linesController.mainLinesRenderer.setup(verticalRange: destinationChartVerticalRange, animated: animated) + linesController.previewLinesChartRenderer.setup(verticalRange: destinationChartVerticalRange, animated: animated) + linesController.previewLinesChartRenderer.setup(horizontalRange: barsController.totalHorizontalRange, animated: animated) + linesController.mainLinesRenderer.setVisible(false, animated: animated) + linesController.previewLinesChartRenderer.setVisible(false, animated: animated) + } + + barsController.willAppear(animated: animated) + linesController.willDisappear(animated: animated) + } + + self.setBackButtonVisibilityClosure?(isZoomed, animated) + self.refreshChartToolsClosure?(animated) + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + if isZoomed { + linesController.updateChartsVisibility(visibility: visibility, animated: animated) + } else { + barsController.updateChartsVisibility(visibility: visibility, animated: animated) + } + } + + var visibleChartValues: [ChartsCollection.Chart] { + let visibility = isZoomed ? linesController.chartVisibility : barsController.chartVisibility + let collection = isZoomed ? linesController.chartsCollection : barsController.chartsCollection + let visibleCharts: [ChartsCollection.Chart] = visibility.enumerated().compactMap { args in + args.element ? collection.chartValues[args.offset] : nil + } + return visibleCharts + } + + override var actualChartVisibility: [Bool] { + return isZoomed ? linesController.chartVisibility : barsController.chartVisibility + } + + override var actualChartsCollection: ChartsCollection { + return isZoomed ? linesController.chartsCollection : barsController.chartsCollection + } + + override func chartInteractionDidBegin(point: CGPoint) { + if isZoomed { + linesController.chartInteractionDidBegin(point: point) + } else { + barsController.chartInteractionDidBegin(point: point) + } + } + + override func chartInteractionDidEnd() { + if isZoomed { + linesController.chartInteractionDidEnd() + } else { + barsController.chartInteractionDidEnd() + } + } + + override var currentChartHorizontalRangeFraction: ClosedRange { + if isZoomed { + return linesController.currentChartHorizontalRangeFraction + } else { + return barsController.currentChartHorizontalRangeFraction + } + } + + override func cancelChartInteraction() { + if isZoomed { + return linesController.hideDetailsView(animated: true) + } else { + return barsController.hideDetailsView(animated: true) + } + } + + override func didTapZoomIn(date: Date) { + guard isZoomed == false else { return } + if isZoomed { + return linesController.hideDetailsView(animated: true) + } + self.getDetailsData?(date, { updatedCollection in + if let updatedCollection = updatedCollection { + self.linesController.initialize(chartsCollection: updatedCollection, + initialDate: date, + totalHorizontalRange: 0...1, + totalVerticalRange: 0...1) + self.switchToChart(chartsCollection: updatedCollection, isZoomed: true, animated: true) + } + }) + } + + func lineProportionAnimationRange() -> ClosedRange { + let visibleLines = self.barsController.chartVisibility.enumerated().compactMap { $0.element ? self.linesController.chartLines[$0.offset] : nil } + let linesRange = LinesChartRenderer.LineData.verticalRange(lines: visibleLines) ?? BaseConstants.defaultRange + let barsRange = BarChartRenderer.BarsData.verticalRange(bars: self.barsController.visibleBars, + calculatingRange: self.linesController.totalHorizontalRange) ?? BaseConstants.defaultRange + let range = 0...(linesRange.upperBound / barsRange.distance * self.barsController.currentVerticalMainChartRange.distance) + return range + } + + override func didTapZoomOut() { + cancelChartInteraction() + switchToChart(chartsCollection: barsController.chartsCollection, isZoomed: false, animated: true) + } + + override func updateChartRange(_ rangeFraction: ClosedRange) { + if isZoomed { + return linesController.chartRangeFractionDidUpdated(rangeFraction) + } else { + return barsController.chartRangeFractionDidUpdated(rangeFraction) + } + } + + override func apply(colorMode: ColorMode, animated: Bool) { + super.apply(colorMode: colorMode, animated: animated) + + linesController.apply(colorMode: colorMode, animated: animated) + barsController.apply(colorMode: colorMode, animated: animated) + } + + override var drawChartVisibity: Bool { + return isZoomed + } +} + +//TODO: Убрать Performance полоски сверзу чартов (Не забыть) +//TODO: Добавить ховеры на кнопки diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift new file mode 100644 index 0000000000..fc39a5f4c6 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift @@ -0,0 +1,210 @@ +// +// LinesComponentController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/14/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class LinesComponentController: GeneralChartComponentController { + let mainLinesRenderer: LinesChartRenderer + let horizontalScalesRenderer: HorizontalScalesRenderer + let verticalScalesRenderer: VerticalScalesRenderer + let verticalLineRenderer: VerticalLinesRenderer + let lineBulletsRenerer: LineBulletsRenerer + + let previewLinesChartRenderer: LinesChartRenderer + + private let zoomedLinesRenderer = LinesChartRenderer() + private let zoomedPreviewLinesRenderer = LinesChartRenderer() + + private let userLinesTransitionAnimation: Bool + + private(set) var chartLines: [LinesChartRenderer.LineData] = [] + + init(isZoomed: Bool, + userLinesTransitionAnimation: Bool, + mainLinesRenderer: LinesChartRenderer, + horizontalScalesRenderer: HorizontalScalesRenderer, + verticalScalesRenderer: VerticalScalesRenderer, + verticalLineRenderer: VerticalLinesRenderer, + lineBulletsRenerer: LineBulletsRenerer, + previewLinesChartRenderer: LinesChartRenderer) { + self.mainLinesRenderer = mainLinesRenderer + self.horizontalScalesRenderer = horizontalScalesRenderer + self.verticalScalesRenderer = verticalScalesRenderer + self.verticalLineRenderer = verticalLineRenderer + self.lineBulletsRenerer = lineBulletsRenerer + self.previewLinesChartRenderer = previewLinesChartRenderer + self.userLinesTransitionAnimation = userLinesTransitionAnimation + + super.init(isZoomed: isZoomed) + + self.mainLinesRenderer.lineWidth = BaseConstants.mainChartLineWidth + self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel + self.previewLinesChartRenderer.lineWidth = BaseConstants.previewChartLineWidth + self.previewLinesChartRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel + + self.lineBulletsRenerer.isEnabled = false + } + + override func initialize(chartsCollection: ChartsCollection, + initialDate: Date, + totalHorizontalRange _: ClosedRange, + totalVerticalRange _: ClosedRange) { + let (chartLines, totalHorizontalRange, totalVerticalRange) = LinesChartRenderer.LineData.initialComponents(chartsCollection: chartsCollection) + self.chartLines = chartLines + + self.lineBulletsRenerer.bullets = self.chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, + color: $0.color)} + + super.initialize(chartsCollection: chartsCollection, + initialDate: initialDate, + totalHorizontalRange: totalHorizontalRange, + totalVerticalRange: totalVerticalRange) + + self.mainLinesRenderer.setup(verticalRange: totalVerticalRange, animated: true) + } + + override func willAppear(animated: Bool) { + mainLinesRenderer.setLines(lines: self.chartLines, animated: animated && userLinesTransitionAnimation) + previewLinesChartRenderer.setLines(lines: self.chartLines, animated: animated && userLinesTransitionAnimation) + + previewLinesChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) + previewLinesChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) + + setupMainChart(verticalRange: initialVerticalRange, animated: animated) + setupMainChart(horizontalRange: initialHorizontalRange, animated: animated) + + updateChartVerticalRanges(horizontalRange: initialHorizontalRange, animated: animated) + + super.willAppear(animated: animated) + + updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) + setConponentsVisible(visible: true, animated: animated) + updateHorizontalLimitLabels(animated: animated, forceUpdate: true) + } + + override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { + super.chartRangeDidUpdated(updatedRange) + if !isZoomed { + initialHorizontalRange = updatedRange + } + setupMainChart(horizontalRange: updatedRange, animated: false) + updateHorizontalLimitLabels(animated: true, forceUpdate: false) + updateChartVerticalRanges(horizontalRange: updatedRange, animated: true) + } + + func updateHorizontalLimitLabels(animated: Bool, forceUpdate: Bool) { + updateHorizontalLimitLabels(horizontalScalesRenderer: horizontalScalesRenderer, + horizontalRange: currentHorizontalMainChartRange, + scaleType: isZoomed ? .hour : .day, + forceUpdate: forceUpdate, + animated: animated) + } + + func prepareAppearanceAnimation(horizontalRnage: ClosedRange) { + setupMainChart(horizontalRange: horizontalRnage, animated: false) + setConponentsVisible(visible: false, animated: false) + } + + func setConponentsVisible(visible: Bool, animated: Bool) { + mainLinesRenderer.setVisible(visible, animated: animated) + horizontalScalesRenderer.setVisible(visible, animated: animated) + verticalScalesRenderer.setVisible(visible, animated: animated) + verticalLineRenderer.setVisible(visible, animated: animated) + previewLinesChartRenderer.setVisible(visible, animated: animated) + lineBulletsRenerer.setVisible(visible, animated: animated) + } + + func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { + mainLinesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + verticalLineRenderer.setup(horizontalRange: horizontalRange, animated: animated) + lineBulletsRenerer.setup(horizontalRange: horizontalRange, animated: animated) + } + + var visibleLines: [LinesChartRenderer.LineData] { + return chartVisibility.enumerated().compactMap { $0.element ? chartLines[$0.offset] : nil } + } + + func updateChartVerticalRanges(horizontalRange: ClosedRange, animated: Bool) { + if let range = LinesChartRenderer.LineData.verticalRange(lines: visibleLines, + calculatingRange: horizontalRange, + addBounds: true) { + let (range, labels) = verticalLimitsLabels(verticalRange: range) + if verticalScalesRenderer.verticalRange.end != range { + verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: animated) + } + + setupMainChart(verticalRange: range, animated: animated) + verticalScalesRenderer.setVisible(true, animated: animated) + } else { + verticalScalesRenderer.setVisible(false, animated: animated) + } + + if let range = LinesChartRenderer.LineData.verticalRange(lines: visibleLines) { + previewLinesChartRenderer.setup(verticalRange: range, animated: animated) + } + } + + func setupMainChart(verticalRange: ClosedRange, animated: Bool) { + mainLinesRenderer.setup(verticalRange: verticalRange, animated: animated) + horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) + verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) + verticalLineRenderer.setup(verticalRange: verticalRange, animated: animated) + lineBulletsRenerer.setup(verticalRange: verticalRange, animated: animated) + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + super.updateChartsVisibility(visibility: visibility, animated: animated) + for (index, isVisible) in visibility.enumerated() { + mainLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) + previewLinesChartRenderer.setLineVisible(isVisible, at: index, animated: animated) + lineBulletsRenerer.setLineVisible(isVisible, at: index, animated: animated) + } + updateChartVerticalRanges(horizontalRange: currentHorizontalMainChartRange, animated: true) + } + + override var currentMainRangeRenderer: BaseChartRenderer { + return mainLinesRenderer + } + + override var currentPreviewRangeRenderer: BaseChartRenderer { + return previewLinesChartRenderer + } + + override func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { + super.showDetailsView(at: chartPosition, detailsViewPosition: detailsViewPosition, dataIndex: dataIndex, date: date, animted: animted) + verticalLineRenderer.values = [chartPosition] + verticalLineRenderer.isEnabled = true + + lineBulletsRenerer.isEnabled = true + lineBulletsRenerer.setVisible(true, animated: animted) + lineBulletsRenerer.bullets = chartLines.compactMap { chart in + return LineBulletsRenerer.Bullet(coordinate: chart.points[dataIndex], color: chart.color) + } + } + + override func hideDetailsView(animated: Bool) { + super.hideDetailsView(animated: animated) + + verticalLineRenderer.values = [] + verticalLineRenderer.isEnabled = false + lineBulletsRenerer.isEnabled = false + } + + override func apply(colorMode: ColorMode, animated: Bool) { + super.apply(colorMode: colorMode, animated: animated) + + horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor + verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor + verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor + lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) + verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor + } +} diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift new file mode 100644 index 0000000000..ab836d00d2 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift @@ -0,0 +1,243 @@ +// +// StackedBarsChartController.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class StackedBarsChartController: BaseChartController { + let barsController: BarsComponentController + let zoomedBarsController: BarsComponentController + + override init(chartsCollection: ChartsCollection) { + let horizontalScalesRenderer = HorizontalScalesRenderer() + let verticalScalesRenderer = VerticalScalesRenderer() + barsController = BarsComponentController(isZoomed: false, + mainBarsRenderer: BarChartRenderer(), + horizontalScalesRenderer: horizontalScalesRenderer, + verticalScalesRenderer: verticalScalesRenderer, + previewBarsChartRenderer: BarChartRenderer()) + zoomedBarsController = BarsComponentController(isZoomed: true, + mainBarsRenderer: BarChartRenderer(), + horizontalScalesRenderer: horizontalScalesRenderer, + verticalScalesRenderer: verticalScalesRenderer, + previewBarsChartRenderer: BarChartRenderer()) + + super.init(chartsCollection: chartsCollection) + + [barsController, zoomedBarsController].forEach { controller in + controller.chartFrame = { [unowned self] in self.chartFrame() } + controller.cartViewBounds = { [unowned self] in self.cartViewBounds() } + controller.zoomInOnDateClosure = { [unowned self] date in + self.didTapZoomIn(date: date) + } + controller.setChartTitleClosure = { [unowned self] (title, animated) in + self.setChartTitleClosure?(title, animated) + } + controller.setDetailsViewPositionClosure = { [unowned self] (position) in + self.setDetailsViewPositionClosure?(position) + } + controller.setDetailsChartVisibleClosure = { [unowned self] (visible, animated) in + self.setDetailsChartVisibleClosure?(visible, animated) + } + controller.setDetailsViewModel = { [unowned self] (viewModel, animated) in + self.setDetailsViewModel?(viewModel, animated) + } + controller.updatePreviewRangeClosure = { [unowned self] (fraction, animated) in + self.chartRangeUpdatedClosure?(fraction, animated) + } + controller.chartRangePagingClosure = { [unowned self] (isEnabled, pageSize) in + self.setChartRangePagingEnabled(isEnabled: isEnabled, minimumSelectionSize: pageSize) + } + } + } + + override var mainChartRenderers: [ChartViewRenderer] { + return [barsController.mainBarsRenderer, + zoomedBarsController.mainBarsRenderer, + barsController.horizontalScalesRenderer, + barsController.verticalScalesRenderer, +// performanceRenderer + ] + } + + override var navigationRenderers: [ChartViewRenderer] { + return [barsController.previewBarsChartRenderer, + zoomedBarsController.previewBarsChartRenderer] + } + + override func initializeChart() { + barsController.initialize(chartsCollection: initialChartsCollection, + initialDate: Date(), + totalHorizontalRange: BaseConstants.defaultRange, + totalVerticalRange: BaseConstants.defaultRange) + switchToChart(chartsCollection: barsController.chartsCollection, isZoomed: false, animated: false) + } + + func switchToChart(chartsCollection: ChartsCollection, isZoomed: Bool, animated: Bool) { + if animated { + TimeInterval.setDefaultSuration(.expandAnimationDuration) + DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { + TimeInterval.setDefaultSuration(.osXDuration) + } + } + + super.isZoomed = isZoomed + if isZoomed { + let toHorizontalRange = zoomedBarsController.initialHorizontalRange + let destinationHorizontalRange = (toHorizontalRange.lowerBound - barsController.barsWidth)...(toHorizontalRange.upperBound - barsController.barsWidth) + let verticalVisibleRange = barsController.currentVerticalMainChartRange + let initialVerticalRange = verticalVisibleRange.lowerBound...(verticalVisibleRange.upperBound + verticalVisibleRange.distance * 10) + + zoomedBarsController.mainBarsRenderer.setup(horizontalRange: barsController.currentHorizontalMainChartRange, animated: false) + zoomedBarsController.previewBarsChartRenderer.setup(horizontalRange: barsController.currentPreviewHorizontalRange, animated: false) + zoomedBarsController.mainBarsRenderer.setup(verticalRange: initialVerticalRange, animated: false) + zoomedBarsController.previewBarsChartRenderer.setup(verticalRange: initialVerticalRange, animated: false) + zoomedBarsController.mainBarsRenderer.setVisible(true, animated: false) + zoomedBarsController.previewBarsChartRenderer.setVisible(true, animated: false) + + barsController.setupMainChart(horizontalRange: destinationHorizontalRange, animated: animated) + barsController.previewBarsChartRenderer.setup(horizontalRange: zoomedBarsController.totalHorizontalRange, animated: animated) + barsController.mainBarsRenderer.setVisible(false, animated: animated) + barsController.previewBarsChartRenderer.setVisible(false, animated: animated) + + zoomedBarsController.willAppear(animated: animated) + barsController.willDisappear(animated: animated) + + zoomedBarsController.updateChartsVisibility(visibility: barsController.chartVisibility, animated: false) + zoomedBarsController.mainBarsRenderer.setup(verticalRange: zoomedBarsController.currentVerticalMainChartRange, animated: animated, timeFunction: .easeOut) + zoomedBarsController.previewBarsChartRenderer.setup(verticalRange: zoomedBarsController.currentPreviewVerticalRange, animated: animated, timeFunction: .easeOut) + } else { + if !zoomedBarsController.chartsCollection.isBlank { + barsController.hideDetailsView(animated: false) + barsController.chartVisibility = zoomedBarsController.chartVisibility + let visibleVerticalRange = BarChartRenderer.BarsData.verticalRange(bars: barsController.visibleBars, + calculatingRange: barsController.initialHorizontalRange) ?? BaseConstants.defaultRange + barsController.mainBarsRenderer.setup(verticalRange: visibleVerticalRange, animated: false) + + let toHorizontalRange = barsController.initialHorizontalRange + + let verticalVisibleRange = barsController.initialVerticalRange + let targetVerticalRange = verticalVisibleRange.lowerBound...(verticalVisibleRange.upperBound + verticalVisibleRange.distance * 10) + + zoomedBarsController.setupMainChart(horizontalRange: toHorizontalRange, animated: animated) + zoomedBarsController.mainBarsRenderer.setup(verticalRange: targetVerticalRange, animated: animated, timeFunction: .easeIn) + zoomedBarsController.previewBarsChartRenderer.setup(verticalRange: targetVerticalRange, animated: animated, timeFunction: .easeIn) + zoomedBarsController.previewBarsChartRenderer.setup(horizontalRange: barsController.totalHorizontalRange, animated: animated) + DispatchQueue.main.asyncAfter(deadline: .now() + .defaultDuration) { [weak self] in + self?.zoomedBarsController.mainBarsRenderer.setVisible(false, animated: false) + self?.zoomedBarsController.previewBarsChartRenderer.setVisible(false, animated: false) + } + } + + barsController.willAppear(animated: animated) + zoomedBarsController.willDisappear(animated: animated) + + if !zoomedBarsController.chartsCollection.isBlank { + barsController.updateChartsVisibility(visibility: zoomedBarsController.chartVisibility, animated: false) + } + } + + self.setBackButtonVisibilityClosure?(isZoomed, animated) + } + + override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + if isZoomed { + zoomedBarsController.updateChartsVisibility(visibility: visibility, animated: animated) + } else { + barsController.updateChartsVisibility(visibility: visibility, animated: animated) + } + } + + var visibleChartValues: [ChartsCollection.Chart] { + let visibility = isZoomed ? zoomedBarsController.chartVisibility : barsController.chartVisibility + let collection = isZoomed ? zoomedBarsController.chartsCollection : barsController.chartsCollection + let visibleCharts: [ChartsCollection.Chart] = visibility.enumerated().compactMap { args in + args.element ? collection.chartValues[args.offset] : nil + } + return visibleCharts + } + + override var actualChartVisibility: [Bool] { + return isZoomed ? zoomedBarsController.chartVisibility : barsController.chartVisibility + } + + override var actualChartsCollection: ChartsCollection { + return isZoomed ? zoomedBarsController.chartsCollection : barsController.chartsCollection + } + + override func chartInteractionDidBegin(point: CGPoint) { + if isZoomed { + zoomedBarsController.chartInteractionDidBegin(point: point) + } else { + barsController.chartInteractionDidBegin(point: point) + } + } + + override func chartInteractionDidEnd() { + if isZoomed { + zoomedBarsController.chartInteractionDidEnd() + } else { + barsController.chartInteractionDidEnd() + } + } + + override var drawChartVisibity: Bool { + return true + } + + override var currentChartHorizontalRangeFraction: ClosedRange { + if isZoomed { + return zoomedBarsController.currentChartHorizontalRangeFraction + } else { + return barsController.currentChartHorizontalRangeFraction + } + } + + override func cancelChartInteraction() { + if isZoomed { + return zoomedBarsController.hideDetailsView(animated: true) + } else { + return barsController.hideDetailsView(animated: true) + } + } + + override func didTapZoomIn(date: Date) { + guard isZoomed == false else { return } + if isZoomed { + return zoomedBarsController.hideDetailsView(animated: true) + } + self.getDetailsData?(date, { updatedCollection in + if let updatedCollection = updatedCollection { + self.zoomedBarsController.initialize(chartsCollection: updatedCollection, + initialDate: date, + totalHorizontalRange: 0...1, + totalVerticalRange: 0...1) + self.switchToChart(chartsCollection: updatedCollection, isZoomed: true, animated: true) + } + }) + } + + override func didTapZoomOut() { + cancelChartInteraction() + switchToChart(chartsCollection: barsController.chartsCollection, isZoomed: false, animated: true) + } + + override func updateChartRange(_ rangeFraction: ClosedRange) { + if isZoomed { + return zoomedBarsController.chartRangeFractionDidUpdated(rangeFraction) + } else { + return barsController.chartRangeFractionDidUpdated(rangeFraction) + } + } + + override func apply(colorMode: ColorMode, animated: Bool) { + super.apply(colorMode: colorMode, animated: animated) + + zoomedBarsController.apply(colorMode: colorMode, animated: animated) + barsController.apply(colorMode: colorMode, animated: animated) + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/BarChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/BarChartRenderer.swift new file mode 100644 index 0000000000..73a6b52f42 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/BarChartRenderer.swift @@ -0,0 +1,293 @@ +// +// BarChartRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class BarChartRenderer: BaseChartRenderer { + struct BarsData { + static let blank = BarsData(barWidth: 1, locations: [], components: []) + var barWidth: CGFloat + var locations: [CGFloat] + var components: [Component] + + struct Component { + var color: UIColor + var values: [CGFloat] + } + } + + var fillToTop: Bool = false + private(set) lazy var selectedIndexAnimator: AnimationController = { + return AnimationController(current: 0, refreshClosure: self.refreshClosure) + }() + func setSelectedIndex(_ index: Int?, animated: Bool) { + let destinationValue: CGFloat = (index == nil) ? 0 : 1 + if animated { + if index != nil { + selectedBarIndex = index + } + self.selectedIndexAnimator.completionClosure = { + self.selectedBarIndex = index + } + guard self.selectedIndexAnimator.end != destinationValue else { return } + self.selectedIndexAnimator.animate(to: destinationValue, duration: .defaultDuration) + } else { + self.selectedIndexAnimator.set(current: destinationValue) + self.selectedBarIndex = index + } + } + + private var selectedBarIndex: Int? { + didSet { + setNeedsDisplay() + } + } + var generalUnselectedAlpha: CGFloat = 0.5 + + private var componentsAnimators: [AnimationController] = [] + var bars: BarsData = BarsData(barWidth: 1, locations: [], components: []) { + willSet { + if bars.components.count != newValue.components.count { + componentsAnimators = newValue.components.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } + } + } + didSet { + setNeedsDisplay() + } + } + + func setComponentVisible(_ isVisible: Bool, at index: Int, animated: Bool) { + componentsAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + + private lazy var backgroundColorAnimator = AnimationController(current: UIColorContainer(color: .white), refreshClosure: refreshClosure) + func update(backgroundColor: UIColor, animated: Bool) { + if animated { + backgroundColorAnimator.animate(to: UIColorContainer(color: backgroundColor), duration: .defaultDuration) + } else { + backgroundColorAnimator.set(current: UIColorContainer(color: backgroundColor)) + } + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + let chartsAlpha = chartAlphaAnimator.current + if chartsAlpha == 0 { return } + + let range = renderRange(bounds: bounds, chartFrame: chartFrame) + + var selectedPaths: [[CGRect]] = bars.components.map { _ in [] } + var unselectedPaths: [[CGRect]] = bars.components.map { _ in [] } + + if var barIndex = bars.locations.firstIndex(where: { $0 >= range.lowerBound }) { + if fillToTop { + barIndex = max(0, barIndex - 1) + + while barIndex < bars.locations.count { + let currentLocation = bars.locations[barIndex] + let right = transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame).roundedUpToPixelGrid() + let left = transform(toChartCoordinateHorizontal: currentLocation - bars.barWidth, chartFrame: chartFrame).roundedUpToPixelGrid() + + var summ: CGFloat = 0 + for (index, component) in bars.components.enumerated() { + summ += componentsAnimators[index].current * component.values[barIndex] + } + guard summ > 0 else { + barIndex += 1 + continue + } + + var stackedValue: CGFloat = 0 + for (index, component) in bars.components.enumerated() { + let visibilityPercent = componentsAnimators[index].current + if visibilityPercent == 0 { continue } + + let bottomFraction = stackedValue + let topFraction = stackedValue + ((component.values[barIndex] * visibilityPercent) / summ) + + let rect = CGRect(x: left, + y: chartFrame.maxY - chartFrame.height * topFraction, + width: right - left, + height: chartFrame.height * (topFraction - bottomFraction)) + if selectedBarIndex == barIndex { + selectedPaths[index].append(rect) + } else { + unselectedPaths[index].append(rect) + } + stackedValue = topFraction + } + if currentLocation > range.upperBound { + break + } + barIndex += 1 + } + + for (index, component) in bars.components.enumerated() { + context.saveGState() + context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue).cgColor) + context.fill(selectedPaths[index]) + let resultAlpha: CGFloat = 1.0 - (1.0 - generalUnselectedAlpha) * selectedIndexAnimator.current + context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue * resultAlpha).cgColor) + context.fill(unselectedPaths[index]) + context.restoreGState() + } + } else { + var selectedPaths: [[CGRect]] = bars.components.map { _ in [] } + barIndex = max(0, barIndex - 1) + + var currentLocation = bars.locations[barIndex] + var leftX = transform(toChartCoordinateHorizontal: currentLocation - bars.barWidth, chartFrame: chartFrame) + var rightX: CGFloat = 0 + + let startPoint = CGPoint(x: leftX, + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + + var backgourndPaths: [[CGPoint]] = bars.components.map { _ in Array() } + let itemsCount = ((bars.locations.count - barIndex) * 2) + 4 + for path in backgourndPaths.indices { + backgourndPaths[path].reserveCapacity(itemsCount) + backgourndPaths[path].append(startPoint) + } + var maxValues: [CGFloat] = bars.components.map { _ in 0 } + while barIndex < bars.locations.count { + currentLocation = bars.locations[barIndex] + rightX = transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame) + + var stackedValue: CGFloat = 0 + var bottomY: CGFloat = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) + for (index, component) in bars.components.enumerated() { + let visibilityPercent = componentsAnimators[index].current + if visibilityPercent == 0 { continue } + + let height = component.values[barIndex] * visibilityPercent + stackedValue += height + let topY = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) + let componentHeight = (bottomY - topY) + maxValues[index] = max(maxValues[index], componentHeight) + if selectedBarIndex == barIndex { + let rect = CGRect(x: leftX, + y: topY, + width: rightX - leftX, + height: componentHeight) + selectedPaths[index].append(rect) + } + backgourndPaths[index].append(CGPoint(x: leftX, y: topY)) + backgourndPaths[index].append(CGPoint(x: rightX, y: topY)) + bottomY = topY + } + if currentLocation > range.upperBound { + break + } + leftX = rightX + barIndex += 1 + } + + let endPoint = CGPoint(x: transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame).roundedUpToPixelGrid(), + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + let colorOffset = Double((1.0 - (1.0 - generalUnselectedAlpha) * selectedIndexAnimator.current) * chartsAlpha) + + for (index, component) in bars.components.enumerated().reversed() { + if maxValues[index] < optimizationLevel { + continue + } + context.saveGState() + backgourndPaths[index].append(endPoint) + + context.setFillColor(UIColor.valueBetween(start: backgroundColorAnimator.current.color, + end: component.color, + offset: colorOffset).cgColor) + context.beginPath() + context.addLines(between: backgourndPaths[index]) + context.closePath() + context.fillPath() + context.restoreGState() + } + + for (index, component) in bars.components.enumerated().reversed() { + context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue).cgColor) + context.fill(selectedPaths[index]) + } + } + } + } +} + +extension BarChartRenderer.BarsData { + static func initialComponents(chartsCollection: ChartsCollection) -> + (width: CGFloat, + chartBars: BarChartRenderer.BarsData, + totalHorizontalRange: ClosedRange, + totalVerticalRange: ClosedRange) { + let width: CGFloat + if chartsCollection.axisValues.count > 1 { + width = CGFloat(abs(chartsCollection.axisValues[1].timeIntervalSince1970 - chartsCollection.axisValues[0].timeIntervalSince1970)) + } else { + width = 1 + } + let components = chartsCollection.chartValues.map { BarChartRenderer.BarsData.Component(color: $0.color, + values: $0.values.map { CGFloat($0) }) } + let chartBars = BarChartRenderer.BarsData(barWidth: width, + locations: chartsCollection.axisValues.map { CGFloat($0.timeIntervalSince1970) }, + components: components) + + + + let totalVerticalRange = BarChartRenderer.BarsData.verticalRange(bars: chartBars) ?? 0...1 + let totalHorizontalRange = BarChartRenderer.BarsData.visibleHorizontalRange(bars: chartBars, width: width) ?? 0...1 + return (width: width, chartBars: chartBars, totalHorizontalRange: totalHorizontalRange, totalVerticalRange: totalVerticalRange) + } + + static func visibleHorizontalRange(bars: BarChartRenderer.BarsData, width: CGFloat) -> ClosedRange? { + guard let firstPoint = bars.locations.first, + let lastPoint = bars.locations.last, + firstPoint <= lastPoint else { + return nil + } + + return (firstPoint - width)...lastPoint + } + + static func verticalRange(bars: BarChartRenderer.BarsData, calculatingRange: ClosedRange? = nil, addBounds: Bool = false) -> ClosedRange? { + guard bars.components.count > 0 else { + return nil + } + if let calculatingRange = calculatingRange { + guard var index = bars.locations.firstIndex(where: { $0 >= calculatingRange.lowerBound && $0 <= calculatingRange.upperBound }) else { + return nil + } + + var vMax: CGFloat = bars.components[0].values[index] + while index < bars.locations.count { + var summ: CGFloat = 0 + for component in bars.components { + summ += component.values[index] + } + vMax = max(vMax, summ) + + if bars.locations[index] > calculatingRange.upperBound { + break + } + index += 1 + } + return 0...vMax + } else { + var index = 0 + + var vMax: CGFloat = bars.components[0].values[index] + while index < bars.locations.count { + var summ: CGFloat = 0 + for component in bars.components { + summ += component.values[index] + } + vMax = max(vMax, summ) + index += 1 + } + return 0...vMax + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/BaseChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/BaseChartRenderer.swift new file mode 100644 index 0000000000..63627566e7 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/BaseChartRenderer.swift @@ -0,0 +1,116 @@ +// +// BaseChartRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private let exponentialAnimationTrashold: CGFloat = 100 + +class BaseChartRenderer: ChartViewRenderer { + var containerViews: [UIView] = [] + + var optimizationLevel: CGFloat = 1 { + didSet { + setNeedsDisplay() + } + } + var isEnabled: Bool = true { + didSet { + setNeedsDisplay() + } + } + + private(set) lazy var chartAlphaAnimator: AnimationController = { + return AnimationController(current: 1, refreshClosure: self.refreshClosure) + }() + func setVisible(_ visible: Bool, animated: Bool) { + let destinationValue: CGFloat = visible ? 1 : 0 + guard self.chartAlphaAnimator.end != destinationValue else { return } + if animated { + self.chartAlphaAnimator.animate(to: destinationValue, duration: .defaultDuration) + } else { + self.chartAlphaAnimator.set(current: destinationValue) + } + } + + lazy var horizontalRange = AnimationController>(current: 0...1, refreshClosure: refreshClosure) + lazy var verticalRange = AnimationController>(current: 0...1, refreshClosure: refreshClosure) + + func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { + guard self.verticalRange.end != verticalRange else { + self.verticalRange.timeFunction = timeFunction ?? .linear + return + } + if animated { + let function: TimeFunction + if let timeFunction = timeFunction { + function = timeFunction + } else if self.verticalRange.current.distance > 0 && verticalRange.distance > 0 { + if self.verticalRange.current.distance / verticalRange.distance > exponentialAnimationTrashold { + function = .easeIn + } else if verticalRange.distance / self.verticalRange.current.distance > exponentialAnimationTrashold { + function = .easeOut + } else { + function = .linear + } + } else { + function = .linear + } + + self.verticalRange.animate(to: verticalRange, duration: .defaultDuration, timeFunction: function) + } else { + self.verticalRange.set(current: verticalRange) + } + } + + func setup(horizontalRange: ClosedRange, animated: Bool) { + guard self.horizontalRange.end != horizontalRange else { return } + if animated { + let animationCurve: TimeFunction = self.horizontalRange.current.distance > horizontalRange.distance ? .easeOut : .easeIn + self.horizontalRange.animate(to: horizontalRange, duration: .defaultDuration, timeFunction: animationCurve) + } else { + self.horizontalRange.set(current: horizontalRange) + } + } + + func transform(toChartCoordinateHorizontal x: CGFloat, chartFrame: CGRect) -> CGFloat { + return chartFrame.origin.x + (x - horizontalRange.current.lowerBound) / horizontalRange.current.distance * chartFrame.width + } + + func transform(toChartCoordinateVertical y: CGFloat, chartFrame: CGRect) -> CGFloat { + return chartFrame.height + chartFrame.origin.y - (y - verticalRange.current.lowerBound) / verticalRange.current.distance * chartFrame.height + } + + func transform(toChartCoordinate point: CGPoint, chartFrame: CGRect) -> CGPoint { + return CGPoint(x: transform(toChartCoordinateHorizontal: point.x, chartFrame: chartFrame), + y: transform(toChartCoordinateVertical: point.y, chartFrame: chartFrame)) + } + + func renderRange(bounds: CGRect, chartFrame: CGRect) -> ClosedRange { + let lowerBound = horizontalRange.current.lowerBound - chartFrame.origin.x / chartFrame.width * horizontalRange.current.distance + let upperBound = horizontalRange.current.upperBound + (bounds.width - chartFrame.width - chartFrame.origin.x) / chartFrame.width * horizontalRange.current.distance + guard lowerBound <= upperBound else { + print("Error: Unexpecated bounds range!") + return 0...1 + } + return lowerBound...upperBound + } + + func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + fatalError("abstract") + } + + func setNeedsDisplay() { + containerViews.forEach { $0.setNeedsDisplay() } + } + + var refreshClosure: () -> Void { + return { [weak self] in + self?.setNeedsDisplay() + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/ChartDetailsRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/ChartDetailsRenderer.swift new file mode 100644 index 0000000000..ad61ff5dd9 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/ChartDetailsRenderer.swift @@ -0,0 +1,147 @@ +// +// ChartDetailsRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class ChartDetailsRenderer: BaseChartRenderer, ColorModeContainer { + private lazy var colorAnimator = AnimationController(current: 1, refreshClosure: refreshClosure) + private var fromColorMode: ColorMode = .day + private var currentColorMode: ColorMode = .day + func apply(colorMode: ColorMode, animated: Bool) { + if currentColorMode != colorMode { + fromColorMode = currentColorMode + currentColorMode = colorMode + if animated { + colorAnimator.set(current: 0) + colorAnimator.animate(to: 1, duration: .defaultDuration) + } else { + colorAnimator.set(current: 1) + } + } + } + + private var valuesAnimators: [AnimationController] = [] + func setValueVisible(_ isVisible: Bool, at index: Int, animated: Bool) { + valuesAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + var detailsViewModel: ChartDetailsViewModel = .blank { + didSet { + if detailsViewModel.values.count != valuesAnimators.count { + valuesAnimators = detailsViewModel.values.map { _ in AnimationController(current: 1, refreshClosure: refreshClosure) } + } + setNeedsDisplay() + } + } + + var detailsViewPosition: CGFloat = 0 { + didSet { + setNeedsDisplay() + } + } + var detailViewPositionOffset: CGFloat = 10 + var detailViewTopOffset: CGFloat = 10 + private var iconWidth: CGFloat = 10 + private var margins: CGFloat = 10 + private let cornerRadius: CGFloat = 5 + private var rowHeight: CGFloat = 20 + private let titleFont = UIFont.systemFont(ofSize: 14, weight: .bold) + private let prefixFont = UIFont.systemFont(ofSize: 14, weight: .bold) + private let labelsFont = UIFont.systemFont(ofSize: 14, weight: .medium) + private let valuesFont = UIFont.systemFont(ofSize: 14, weight: .bold) + private let labelsColor: UIColor = .black + + private(set) var previousRenderBannerFrame: CGRect = .zero + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + previousRenderBannerFrame = .zero + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + let generalAlpha = chartAlphaAnimator.current + if generalAlpha == 0 { return } + + let widths: [(prefix: CGFloat, label: CGFloat, value: CGFloat)] = detailsViewModel.values.map { value in + var prefixWidth: CGFloat = 0 + if let prefixText = value.prefix { + prefixWidth = (prefixText as NSString).boundingRect(with: bounds.size, + options: .usesLineFragmentOrigin, + attributes: [.font: prefixFont], + context: nil).width.rounded(.up) + margins + } + + let labelWidth = (value.title as NSString).boundingRect(with: bounds.size, + options: .usesLineFragmentOrigin, + attributes: [.font: labelsFont], + context: nil).width.rounded(.up) + margins + + let valueWidth = (value.value as NSString).boundingRect(with: bounds.size, + options: .usesLineFragmentOrigin, + attributes: [.font: valuesFont], + context: nil).width.rounded(.up) + return (prefixWidth, labelWidth, valueWidth) + } + + let titleWidth = (detailsViewModel.title as NSString).boundingRect(with: bounds.size, + options: .usesLineFragmentOrigin, + attributes: [.font: titleFont], + context: nil).width + let prefixesWidth = widths.map { $0.prefix }.max() ?? 0 + let labelsWidth = widths.map { $0.label }.max() ?? 0 + let valuesWidth = widths.map { $0.value }.max() ?? 0 + + let totalWidth: CGFloat = max(prefixesWidth + labelsWidth + valuesWidth, titleWidth + iconWidth) + margins * 2 + let totalHeight: CGFloat = CGFloat(detailsViewModel.values.count + 1) * rowHeight + margins * 2 + let backgroundColor = UIColor.valueBetween(start: fromColorMode.chartDetailsViewColor, + end: currentColorMode.chartDetailsViewColor, + offset: Double(colorAnimator.current)) + let titleAndTextColor = UIColor.valueBetween(start: fromColorMode.chartDetailsTextColor, + end: currentColorMode.chartDetailsTextColor, + offset: Double(colorAnimator.current)) + let detailsViewFrame: CGRect + if totalWidth + detailViewTopOffset > detailsViewPosition { + detailsViewFrame = CGRect(x: detailsViewPosition + detailViewTopOffset, + y: detailViewTopOffset + chartFrame.minY, + width: totalWidth, + height: totalHeight) + } else { + detailsViewFrame = CGRect(x: detailsViewPosition - totalWidth - detailViewTopOffset, + y: detailViewTopOffset + chartFrame.minY, + width: totalWidth, + height: totalHeight) + } + previousRenderBannerFrame = detailsViewFrame + context.saveGState() + context.setFillColor(backgroundColor.cgColor) + context.beginPath() + context.addPath(CGPath(roundedRect: detailsViewFrame, cornerWidth: 5, cornerHeight: 5, transform: nil)) + context.fillPath() + context.endPage() + context.restoreGState() + + var drawY = detailsViewFrame.minY + margins + (rowHeight - titleFont.pointSize) / 2 + (detailsViewModel.title as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + margins, y: drawY), withAttributes: [.font: titleFont, + .foregroundColor: titleAndTextColor]) + drawY += rowHeight + + for (index, row) in widths.enumerated() { + let value = detailsViewModel.values[index] + if let prefixText = value.prefix { + (prefixText as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + prefixesWidth - row.prefix, + y: drawY), + withAttributes: [.font: prefixText, .foregroundColor: titleAndTextColor]) + } + + (value.title as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + prefixesWidth + margins, + y: drawY), + withAttributes: [.font: labelsFont, .foregroundColor: titleAndTextColor]) + + (value.value as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + prefixesWidth + labelsWidth + valuesWidth - row.value + margins, + y: drawY), + withAttributes: [.font: labelsFont, .foregroundColor: value.color]) + + drawY += rowHeight + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/HorizontalScalesRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/HorizontalScalesRenderer.swift new file mode 100644 index 0000000000..3ab90ef546 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/HorizontalScalesRenderer.swift @@ -0,0 +1,99 @@ +// +// HorizontalScalesRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/8/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class HorizontalScalesRenderer: BaseChartRenderer { + private var horizontalLabels: [LinesChartLabel] = [] + private var animatedHorizontalLabels: [AnimatedLinesChartLabels] = [] + + var labelsVerticalOffset: CGFloat = 8 + var labelsFont: UIFont = .systemFont(ofSize: 11) + var labelsColor: UIColor = .gray + + func setup(labels: [LinesChartLabel], animated: Bool) { + if animated { + var labelsToKeepVisible: [LinesChartLabel] = [] + let labelsToHide: [LinesChartLabel] + var labelsToShow: [LinesChartLabel] = [] + + for label in labels { + if horizontalLabels.contains(label) { + labelsToKeepVisible.append(label) + } else { + labelsToShow.append(label) + } + } + labelsToHide = horizontalLabels.filter { !labels.contains($0) } + animatedHorizontalLabels.removeAll() + horizontalLabels = labelsToKeepVisible + + let showAnimation = AnimatedLinesChartLabels(labels: labelsToShow, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) + showAnimation.isAppearing = true + showAnimation.alphaAnimator.set(current: 0) + showAnimation.alphaAnimator.animate(to: 1, duration: .defaultDuration) + showAnimation.alphaAnimator.completionClosure = { [weak self, weak showAnimation] in + guard let self = self, let showAnimation = showAnimation else { return } + self.animatedHorizontalLabels.removeAll(where: { $0 === showAnimation }) + self.horizontalLabels = labels + } + + let hideAnimation = AnimatedLinesChartLabels(labels: labelsToHide, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) + hideAnimation.isAppearing = false + hideAnimation.alphaAnimator.set(current: 1) + hideAnimation.alphaAnimator.animate(to: 0, duration: .defaultDuration) + hideAnimation.alphaAnimator.completionClosure = { [weak self, weak hideAnimation] in + guard let self = self, let hideAnimation = hideAnimation else { return } + self.animatedHorizontalLabels.removeAll(where: { $0 === hideAnimation }) + } + + animatedHorizontalLabels.append(showAnimation) + animatedHorizontalLabels.append(hideAnimation) + } else { + horizontalLabels = labels + animatedHorizontalLabels = [] + } + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + let itemsAlpha = chartAlphaAnimator.current + guard itemsAlpha > 0 else { return } + + let range = renderRange(bounds: bounds, chartFrame: chartFrame) + + func drawHorizontalLabels(_ labels: [LinesChartLabel], color: UIColor) { + let attributes: [NSAttributedString.Key : Any] = [.foregroundColor: color, + .font: labelsFont] + let y = chartFrame.origin.y + chartFrame.height + labelsVerticalOffset + + if let start = labels.firstIndex(where: { $0.value > range.lowerBound }) { + for index in start.. range.upperBound { + break + } + } + } + } + let labelColorAlpha = labelsColor.alphaValue * itemsAlpha + drawHorizontalLabels(horizontalLabels, color: labelsColor.withAlphaComponent(labelColorAlpha * itemsAlpha)) + for animation in animatedHorizontalLabels { + let color = labelsColor.withAlphaComponent(animation.alphaAnimator.current * labelColorAlpha) + drawHorizontalLabels(animation.labels, color: color) + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/LineBulletsRenerer.swift b/submodules/Charts/Sources/Charts/Renderes/LineBulletsRenerer.swift new file mode 100644 index 0000000000..e0417719d7 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/LineBulletsRenerer.swift @@ -0,0 +1,67 @@ +// +// LineBulletsRenerer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/8/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class LineBulletsRenerer: BaseChartRenderer { + struct Bullet { + var coordinate: CGPoint + var color: UIColor + } + + var bullets: [Bullet] = [] { + willSet { + if alphaAnimators.count != newValue.count { + alphaAnimators = newValue.map { _ in AnimationController(current: 1.0, refreshClosure: refreshClosure) } + } + } + didSet { + setNeedsDisplay() + } + } + private var alphaAnimators: [AnimationController] = [] + + private lazy var innerColorAnimator = AnimationController(current: UIColorContainer(color: .white), refreshClosure: refreshClosure) + public func setInnerColor(_ color: UIColor, animated: Bool) { + if animated { + innerColorAnimator.animate(to: UIColorContainer(color: color), duration: .defaultDuration) + } else { + innerColorAnimator.set(current: UIColorContainer(color: color)) + } + } + + var linesWidth: CGFloat = 2 + var bulletRadius: CGFloat = 6 + + func setLineVisible(_ isVisible: Bool, at index: Int, animated: Bool) { + alphaAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + let generalAlpha = chartAlphaAnimator.current + if generalAlpha == 0 { return } + + for (index, bullet) in bullets.enumerated() { + let alpha = alphaAnimators[index].current + if alpha == 0 { continue } + + let centerX = transform(toChartCoordinateHorizontal: bullet.coordinate.x, chartFrame: chartFrame) + let centerY = transform(toChartCoordinateVertical: bullet.coordinate.y, chartFrame: chartFrame) + context.setFillColor(innerColorAnimator.current.color.withAlphaComponent(alpha).cgColor) + context.setStrokeColor(bullet.color.withAlphaComponent(alpha).cgColor) + context.setLineWidth(linesWidth) + let rect = CGRect(x: centerX - bulletRadius / 2, + y: centerY - bulletRadius / 2, + width: bulletRadius, + height: bulletRadius) + context.fillEllipse(in: rect) + context.strokeEllipse(in: rect) + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/LinesChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/LinesChartRenderer.swift new file mode 100644 index 0000000000..fe3cdd47ab --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/LinesChartRenderer.swift @@ -0,0 +1,538 @@ +// +// LinesChartRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class LinesChartRenderer: BaseChartRenderer { + struct LineData { + var color: UIColor + var points: [CGPoint] + } + + private var linesAlphaAnimators: [AnimationController] = [] + + var lineWidth: CGFloat = 1 { + didSet { + setNeedsDisplay() + } + } + private lazy var linesShapeAnimator = AnimationController(current: 1, refreshClosure: self.refreshClosure) + private var fromLines: [LineData] = [] + private var toLines: [LineData] = [] + + func setLines(lines: [LineData], animated: Bool) { + if toLines.count != lines.count { + linesAlphaAnimators = lines.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } + } + if animated { + self.fromLines = self.toLines + self.toLines = lines + linesShapeAnimator.set(current: 1.0 - linesShapeAnimator.current) + linesShapeAnimator.completionClosure = { + self.fromLines = [] + } + linesShapeAnimator.animate(to: 1, duration: .defaultDuration) + } else { + self.fromLines = [] + self.toLines = lines + linesShapeAnimator.set(current: 1) + } + } + + func setLineVisible(_ isVisible: Bool, at index: Int, animated: Bool) { + linesAlphaAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + let chartsAlpha = chartAlphaAnimator.current + if chartsAlpha == 0 { return } + let range = renderRange(bounds: bounds, chartFrame: chartFrame) + + for (index, toLine) in toLines.enumerated() { + let alpha = linesAlphaAnimators[index].current * chartsAlpha + if alpha == 0 { continue } + context.setStrokeColor(toLine.color.withAlphaComponent(alpha).cgColor) + context.setLineWidth(lineWidth) + + if linesShapeAnimator.isAnimating { + let animationOffset = linesShapeAnimator.current + + let path = CGMutablePath() + let fromPoints = fromLines.safeElement(at: index)?.points ?? [] + let toPoints = toLines.safeElement(at: index)?.points ?? [] + + var fromIndex: Int? = fromPoints.firstIndex(where: { $0.x >= range.lowerBound }) + var toIndex: Int? = toPoints.firstIndex(where: { $0.x >= range.lowerBound }) + + let fromRange = verticalRange.start + let currentRange = verticalRange.current + let toRange = verticalRange.end + + func convertFromPoint(_ fromPoint: CGPoint) -> CGPoint { + return CGPoint(x: fromPoint.x, + y: (fromPoint.y - fromRange.lowerBound) / fromRange.distance * currentRange.distance + currentRange.lowerBound) + } + + func convertToPoint(_ toPoint: CGPoint) -> CGPoint { + return CGPoint(x: toPoint.x, + y: (toPoint.y - toRange.lowerBound) / toRange.distance * currentRange.distance + currentRange.lowerBound) + } + + var previousFromPoint: CGPoint + var previousToPoint: CGPoint + let startFromPoint: CGPoint? + let startToPoint: CGPoint? + + if let validFrom = fromIndex { + previousFromPoint = convertFromPoint(fromPoints[max(0, validFrom - 1)]) + startFromPoint = previousFromPoint + } else { + previousFromPoint = .zero + startFromPoint = nil + } + if let validTo = toIndex { + previousToPoint = convertToPoint(toPoints[max(0, validTo - 1)]) + startToPoint = previousToPoint + } else { + previousToPoint = .zero + startToPoint = nil + } + + var combinedPoints: [CGPoint] = [] + + func add(pointToDraw: CGPoint) { + if let startFromPoint = startFromPoint, + pointToDraw.x < startFromPoint.x { + let animatedPoint = CGPoint(x: pointToDraw.x, + y: CGFloat.valueBetween(start: startFromPoint.y, end: pointToDraw.y, offset: animationOffset)) + combinedPoints.append(transform(toChartCoordinate: animatedPoint, chartFrame: chartFrame)) + } else if let startToPoint = startToPoint, + pointToDraw.x < startToPoint.x { + let animatedPoint = CGPoint(x: pointToDraw.x, + y: CGFloat.valueBetween(start: startToPoint.y, end: pointToDraw.y, offset: 1 - animationOffset)) + combinedPoints.append(transform(toChartCoordinate: animatedPoint, chartFrame: chartFrame)) + } else { + combinedPoints.append(transform(toChartCoordinate: pointToDraw, chartFrame: chartFrame)) + } + } + + if previousToPoint != .zero && previousFromPoint != .zero { + add(pointToDraw: (previousToPoint.x < previousFromPoint.x ? previousToPoint : previousFromPoint)) + } else if previousToPoint != .zero { + add(pointToDraw: previousToPoint) + } else if previousFromPoint != .zero { + add(pointToDraw: previousFromPoint) + } + + while let validFromIndex = fromIndex, + let validToIndex = toIndex, + validFromIndex < fromPoints.count, + validToIndex < toPoints.count { + let currentFromPoint = convertFromPoint(fromPoints[validFromIndex]) + let currentToPoint = convertToPoint(toPoints[validToIndex]) + let pointToAdd: CGPoint + if currentFromPoint.x == currentToPoint.x { + pointToAdd = CGPoint.valueBetween(start: currentFromPoint, end: currentToPoint, offset: animationOffset) + previousFromPoint = currentFromPoint + previousToPoint = currentToPoint + fromIndex = validFromIndex + 1 + toIndex = validToIndex + 1 + } else if currentFromPoint.x < currentToPoint.x { + if previousToPoint.x < currentFromPoint.x { + let offset = Double((currentFromPoint.x - previousToPoint.x) / (currentToPoint.x - previousToPoint.x)) + let intermidiateToPoint = CGPoint.valueBetween(start: previousToPoint, end: currentToPoint, offset: offset) + pointToAdd = CGPoint.valueBetween(start: currentFromPoint, end: intermidiateToPoint, offset: animationOffset) + } else { + pointToAdd = currentFromPoint + } + previousFromPoint = currentFromPoint + fromIndex = validFromIndex + 1 + } else { + if previousFromPoint.x < currentToPoint.x { + let offset = Double((currentToPoint.x - previousFromPoint.x) / (currentFromPoint.x - previousFromPoint.x)) + let intermidiateFromPoint = CGPoint.valueBetween(start: previousFromPoint, end: currentFromPoint, offset: offset) + pointToAdd = CGPoint.valueBetween(start: intermidiateFromPoint, end: currentToPoint, offset: animationOffset) + } else { + pointToAdd = currentToPoint + } + previousToPoint = currentToPoint + toIndex = validToIndex + 1 + } + add(pointToDraw: pointToAdd) + if (pointToAdd.x > range.upperBound) { + break + } + } + + while let validToIndex = toIndex, validToIndex < toPoints.count { + var pointToAdd = convertToPoint(toPoints[validToIndex]) + pointToAdd.y = CGFloat.valueBetween(start: previousFromPoint.y, + end: pointToAdd.y, + offset: animationOffset) + + add(pointToDraw: pointToAdd) + if (pointToAdd.x > range.upperBound) { + break + } + + toIndex = validToIndex + 1 + } + + while let validFromIndex = fromIndex, validFromIndex < fromPoints.count { + var pointToAdd = convertFromPoint(fromPoints[validFromIndex]) + pointToAdd.y = CGFloat.valueBetween(start: previousToPoint.y, + end: pointToAdd.y, + offset: 1 - animationOffset) + + add(pointToDraw: pointToAdd) + if (pointToAdd.x > range.upperBound) { + break + } + + fromIndex = validFromIndex + 1 + } + + var index = 0 + var lines: [CGPoint] = [] + var currentChartPoint = combinedPoints[index] + lines.append(currentChartPoint) + + var chartPoints = [currentChartPoint] + var minIndex = 0 + var maxIndex = 0 + index += 1 + + while index < combinedPoints.count { + currentChartPoint = combinedPoints[index] + + if currentChartPoint.x - chartPoints[0].x < lineWidth * optimizationLevel { + chartPoints.append(currentChartPoint) + + if currentChartPoint.y > chartPoints[maxIndex].y { + maxIndex = chartPoints.count - 1 + } + if currentChartPoint.y < chartPoints[minIndex].y { + minIndex = chartPoints.count - 1 + } + + index += 1 + } else { + if chartPoints.count == 1 { + lines.append(currentChartPoint) + lines.append(currentChartPoint) + chartPoints[0] = currentChartPoint + index += 1 + minIndex = 0 + maxIndex = 0 + } else { + if minIndex < maxIndex { + if minIndex != 0 { + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + } + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + if maxIndex != chartPoints.count - 1 { + chartPoints = [chartPoints[maxIndex], chartPoints.last!] + } else { + chartPoints = [chartPoints[maxIndex]] + } + } else { + if maxIndex != 0 { + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + } + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + if minIndex != chartPoints.count - 1 { + chartPoints = [chartPoints[minIndex], chartPoints.last!] + } else { + chartPoints = [chartPoints[minIndex]] + } + } + if chartPoints.count == 2 { + if chartPoints[0].y < chartPoints[1].y { + minIndex = 0 + maxIndex = 1 + } else { + minIndex = 1 + maxIndex = 0 + } + } else { + minIndex = 0 + maxIndex = 0 + } + } + } + } + + if chartPoints.count == 1 { + lines.append(currentChartPoint) + lines.append(currentChartPoint) + } else { + if minIndex < maxIndex { + if minIndex != 0 { + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + } + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + if maxIndex != chartPoints.count - 1 { + lines.append(chartPoints.last!) + lines.append(chartPoints.last!) + } + } else { + if maxIndex != 0 { + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + } + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + if minIndex != chartPoints.count - 1 { + lines.append(chartPoints.last!) + lines.append(chartPoints.last!) + } + } + } + + if (lines.count % 2) == 1 { + lines.removeLast() + } + + context.setLineCap(.round) + context.strokeLineSegments(between: lines) + + } else { + let alpha = linesAlphaAnimators[index].current * chartsAlpha + if alpha == 0 { continue } + context.setStrokeColor(toLine.color.withAlphaComponent(alpha).cgColor) + context.setLineWidth(lineWidth) + + if var index = toLine.points.firstIndex(where: { $0.x >= range.lowerBound }) { + var lines: [CGPoint] = [] + index = max(0, index - 1) + var currentPoint = toLine.points[index] + var currentChartPoint = transform(toChartCoordinate: currentPoint, chartFrame: chartFrame) + lines.append(currentChartPoint) + //context.move(to: currentChartPoint) + + var chartPoints = [currentChartPoint] + var minIndex = 0 + var maxIndex = 0 + index += 1 + + while index < toLine.points.count { + currentPoint = toLine.points[index] + currentChartPoint = transform(toChartCoordinate: currentPoint, chartFrame: chartFrame) + + if currentChartPoint.x - chartPoints[0].x < lineWidth * optimizationLevel { + chartPoints.append(currentChartPoint) + + if currentChartPoint.y > chartPoints[maxIndex].y { + maxIndex = chartPoints.count - 1 + } + if currentChartPoint.y < chartPoints[minIndex].y { + minIndex = chartPoints.count - 1 + } + + index += 1 + } else { + if chartPoints.count == 1 { + lines.append(currentChartPoint) + lines.append(currentChartPoint) + chartPoints[0] = currentChartPoint + index += 1 + minIndex = 0 + maxIndex = 0 + } else { + if minIndex < maxIndex { + if minIndex != 0 { + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + } + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + if maxIndex != chartPoints.count - 1 { + chartPoints = [chartPoints[maxIndex], chartPoints.last!] + } else { + chartPoints = [chartPoints[maxIndex]] + } + } else { + if maxIndex != 0 { + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + } + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + if minIndex != chartPoints.count - 1 { + chartPoints = [chartPoints[minIndex], chartPoints.last!] + } else { + chartPoints = [chartPoints[minIndex]] + } + } + if chartPoints.count == 2 { + if chartPoints[0].y < chartPoints[1].y { + minIndex = 0 + maxIndex = 1 + } else { + minIndex = 1 + maxIndex = 0 + } + } else { + minIndex = 0 + maxIndex = 0 + } + } + } + if currentPoint.x > range.upperBound { + break + } + } + + if chartPoints.count == 1 { + lines.append(currentChartPoint) + lines.append(currentChartPoint) + } else { + if minIndex < maxIndex { + if minIndex != 0 { + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + } + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + if maxIndex != chartPoints.count - 1 { + lines.append(chartPoints.last!) + lines.append(chartPoints.last!) + } + } else { + if maxIndex != 0 { + lines.append(chartPoints[maxIndex]) + lines.append(chartPoints[maxIndex]) + } + lines.append(chartPoints[minIndex]) + lines.append(chartPoints[minIndex]) + if minIndex != chartPoints.count - 1 { + lines.append(chartPoints.last!) + lines.append(chartPoints.last!) + } + } + } + + if (lines.count % 2) == 1 { + lines.removeLast() + } + + context.setLineCap(.round) + context.strokeLineSegments(between: lines) + } + +// if var start = toLine.points.firstIndex(where: { $0.x > range.lowerBound }) { +// let alpha = linesAlphaAnimators[index].current * chartsAlpha +// if alpha == 0 { continue } +// context.setStrokeColor(toLine.color.withAlphaComponent(alpha).cgColor) +// context.setLineWidth(lineWidth) +// +// context.setLineCap(.round) +// start = max(0, start - 1) +// let startPoint = toLine.points[start] +// var lines: [CGPoint] = [] +// var pointToDraw = CGPoint(x: transform(toChartCoordinateHorizontal: startPoint.x, chartFrame: chartFrame), +// y: transform(toChartCoordinateVertical: startPoint.y, chartFrame: chartFrame)) +// for index in (start + 1).. range.upperBound { +// break +// } +// } +// +// context.strokeLineSegments(between: lines) +// } + } + } + } +} + +extension LinesChartRenderer.LineData { + static func initialComponents(chartsCollection: ChartsCollection) -> (linesData: [LinesChartRenderer.LineData], + totalHorizontalRange: ClosedRange, + totalVerticalRange: ClosedRange) { + let lines: [LinesChartRenderer.LineData] = chartsCollection.chartValues.map { chart in + let points = chart.values.enumerated().map({ (arg) -> CGPoint in + return CGPoint(x: chartsCollection.axisValues[arg.offset].timeIntervalSince1970, + y: arg.element) + }) + return LinesChartRenderer.LineData(color: chart.color, points: points) + } + let horizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: lines) ?? BaseConstants.defaultRange + let verticalRange = LinesChartRenderer.LineData.verticalRange(lines: lines) ?? BaseConstants.defaultRange + return (linesData: lines, totalHorizontalRange: horizontalRange, totalVerticalRange: verticalRange) + } + + static func horizontalRange(lines: [LinesChartRenderer.LineData]) -> ClosedRange? { + guard let firstPoint = lines.first?.points.first else { return nil } + var hMin: CGFloat = firstPoint.x + var hMax: CGFloat = firstPoint.x + + for line in lines { + if let first = line.points.first, + let last = line.points.last { + hMin = min(hMin, first.x) + hMax = max(hMax, last.x) + } + } + + return hMin...hMax + } + + static func verticalRange(lines: [LinesChartRenderer.LineData], calculatingRange: ClosedRange? = nil, addBounds: Bool = false) -> ClosedRange? { + if let calculatingRange = calculatingRange { + guard let initalStart = lines.first?.points.first(where: { $0.x >= calculatingRange.lowerBound && + $0.x <= calculatingRange.upperBound }) else { return nil } + var vMin: CGFloat = initalStart.y + var vMax: CGFloat = initalStart.y + for line in lines { + if var index = line.points.firstIndex(where: { $0.x > calculatingRange.lowerBound }) { + if addBounds { + index = max(0, index - 1) + } + while index < line.points.count { + let point = line.points[index] + if point.x < calculatingRange.upperBound { + vMin = min(vMin, point.y) + vMax = max(vMax, point.y) + } else if addBounds { + vMin = min(vMin, point.y) + vMax = max(vMax, point.y) + break + } else { + break + } + index += 1 + } + } + } + return vMin...vMax + } else { + guard let firstPoint = lines.first?.points.first else { return nil } + var vMin: CGFloat = firstPoint.y + var vMax: CGFloat = firstPoint.y + for line in lines { + for point in line.points { + vMin = min(vMin, point.y) + vMax = max(vMax, point.y) + } + } + return vMin...vMax + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/PecentChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PecentChartRenderer.swift new file mode 100644 index 0000000000..07ff3daaaa --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/PecentChartRenderer.swift @@ -0,0 +1,132 @@ +// +// PecentChartRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class PecentChartRenderer: BaseChartRenderer { + struct PercentageData { + static let blank = PecentChartRenderer.PercentageData(locations: [], components: []) + var locations: [CGFloat] + var components: [Component] + + struct Component { + var color: UIColor + var values: [CGFloat] + } + } + + override func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { + super.setup(verticalRange: 0...1, animated: animated, timeFunction: timeFunction) + } + + private var componentsAnimators: [AnimationController] = [] + var percentageData: PercentageData = PercentageData(locations: [], components: []) { + willSet { + if percentageData.components.count != newValue.components.count { + componentsAnimators = newValue.components.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } + } + } + didSet { + setNeedsDisplay() + } + } + + func setComponentVisible(_ isVisible: Bool, at index: Int, animated: Bool) { + componentsAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + let alpha = chartAlphaAnimator.current + guard alpha > 0 else { return } + + let range = renderRange(bounds: bounds, chartFrame: chartFrame) + + var paths: [CGMutablePath] = percentageData.components.map { _ in CGMutablePath() } + var vertices: [CGFloat] = Array(repeating: 0, count: percentageData.components.count) + + if var locationIndex = percentageData.locations.firstIndex(where: { $0 > range.lowerBound }) { + locationIndex = max(0, locationIndex - 1) + + var currentLocation = transform(toChartCoordinateHorizontal: percentageData.locations[locationIndex], chartFrame: chartFrame) + + let startPoint = CGPoint(x: currentLocation, + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + + for path in paths { + path.move(to: startPoint) + } + paths.last?.addLine(to: CGPoint(x: currentLocation, + y: transform(toChartCoordinateVertical: verticalRange.current.upperBound, chartFrame: chartFrame))) + + while locationIndex < percentageData.locations.count { + currentLocation = transform(toChartCoordinateHorizontal: percentageData.locations[locationIndex], chartFrame: chartFrame) + var summ: CGFloat = 0 + + for (index, component) in percentageData.components.enumerated() { + let visibilityPercent = componentsAnimators[index].current + + let value = component.values[locationIndex] * visibilityPercent + if index == 0 { + vertices[index] = value + } else { + vertices[index] = value + vertices[index - 1] + } + summ += value + } + + if summ > 0 { + for (index, value) in vertices.dropLast().enumerated() { + paths[index].addLine(to: CGPoint(x: currentLocation, + y: transform(toChartCoordinateVertical: value / summ, chartFrame: chartFrame))) + } + } + + if currentLocation > range.upperBound { + break + } + + locationIndex += 1 + } + + paths.last?.addLine(to: CGPoint(x: currentLocation, + y: transform(toChartCoordinateVertical: verticalRange.current.upperBound, chartFrame: chartFrame))) + + let endPoint = CGPoint(x: currentLocation, + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + + for (index, path) in paths.enumerated().reversed() { + let visibilityPercent = componentsAnimators[index].current + if visibilityPercent == 0 { continue } + + path.addLine(to: endPoint) + path.closeSubpath() + + context.saveGState() + context.beginPath() + context.addPath(path) + + context.setFillColor(percentageData.components[index].color.cgColor) + context.fillPath() + context.restoreGState() + } + } + } +} + +extension PecentChartRenderer.PercentageData { + static func horizontalRange(data: PecentChartRenderer.PercentageData) -> ClosedRange? { + guard let firstPoint = data.locations.first, + let lastPoint = data.locations.last, + firstPoint <= lastPoint else { + return nil + } + + return firstPoint...lastPoint + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift new file mode 100644 index 0000000000..e36fdaf913 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift @@ -0,0 +1,202 @@ +// +// PercentPieAnimationRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class PercentPieAnimationRenderer: BaseChartRenderer { + override func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { + super.setup(verticalRange: 0...1, animated: animated, timeFunction: timeFunction) + } + + private lazy var transitionAnimator = AnimationController(current: 0, refreshClosure: refreshClosure) + private var animationComponentsPoints: [[CGPoint]] = [] + var visiblePercentageData: PecentChartRenderer.PercentageData = .blank { + didSet { + animationComponentsPoints = [] + } + } + var visiblePieComponents: [PieChartRenderer.PieComponent] = [] + + func animate(fromDataToPie: Bool, animated: Bool, completion: @escaping () -> Void) { + assert(visiblePercentageData.components.count == visiblePieComponents.count) + + isEnabled = true + transitionAnimator.completionClosure = { [weak self] in + self?.isEnabled = false + completion() + } + transitionAnimator.animate(to: fromDataToPie ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + + private func generateAnimationComponentPoints(bounds: CGRect, chartFrame: CGRect) { + let range = renderRange(bounds: bounds, chartFrame: chartFrame) + + let componentsCount = visiblePercentageData.components.count + guard componentsCount > 0 else { return } + animationComponentsPoints = visiblePercentageData.components.map { _ in [] } + var vertices: [CGFloat] = Array(repeating: 0, count: visiblePercentageData.components.count) + + if var locationIndex = visiblePercentageData.locations.firstIndex(where: { $0 > range.lowerBound }) { + locationIndex = max(0, locationIndex - 1) + var currentLocation = transform(toChartCoordinateHorizontal: visiblePercentageData.locations[locationIndex], chartFrame: chartFrame) + let startPoint = CGPoint(x: currentLocation, y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + for index in 0.. range.upperBound { + break + } + locationIndex += 1 + } + + animationComponentsPoints[componentsCount - 1].append(CGPoint(x: currentLocation, y: transform(toChartCoordinateVertical: verticalRange.current.upperBound, chartFrame: chartFrame))) + let endPoint = CGPoint(x: currentLocation, y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + for index in 0.. 0 && verticalRange.current.distance > 0 else { return } + self.optimizationLevel = 1 + + if animationComponentsPoints.isEmpty { + generateAnimationComponentPoints(bounds: bounds, chartFrame: chartFrame) + } + + let numberOfComponents = animationComponentsPoints.count + guard numberOfComponents > 0 else { return } + let destinationRadius = max(chartFrame.width, chartFrame.height) + + let animationFraction = transitionAnimator.current + let animationFractionD = Double(transitionAnimator.current) + let easeInAnimationFractionD = animationFractionD * animationFractionD * animationFractionD * animationFractionD + let center = CGPoint(x: chartFrame.midX, y: chartFrame.midY) + let totalPieSumm: CGFloat = visiblePieComponents.map { $0.value } .reduce(0, +) + + let pathsToDraw: [CGMutablePath] = (0.. 4 else { + return + } + + let percent = visiblePieComponents[componentIndex].value / totalPieSumm + let segmentSize = 2 * .pi * percent + let endAngle = startAngle + segmentSize + let centerAngle = (startAngle + endAngle) / 2 + + let lineCenterPoint = CGPoint.valueBetween(start: componentPoints[componentPoints.count / 2], + end: center, + offset: animationFractionD) + + let startDestinationPoint = lineCenterPoint + CGPoint(x: destinationRadius, y: 0) + let centerDestinationPoint = lineCenterPoint + CGPoint(x: 0, y: destinationRadius) + let endDestinationPoint = lineCenterPoint + CGPoint(x: -destinationRadius, y: 0) + let initialStartDestinationAngle: CGFloat = 0 + let initialCenterDestinationAngle: CGFloat = .pi / 2 + let initialEndDestinationAngle: CGFloat = .pi + + var previousAddedPoint = (componentPoints[0] * 2 - center) + .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: centerAngle - initialCenterDestinationAngle, offset: animationFractionD)) + + pathsToDraw[componentIndex].move(to: previousAddedPoint) + + func addPointToPath(_ point: CGPoint) { + if (point - previousAddedPoint).lengthSquared() > optimizationLevel { + pathsToDraw[componentIndex].addLine(to: point) + previousAddedPoint = point + } + } + + for endPointIndex in 1..<(componentPoints.count / 2) { + addPointToPath(CGPoint.valueBetween(start: componentPoints[endPointIndex], end: endDestinationPoint, offset: easeInAnimationFractionD) + .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: endAngle - initialEndDestinationAngle, offset: animationFractionD))) + } + + addPointToPath(lineCenterPoint) + + for startPointIndex in (componentPoints.count / 2 + 1)..<(componentPoints.count - 1) { + addPointToPath(CGPoint.valueBetween(start: componentPoints[startPointIndex], end: startDestinationPoint, offset: easeInAnimationFractionD) + .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: startAngle - initialStartDestinationAngle, offset: animationFractionD))) + } + + if let lastPoint = componentPoints.last { + addPointToPath((lastPoint * 2 - center) + .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: centerAngle - initialCenterDestinationAngle, offset: animationFractionD))) + } + + startAngle = endAngle + } + + if let lastPath = animationComponentsPoints.last { + pathsToDraw.last?.addLines(between: lastPath) + } + + for (index, path) in pathsToDraw.enumerated().reversed() { + path.closeSubpath() + + context.saveGState() + context.beginPath() + context.addPath(path) + + context.setFillColor(visiblePieComponents[index].color.cgColor) + context.fillPath() + context.restoreGState() + } + + let diagramRadius = (min(chartFrame.width, chartFrame.height) / 2) * 0.925 + let targetFrame = CGRect(origin: CGPoint(x: center.x - diagramRadius, + y: center.y - diagramRadius), + size: CGSize(width: diagramRadius * 2, + height: diagramRadius * 2)) + + let minX = animationComponentsPoints.last?.first?.x ?? 0 + let maxX = animationComponentsPoints.last?.last?.x ?? 0 + let startFrame = CGRect(x: minX, + y: chartFrame.minY, + width: maxX - minX, + height: chartFrame.height) + let cornerRadius = diagramRadius * animationFraction + let fadeOutFrame = CGRect.valueBetween(start: startFrame, end: targetFrame, offset: animationFractionD) + let fadeOutPath = CGMutablePath() + fadeOutPath.addRect(bounds) + fadeOutPath.addPath(CGPath(roundedRect: fadeOutFrame, cornerWidth: cornerRadius, cornerHeight: cornerRadius, transform: nil)) + + context.saveGState() + context.beginPath() + context.addPath(fadeOutPath) + context.setFillColor(backgroundColor.cgColor) + context.fillPath(using: .evenOdd) + context.restoreGState() + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/PerformanceRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PerformanceRenderer.swift new file mode 100644 index 0000000000..c17663ce5f --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/PerformanceRenderer.swift @@ -0,0 +1,31 @@ +// +// PerformanceRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/10/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class PerformanceRenderer: ChartViewRenderer { + var containerViews: [UIView] = [] + + private var previousTickTime: TimeInterval = CACurrentMediaTime() + + func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + let currentTime = CACurrentMediaTime() + let delta = currentTime - previousTickTime + previousTickTime = currentTime + + let normalDelta = 0.017 + let redDelta = 0.05 + + if delta > normalDelta || delta < 0.75 { + let green = CGFloat( 1.0 - crop(0, (delta - normalDelta) / (redDelta - normalDelta), 1)) + let color = UIColor(red: 1.0, green: green, blue: 0, alpha: 1) + context.setFillColor(color.cgColor) + context.fill(CGRect(x: 0, y: 0, width: bounds.width, height: 3)) + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/PieChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PieChartRenderer.swift new file mode 100644 index 0000000000..ed4e6bdd49 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/PieChartRenderer.swift @@ -0,0 +1,191 @@ +// +// PieChartRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class PieChartRenderer: BaseChartRenderer { + struct PieComponent: Hashable { + var color: UIColor + var value: CGFloat + } + + override func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { + super.setup(verticalRange: 0...1, animated: animated, timeFunction: timeFunction) + } + + var valuesFormatter: NumberFormatter = NumberFormatter() + var drawValues: Bool = true + + private var componentsAnimators: [AnimationController] = [] + private lazy var transitionAnimator: AnimationController = { AnimationController(current: 1, refreshClosure: self.refreshClosure) }() + private var oldPercentageData: [PieComponent] = [] + private var percentageData: [PieComponent] = [] + private var setlectedSegmentsAnimators: [AnimationController] = [] + + var drawPie: Bool = true + var initialAngle: CGFloat = .pi / 3 + var hasSelectedSegments: Bool { + return selectedSegment != nil + } + private(set) var selectedSegment: Int? + func selectSegmentAt(at indexToSelect: Int?, animated: Bool) { + selectedSegment = indexToSelect + for (index, animator) in setlectedSegmentsAnimators.enumerated() { + let fraction: CGFloat = (index == indexToSelect) ? 1.0 : 0.0 + if animated { + animator.animate(to: fraction, duration: .defaultDuration / 2) + } else { + animator.set(current: fraction) + } + } + } + + func updatePercentageData(_ percentageData: [PieComponent], animated: Bool) { + if self.percentageData.count != percentageData.count { + componentsAnimators = percentageData.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } + setlectedSegmentsAnimators = percentageData.map { _ in AnimationController(current: 0, refreshClosure: self.refreshClosure) } + } + if animated { + self.oldPercentageData = self.currentTransitionAnimationData + self.percentageData = percentageData + transitionAnimator.completionClosure = { [weak self] in + self?.oldPercentageData = [] + } + transitionAnimator.set(current: 0) + transitionAnimator.animate(to: 1, duration: .defaultDuration) + } else { + self.oldPercentageData = [] + self.percentageData = percentageData + transitionAnimator.set(current: 0) + } + } + + func setComponentVisible(_ isVisible: Bool, at index: Int, animated: Bool) { + componentsAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + + var lastRenderedBounds: CGRect = .zero + var lastRenderedChartFrame: CGRect = .zero + func selectedItemIndex(at point: CGPoint) -> Int? { + let touchPosition = lastRenderedChartFrame.origin + point * lastRenderedChartFrame.size + let center = CGPoint(x: lastRenderedChartFrame.midX, y: lastRenderedChartFrame.midY) + let radius = min(lastRenderedChartFrame.width, lastRenderedChartFrame.height) / 2 + if center.distanceTo(touchPosition) > radius { return nil } + let angle = (center - touchPosition).angle + .pi + let currentData = currentlyVisibleData + let total: CGFloat = currentData.map({ $0.value }).reduce(0, +) + var startAngle: CGFloat = initialAngle + for (index, piece) in currentData.enumerated() { + let percent = piece.value / total + let segmentSize = 2 * .pi * percent + let endAngle = startAngle + segmentSize + if angle >= startAngle && angle <= endAngle || + angle + .pi * 2 >= startAngle && angle + .pi * 2 <= endAngle { + return index + } + startAngle = endAngle + } + return nil + } + + private var currentTransitionAnimationData: [PieComponent] { + if transitionAnimator.isAnimating { + let animationFraction = transitionAnimator.current + return percentageData.enumerated().map { arg in + return PieComponent(color: arg.element.color, + value: oldPercentageData[arg.offset].value * (1 - animationFraction) + arg.element.value * animationFraction) + } + } else { + return percentageData + } + } + + var currentlyVisibleData: [PieComponent] { + return currentTransitionAnimationData.enumerated().map { arg in + return PieComponent(color: arg.element.color, + value: arg.element.value * componentsAnimators[arg.offset].current) + } + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + lastRenderedBounds = bounds + lastRenderedChartFrame = chartFrame + let chartAlpha = chartAlphaAnimator.current + if chartAlpha == 0 { return } + + let center = CGPoint(x: chartFrame.midX, y: chartFrame.midY) + let radius = min(chartFrame.width, chartFrame.height) / 2 + + let currentData = currentlyVisibleData + + let total: CGFloat = currentData.map({ $0.value }).reduce(0, +) + guard total > 0 else { + return + } + + let animationSelectionOffset: CGFloat = radius / 15 + let maximumFontSize: CGFloat = radius / 7 + let minimumFontSize: CGFloat = 4 + let centerOffsetStartAngle = CGFloat.pi / 4 + let minimumValueToDraw: CGFloat = 0.01 + let diagramRadius = radius - animationSelectionOffset + + let numberOfVisibleItems = currentlyVisibleData.filter { $0.value > 0 }.count + var startAngle: CGFloat = initialAngle + for (index, piece) in currentData.enumerated() { + let percent = piece.value / total + guard percent > 0 else { continue } + let segmentSize = 2 * .pi * percent * chartAlpha + let endAngle = startAngle + segmentSize + let centerAngle = (startAngle + endAngle) / 2 + let labelVector = CGPoint(x: cos(centerAngle), + y: sin(centerAngle)) + + let selectionAnimationFraction = (numberOfVisibleItems > 1 ? setlectedSegmentsAnimators[index].current : 0) + + let updatedCenter = CGPoint(x: center.x + labelVector.x * selectionAnimationFraction * animationSelectionOffset, + y: center.y + labelVector.y * selectionAnimationFraction * animationSelectionOffset) + if drawPie { + context.saveGState() + context.setFillColor(piece.color.withAlphaComponent(piece.color.alphaValue * chartAlpha).cgColor) + context.move(to: updatedCenter) + context.addArc(center: updatedCenter, + radius: radius - animationSelectionOffset, + startAngle: startAngle, + endAngle: endAngle, + clockwise: false) + context.fillPath() + context.restoreGState() + } + + if drawValues && percent >= minimumValueToDraw { + context.saveGState() + + let text = valuesFormatter.string(from: percent * 100) + let fraction = crop(0, segmentSize / centerOffsetStartAngle, 1) + let fontSize = (minimumFontSize + (maximumFontSize - minimumFontSize) * fraction).rounded(.up) + let labelPotisionOffset = diagramRadius / 2 + diagramRadius / 2 * (1 - fraction) + let font = UIFont.systemFont(ofSize: fontSize, weight: .bold) + let labelsEaseInColor = crop(0, chartAlpha * chartAlpha * 2 - 1, 1) + let attributes: [NSAttributedString.Key: Any] = [.foregroundColor: UIColor.white.withAlphaComponent(labelsEaseInColor), + .font: font] + let rect = (text as NSString).boundingRect(with: bounds.size, + options: .usesLineFragmentOrigin, + attributes: attributes, + context: nil) + let labelPoint = CGPoint(x: labelVector.x * labelPotisionOffset + updatedCenter.x - rect.width / 2, + y: labelVector.y * labelPotisionOffset + updatedCenter.y - rect.height / 2) + (text as NSString).draw(at: labelPoint, withAttributes: attributes) + context.restoreGState() + } + + startAngle = endAngle + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/VerticalLinesRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/VerticalLinesRenderer.swift new file mode 100644 index 0000000000..39d1f26a46 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/VerticalLinesRenderer.swift @@ -0,0 +1,42 @@ +// +// VerticalLinesRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/8/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class VerticalLinesRenderer: BaseChartRenderer { + var values: [CGFloat] = [] { + didSet { + alphaAnimators = values.map { _ in AnimationController(current: 1.0, refreshClosure: refreshClosure) } + setNeedsDisplay() + } + } + private var alphaAnimators: [AnimationController] = [] + + var linesColor: UIColor = .black + var linesWidth: CGFloat = UIView.oneDevicePixel + + func setLineVisible(_ isVisible: Bool, at index: Int, animated: Bool) { + alphaAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + + context.setLineWidth(linesWidth) + + for (index, value) in values.enumerated() { + let alpha = alphaAnimators[index].current + if alpha == 0 { continue } + + context.setStrokeColor(linesColor.withAlphaComponent(linesColor.alphaValue * alpha).cgColor) + let pointX = transform(toChartCoordinateHorizontal: value, chartFrame: chartFrame) + context.strokeLineSegments(between: [CGPoint(x: pointX, y: chartFrame.minY), + CGPoint(x: pointX, y: chartFrame.maxY)]) + } + } +} diff --git a/submodules/Charts/Sources/Charts/Renderes/VerticalScalesRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/VerticalScalesRenderer.swift new file mode 100644 index 0000000000..79d9dcec22 --- /dev/null +++ b/submodules/Charts/Sources/Charts/Renderes/VerticalScalesRenderer.swift @@ -0,0 +1,162 @@ +// +// VerticalScalesRenderer.swift +// GraphTest +// +// Created by Andrei Salavei on 4/8/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class VerticalScalesRenderer: BaseChartRenderer { + private var verticalLabelsAndLines: [LinesChartLabel] = [] + private var animatedVerticalLabelsAndLines: [AnimatedLinesChartLabels] = [] + private lazy var horizontalLinesAlphaAnimator: AnimationController = { + return AnimationController(current: 1, refreshClosure: self.refreshClosure) + }() + + var drawAxisX: Bool = true + var axisXColor: UIColor = .black + var axisXWidth: CGFloat = UIView.oneDevicePixel + + var isRightAligned: Bool = false + + var horizontalLinesColor: UIColor = .black { + didSet { + setNeedsDisplay() + } + } + var horizontalLinesWidth: CGFloat = UIView.oneDevicePixel + var lavelsAsisOffset: CGFloat = 6 + var labelsColor: UIColor = .black { + didSet { + setNeedsDisplay() + } + } + var labelsFont: UIFont = .systemFont(ofSize: 11) + + func setHorizontalLinesVisible(_ visible: Bool, animated: Bool) { + let destinationValue: CGFloat = visible ? 1 : 0 + guard self.horizontalLinesAlphaAnimator.end != destinationValue else { return } + if animated { + self.horizontalLinesAlphaAnimator.animate(to: destinationValue, duration: .defaultDuration) + } else { + self.horizontalLinesAlphaAnimator.set(current: destinationValue) + } + } + + func setup(verticalLimitsLabels: [LinesChartLabel], animated: Bool) { + if animated { + var labelsToKeepVisible: [LinesChartLabel] = [] + let labelsToHide: [LinesChartLabel] + var labelsToShow: [LinesChartLabel] = [] + + for label in verticalLimitsLabels { + if verticalLabelsAndLines.contains(label) { + labelsToKeepVisible.append(label) + } else { + labelsToShow.append(label) + } + } + labelsToHide = verticalLabelsAndLines.filter { !verticalLimitsLabels.contains($0) } + animatedVerticalLabelsAndLines.removeAll(where: { $0.isAppearing }) + verticalLabelsAndLines = labelsToKeepVisible + + let showAnimation = AnimatedLinesChartLabels(labels: labelsToShow, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) + showAnimation.isAppearing = true + showAnimation.alphaAnimator.set(current: 0) + showAnimation.alphaAnimator.animate(to: 1, duration: .defaultDuration) + showAnimation.alphaAnimator.completionClosure = { [weak self, weak showAnimation] in + guard let self = self, let showAnimation = showAnimation else { return } + self.animatedVerticalLabelsAndLines.removeAll(where: { $0 === showAnimation }) + self.verticalLabelsAndLines = verticalLimitsLabels + } + + let hideAnimation = AnimatedLinesChartLabels(labels: labelsToHide, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) + hideAnimation.isAppearing = false + hideAnimation.alphaAnimator.set(current: 1) + hideAnimation.alphaAnimator.animate(to: 0, duration: .defaultDuration) + hideAnimation.alphaAnimator.completionClosure = { [weak self, weak hideAnimation] in + guard let self = self, let hideAnimation = hideAnimation else { return } + self.animatedVerticalLabelsAndLines.removeAll(where: { $0 === hideAnimation }) + } + + animatedVerticalLabelsAndLines.append(showAnimation) + animatedVerticalLabelsAndLines.append(hideAnimation) + } else { + verticalLabelsAndLines = verticalLimitsLabels + animatedVerticalLabelsAndLines = [] + } + } + + override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { + guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } + let generalAlpha = chartAlphaAnimator.current + if generalAlpha == 0 { return } + let labelColorAlpha = labelsColor.alphaValue + + func drawLines(_ labels: [LinesChartLabel], alpha: CGFloat) { + var lineSegments: [CGPoint] = [] + let x0 = chartFrame.minX + let x1 = chartFrame.maxX + + context.setStrokeColor(horizontalLinesColor.withAlphaComponent(horizontalLinesColor.alphaValue * alpha).cgColor) + + for lineInfo in labels { + let y = transform(toChartCoordinateVertical: lineInfo.value, chartFrame: chartFrame).roundedUpToPixelGrid() + lineSegments.append(CGPoint(x: x0, y: y)) + lineSegments.append(CGPoint(x: x1, y: y)) + } + context.strokeLineSegments(between: lineSegments) + } + + func drawVerticalLabels(_ labels: [LinesChartLabel], attributes: [NSAttributedString.Key: Any]) { + if isRightAligned { + for label in labels { + let y = transform(toChartCoordinateVertical: label.value, chartFrame: chartFrame) - labelsFont.pointSize - lavelsAsisOffset + + let rect = (label.text as NSString).boundingRect(with: bounds.size, + options: .usesLineFragmentOrigin, + attributes: attributes, + context: nil) + + (label.text as NSString).draw(at: CGPoint(x:chartFrame.maxX - rect.width, y: y), withAttributes: attributes) + } + } else { + for label in labels { + let y = transform(toChartCoordinateVertical: label.value, chartFrame: chartFrame) - labelsFont.pointSize - lavelsAsisOffset + + (label.text as NSString).draw(at: CGPoint(x:chartFrame.minX, y: y), withAttributes: attributes) + } + } + } + + let horizontalLinesAlpha = horizontalLinesAlphaAnimator.current + if horizontalLinesAlpha > 0 { + context.setLineWidth(horizontalLinesWidth) + + drawLines(verticalLabelsAndLines, alpha: generalAlpha) + for animatedLabesAndLines in animatedVerticalLabelsAndLines { + drawLines(animatedLabesAndLines.labels, alpha: animatedLabesAndLines.alphaAnimator.current * generalAlpha * horizontalLinesAlpha) + } + + if drawAxisX { + context.setLineWidth(axisXWidth) + context.setStrokeColor(axisXColor.withAlphaComponent(axisXColor.alphaValue * horizontalLinesAlpha * generalAlpha).cgColor) + + let lineSegments: [CGPoint] = [CGPoint(x: chartFrame.minX, y: chartFrame.maxY.roundedUpToPixelGrid()), + CGPoint(x: chartFrame.maxX, y: chartFrame.maxY.roundedUpToPixelGrid())] + + context.strokeLineSegments(between: lineSegments) + } + } + + drawVerticalLabels(verticalLabelsAndLines, attributes: [.foregroundColor: labelsColor.withAlphaComponent(labelColorAlpha * generalAlpha), + .font: labelsFont]) + for animatedLabesAndLines in animatedVerticalLabelsAndLines { + drawVerticalLabels(animatedLabesAndLines.labels, + attributes: [.foregroundColor: labelsColor.withAlphaComponent(animatedLabesAndLines.alphaAnimator.current * labelColorAlpha * generalAlpha), + .font: labelsFont]) + } + } +} diff --git a/submodules/Charts/Sources/Helpers/AnimationController.swift b/submodules/Charts/Sources/Helpers/AnimationController.swift new file mode 100644 index 0000000000..6df8d17f76 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/AnimationController.swift @@ -0,0 +1,178 @@ +// +// RangeAnimatedContainer.swift +// GraphTest +// +// Created by Andrei Salavei on 3/12/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +protocol Animatable { + static func valueBetween(start: Self, end: Self, offset: Double) -> Self +} + +enum TimeFunction { + case linear + case easeOut + case easeIn + + func profress(time: TimeInterval, duration: TimeInterval) -> TimeInterval { + switch self { + case .linear: + return time / duration + case .easeIn: + return (pow(2, 10 * (time / duration - 1)) - 0.0009765625) * 1.0009775171065499 + + case .easeOut: + return (-pow(2, -10 * time / duration)) + 1 * 1.0009775171065499 + } + } +} + +class AnimationController { + + private(set) var isAnimating: Bool = false + private(set) var animationDuration: TimeInterval = 0.0 + private(set) var currentTime: TimeInterval = 0.0 + + private(set) var start: AnimatableObject + private(set) var end: AnimatableObject + private(set) var current: AnimatableObject + + var timeFunction: TimeFunction = .linear + + var refreshClosure: (() -> Void)? +// var updateClosure: ((AnimatableObject) -> Void)? + var completionClosure: (() -> Void)? + + init(current: AnimatableObject, refreshClosure: (() -> Void)?) { + self.current = current + self.start = current + self.end = current + self.refreshClosure = refreshClosure + } + + func animate(to: AnimatableObject, duration: TimeInterval, timeFunction: TimeFunction = .linear) { + self.timeFunction = timeFunction + currentTime = 0 + animationDuration = duration + if animationDuration > 0 { + start = current + end = to + isAnimating = true + DisplayLinkService.shared.add(listner: self) + } else { + start = to + end = to + current = to + isAnimating = false + DisplayLinkService.shared.remove(listner: self) + } + refreshClosure?() + } + + func set(current: AnimatableObject) { + self.start = current + self.end = current + self.current = current + + animationDuration = 0.0 + currentTime = 0.0 +// updateClosure?(current) + refreshClosure?() + if isAnimating { + isAnimating = false + DisplayLinkService.shared.remove(listner: self) + } + } +} + +extension AnimationController: DisplayLinkListner { + func update(delta: TimeInterval) { + guard isAnimating else { + DisplayLinkService.shared.remove(listner: self) + return + } + + currentTime += delta + if currentTime > animationDuration || animationDuration <= 0 { + start = end + current = end + isAnimating = false + animationDuration = 0.0 + currentTime = 0.0 +// updateClosure?(end) + completionClosure?() + refreshClosure?() + DisplayLinkService.shared.remove(listner: self) + } else { + let offset = timeFunction.profress(time: currentTime, duration: animationDuration) + current = AnimatableObject.valueBetween(start: start, end: end, offset: offset) +// updateClosure?(current) + refreshClosure?() + } + } +} + +extension ClosedRange: Animatable where Bound: BinaryFloatingPoint { + static func valueBetween(start: ClosedRange, end: ClosedRange, offset: Double) -> ClosedRange { + let castedOffset = Bound(offset) + return ClosedRange(uncheckedBounds: (lower: start.lowerBound + (end.lowerBound - start.lowerBound) * castedOffset, + upper: start.upperBound + (end.upperBound - start.upperBound) * castedOffset)) + } +} + +extension CGFloat: Animatable { + static func valueBetween(start: CGFloat, end: CGFloat, offset: Double) -> CGFloat { + return start + (end - start) * CGFloat(offset) + } +} + +extension Double: Animatable { + static func valueBetween(start: Double, end: Double, offset: Double) -> Double { + return start + (end - start) * Double(offset) + } +} + +extension Int: Animatable { + static func valueBetween(start: Int, end: Int, offset: Double) -> Int { + return start + Int(Double(end - start) * offset) + } +} + +extension CGPoint: Animatable { + static func valueBetween(start: CGPoint, end: CGPoint, offset: Double) -> CGPoint { + return CGPoint(x: start.x + (end.x - start.x) * CGFloat(offset), + y: start.y + (end.y - start.y) * CGFloat(offset)) + } +} + +extension CGRect: Animatable { + static func valueBetween(start: CGRect, end: CGRect, offset: Double) -> CGRect { + return CGRect(x: start.origin.x + (end.origin.x - start.origin.x) * CGFloat(offset), + y: start.origin.y + (end.origin.y - start.origin.y) * CGFloat(offset), + width: start.width + (end.width - start.width) * CGFloat(offset), + height: start.height + (end.height - start.height) * CGFloat(offset)) + } +} + +struct UIColorContainer: Animatable { + var color: UIColor + + static func valueBetween(start: UIColorContainer, end: UIColorContainer, offset: Double) -> UIColorContainer { + return UIColorContainer(color: UIColor.valueBetween(start: start.color, end: end.color, offset: offset)) + } +} + +extension UIColor { + static func valueBetween(start: UIColor, end: UIColor, offset: Double) -> UIColor { + let offsetF = CGFloat(offset) + let startCIColor = CIColor(color: start) + let endCIColor = CIColor(color: end) + return UIColor(red: startCIColor.red + (endCIColor.red - startCIColor.red) * offsetF, + green: startCIColor.green + (endCIColor.green - startCIColor.green) * offsetF, + blue: startCIColor.blue + (endCIColor.blue - startCIColor.blue) * offsetF, + alpha: startCIColor.alpha + (endCIColor.alpha - startCIColor.alpha) * offsetF) + } +} diff --git a/submodules/Charts/Sources/Helpers/Array+Utils.swift b/submodules/Charts/Sources/Helpers/Array+Utils.swift new file mode 100644 index 0000000000..539a559756 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/Array+Utils.swift @@ -0,0 +1,18 @@ +// +// Array+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import Foundation + +extension Array { + func safeElement(at index: Int) -> Element? { + if index >= 0 && index < count { + return self[index] + } + return nil + } +} diff --git a/submodules/Charts/Sources/Helpers/CGFloat.swift b/submodules/Charts/Sources/Helpers/CGFloat.swift new file mode 100644 index 0000000000..7bde39b84f --- /dev/null +++ b/submodules/Charts/Sources/Helpers/CGFloat.swift @@ -0,0 +1,17 @@ +// +// CGFloat.swift +// GraphTest +// +// Created by Andrei Salavei on 4/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private let screenScale: CGFloat = UIScreen.main.scale + +extension CGFloat { + func roundedUpToPixelGrid() -> CGFloat { + return (self * screenScale).rounded(.up) / screenScale + } +} diff --git a/submodules/Charts/Sources/Helpers/CGPoint+Extensions.swift b/submodules/Charts/Sources/Helpers/CGPoint+Extensions.swift new file mode 100644 index 0000000000..b5bbd06da4 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/CGPoint+Extensions.swift @@ -0,0 +1,219 @@ +// +// CGPoint+Extensions.swift +// GraphTest +// +// Created by Andrei Salavei on 4/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +extension CGPoint { + public init(vector: CGVector) { + self.init(x: vector.dx, y: vector.dy) + } + + + public init(angle: CGFloat) { + self.init(x: cos(angle), y: sin(angle)) + } + + + public mutating func offset(dx: CGFloat, dy: CGFloat) -> CGPoint { + x += dx + y += dy + return self + } + + public func length() -> CGFloat { + return sqrt(x*x + y*y) + } + + public func lengthSquared() -> CGFloat { + return x*x + y*y + } + + func normalized() -> CGPoint { + let len = length() + return len>0 ? self / len : CGPoint.zero + } + + public mutating func normalize() -> CGPoint { + self = normalized() + return self + } + + public func distanceTo(_ point: CGPoint) -> CGFloat { + return (self - point).length() + } + + public var angle: CGFloat { + return atan2(y, x) + } + + public var cgSize: CGSize { + return CGSize(width: x, height: y) + } + + func rotate(origin: CGPoint, angle: CGFloat) -> CGPoint { + let point = self - origin + let s = sin(angle) + let c = cos(angle) + return CGPoint(x: c * point.x - s * point.y, + y: s * point.x + c * point.y) + origin + } +} + +extension CGSize { + public var cgPoint: CGPoint { + return CGPoint(x: width, y: height) + } + + public init(point: CGPoint) { + self.init(width: point.x, height: point.y) + } +} + +public func + (left: CGPoint, right: CGPoint) -> CGPoint { + return CGPoint(x: left.x + right.x, y: left.y + right.y) +} + +public func += (left: inout CGPoint, right: CGPoint) { + left = left + right +} + +public func + (left: CGPoint, right: CGVector) -> CGPoint { + return CGPoint(x: left.x + right.dx, y: left.y + right.dy) +} + +public func += (left: inout CGPoint, right: CGVector) { + left = left + right +} + +public func - (left: CGPoint, right: CGPoint) -> CGPoint { return CGPoint(x: left.x - right.x, y: left.y - right.y) } +public func - (left: CGSize, right: CGSize) -> CGSize { return CGSize(width: left.width - right.width, height: left.height - right.height) } +public func - (left: CGSize, right: CGPoint) -> CGSize { return CGSize(width: left.width - right.x, height: left.height - right.x) } +public func - (left: CGPoint, right: CGSize) -> CGPoint { return CGPoint(x: left.x - right.width, y: left.y - right.height) } + +public func -= (left: inout CGPoint, right: CGPoint) { + left = left - right +} + +public func - (left: CGPoint, right: CGVector) -> CGPoint { + return CGPoint(x: left.x - right.dx, y: left.y - right.dy) +} + +public func -= (left: inout CGPoint, right: CGVector) { + left = left - right +} + +public func *= (left: inout CGPoint, right: CGPoint) { + left = left * right +} + +public func * (point: CGPoint, scalar: CGFloat) -> CGPoint { return CGPoint(x: point.x * scalar, y: point.y * scalar) } +public func * (point: CGSize, scalar: CGFloat) -> CGSize { return CGSize(width: point.width * scalar, height: point.height * scalar) } + +public func *= (point: inout CGPoint, scalar: CGFloat) { point = point * scalar } + +public func * (left: CGPoint, right: CGVector) -> CGPoint { + return CGPoint(x: left.x * right.dx, y: left.y * right.dy) +} + +public func *= (left: inout CGPoint, right: CGVector) { + left = left * right +} + +public func / (left: CGPoint, right: CGPoint) -> CGPoint { return CGPoint(x: left.x / right.x, y: left.y / right.y) } +public func / (left: CGSize, right: CGSize) -> CGSize { return CGSize(width: left.width / right.width, height: left.height / right.height) } +public func / (left: CGPoint, right: CGSize) -> CGPoint { return CGPoint(x: left.x / right.width, y: left.y / right.height) } +public func / (left: CGSize, right: CGPoint) -> CGSize { return CGSize(width: left.width / right.x, height: left.height / right.y) } +public func /= (left: inout CGPoint, right: CGPoint) { left = left / right } +public func /= (left: inout CGSize, right: CGSize) { left = left / right } +public func /= (left: inout CGSize, right: CGPoint) { left = left / right } +public func /= (left: inout CGPoint, right: CGSize) { left = left / right } + + +public func / (point: CGPoint, scalar: CGFloat) -> CGPoint { return CGPoint(x: point.x / scalar, y: point.y / scalar) } +public func / (point: CGSize, scalar: CGFloat) -> CGSize { return CGSize(width: point.width / scalar, height: point.height / scalar) } + +public func /= (point: inout CGPoint, scalar: CGFloat) { + point = point / scalar +} + +public func / (left: CGPoint, right: CGVector) -> CGPoint { + return CGPoint(x: left.x / right.dx, y: left.y / right.dy) +} + +public func / (left: CGSize, right: CGVector) -> CGSize { + return CGSize(width: left.width / right.dx, height: left.height / right.dy) +} + +public func /= (left: inout CGPoint, right: CGVector) { + left = left / right +} + +public func * (left: CGPoint, right: CGPoint) -> CGPoint { return CGPoint(x: left.x * right.x, y: left.y * right.y) } +public func * (left: CGPoint, right: CGSize) -> CGPoint { return CGPoint(x: left.x * right.width, y: left.y * right.height) } +public func *= (left: inout CGPoint, right: CGSize) { left = left * right } +public func * (left: CGSize, right: CGSize) -> CGSize { return CGSize(width: left.width * right.width, height: left.height * right.height) } +public func *= (left: inout CGSize, right: CGSize) { left = left * right } +public func * (left: CGSize, right: CGPoint) -> CGSize { return CGSize(width: left.width * right.x, height: left.height * right.y) } +public func *= (left: inout CGSize, right: CGPoint) { left = left * right } + + +public func lerp(start: CGPoint, end: CGPoint, t: CGFloat) -> CGPoint { + return start + (end - start) * t +} + +public func abs(_ point: CGPoint) -> CGPoint { + return CGPoint(x: abs(point.x), y: abs(point.y)) +} + +extension CGSize { + var isValid: Bool { + return width > 0 && height > 0 && width != .infinity && height != .infinity && width != .nan && height != .nan + } + + var ratio: CGFloat { + return width / height + } +} + + +extension CGRect { + static var identity: CGRect { + return CGRect(x: 0, y: 0, width: 1, height: 1) + } + + var center: CGPoint { + return origin + size.cgPoint / 2 + } + + var rounded: CGRect { + return CGRect(x: origin.x.rounded(), + y: origin.y.rounded(), + width: width.rounded(.up), + height: height.rounded(.up)) + } + + var mirroredVertically: CGRect { + return CGRect(x: origin.x, + y: 1.0 - (origin.y + height), + width: width, + height: height) + } +} + +extension CGAffineTransform { + func inverted(with size: CGSize) -> CGAffineTransform { + var transform = self + let transformedSize = CGRect(origin: .zero, size: size).applying(transform).size + transform.tx /= transformedSize.width; + transform.ty /= transformedSize.height; + transform = transform.inverted() + transform.tx *= transformedSize.width; + transform.ty *= transformedSize.height; + return transform + } +} diff --git a/submodules/Charts/Sources/Helpers/ClosedRange+Utils.swift b/submodules/Charts/Sources/Helpers/ClosedRange+Utils.swift new file mode 100644 index 0000000000..236d6c8a38 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/ClosedRange+Utils.swift @@ -0,0 +1,15 @@ +// +// ClosedRange+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 3/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import Foundation + +extension ClosedRange where Bound: Numeric { + var distance: Bound { + return upperBound - lowerBound + } +} diff --git a/submodules/Charts/Sources/Helpers/CustomNavigationController.swift b/submodules/Charts/Sources/Helpers/CustomNavigationController.swift new file mode 100644 index 0000000000..977244dfcc --- /dev/null +++ b/submodules/Charts/Sources/Helpers/CustomNavigationController.swift @@ -0,0 +1,19 @@ +// +// CustomNavigationController.swift +// GraphTest +// +// Created by Andrew Solovey on 15/03/2019. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +class CustomNavigationController: UINavigationController { + override var preferredStatusBarStyle: UIStatusBarStyle { + return topViewController?.preferredStatusBarStyle ?? .default + } + + override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation { + return topViewController?.preferredStatusBarUpdateAnimation ?? .fade + } +} diff --git a/submodules/Charts/Sources/Helpers/DisplayLinkService.swift b/submodules/Charts/Sources/Helpers/DisplayLinkService.swift new file mode 100644 index 0000000000..2c91471c39 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/DisplayLinkService.swift @@ -0,0 +1,114 @@ +// +// DisplayLinkService.swift +// GraphTest +// +// Created by Andrei Salavei on 4/7/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit +import CoreGraphics + +public protocol DisplayLinkListner: class { + func update(delta: TimeInterval) +} + +// DispatchSource mares refreshes more accurate +class DisplayLinkService { + let listners = NSHashTable.weakObjects() + static let shared = DisplayLinkService() + + public func add(listner: DisplayLinkListner) { + listners.add(listner) + startDisplayLink() + } + + public func remove(listner: DisplayLinkListner) { + listners.remove(listner) + + if listners.count == 0 { + stopDisplayLink() + } + } + +// private init() { +// displayLink.add(to: .main, forMode: .common) +// displayLink.preferredFramesPerSecond = 60 +// displayLink.isPaused = true +// } +// +// // MARK: - Display Link +// private lazy var displayLink: CADisplayLink! = { CADisplayLink(target: self, selector: #selector(displayLinkDidFire)) } () +// private var previousTickTime = 0.0 +// +// private func startDisplayLink() { +// guard displayLink.isPaused else { +// return +// } +// previousTickTime = CACurrentMediaTime() +// displayLink.isPaused = false +// } +// +// @objc private func displayLinkDidFire(_ displayLink: CADisplayLink) { +// let currentTime = CACurrentMediaTime() +// let delta = currentTime - previousTickTime +// previousTickTime = currentTime +// let allListners = listners.allObjects +// var hasListners = false +// for listner in allListners { +// (listner as! DisplayLinkListner).update(delta: delta) +// hasListners = true +// } +// +// if !hasListners { +// stopDisplayLink() +// } +// } +// +// private func stopDisplayLink() { +// displayLink.isPaused = true +// } + + private init() { + dispatchSourceTimer.schedule(deadline: .now() + 1.0 / 60, repeating: 1.0 / 60) + dispatchSourceTimer.setEventHandler { + DispatchQueue.main.sync { + self.fire() + } + } + } + + private var dispatchSourceTimer = DispatchSource.makeTimerSource(flags: [], queue: .global(qos: .userInteractive)) + private var dispatchSourceTimerStarted: Bool = false + private var previousTickTime = 0.0 + + private func startDisplayLink() { + guard !dispatchSourceTimerStarted else { return } + dispatchSourceTimerStarted = true + previousTickTime = CACurrentMediaTime() + dispatchSourceTimer.resume() + } + + private func stopDisplayLink() { + guard dispatchSourceTimerStarted else { return } + dispatchSourceTimerStarted = false + dispatchSourceTimer.suspend() + } + + public func fire() { + let currentTime = CACurrentMediaTime() + + let delta = currentTime - previousTickTime + previousTickTime = currentTime + let allListners = listners.allObjects + var hasListners = false + for listner in allListners { + (listner as! DisplayLinkListner).update(delta: delta) + hasListners = true + } + + if !hasListners { + stopDisplayLink() + } + } +} diff --git a/submodules/Charts/Sources/Helpers/GlobalHelpers.swift b/submodules/Charts/Sources/Helpers/GlobalHelpers.swift new file mode 100644 index 0000000000..3f5c488ff9 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/GlobalHelpers.swift @@ -0,0 +1,12 @@ +// +// GlobalHelpers.swift +// TrackingRecorder +// +// Created by Andrew Solovey on 07.09.2018. +// Copyright © 2018 Andrew Solovey. All rights reserved. +// + +public func crop(_ lower: Type, _ val: Type, _ upper: Type) -> Type where Type : Comparable { + assert(lower < upper, "Invalid lover and upper values") + return max(lower, min(upper, val)) +} diff --git a/submodules/Charts/Sources/Helpers/NumberFormatter+Utils.swift b/submodules/Charts/Sources/Helpers/NumberFormatter+Utils.swift new file mode 100644 index 0000000000..1254d44249 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/NumberFormatter+Utils.swift @@ -0,0 +1,19 @@ +// +// NumberFormatter+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 4/12/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +extension NumberFormatter { + func string(from value: CGFloat) -> String { + return string(from: Double(value)) + } + + func string(from value: Double) -> String { + return string(from: NSNumber(value: Double(value))) ?? "" + } +} diff --git a/submodules/Charts/Sources/Helpers/OnePixelConstraint.swift b/submodules/Charts/Sources/Helpers/OnePixelConstraint.swift new file mode 100644 index 0000000000..03e33e6524 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/OnePixelConstraint.swift @@ -0,0 +1,17 @@ +// +// OnePixelConstraint.swift +// GraphTest +// +// Created by Andrei Salavei on 4/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +public class OnePixelConstrain: NSLayoutConstraint { + public override func awakeFromNib() { + super.awakeFromNib() + + constant = UIView.oneDevicePixel + } +} diff --git a/submodules/Charts/Sources/Helpers/ScalesNumberFormatter.swift b/submodules/Charts/Sources/Helpers/ScalesNumberFormatter.swift new file mode 100644 index 0000000000..db067f8a95 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/ScalesNumberFormatter.swift @@ -0,0 +1,32 @@ +// +// ScalesNumberFormatter.swift +// GraphTest +// +// Created by Andrei Salavei on 4/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +private let milionsScale = "M" +private let thousandsScale = "K" + +class ScalesNumberFormatter: NumberFormatter { + override func string(from number: NSNumber) -> String? { + let value = number.doubleValue + let pow = log10(value) + if pow >= 6 { + guard let string = super.string(from: NSNumber(value: value / 1_000_000)) else { + return nil + } + return string + milionsScale + } else if pow >= 4 { + guard let string = super.string(from: NSNumber(value: value / 1_000)) else { + return nil + } + return string + thousandsScale + } else { + return super.string(from: number) + } + } +} diff --git a/submodules/Charts/Sources/Helpers/TimeInterval+Utils.swift b/submodules/Charts/Sources/Helpers/TimeInterval+Utils.swift new file mode 100644 index 0000000000..204b1e861a --- /dev/null +++ b/submodules/Charts/Sources/Helpers/TimeInterval+Utils.swift @@ -0,0 +1,27 @@ +// +// TimeInterval+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 3/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import Foundation + +extension TimeInterval { + static let minute: TimeInterval = 60 + static let hour: TimeInterval = 60 * 60 + static let day: TimeInterval = 60 * 60 * 24 + static let osXDuration: TimeInterval = 0.25 + static let expandAnimationDuration: TimeInterval = 0.4 + static var animationDurationMultipler: Double = 1.0 + + static var defaultDuration: TimeInterval { + return innerDefaultDuration * animationDurationMultipler + } + private static var innerDefaultDuration: TimeInterval = osXDuration + + static func setDefaultSuration(_ duration: TimeInterval) { + innerDefaultDuration = duration + } +} diff --git a/submodules/Charts/Sources/Helpers/TimeZone.swift b/submodules/Charts/Sources/Helpers/TimeZone.swift new file mode 100644 index 0000000000..40ba9ab8f5 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/TimeZone.swift @@ -0,0 +1,36 @@ +// +// TimeZone.swift +// GraphTest +// +// Created by Andrei Salavei on 4/9/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import Foundation + +extension TimeZone { + static let utc = TimeZone(secondsFromGMT: 0)! +} + +extension Locale { + static let posix = Locale(identifier: "en_US_POSIX") +} + +extension Calendar { + static let utc: Calendar = { + var calendar = Calendar.current + calendar.locale = Locale.posix + calendar.timeZone = TimeZone.utc + return calendar + }() +} + +extension DateFormatter { + static func utc(format: String = "") -> DateFormatter { + let formatter = DateFormatter() + formatter.calendar = Calendar.utc + formatter.dateFormat = format + formatter.timeZone = TimeZone.utc + return formatter + } +} diff --git a/submodules/Charts/Sources/Helpers/UIColor+Utils.swift b/submodules/Charts/Sources/Helpers/UIColor+Utils.swift new file mode 100644 index 0000000000..0a70421d5e --- /dev/null +++ b/submodules/Charts/Sources/Helpers/UIColor+Utils.swift @@ -0,0 +1,64 @@ +// +// UIColor+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 3/11/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +extension UIColor { + public convenience init?(hexString: String) { + let r, g, b, a: CGFloat + + if hexString.hasPrefix("#") { + let start = hexString.index(hexString.startIndex, offsetBy: 1) + let hexColor = String(hexString[start...]) + + if hexColor.count == 8 { + let scanner = Scanner(string: hexColor) + var hexNumber: UInt64 = 0 + + if scanner.scanHexInt64(&hexNumber) { + r = CGFloat((hexNumber & 0xff000000) >> 24) / 255 + g = CGFloat((hexNumber & 0x00ff0000) >> 16) / 255 + b = CGFloat((hexNumber & 0x0000ff00) >> 8) / 255 + a = CGFloat(hexNumber & 0x000000ff) / 255 + + self.init(red: r, green: g, blue: b, alpha: a) + return + } + } else if hexColor.count == 6 { + let scanner = Scanner(string: hexColor) + var hexNumber: UInt64 = 0 + + if scanner.scanHexInt64(&hexNumber) { + r = CGFloat((hexNumber & 0xff0000) >> 16) / 255 + g = CGFloat((hexNumber & 0x00ff00) >> 8) / 255 + b = CGFloat((hexNumber & 0x0000ff) >> 0) / 255 + + self.init(red: r, green: g, blue: b, alpha: 1.0) + return + } + } + } + return nil + } + + func image(_ size: CGSize = CGSize(width: 1, height: 1)) -> UIImage { + if #available(iOS 10.0, *) { + return UIGraphicsImageRenderer(size: size).image { rendererContext in + self.setFill() + rendererContext.fill(CGRect(origin: .zero, size: size)) + } + } else { + return UIImage() + } + } + + var redValue: CGFloat{ return CIColor(color: self).red } + var greenValue: CGFloat{ return CIColor(color: self).green } + var blueValue: CGFloat{ return CIColor(color: self).blue } + var alphaValue: CGFloat{ return CIColor(color: self).alpha } +} diff --git a/submodules/Charts/Sources/Helpers/UIImage+Utils.swift b/submodules/Charts/Sources/Helpers/UIImage+Utils.swift new file mode 100644 index 0000000000..50964025c2 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/UIImage+Utils.swift @@ -0,0 +1,28 @@ +// +// UIImage+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 4/8/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +extension UIImage { + static let arrowRight = UIImage(bundleImageName: "Chart/arrow_right") + static let arrowLeft = UIImage(bundleImageName: "Chart/arrow_left") + + public convenience init?(color: UIColor, size: CGSize = CGSize(width: 1, height: 1)) { + let rect = CGRect(origin: .zero, size: size) + UIGraphicsBeginImageContextWithOptions(rect.size, false, 0.0) + color.setFill() + UIRectFill(rect) + let image = UIGraphicsGetImageFromCurrentImageContext() + UIGraphicsEndImageContext() + + guard let cgImage = image?.cgImage else { return nil } + self.init(cgImage: cgImage) + } + + +} diff --git a/submodules/Charts/Sources/Helpers/UIImageView+Utils.swift b/submodules/Charts/Sources/Helpers/UIImageView+Utils.swift new file mode 100644 index 0000000000..608f25a114 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/UIImageView+Utils.swift @@ -0,0 +1,24 @@ +// +// UIImageView+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 4/9/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +extension UIImageView { + func setImage(_ image: UIImage?, animated: Bool) { + if self.image != image { + if animated { + let animation = CATransition() + animation.timingFunction = CAMediaTimingFunction.init(name: .linear) + animation.type = .fade + animation.duration = .defaultDuration + self.layer.add(animation, forKey: "kCATransitionImageFade") + } + self.image = image + } + } +} diff --git a/submodules/Charts/Sources/Helpers/UILabel+Utils.swift b/submodules/Charts/Sources/Helpers/UILabel+Utils.swift new file mode 100644 index 0000000000..6c41c73fd9 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/UILabel+Utils.swift @@ -0,0 +1,37 @@ +// +// UILabel+Utils.swift +// GraphTest +// +// Created by Andrei Salavei on 4/9/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +extension UILabel { + func setTextColor(_ color: UIColor, animated: Bool) { + if self.textColor != color { + if animated { + let animation = CATransition() + animation.timingFunction = CAMediaTimingFunction.init(name: .linear) + animation.type = .fade + animation.duration = .defaultDuration + self.layer.add(animation, forKey: "kCATransitionColorFade") + } + self.textColor = color + } + } + + func setText(_ title: String?, animated: Bool) { + if self.text != title { + if animated { + let animation = CATransition() + animation.timingFunction = CAMediaTimingFunction.init(name: .linear) + animation.type = .fade + animation.duration = .defaultDuration + self.layer.add(animation, forKey: "kCATransitionTextFade") + } + self.text = title + } + } +} diff --git a/submodules/Charts/Sources/Helpers/UIView+Extensions.swift b/submodules/Charts/Sources/Helpers/UIView+Extensions.swift new file mode 100644 index 0000000000..bba2d1f886 --- /dev/null +++ b/submodules/Charts/Sources/Helpers/UIView+Extensions.swift @@ -0,0 +1,57 @@ +// +// UIView+Extensions.swift +// GraphTest +// +// Created by Andrei Salavei on 4/10/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +extension UIView { + static let oneDevicePixel: CGFloat = (1.0 / max(2, min(1, UIScreen.main.scale))) +} + +// MARK: UIView+Animation +public extension UIView { + func bringToFront() { + superview?.bringSubviewToFront(self) + } + + func layoutIfNeeded(animated: Bool) { + UIView.perform(animated: animated) { + self.layoutIfNeeded() + } + } + + func setVisible(_ visible: Bool, animated: Bool) { + let updatedAlpha: CGFloat = visible ? 1 : 0 + if self.alpha != updatedAlpha { + UIView.perform(animated: animated) { + self.alpha = updatedAlpha + } + } + } + + static func perform(animated: Bool, animations: @escaping () -> Void) { + perform(animated: animated, animations: animations, completion: { _ in }) + } + + static func perform(animated: Bool, animations: @escaping () -> Void, completion: @escaping (Bool) -> Void) { + if animated { + + UIView.animate(withDuration: .defaultDuration, delay: 0, animations: animations, completion: completion) + } else { + animations() + completion(true) + } + } + + var isVisibleInWindow: Bool { + guard let windowBounds = window?.bounds else { + return false + } + let frame = convert(bounds, to: nil) + return frame.intersects(windowBounds) + } +} diff --git a/submodules/Charts/Sources/Models/ChartLineData.swift b/submodules/Charts/Sources/Models/ChartLineData.swift new file mode 100644 index 0000000000..79813a2a35 --- /dev/null +++ b/submodules/Charts/Sources/Models/ChartLineData.swift @@ -0,0 +1,76 @@ +// +// ChartLineData.swift +// GraphTest +// +// Created by Andrei Salavei on 3/13/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +struct ChartLineData { + var title: String + var color: UIColor + var width: CGFloat? + var points: [CGPoint] +} + +extension ChartLineData { + static func horizontalRange(lines: [ChartLineData]) -> ClosedRange? { + guard let firstPoint = lines.first?.points.first else { return nil } + var hMin: CGFloat = firstPoint.x + var hMax: CGFloat = firstPoint.x + + for line in lines { + if let first = line.points.first, + let last = line.points.last { + hMin = min(hMin, first.x) + hMax = max(hMax, last.x) + } + } + + return hMin...hMax + } + + static func verticalRange(lines: [ChartLineData], calculatingRange: ClosedRange? = nil, addBounds: Bool = false) -> ClosedRange? { + if let calculatingRange = calculatingRange { + guard let initalStart = lines.first?.points.first(where: { $0.x > calculatingRange.lowerBound && + $0.x < calculatingRange.upperBound }) else { return nil } + var vMin: CGFloat = initalStart.y + var vMax: CGFloat = initalStart.y + for line in lines { + if var index = line.points.firstIndex(where: { $0.x > calculatingRange.lowerBound }) { + if addBounds { + index = max(0, index - 1) + } + while index < line.points.count { + let point = line.points[index] + if point.x < calculatingRange.upperBound { + vMin = min(vMin, point.y) + vMax = max(vMax, point.y) + } else if addBounds { + vMin = min(vMin, point.y) + vMax = max(vMax, point.y) + break + } else { + break + } + index += 1 + } + } + } + return vMin...vMax + } else { + guard let firstPoint = lines.first?.points.first else { return nil } + var vMin: CGFloat = firstPoint.y + var vMax: CGFloat = firstPoint.y + for line in lines { + for point in line.points { + vMin = min(vMin, point.y) + vMax = max(vMax, point.y) + } + } + return vMin...vMax + } + } +} diff --git a/submodules/Charts/Sources/Models/ColorMode.swift b/submodules/Charts/Sources/Models/ColorMode.swift new file mode 100644 index 0000000000..f0de7b52ae --- /dev/null +++ b/submodules/Charts/Sources/Models/ColorMode.swift @@ -0,0 +1,175 @@ +// +// ColorMode.swift +// GraphTest +// +// Created by Andrew Solovey on 15/03/2019. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit +import AppBundle + +protocol ColorModeContainer { + func apply(colorMode: ColorMode, animated: Bool) +} + +enum ColorMode { + case day + case night +} + +extension ColorMode { + var chartTitleColor: UIColor { // Текст с датой на чарте + switch self { + case .day: return .black + case .night: return .white + } + } + + var actionButtonColor: UIColor { // Кнопка Zoom Out/ Смена режима день/ночь + switch self { + case .day: return UIColor(red: 53/255.0, green: 120/255.0, blue: 246/255.0, alpha: 1.0) + case .night: return UIColor(red: 84/255.0, green: 164/255.0, blue: 247/255.0, alpha: 1.0) + } + } + + var tableBackgroundColor: UIColor { + switch self { + case .day: return UIColor(red: 239/255.0, green: 239/255.0, blue: 244/255.0, alpha: 1.0) + case .night: return UIColor(red: 24/255.0, green: 34/255.0, blue: 45/255.0, alpha: 1.0) + } + } + + var chartBackgroundColor: UIColor { + switch self { + case .day: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) + case .night: return UIColor(red: 34/255.0, green: 47/255.0, blue: 63/255.0, alpha: 1.0) + } + } + + var sectionTitleColor: UIColor { + switch self { + case .day: return UIColor(red: 109/255.0, green: 109/255.0, blue: 114/255.0, alpha: 1.0) + case .night: return UIColor(red: 133/255.0, green: 150/255.0, blue: 171/255.0, alpha: 1.0) + } + } + + var tableSeparatorColor: UIColor { + switch self { + case .day: return UIColor(red: 200/255.0, green: 199/255.0, blue: 204/255.0, alpha: 1.0) + case .night: return UIColor(red: 18/255.0, green: 26/255.0, blue: 35/255.0, alpha: 1.0) + } + } + + var chartLabelsColor: UIColor { + switch self { + case .day: return UIColor(red: 37/255.0, green: 37/255.0, blue: 41/255.0, alpha: 0.5) + case .night: return UIColor(red: 186/255.0, green: 204/255.0, blue: 225/255.0, alpha: 0.6) + } + } + + var chartHelperLinesColor: UIColor { + switch self { + case .day: return UIColor(red: 24/255.0, green: 45/255.0, blue: 59/255.0, alpha: 0.1) + case .night: return UIColor(red: 133/255.0, green: 150/255.0, blue: 171/255.0, alpha: 0.20) + } + } + + var chartStrongLinesColor: UIColor { + switch self { + case .day: return UIColor(red: 24/255.0, green: 45/255.0, blue: 59/255.0, alpha: 0.35) + case .night: return UIColor(red: 186/255.0, green: 204/255.0, blue: 225/255.0, alpha: 0.45) + } + } + + var barChartStrongLinesColor: UIColor { + switch self { + case .day: return UIColor(red: 37/255.0, green: 37/255.0, blue: 41/255.0, alpha: 0.2) + case .night: return UIColor(red: 186/255.0, green: 204/255.0, blue: 225/255.0, alpha: 0.45) + } + } + + var chartDetailsTextColor: UIColor { + switch self { + case .day: return UIColor(red: 109/255.0, green: 109/255.0, blue: 114/255.0, alpha: 1.0) + case .night: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) + } + } + + var chartDetailsArrowColor: UIColor { + switch self { + case .day: return UIColor(red: 197/255.0, green: 199/255.0, blue: 205/255.0, alpha: 1.0) + case .night: return UIColor(red: 76/255.0, green: 84/255.0, blue: 96/255.0, alpha: 1.0) + } + } + + var chartDetailsViewColor: UIColor { + switch self { + case .day: return UIColor(red: 245/255.0, green: 245/255.0, blue: 251/255.0, alpha: 1.0) + case .night: return UIColor(red: 25/255.0, green: 35/255.0, blue: 47/255.0, alpha: 1.0) + } + } + + var descriptionChatNameColor: UIColor { + switch self { + case .day: return .black + case .night: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) + } + } + + var descriptionActionColor: UIColor { + switch self { + case .day: return UIColor(red: 1/255.0, green: 125/255.0, blue: 229/255.0, alpha: 1.0) + case .night: return UIColor(red: 24/255.0, green: 145/255.0, blue: 255/255.0, alpha: 1.0) + } + } + + var rangeViewBackgroundColor: UIColor { + switch self { + case .day: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) + case .night: return UIColor(red: 34/255.0, green: 47/255.0, blue: 63/255.0, alpha: 1.0) + } + } + + var rangeViewFrameColor: UIColor { + switch self { + case .day: return UIColor(red: 202/255.0, green: 212/255.0, blue: 222/255.0, alpha: 1.0) + case .night: return UIColor(red: 53/255.0, green: 70/255.0, blue: 89/255.0, alpha: 1.0) + } + } + + var rangeViewTintColor: UIColor { + switch self { + case .day: return UIColor(red: 239/255.0, green: 239/255.0, blue: 244/255.0, alpha: 0.5) + case .night: return UIColor(red: 24/255.0, green: 34/255.0, blue: 45/255.0, alpha: 0.5) + } + } + + var rangeViewMarkerColor: UIColor { + switch self { + case .day: return UIColor.white + case .night: return UIColor.white + } + } + + var statusBarStyle: UIStatusBarStyle { + switch self { + case .day: return .default + case .night: return .lightContent + } + } + + var viewTintColor: UIColor { + switch self { + case .day: return .black + case .night: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) + } + } + + var rangeCropImage: UIImage? { + switch self { + case .day: return UIImage(bundleImageName: "Chart/selection_frame_light") + case .night: return UIImage(bundleImageName: "Chart/selection_frame_dark") + } + } +} diff --git a/submodules/Charts/Sources/Models/LinesChartLabel.swift b/submodules/Charts/Sources/Models/LinesChartLabel.swift new file mode 100644 index 0000000000..6ace8c2c65 --- /dev/null +++ b/submodules/Charts/Sources/Models/LinesChartLabel.swift @@ -0,0 +1,25 @@ +// +// LinesChartLabel.swift +// GraphTest +// +// Created by Andrei Salavei on 3/18/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +struct LinesChartLabel: Hashable { + let value: CGFloat + let text: String +} + +class AnimatedLinesChartLabels { + var labels: [LinesChartLabel] + var isAppearing: Bool = false + let alphaAnimator: AnimationController + + init(labels: [LinesChartLabel], alphaAnimator: AnimationController) { + self.labels = labels + self.alphaAnimator = alphaAnimator + } +} diff --git a/submodules/Charts/Sources/Models/LinesSelectionLabel.swift b/submodules/Charts/Sources/Models/LinesSelectionLabel.swift new file mode 100644 index 0000000000..0fd7142eda --- /dev/null +++ b/submodules/Charts/Sources/Models/LinesSelectionLabel.swift @@ -0,0 +1,15 @@ +// +// LinesSelectionLabel.swift +// GraphTest +// +// Created by Andrei Salavei on 3/18/19. +// Copyright © 2019 Andrei Salavei. All rights reserved. +// + +import UIKit + +struct LinesSelectionLabel { + let coordinate: CGPoint + let valueText: String + let color: UIColor +} diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index 61391e300a..1eb8d5bb87 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -22,10 +22,6 @@ import AppBundle import LocalizedPeerData import TelegramIntents -public func useSpecialTabBarIcons() -> Bool { - return (Date(timeIntervalSince1970: 1545642000)...Date(timeIntervalSince1970: 1546387200)).contains(Date()) -} - private func fixListNodeScrolling(_ listNode: ListView, searchNode: NavigationBarSearchContentNode) -> Bool { if searchNode.expansionProgress > 0.0 && searchNode.expansionProgress < 1.0 { let scrollToItem: ListViewScrollToItem @@ -107,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() @@ -145,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 }) @@ -163,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 { @@ -174,12 +174,12 @@ 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? - if (useSpecialTabBarIcons()) { - icon = UIImage(bundleImageName: "Chat List/Tabs/NY/IconChats") + if useSpecialTabBarIcons() { + icon = UIImage(bundleImageName: "Chat List/Tabs/Holiday/IconChats") } else { icon = UIImage(bundleImageName: "Chat List/Tabs/IconChats") } @@ -270,15 +270,9 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, ).start(next: { [weak self] networkState, proxy, passcode, state, chatListFilter in if let strongSelf = self { let defaultTitle: String - if case .root = strongSelf.groupId { + if strongSelf.groupId == .root { if let chatListFilter = chatListFilter { - let title: String - switch chatListFilter.name { - case .unread: - title = "Unread" - case let .custom(value): - title = value - } + let title: String = chatListFilter.title ?? "" defaultTitle = title } else { defaultTitle = strongSelf.presentationData.strings.DialogList_Title @@ -287,7 +281,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, 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 } @@ -297,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 @@ -322,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) @@ -444,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 @@ -464,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 @@ -1810,9 +1806,9 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, /*public func presentTabBarPreviewingController(sourceNodes: [ASDisplayNode]) { if self.isNodeLoaded { - let _ = (self.context.account.postbox.transaction { transaction -> [ChatListFilterPreset] in - let settings = transaction.getPreferencesEntry(key: ApplicationSpecificPreferencesKeys.chatListFilterSettings) as? ChatListFilterSettings ?? ChatListFilterSettings.default - return settings.presets + 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 { @@ -1826,7 +1822,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, guard let strongSelf = self else { return } - if let currentPreset = strongSelf.chatListDisplayNode.chatListNode.chatListFilter { + /*if let currentPreset = strongSelf.chatListDisplayNode.chatListNode.chatListFilter { var found = false if let index = presets.index(where: { $0.id == currentPreset.id }) { found = true @@ -1837,13 +1833,14 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, if !found { strongSelf.chatListDisplayNode.chatListNode.chatListFilter = nil } - } + }*/ })) }, updatePreset: { value in guard let strongSelf = self else { return } - strongSelf.chatListDisplayNode.chatListNode.chatListFilter = value + 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) }) diff --git a/submodules/ChatListUI/Sources/ChatListControllerNode.swift b/submodules/ChatListUI/Sources/ChatListControllerNode.swift index 3dd78330a6..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 diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift index 890a6414cc..321f7685c2 100644 --- a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift @@ -1,4 +1,4 @@ -import Foundation +/*import Foundation import UIKit import Display import SwiftSignalKit @@ -35,7 +35,7 @@ private enum ChatListFilterPresetControllerSection: Int32 { case additionalPeers } -private func filterEntry(presentationData: ItemListPresentationData, arguments: ChatListFilterPresetControllerArguments, title: String, value: Bool, filter: ChatListIncludeCategoryFilter, section: Int32) -> ItemListCheckboxItem { +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 @@ -188,11 +188,7 @@ private enum ChatListFilterPresetEntry: ItemListNodeEntry { return ItemListSwitchItem(presentationData: presentationData, title: title, value: value, sectionId: self.section, style: .blocks, updated: { _ in arguments.updateState { current in var state = current - if state.includeCategories.contains(.muted) { - state.includeCategories.remove(.muted) - } else { - state.includeCategories.insert(.muted) - } + state.excludeMuted = !state.excludeMuted return state } }) @@ -200,11 +196,7 @@ private enum ChatListFilterPresetEntry: ItemListNodeEntry { return ItemListSwitchItem(presentationData: presentationData, title: title, value: value, sectionId: self.section, style: .blocks, updated: { _ in arguments.updateState { current in var state = current - if state.includeCategories.contains(.read) { - state.includeCategories.remove(.read) - } else { - state.includeCategories.insert(.read) - } + state.excludeRead = !state.excludeRead return state } }) @@ -230,7 +222,9 @@ private enum ChatListFilterPresetEntry: ItemListNodeEntry { private struct ChatListFilterPresetControllerState: Equatable { var name: String - var includeCategories: ChatListIncludeCategoryFilter + var includeCategories: ChatListFilterPeerCategories + var excludeMuted: Bool + var excludeRead: Bool var additionallyIncludePeers: [PeerId] var revealedPeerId: PeerId? @@ -239,7 +233,7 @@ private struct ChatListFilterPresetControllerState: Equatable { if self.name.isEmpty { return false } - if self.includeCategories.isEmpty && self.additionallyIncludePeers.isEmpty { + if self.includeCategories.isEmpty && self.additionallyIncludePeers.isEmpty && !self.excludeMuted && !self.excludeRead { return false } return true @@ -259,8 +253,8 @@ private func chatListFilterPresetControllerEntries(presentationData: Presentatio 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.includeCategories.contains(.muted))) - entries.append(.filterRead(title: "Exclude Read", value: !state.includeCategories.contains(.read))) + 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")) @@ -274,19 +268,14 @@ private func chatListFilterPresetControllerEntries(presentationData: Presentatio return entries } -func chatListFilterPresetController(context: AccountContext, currentPreset: ChatListFilterPreset?, updated: @escaping ([ChatListFilterPreset]) -> Void) -> ViewController { +func chatListFilterPresetController(context: AccountContext, currentPreset: ChatListFilter?, updated: @escaping ([ChatListFilter]) -> Void) -> ViewController { let initialName: String if let currentPreset = currentPreset { - switch currentPreset.name { - case .unread: - initialName = "Unread" - case let .custom(value): - initialName = value - } + initialName = currentPreset.title ?? "" } else { initialName = "New Preset" } - let initialState = ChatListFilterPresetControllerState(name: initialName, includeCategories: currentPreset?.includeCategories ?? .all, additionallyIncludePeers: currentPreset?.additionallyIncludePeers ?? []) + 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 @@ -378,15 +367,19 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat }) let rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: state.isComplete, action: { let state = stateValue.with { $0 } - let preset = ChatListFilterPreset(id: currentPreset?.id ?? arc4random64(), name: .custom(state.name), includeCategories: state.includeCategories, additionallyIncludePeers: state.additionallyIncludePeers) + 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.presets = settings.presets.filter { $0 != preset && $0 != currentPreset } - settings.presets.append(preset) + settings.filters = settings.filters.filter { $0 != preset && $0 != currentPreset } + settings.filters.append(preset) return settings }) |> deliverOnMainQueue).start(next: { settings in - updated(settings.presets) + updated(settings.filters) dismissImpl?() }) }) @@ -412,3 +405,4 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat return controller } +*/ diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift index a3900429f8..3ca80247d1 100644 --- a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift @@ -1,4 +1,4 @@ -import Foundation +/*import Foundation import UIKit import Display import SwiftSignalKit @@ -13,12 +13,12 @@ import AccountContext private final class ChatListFilterPresetListControllerArguments { let context: AccountContext - let openPreset: (ChatListFilterPreset) -> Void + let openPreset: (ChatListFilter) -> Void let addNew: () -> Void - let setItemWithRevealedOptions: (ChatListFilterPreset?, ChatListFilterPreset?) -> Void - let removePreset: (ChatListFilterPreset) -> Void + let setItemWithRevealedOptions: (Int32?, Int32?) -> Void + let removePreset: (Int32) -> Void - init(context: AccountContext, openPreset: @escaping (ChatListFilterPreset) -> Void, addNew: @escaping () -> Void, setItemWithRevealedOptions: @escaping (ChatListFilterPreset?, ChatListFilterPreset?) -> Void, removePreset: @escaping (ChatListFilterPreset) -> 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 @@ -45,14 +45,14 @@ private func stringForUserCount(_ peers: [PeerId: SelectivePrivacyPeer], strings private enum ChatListFilterPresetListEntryStableId: Hashable { case listHeader - case preset(Int64) + case preset(Int32) case addItem case listFooter } private enum ChatListFilterPresetListEntry: ItemListNodeEntry { case listHeader(String) - case preset(index: Int, title: String, preset: ChatListFilterPreset, canBeReordered: Bool, canBeDeleted: Bool) + case preset(index: Int, title: String?, preset: ChatListFilter, canBeReordered: Bool, canBeDeleted: Bool) case addItem(String) case listFooter(String) @@ -99,12 +99,12 @@ private enum ChatListFilterPresetListEntry: ItemListNodeEntry { 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: { + 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) + arguments.removePreset(preset.id) }) case let .addItem(text): return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { @@ -117,22 +117,15 @@ private enum ChatListFilterPresetListEntry: ItemListNodeEntry { } private struct ChatListFilterPresetListControllerState: Equatable { - var revealedPreset: ChatListFilterPreset? = nil + var revealedPreset: Int32? = nil } -private func chatListFilterPresetListControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetListControllerState, settings: ChatListFilterSettings) -> [ChatListFilterPresetListEntry] { +private func chatListFilterPresetListControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetListControllerState, settings: ChatListFiltersState) -> [ChatListFilterPresetListEntry] { var entries: [ChatListFilterPresetListEntry] = [] - entries.append(.listHeader("PRESETS")) - for preset in settings.presets { - let title: String - switch preset.name { - case .unread: - title = "Unread" - case let .custom(value): - title = value - } - entries.append(.preset(index: entries.count, title: title, preset: preset, canBeReordered: settings.presets.count > 1, canBeDeleted: true)) + 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")) @@ -140,7 +133,7 @@ private func chatListFilterPresetListControllerEntries(presentationData: Present return entries } -func chatListFilterPresetListController(context: AccountContext, updated: @escaping ([ChatListFilterPreset]) -> Void) -> ViewController { +func chatListFilterPresetListController(context: AccountContext, updated: @escaping ([ChatListFilter]) -> Void) -> ViewController { let initialState = ChatListFilterPresetListControllerState() let statePromise = ValuePromise(initialState, ignoreRepeated: true) let stateValue = Atomic(value: initialState) @@ -164,20 +157,20 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap } return state } - }, removePreset: { preset in + }, removePreset: { id in let _ = (updateChatListFilterSettingsInteractively(postbox: context.account.postbox, { settings in var settings = settings - if let index = settings.presets.index(of: preset) { - settings.presets.remove(at: index) + if let index = settings.filters.index(where: { $0.id == id }) { + settings.filters.remove(at: index) } return settings }) |> deliverOnMainQueue).start(next: { settings in - updated(settings.presets) + updated(settings.filters) }) }) - let preferences = context.account.postbox.preferencesView(keys: [ApplicationSpecificPreferencesKeys.chatListFilterSettings]) + let preferences = context.account.postbox.preferencesView(keys: [PreferencesKeys.chatListFilters]) let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, @@ -185,12 +178,13 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap preferences ) |> map { presentationData, state, preferences -> (ItemListControllerState, (ItemListNodeState, Any)) in - let settings = preferences.values[ApplicationSpecificPreferencesKeys.chatListFilterSettings] as? ChatListFilterSettings ?? ChatListFilterSettings.default + 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: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false) + 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)) @@ -212,3 +206,4 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap return controller } +*/ diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift index 4e8454897f..adad852881 100644 --- a/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift @@ -18,26 +18,26 @@ struct ChatListFilterPresetListItemEditing: Equatable { final class ChatListFilterPresetListItem: ListViewItem, ItemListItem { let presentationData: ItemListPresentationData - let preset: ChatListFilterPreset + let preset: ChatListFilter let title: String let editing: ChatListFilterPresetListItemEditing let canBeReordered: Bool let canBeDeleted: Bool let sectionId: ItemListSectionId let action: () -> Void - let setItemWithRevealedOptions: (ChatListFilterPreset?, ChatListFilterPreset?) -> Void + let setItemWithRevealedOptions: (Int32?, Int32?) -> Void let remove: () -> Void init( presentationData: ItemListPresentationData, - preset: ChatListFilterPreset, + preset: ChatListFilter, title: String, editing: ChatListFilterPresetListItemEditing, canBeReordered: Bool, canBeDeleted: Bool, sectionId: ItemListSectionId, action: @escaping () -> Void, - setItemWithRevealedOptions: @escaping (ChatListFilterPreset?, ChatListFilterPreset?) -> Void, + setItemWithRevealedOptions: @escaping (Int32?, Int32?) -> Void, remove: @escaping () -> Void ) { self.presentationData = presentationData @@ -409,13 +409,13 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN override func revealOptionsInteractivelyOpened() { if let item = self.item { - item.setItemWithRevealedOptions(item.preset, nil) + item.setItemWithRevealedOptions(item.preset.id, nil) } } override func revealOptionsInteractivelyClosed() { if let item = self.item { - item.setItemWithRevealedOptions(nil, item.preset) + item.setItemWithRevealedOptions(nil, item.preset.id) } } diff --git a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift index 79fa26f3f7..0826e73dfe 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift @@ -193,8 +193,10 @@ private enum ChatListRecentEntry: Comparable, Identifiable { } }, 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() } } }) @@ -415,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() @@ -725,7 +727,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo return (views, local) } } - |> mapToSignal{ viewsAndPeers -> Signal<(peers: [RenderedPeer], unread: [PeerId: (Int32, Bool)]), NoError> in + |> mapToSignal { viewsAndPeers -> Signal<(peers: [RenderedPeer], unread: [PeerId: (Int32, Bool)]), NoError> in return context.account.postbox.unreadMessageCountsView(items: viewsAndPeers.0.map {.peer($0.peerId)}) |> map { values in var unread: [PeerId: (Int32, Bool)] = [:] for peerView in viewsAndPeers.0 { @@ -814,8 +816,18 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo ) } - return combineLatest(accountPeer, foundLocalPeers, foundRemotePeers, foundRemoteMessages, presentationDataPromise.get(), searchStatePromise.get()) - |> map { accountPeer, foundLocalPeers, foundRemotePeers, foundRemoteMessages, presentationData, searchState -> ([ChatListSearchEntry], Bool)? in + let resolvedMessage = .single(nil) + |> then(context.sharedContext.resolveUrl(account: context.account, url: query) + |> mapToSignal { resolvedUrl -> Signal in + if case let .channelMessage(peerId, messageId) = resolvedUrl { + return downloadMessage(postbox: context.account.postbox, network: context.account.network, messageId: messageId) + } else { + return .single(nil) + } + }) + + return combineLatest(accountPeer, foundLocalPeers, foundRemotePeers, foundRemoteMessages, presentationDataPromise.get(), searchStatePromise.get(), resolvedMessage) + |> map { accountPeer, foundLocalPeers, foundRemotePeers, foundRemoteMessages, presentationData, searchState, resolvedMessage -> ([ChatListSearchEntry], Bool)? in var entries: [ChatListSearchEntry] = [] let isSearching = foundRemotePeers.2 || foundRemoteMessages.1 var index = 0 @@ -948,6 +960,17 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo } } + if let message = resolvedMessage { + var peer = RenderedPeer(message: message) + if let group = message.peers[message.id.peerId] as? TelegramGroup, let migrationReference = group.migrationReference { + if let channelPeer = message.peers[migrationReference.peerId] { + peer = RenderedPeer(peer: channelPeer) + } + } + entries.append(.message(message, peer, nil, presentationData)) + index += 1 + } + if !foundRemotePeers.2 { index = 0 for message in foundRemoteMessages.0.0 { diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift index 3bd95959cd..fdd814e57a 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift @@ -366,21 +366,9 @@ public final class ChatListNode: ListView { } private var currentLocation: ChatListNodeLocation? - var chatListFilter: ChatListFilterPreset? { - didSet { - if self.chatListFilter != oldValue { - self.chatListFilterValue.set(self.chatListFilter) - - if self.chatListFilter?.includeCategories != oldValue?.includeCategories || self.chatListFilter?.additionallyIncludePeers != oldValue?.additionallyIncludePeers { - if let currentLocation = self.currentLocation { - self.setChatListLocation(.initial(count: 50, filter: self.chatListFilter)) - } - } - } - } - } - private let chatListFilterValue = ValuePromise(nil) - var chatListFilterSignal: Signal { + let chatListFilter: ChatListFilter? + private let chatListFilterValue = Promise() + var chatListFilterSignal: Signal { return self.chatListFilterValue.get() } private let chatListLocation = ValuePromise() @@ -425,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 @@ -541,7 +531,7 @@ public final class ChatListNode: ListView { let chatListViewUpdate = self.chatListLocation.get() |> distinctUntilChanged - |> mapToSignal { location -> Signal<(ChatListNodeViewUpdate, ChatListFilterPreset?), NoError> in + |> mapToSignal { location -> Signal<(ChatListNodeViewUpdate, ChatListFilter?), NoError> in return chatListViewForLocation(groupId: groupId, location: location, account: context.account) |> map { update in return (update, location.filter) diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift index 314f319a9d..5878d7df08 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift @@ -7,11 +7,11 @@ import Display import TelegramUIPreferences enum ChatListNodeLocation: Equatable { - case initial(count: Int, filter: ChatListFilterPreset?) - case navigation(index: ChatListIndex, filter: ChatListFilterPreset?) - case scroll(index: ChatListIndex, sourceIndex: ChatListIndex, scrollPosition: ListViewScrollPosition, animated: Bool, filter: ChatListFilterPreset?) + case initial(count: Int, filter: ChatListFilter?) + case navigation(index: ChatListIndex, filter: ChatListFilter?) + case scroll(index: ChatListIndex, sourceIndex: ChatListIndex, scrollPosition: ListViewScrollPosition, animated: Bool, filter: ChatListFilter?) - var filter: ChatListFilterPreset? { + var filter: ChatListFilter? { switch self { case let .initial(initial): return initial.filter @@ -32,17 +32,17 @@ 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.additionallyIncludePeers) + let includePeers = Set(filter.includePeers) filterPredicate = { peer, notificationSettings, isUnread in if includePeers.contains(peer.id) { return true } - if !filter.includeCategories.contains(.read) { + if filter.excludeRead { if !isUnread { return false } } - if !filter.includeCategories.contains(.muted) { + if filter.excludeMuted { if let notificationSettings = notificationSettings as? TelegramPeerNotificationSettings { if case .muted = notificationSettings.muteState { return false @@ -51,26 +51,26 @@ func chatListViewForLocation(groupId: PeerGroupId, location: ChatListNodeLocatio return false } } - if !filter.includeCategories.contains(.privateChats) { + if !filter.categories.contains(.privateChats) { if let user = peer as? TelegramUser { if user.botInfo == nil { return false } } } - if !filter.includeCategories.contains(.secretChats) { + if !filter.categories.contains(.secretChats) { if let _ = peer as? TelegramSecretChat { return false } } - if !filter.includeCategories.contains(.bots) { + if !filter.categories.contains(.bots) { if let user = peer as? TelegramUser { if user.botInfo != nil { return false } } } - if !filter.includeCategories.contains(.privateGroups) { + if !filter.categories.contains(.privateGroups) { if let _ = peer as? TelegramGroup { return false } else if let channel = peer as? TelegramChannel { @@ -81,7 +81,7 @@ func chatListViewForLocation(groupId: PeerGroupId, location: ChatListNodeLocatio } } } - if !filter.includeCategories.contains(.publicGroups) { + if !filter.categories.contains(.publicGroups) { if let channel = peer as? TelegramChannel { if case .group = channel.info { if channel.username != nil { @@ -90,7 +90,7 @@ func chatListViewForLocation(groupId: PeerGroupId, location: ChatListNodeLocatio } } } - if !filter.includeCategories.contains(.channels) { + if !filter.categories.contains(.channels) { if let channel = peer as? TelegramChannel { if case .broadcast = channel.info { return false diff --git a/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift b/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift index 4b0f09f8c2..d7997ee48c 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift @@ -12,7 +12,7 @@ struct ChatListNodeView { let originalView: ChatListView let filteredEntries: [ChatListNodeEntry] let isLoading: Bool - let filter: ChatListFilterPreset? + let filter: ChatListFilter? } enum ChatListNodeViewTransitionReason { diff --git a/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift index 79e09e3b11..6cb265b924 100644 --- a/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift +++ b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift @@ -8,6 +8,7 @@ import AccountContext import SyncCore import Postbox import TelegramUIPreferences +import TelegramCore final class TabBarChatListFilterController: ViewController { private var controllerNode: TabBarChatListFilterControllerNode { @@ -21,17 +22,17 @@ final class TabBarChatListFilterController: ViewController { private let context: AccountContext private let sourceNodes: [ASDisplayNode] - private let presetList: [ChatListFilterPreset] - private let currentPreset: ChatListFilterPreset? + private let presetList: [ChatListFilter] + private let currentPreset: ChatListFilter? private let setup: () -> Void - private let updatePreset: (ChatListFilterPreset?) -> 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: [ChatListFilterPreset], currentPreset: ChatListFilterPreset?, setup: @escaping () -> Void, updatePreset: @escaping (ChatListFilterPreset?) -> Void) { + 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 @@ -184,7 +185,7 @@ private final class AddFilterItemNode: ASDisplayNode, AbstractTabBarChatListFilt private final class FilterItemNode: ASDisplayNode, AbstractTabBarChatListFilterItemNode { private let context: AccountContext private let title: String - let preset: ChatListFilterPreset? + let preset: ChatListFilter? private let isCurrent: Bool private let presentationData: PresentationData private let action: () -> Bool @@ -199,7 +200,7 @@ private final class FilterItemNode: ASDisplayNode, AbstractTabBarChatListFilterI private let badgeTitleNode: ImmediateTextNode private var badgeText: String = "" - init(context: AccountContext, title: String, preset: ChatListFilterPreset?, isCurrent: Bool, displaySeparator: Bool, presentationData: PresentationData, action: @escaping () -> Bool) { + 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 @@ -324,7 +325,7 @@ private final class TabBarChatListFilterControllerNode: ViewControllerTracingNod let isReady = Promise() private var didSetIsReady = false - init(context: AccountContext, presentationData: PresentationData, cancel: @escaping () -> Void, sourceNodes: [ASDisplayNode], presetList: [ChatListFilterPreset], currentPreset: ChatListFilterPreset?, setup: @escaping () -> Void, updatePreset: @escaping (ChatListFilterPreset?) -> Void) { + 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 @@ -358,21 +359,10 @@ private final class TabBarChatListFilterControllerNode: ViewControllerTracingNod setup() })) - contentNodes.append(FilterItemNode(context: context, title: "All", preset: nil, isCurrent: currentPreset == nil, displaySeparator: !presetList.isEmpty, presentationData: presentationData, action: { - updatePreset(nil) - return false - })) - for i in 0 ..< presetList.count { let preset = presetList[i] - let title: String - switch preset.name { - case .unread: - title = "Unread" - case let .custom(value): - title = value - } + 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 @@ -393,7 +383,7 @@ private final class TabBarChatListFilterControllerNode: ViewControllerTracingNod unreadCountItems.append(.total(nil)) var additionalPeerIds = Set() for preset in presetList { - additionalPeerIds.formUnion(preset.additionallyIncludePeers) + additionalPeerIds.formUnion(preset.includePeers) } if !additionalPeerIds.isEmpty { for peerId in additionalPeerIds { @@ -447,36 +437,34 @@ private final class TabBarChatListFilterControllerNode: ViewControllerTracingNod let badgeString: String if let preset = contentNode.preset { var tags: [PeerSummaryCounterTags] = [] - if preset.includeCategories.contains(.privateChats) { + if preset.categories.contains(.privateChats) { tags.append(.privateChat) } - if preset.includeCategories.contains(.secretChats) { + if preset.categories.contains(.secretChats) { tags.append(.secretChat) } - if preset.includeCategories.contains(.privateGroups) { + if preset.categories.contains(.privateGroups) { tags.append(.privateGroup) } - if preset.includeCategories.contains(.bots) { + if preset.categories.contains(.bots) { tags.append(.bot) } - if preset.includeCategories.contains(.publicGroups) { + if preset.categories.contains(.publicGroups) { tags.append(.publicGroup) } - if preset.includeCategories.contains(.channels) { + if preset.categories.contains(.channels) { tags.append(.channel) } var count = 0 if let totalState = totalState { for tag in tags { - if preset.includeCategories.contains(.muted) { - } if let value = totalState.filteredCounters[tag] { count += Int(value.chatCount) } } } - for peerId in preset.additionallyIncludePeers { + for peerId in preset.includePeers { if let (tag, peerCount) = peerTagAndCount[peerId] { if !tags.contains(tag) { count += peerCount 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/ContactListUI/Sources/ContactsController.swift b/submodules/ContactListUI/Sources/ContactsController.swift index 7dcfc4b716..c1151b630f 100644 --- a/submodules/ContactListUI/Sources/ContactsController.swift +++ b/submodules/ContactListUI/Sources/ContactsController.swift @@ -105,7 +105,12 @@ public class ContactsController: ViewController { self.title = self.presentationData.strings.Contacts_Title self.tabBarItem.title = self.presentationData.strings.Contacts_Title - let icon = UIImage(bundleImageName: "Chat List/Tabs/IconContacts") + let icon: UIImage? + if useSpecialTabBarIcons() { + icon = UIImage(bundleImageName: "Chat List/Tabs/Holiday/IconContacts") + } else { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconContacts") + } self.tabBarItem.image = icon self.tabBarItem.selectedImage = icon @@ -530,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, fromChat: 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/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 59fc67d902..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? @@ -685,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) } 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..17c2f5b747 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 false, 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/TabBarNode.swift b/submodules/Display/Display/TabBarNode.swift index f83a6b1289..9301512ec1 100644 --- a/submodules/Display/Display/TabBarNode.swift +++ b/submodules/Display/Display/TabBarNode.swift @@ -442,7 +442,7 @@ class TabBarNode: ASDisplayNode { if horizontal { backgroundFrame = CGRect(origin: CGPoint(x: originX + 15.0, y: 3.0), size: backgroundSize) } else { - let contentWidth = node.contentWidth ?? node.frame.width + let contentWidth: CGFloat = 25.0 //node.contentWidth ?? node.frame.width backgroundFrame = CGRect(origin: CGPoint(x: floor(originX + node.frame.width / 2.0) + contentWidth - backgroundSize.width - 5.0, y: self.centered ? 9.0 : 2.0), size: backgroundSize) } transition.updateFrame(node: container.badgeContainerNode, frame: backgroundFrame) 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/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift index df429f52d5..2a31c310a1 100644 --- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift @@ -168,7 +168,12 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll self.dateNode.isHidden = true self.backwardButton.isHidden = true self.forwardButton.isHidden = true - self.playbackControlButton.isHidden = true + if status == .Local { + self.playbackControlButton.isHidden = false + self.playbackControlButton.setImage(playImage, for: []) + } else { + self.playbackControlButton.isHidden = true + } self.statusButtonNode.isHidden = false self.statusNode.isHidden = false diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift index bdc0a7b29c..11e4215545 100644 --- a/submodules/GalleryUI/Sources/GalleryController.swift +++ b/submodules/GalleryUI/Sources/GalleryController.swift @@ -332,7 +332,7 @@ public class GalleryController: ViewController, StandalonePresentableController private let centralItemRightBarButtonItem = Promise() private let centralItemRightBarButtonItems = Promise<[UIBarButtonItem]?>(nil) private let centralItemNavigationStyle = Promise() - private let centralItemFooterContentNode = Promise() + private let centralItemFooterContentNode = Promise<(GalleryFooterContentNode?, GalleryOverlayContentNode?)>() private let centralItemAttributesDisposable = DisposableSet(); private let _hiddenMedia = Promise<(MessageId, Media)?>(nil) @@ -531,9 +531,9 @@ public class GalleryController: ViewController, StandalonePresentableController } })) - self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode in + self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode, overlayContentNode in self?.galleryNode.updatePresentationState({ - $0.withUpdatedFooterContentNode(footerContentNode) + $0.withUpdatedFooterContentNode(footerContentNode).withUpdatedOverlayContentNode(overlayContentNode) }, transition: .immediate) })) diff --git a/submodules/GalleryUI/Sources/GalleryControllerNode.swift b/submodules/GalleryUI/Sources/GalleryControllerNode.swift index 0c82bd5bec..5409b07a5b 100644 --- a/submodules/GalleryUI/Sources/GalleryControllerNode.swift +++ b/submodules/GalleryUI/Sources/GalleryControllerNode.swift @@ -250,8 +250,8 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture self.updateThumbnailContainerNodeAlpha(transition) } - self.footerNode.updateLayout(layout, footerContentNode: self.presentationState.footerContentNode, thumbnailPanelHeight: thumbnailPanelHeight, transition: transition) - + self.footerNode.updateLayout(layout, footerContentNode: self.presentationState.footerContentNode, overlayContentNode: self.presentationState.overlayContentNode, thumbnailPanelHeight: thumbnailPanelHeight, transition: transition) + let previousContentHeight = self.scrollView.contentSize.height let previousVerticalOffset = self.scrollView.contentOffset.y @@ -276,14 +276,14 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture let alpha: CGFloat = self.areControlsHidden ? 0.0 : 1.0 self.navigationBar?.alpha = alpha self.statusBar?.updateAlpha(alpha, transition: .animated(duration: 0.3, curve: .easeInOut)) - self.footerNode.alpha = alpha + self.footerNode.setVisibilityAlpha(alpha) self.updateThumbnailContainerNodeAlpha(.immediate) }) } else { let alpha: CGFloat = self.areControlsHidden ? 0.0 : 1.0 self.navigationBar?.alpha = alpha self.statusBar?.updateAlpha(alpha, transition: .immediate) - self.footerNode.alpha = alpha + self.footerNode.setVisibilityAlpha(alpha) self.updateThumbnailContainerNodeAlpha(.immediate) } } diff --git a/submodules/GalleryUI/Sources/GalleryControllerPresentationState.swift b/submodules/GalleryUI/Sources/GalleryControllerPresentationState.swift index 7fd9620cb5..4881b7744e 100644 --- a/submodules/GalleryUI/Sources/GalleryControllerPresentationState.swift +++ b/submodules/GalleryUI/Sources/GalleryControllerPresentationState.swift @@ -2,16 +2,23 @@ import Foundation public final class GalleryControllerPresentationState { public let footerContentNode: GalleryFooterContentNode? + public let overlayContentNode: GalleryOverlayContentNode? public init() { self.footerContentNode = nil + self.overlayContentNode = nil } - public init(footerContentNode: GalleryFooterContentNode?) { + public init(footerContentNode: GalleryFooterContentNode?, overlayContentNode: GalleryOverlayContentNode?) { self.footerContentNode = footerContentNode + self.overlayContentNode = overlayContentNode } public func withUpdatedFooterContentNode(_ footerContentNode: GalleryFooterContentNode?) -> GalleryControllerPresentationState { - return GalleryControllerPresentationState(footerContentNode: footerContentNode) + return GalleryControllerPresentationState(footerContentNode: footerContentNode, overlayContentNode: self.overlayContentNode) + } + + public func withUpdatedOverlayContentNode(_ overlayContentNode: GalleryOverlayContentNode?) -> GalleryControllerPresentationState { + return GalleryControllerPresentationState(footerContentNode: self.footerContentNode, overlayContentNode: overlayContentNode) } } diff --git a/submodules/GalleryUI/Sources/GalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/GalleryFooterContentNode.swift index 9fe0dadf41..1d9126eec0 100644 --- a/submodules/GalleryUI/Sources/GalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/GalleryFooterContentNode.swift @@ -31,3 +31,20 @@ open class GalleryFooterContentNode: ASDisplayNode { completion() } } + +open class GalleryOverlayContentNode: ASDisplayNode { + var visibilityAlpha: CGFloat = 1.0 + open func setVisibilityAlpha(_ alpha: CGFloat) { + self.visibilityAlpha = alpha + } + + open func updateLayout(size: CGSize, metrics: LayoutMetrics, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { + } + + open func animateIn(previousContentNode: GalleryOverlayContentNode?, transition: ContainedViewLayoutTransition) { + } + + open func animateOut(nextContentNode: GalleryOverlayContentNode?, transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) { + completion() + } +} diff --git a/submodules/GalleryUI/Sources/GalleryFooterNode.swift b/submodules/GalleryUI/Sources/GalleryFooterNode.swift index 7537360dce..027ea8a682 100644 --- a/submodules/GalleryUI/Sources/GalleryFooterNode.swift +++ b/submodules/GalleryUI/Sources/GalleryFooterNode.swift @@ -7,6 +7,7 @@ public final class GalleryFooterNode: ASDisplayNode { private let backgroundNode: ASDisplayNode private var currentFooterContentNode: GalleryFooterContentNode? + private var currentOverlayContentNode: GalleryOverlayContentNode? private var currentLayout: (ContainerViewLayout, CGFloat)? private let controllerInteraction: GalleryControllerInteraction @@ -22,38 +23,59 @@ public final class GalleryFooterNode: ASDisplayNode { self.addSubnode(self.backgroundNode) } - public func updateLayout(_ layout: ContainerViewLayout, footerContentNode: GalleryFooterContentNode?, thumbnailPanelHeight: CGFloat, transition: ContainedViewLayoutTransition) { + private var visibilityAlpha: CGFloat = 1.0 + public func setVisibilityAlpha(_ alpha: CGFloat) { + self.visibilityAlpha = alpha + self.backgroundNode.alpha = alpha + self.currentFooterContentNode?.alpha = alpha + self.currentOverlayContentNode?.setVisibilityAlpha(alpha) + } + + public func updateLayout(_ layout: ContainerViewLayout, footerContentNode: GalleryFooterContentNode?, overlayContentNode: GalleryOverlayContentNode?, thumbnailPanelHeight: CGFloat, transition: ContainedViewLayoutTransition) { self.currentLayout = (layout, thumbnailPanelHeight) let cleanInsets = layout.insets(options: []) - var removeCurrentFooterContentNode: GalleryFooterContentNode? + var dismissedCurrentFooterContentNode: GalleryFooterContentNode? if self.currentFooterContentNode !== footerContentNode { if let currentFooterContentNode = self.currentFooterContentNode { currentFooterContentNode.requestLayout = nil - removeCurrentFooterContentNode = currentFooterContentNode + dismissedCurrentFooterContentNode = currentFooterContentNode } self.currentFooterContentNode = footerContentNode if let footerContentNode = footerContentNode { + footerContentNode.alpha = self.visibilityAlpha footerContentNode.controllerInteraction = self.controllerInteraction footerContentNode.requestLayout = { [weak self] transition in if let strongSelf = self, let (currentLayout, currentThumbnailPanelHeight) = strongSelf.currentLayout { - strongSelf.updateLayout(currentLayout, footerContentNode: strongSelf.currentFooterContentNode, thumbnailPanelHeight: currentThumbnailPanelHeight, transition: transition) + strongSelf.updateLayout(currentLayout, footerContentNode: strongSelf.currentFooterContentNode, overlayContentNode: strongSelf.currentOverlayContentNode, thumbnailPanelHeight: currentThumbnailPanelHeight, transition: transition) } } self.addSubnode(footerContentNode) } } + var dismissedCurrentOverlayContentNode: GalleryOverlayContentNode? + if self.currentOverlayContentNode !== overlayContentNode { + if let currentOverlayContentNode = self.currentOverlayContentNode { + dismissedCurrentOverlayContentNode = currentOverlayContentNode + } + self.currentOverlayContentNode = overlayContentNode + if let overlayContentNode = overlayContentNode { + overlayContentNode.setVisibilityAlpha(self.visibilityAlpha) + self.addSubnode(overlayContentNode) + } + } + var backgroundHeight: CGFloat = 0.0 if let footerContentNode = self.currentFooterContentNode { backgroundHeight = footerContentNode.updateLayout(size: layout.size, metrics: layout.metrics, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: cleanInsets.bottom, contentInset: thumbnailPanelHeight, transition: transition) transition.updateFrame(node: footerContentNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - backgroundHeight), size: CGSize(width: layout.size.width, height: backgroundHeight))) - if let removeCurrentFooterContentNode = removeCurrentFooterContentNode { + if let dismissedCurrentFooterContentNode = dismissedCurrentFooterContentNode { let contentTransition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring) - footerContentNode.animateIn(fromHeight: removeCurrentFooterContentNode.bounds.height, previousContentNode: removeCurrentFooterContentNode, transition: contentTransition) - removeCurrentFooterContentNode.animateOut(toHeight: backgroundHeight, nextContentNode: footerContentNode, transition: contentTransition, completion: { [weak self, weak removeCurrentFooterContentNode] in - if let strongSelf = self, let removeCurrentFooterContentNode = removeCurrentFooterContentNode, removeCurrentFooterContentNode !== strongSelf.currentFooterContentNode { - removeCurrentFooterContentNode.removeFromSupernode() + footerContentNode.animateIn(fromHeight: dismissedCurrentFooterContentNode.bounds.height, previousContentNode: dismissedCurrentFooterContentNode, transition: contentTransition) + dismissedCurrentFooterContentNode.animateOut(toHeight: backgroundHeight, nextContentNode: footerContentNode, transition: contentTransition, completion: { [weak self, weak dismissedCurrentFooterContentNode] in + if let strongSelf = self, let dismissedCurrentFooterContentNode = dismissedCurrentFooterContentNode, dismissedCurrentFooterContentNode !== strongSelf.currentFooterContentNode { + dismissedCurrentFooterContentNode.removeFromSupernode() } }) contentTransition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - backgroundHeight), size: CGSize(width: layout.size.width, height: backgroundHeight))) @@ -61,16 +83,42 @@ public final class GalleryFooterNode: ASDisplayNode { transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - backgroundHeight), size: CGSize(width: layout.size.width, height: backgroundHeight))) } } else { - if let removeCurrentFooterContentNode = removeCurrentFooterContentNode { - removeCurrentFooterContentNode.removeFromSupernode() + if let dismissedCurrentFooterContentNode = dismissedCurrentFooterContentNode { + dismissedCurrentFooterContentNode.removeFromSupernode() } transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - backgroundHeight), size: CGSize(width: layout.size.width, height: backgroundHeight))) } + + let contentTransition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring) + if let overlayContentNode = self.currentOverlayContentNode { + overlayContentNode.updateLayout(size: layout.size, metrics: layout.metrics, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: backgroundHeight, transition: transition) + transition.updateFrame(node: overlayContentNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + + overlayContentNode.animateIn(previousContentNode: dismissedCurrentOverlayContentNode, transition: contentTransition) + if let dismissedCurrentOverlayContentNode = dismissedCurrentOverlayContentNode { + dismissedCurrentOverlayContentNode.animateOut(nextContentNode: overlayContentNode, transition: contentTransition, completion: { [weak self, weak dismissedCurrentOverlayContentNode] in + if let strongSelf = self, let dismissedCurrentOverlayContentNode = dismissedCurrentOverlayContentNode, dismissedCurrentOverlayContentNode !== strongSelf.currentOverlayContentNode { + dismissedCurrentOverlayContentNode.removeFromSupernode() + } + }) + } + } else { + if let dismissedCurrentOverlayContentNode = dismissedCurrentOverlayContentNode { + dismissedCurrentOverlayContentNode.animateOut(nextContentNode: overlayContentNode, transition: contentTransition, completion: { [weak self, weak dismissedCurrentOverlayContentNode] in + if let strongSelf = self, let dismissedCurrentOverlayContentNode = dismissedCurrentOverlayContentNode, dismissedCurrentOverlayContentNode !== strongSelf.currentOverlayContentNode { + dismissedCurrentOverlayContentNode.removeFromSupernode() + } + }) + } + } } override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { - if !self.backgroundNode.frame.contains(point) { + if let overlayResult = self.currentOverlayContentNode?.hitTest(point, with: event) { + return overlayResult + } + if !self.backgroundNode.frame.contains(point) || self.visibilityAlpha < 1.0 { return nil } let result = super.hitTest(point, with: event) diff --git a/submodules/GalleryUI/Sources/GalleryItemNode.swift b/submodules/GalleryUI/Sources/GalleryItemNode.swift index ce3d8b3c59..b2c513654f 100644 --- a/submodules/GalleryUI/Sources/GalleryItemNode.swift +++ b/submodules/GalleryUI/Sources/GalleryItemNode.swift @@ -21,6 +21,10 @@ open class GalleryItemNode: ASDisplayNode { } public var toggleControlsVisibility: () -> Void = { } + public var goToPreviousItem: () -> Void = { } + public var goToNextItem: () -> Void = { } + public var canGoToPreviousItem: () -> Bool = { return false } + public var canGoToNextItem: () -> Bool = { return false } public var dismiss: () -> Void = { } public var beginCustomDismiss: () -> Void = { } public var completeCustomDismiss: () -> Void = { } @@ -54,8 +58,8 @@ open class GalleryItemNode: ASDisplayNode { return .single(nil) } - open func footerContent() -> Signal { - return .single(nil) + open func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((nil, nil)) } open func navigationStyle() -> Signal { diff --git a/submodules/GalleryUI/Sources/GalleryPagerNode.swift b/submodules/GalleryUI/Sources/GalleryPagerNode.swift index fea7e407af..1b2f7e5649 100644 --- a/submodules/GalleryUI/Sources/GalleryPagerNode.swift +++ b/submodules/GalleryUI/Sources/GalleryPagerNode.swift @@ -241,6 +241,32 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate { private func makeNodeForItem(at index: Int) -> GalleryItemNode { let node = self.items[index].node() node.toggleControlsVisibility = self.toggleControlsVisibility + node.goToPreviousItem = { [weak self] in + if let strongSelf = self { + if let index = strongSelf.centralItemIndex, index > 0 { + strongSelf.transaction(GalleryPagerTransaction(deleteItems: [], insertItems: [], updateItems: [], focusOnItem: index - 1)) + } + } + } + node.goToNextItem = { [weak self] in + if let strongSelf = self { + if let index = strongSelf.centralItemIndex, index < strongSelf.items.count - 1 { + strongSelf.transaction(GalleryPagerTransaction(deleteItems: [], insertItems: [], updateItems: [], focusOnItem: index + 1)) + } + } + } + node.canGoToPreviousItem = { [weak self] in + if let strongSelf = self, let index = strongSelf.centralItemIndex, index > 0 { + return true + } + return false + } + node.canGoToNextItem = { [weak self] in + if let strongSelf = self, let index = strongSelf.centralItemIndex, index < strongSelf.items.count - 1 { + return true + } + return false + } node.dismiss = self.dismiss node.beginCustomDismiss = self.beginCustomDismiss node.completeCustomDismiss = self.completeCustomDismiss @@ -314,7 +340,7 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate { } } - if centralItemIndex != items.count - 1 { + if centralItemIndex != self.items.count - 1 { if self.shouldLoadItems(force: forceLoad) && self.visibleItemNode(at: centralItemIndex + 1) == nil { let node = self.makeNodeForItem(at: centralItemIndex + 1) node.frame = centralItemNode.frame.offsetBy(dx: centralItemNode.frame.size.width + self.pageGap, dy: 0.0) diff --git a/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift index f4f24f1221..834d6758d1 100644 --- a/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift @@ -325,8 +325,8 @@ final class ChatAnimationGalleryItemNode: ZoomableContentGalleryItemNode { return self._rightBarButtonItems.get() } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } @objc func statusPressed() { diff --git a/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift index 1537d93a17..2be4d488cc 100644 --- a/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift @@ -375,8 +375,8 @@ class ChatDocumentGalleryItemNode: ZoomableContentGalleryItemNode, WKNavigationD self.statusNodeContainer.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, timingFunction: CAMediaTimingFunctionName.easeIn.rawValue, removeOnCompletion: false) } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } @objc func statusPressed() { diff --git a/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift index c0714f5fd1..753b5cc904 100644 --- a/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift @@ -310,8 +310,8 @@ class ChatExternalFileGalleryItemNode: GalleryItemNode { self.statusNodeContainer.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, timingFunction: CAMediaTimingFunctionName.easeIn.rawValue, removeOnCompletion: false) } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } @objc func statusPressed() { diff --git a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift index 083195070c..e07033342e 100644 --- a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift @@ -505,8 +505,8 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode { return self._rightBarButtonItem.get() } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } @objc func statusPressed() { diff --git a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift index 183bce8efd..f0b6c51d16 100644 --- a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift @@ -145,6 +145,87 @@ private final class UniversalVideoGalleryItemPictureInPictureNode: ASDisplayNode } } +private let soundOnImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/SoundOn"), color: .white) +private let soundOffImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/SoundOff"), color: .white) +private var roundButtonBackgroundImage = { + return generateImage(CGSize(width: 42.0, height: 42), rotatedContext: { size, context in + let bounds = CGRect(origin: CGPoint(), size: size) + context.clear(bounds) + context.setFillColor(UIColor(white: 0.0, alpha: 0.5).cgColor) + context.fillEllipse(in: bounds) + }) +}() + +private final class UniversalVideoGalleryItemOverlayNode: GalleryOverlayContentNode { + private let soundButtonNode: HighlightableButtonNode + private var validLayout: (CGSize, LayoutMetrics, CGFloat, CGFloat, CGFloat)? + + override init() { + self.soundButtonNode = HighlightableButtonNode() + self.soundButtonNode.alpha = 0.0 + self.soundButtonNode.setBackgroundImage(roundButtonBackgroundImage, for: .normal) + self.soundButtonNode.setImage(soundOffImage, for: .normal) + self.soundButtonNode.setImage(soundOnImage, for: .selected) + self.soundButtonNode.setImage(soundOnImage, for: [.selected, .highlighted]) + + super.init() + + self.soundButtonNode.addTarget(self, action: #selector(self.soundButtonPressed), forControlEvents: .touchUpInside) + self.addSubnode(self.soundButtonNode) + } + + func hide() { + self.soundButtonNode.isHidden = true + } + + override func updateLayout(size: CGSize, metrics: LayoutMetrics, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { + self.validLayout = (size, metrics, leftInset, rightInset, bottomInset) + + let soundButtonDiameter: CGFloat = 42.0 + let inset: CGFloat = 12.0 + let effectiveBottomInset = self.visibilityAlpha < 1.0 ? 0.0 : bottomInset + let soundButtonFrame = CGRect(origin: CGPoint(x: size.width - soundButtonDiameter - inset - rightInset, y: size.height - soundButtonDiameter - inset - effectiveBottomInset), size: CGSize(width: soundButtonDiameter, height: soundButtonDiameter)) + transition.updateFrame(node: self.soundButtonNode, frame: soundButtonFrame) + } + + override func animateIn(previousContentNode: GalleryOverlayContentNode?, transition: ContainedViewLayoutTransition) { + transition.updateAlpha(node: self.soundButtonNode, alpha: 1.0) + } + + override func animateOut(nextContentNode: GalleryOverlayContentNode?, transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) { + transition.updateAlpha(node: self.soundButtonNode, alpha: 0.0) + } + + override func setVisibilityAlpha(_ alpha: CGFloat) { + super.setVisibilityAlpha(alpha) + self.updateSoundButtonVisibility() + } + + func updateSoundButtonVisibility() { + if self.soundButtonNode.isSelected { + self.soundButtonNode.alpha = self.visibilityAlpha + } else { + self.soundButtonNode.alpha = 1.0 + } + + if let validLayout = self.validLayout { + self.updateLayout(size: validLayout.0, metrics: validLayout.1, leftInset: validLayout.2, rightInset: validLayout.3, bottomInset: validLayout.4, transition: .animated(duration: 0.3, curve: .easeInOut)) + } + } + + @objc func soundButtonPressed() { + self.soundButtonNode.isSelected = !self.soundButtonNode.isSelected + self.updateSoundButtonVisibility() + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if !self.soundButtonNode.frame.contains(point) { + return nil + } + return super.hitTest(point, with: event) + } +} + private struct FetchControls { let fetch: () -> Void let cancel: () -> Void @@ -161,6 +242,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { private let scrubberView: ChatVideoGalleryItemScrubberView private let footerContentNode: ChatItemGalleryFooterContentNode + private let overlayContentNode: UniversalVideoGalleryItemOverlayNode private var videoNode: UniversalVideoNode? private var videoFramePreview: MediaPlayerFramePreview? @@ -173,6 +255,8 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { private var _isVisible: Bool? private var initiallyActivated = false private var hideStatusNodeUntilCentrality = false + private var playOnContentOwnership = false + private var skipInitialPause = false private var validLayout: (ContainerViewLayout, CGFloat)? private var didPause = false private var isPaused = true @@ -206,6 +290,8 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { self.footerContentNode.performAction = performAction self.footerContentNode.openActionOptions = openActionOptions + self.overlayContentNode = UniversalVideoGalleryItemOverlayNode() + self.statusButtonNode = HighlightableButtonNode() self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(white: 0.0, alpha: 0.5)) self.statusNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 50.0, height: 50.0)) @@ -391,6 +477,13 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { videoNode.ownsContentNodeUpdated = { [weak self] value in if let strongSelf = self { strongSelf.updateDisplayPlaceholder(!value) + + if strongSelf.playOnContentOwnership { + strongSelf.playOnContentOwnership = false + strongSelf.initiallyActivated = true + strongSelf.skipInitialPause = true + strongSelf.videoNode?.playOnceWithSound(playAndRecord: false, actionAtEnd: .stop) + } } } self.videoNode = videoNode @@ -398,6 +491,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { videoNode.backgroundColor = videoNode.ownsContentNode ? UIColor.black : UIColor(rgb: 0x333335) if item.fromPlayingVideo { videoNode.canAttachContent = false + self.overlayContentNode.hide() } else { self.updateDisplayPlaceholder(!videoNode.ownsContentNode) } @@ -625,7 +719,8 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { } private func shouldAutoplayOnCentrality() -> Bool { - if let item = self.item, let content = item.content as? NativeVideoContent, !self.initiallyActivated { +// !self.initiallyActivated + if let item = self.item, let content = item.content as? NativeVideoContent { var isLocal = false if let fetchStatus = self.fetchStatus, case .Local = fetchStatus { isLocal = true @@ -658,15 +753,19 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { self.hideStatusNodeUntilCentrality = false self.statusButtonNode.isHidden = self.hideStatusNodeUntilCentrality || self.statusNodeShouldBeHidden + if videoNode.ownsContentNode { if isAnimated { videoNode.seek(0.0) videoNode.play() - } - else if self.shouldAutoplayOnCentrality() { + } else if self.shouldAutoplayOnCentrality() { self.initiallyActivated = true videoNode.playOnceWithSound(playAndRecord: false, actionAtEnd: .stop) } + } else { + if self.shouldAutoplayOnCentrality() { + self.playOnContentOwnership = true + } } } else { self.dismissOnOrientationChange = false @@ -689,8 +788,12 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { if hadPreviousValue { videoNode.canAttachContent = isVisible if isVisible { - videoNode.pause() - videoNode.seek(0.0) + if self.skipInitialPause { + self.skipInitialPause = false + } else { + videoNode.pause() + videoNode.seek(0.0) + } } else { videoNode.continuePlayingWithoutSound() } @@ -982,7 +1085,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { transformedSuperFrame = transformedSuperFrame.offsetBy(dx: videoNode.position.x - previousFrame.center.x, dy: videoNode.position.y - previousFrame.center.y) } - let initialScale: CGFloat = 1.0 //min(videoNode.layer.bounds.width / node.0.view.bounds.width, videoNode.layer.bounds.height / node.0.view.bounds.height) + let initialScale: CGFloat = 1.0 let targetScale = max(transformedFrame.size.width / videoNode.layer.bounds.size.width, transformedFrame.size.height / videoNode.layer.bounds.size.height) videoNode.backgroundColor = .clear @@ -1197,7 +1300,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { } } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } } diff --git a/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift b/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift index 7c7851232a..58550dd126 100644 --- a/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift +++ b/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift @@ -3,8 +3,36 @@ import UIKit import Display import AsyncDisplayKit +private let leftFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opaque: false, rotatedContext: { size, context in + let bounds = CGRect(origin: CGPoint(), size: size) + context.clear(bounds) + + let gradientColors = [UIColor.black.withAlphaComponent(0.35).cgColor, UIColor.black.withAlphaComponent(0.0).cgColor] as CFArray + + var locations: [CGFloat] = [0.0, 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: 64.0, y: 0.0), options: CGGradientDrawingOptions()) +}) + +private let rightFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opaque: false, rotatedContext: { size, context in + let bounds = CGRect(origin: CGPoint(), size: size) + context.clear(bounds) + + let gradientColors = [UIColor.black.withAlphaComponent(0.0).cgColor, UIColor.black.withAlphaComponent(0.35).cgColor] as CFArray + + var locations: [CGFloat] = [0.0, 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: 64.0, y: 0.0), options: CGGradientDrawingOptions()) +}) + open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate { public let scrollNode: ASScrollNode + private let leftFadeNode: ASImageNode + private let rightFadeNode: ASImageNode private var containerLayout: ContainerViewLayout? @@ -32,6 +60,16 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate self.scrollNode.view.contentInsetAdjustmentBehavior = .never } + self.leftFadeNode = ASImageNode() + self.leftFadeNode.contentMode = .scaleToFill + self.leftFadeNode.image = leftFadeImage + self.leftFadeNode.alpha = 0.0 + + self.rightFadeNode = ASImageNode() + self.rightFadeNode.contentMode = .scaleToFill + self.rightFadeNode.image = rightFadeImage + self.rightFadeNode.alpha = 0.0 + super.init() self.scrollNode.view.delegate = self @@ -42,41 +80,70 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate self.scrollNode.view.delaysContentTouches = false let tapRecognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.contentTap(_:))) - tapRecognizer.tapActionAtPoint = { _ in + tapRecognizer.tapActionAtPoint = { [weak self] location in + if let strongSelf = self { + if location.x < 44.0 || location.x > strongSelf.frame.width - 44.0 { + return .waitForSingleTap + } + } return .waitForDoubleTap } + tapRecognizer.highlight = { [weak self] location in + if let strongSelf = self { + let transition: ContainedViewLayoutTransition = .animated(duration: 0.07, curve: .easeInOut) + if let location = location, location.x < 44.0 && strongSelf.canGoToPreviousItem() { + transition.updateAlpha(node: strongSelf.leftFadeNode, alpha: 1.0) + } else { + transition.updateAlpha(node: strongSelf.leftFadeNode, alpha: 0.0) + } + if let location = location, location.x > strongSelf.frame.width - 44.0 && strongSelf.canGoToNextItem() { + transition.updateAlpha(node: strongSelf.rightFadeNode, alpha: 1.0) + } else { + transition.updateAlpha(node: strongSelf.rightFadeNode, alpha: 0.0) + } + } + } self.scrollNode.view.addGestureRecognizer(tapRecognizer) - + self.addSubnode(self.scrollNode) + self.addSubnode(self.leftFadeNode) + self.addSubnode(self.rightFadeNode) } @objc open func contentTap(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { if recognizer.state == .ended { if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { - switch gesture { - case .tap: - self.toggleControlsVisibility() - case .doubleTap: - if let contentView = self.zoomableContent?.1.view, self.scrollNode.view.zoomScale.isLessThanOrEqualTo(self.scrollNode.view.minimumZoomScale) { - let pointInView = self.scrollNode.view.convert(location, to: contentView) - - let newZoomScale = self.scrollNode.view.maximumZoomScale - let scrollViewSize = self.scrollNode.view.bounds.size - - let w = scrollViewSize.width / newZoomScale - let h = scrollViewSize.height / newZoomScale - let x = pointInView.x - (w / 2.0) - let y = pointInView.y - (h / 2.0) - - let rectToZoomTo = CGRect(x: x, y: y, width: w, height: h) - - self.scrollNode.view.zoom(to: rectToZoomTo, animated: true) - } else { - self.scrollNode.view.setZoomScale(self.scrollNode.view.minimumZoomScale, animated: true) - } - default: - break + let pointInNode = self.scrollNode.view.convert(location, to: self.view) + if pointInNode.x < 44.0 { + self.goToPreviousItem() + } else if pointInNode.x > self.frame.width - 44.0 { + self.goToNextItem() + } else { + switch gesture { + case .tap: + self.toggleControlsVisibility() + case .doubleTap: + if let contentView = self.zoomableContent?.1.view, self.scrollNode.view.zoomScale.isLessThanOrEqualTo(self.scrollNode.view.minimumZoomScale) { + let pointInView = self.scrollNode.view.convert(location, to: contentView) + + let newZoomScale = self.scrollNode.view.maximumZoomScale + let scrollViewSize = self.scrollNode.view.bounds.size + + let w = scrollViewSize.width / newZoomScale + let h = scrollViewSize.height / newZoomScale + let x = pointInView.x - (w / 2.0) + let y = pointInView.y - (h / 2.0) + + let rectToZoomTo = CGRect(x: x, y: y, width: w, height: h) + + self.scrollNode.view.zoom(to: rectToZoomTo, animated: true) + } else { + self.scrollNode.view.setZoomScale(self.scrollNode.view.minimumZoomScale, animated: true) + } + default: + break + } } } } @@ -93,6 +160,10 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate } self.containerLayout = layout + let fadeWidth = min(72.0, layout.size.width * 0.2) + self.leftFadeNode.frame = CGRect(x: 0.0, y: 0.0, width: fadeWidth, height: layout.size.height) + self.rightFadeNode.frame = CGRect(x: layout.size.width - fadeWidth, y: 0.0, width: fadeWidth, height: layout.size.height) + if shouldResetContents { var previousFrame: CGRect? var previousScale: CGFloat? diff --git a/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift b/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift index 9254384396..1d0c082ae5 100644 --- a/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift +++ b/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift @@ -301,7 +301,7 @@ final class InstantImageGalleryItemNode: ZoomableContentGalleryItemNode { return self._title.get() } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } } diff --git a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift index c930ad926b..1360bc8ac7 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, fromChat: false) { strongSelf.getNavigationController()?.pushViewController(controller) } } diff --git a/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift b/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift index 0e32aadb82..d50fc2b478 100644 --- a/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift +++ b/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift @@ -170,7 +170,7 @@ public class InstantPageGalleryController: ViewController, StandalonePresentable private let centralItemTitleView = Promise() private let centralItemRightBarButtonItem = Promise() private let centralItemNavigationStyle = Promise() - private let centralItemFooterContentNode = Promise() + private let centralItemFooterContentNode = Promise<(GalleryFooterContentNode?, GalleryOverlayContentNode?)>() private let centralItemAttributesDisposable = DisposableSet(); private let _hiddenMedia = Promise(nil) @@ -243,7 +243,7 @@ public class InstantPageGalleryController: ViewController, StandalonePresentable self?.navigationItem.rightBarButtonItem = rightBarButtonItem })) - self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode in + self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode, _ in self?.galleryNode.updatePresentationState({ $0.withUpdatedFooterContentNode(footerContentNode) }, transition: .immediate) 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/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift b/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift index 2b0988c6d8..b9da7f99eb 100644 --- a/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift +++ b/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift @@ -12,6 +12,11 @@ public enum ItemListPeerActionItemHeight { case peerList } +public enum ItemListPeerActionItemColor { + case accent + case destructive +} + public class ItemListPeerActionItem: ListViewItem, ItemListItem { let presentationData: ItemListPresentationData let icon: UIImage? @@ -19,16 +24,18 @@ public class ItemListPeerActionItem: ListViewItem, ItemListItem { public let alwaysPlain: Bool let editing: Bool let height: ItemListPeerActionItemHeight + let color: ItemListPeerActionItemColor public let sectionId: ItemListSectionId let action: (() -> Void)? - public init(presentationData: ItemListPresentationData, icon: UIImage?, title: String, alwaysPlain: Bool = false, sectionId: ItemListSectionId, height: ItemListPeerActionItemHeight = .peerList, editing: Bool, action: (() -> Void)?) { + public init(presentationData: ItemListPresentationData, icon: UIImage?, title: String, alwaysPlain: Bool = false, sectionId: ItemListSectionId, height: ItemListPeerActionItemHeight = .peerList, color: ItemListPeerActionItemColor = .accent, editing: Bool, action: (() -> Void)?) { self.presentationData = presentationData self.icon = icon self.title = title self.alwaysPlain = alwaysPlain self.editing = editing self.height = height + self.color = color self.sectionId = sectionId self.action = action } @@ -167,7 +174,15 @@ class ItemListPeerActionItemNode: ListViewItemNode { let editingOffset: CGFloat = (item.editing ? 38.0 : 0.0) - let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: item.presentationData.theme.list.itemAccentColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - editingOffset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + let textColor: UIColor + switch item.color { + case .accent: + textColor = item.presentationData.theme.list.itemAccentColor + case .destructive: + textColor = item.presentationData.theme.list.itemDestructiveColor + } + + let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - editingOffset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) let separatorHeight = UIScreenPixel diff --git a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift index a40405c95f..8c8fcf6b0f 100644 --- a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift +++ b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift @@ -208,9 +208,9 @@ private final class LoadingShimmerNode: ASDisplayNode { public struct ItemListPeerItemEditing: Equatable { public var editable: Bool public var editing: Bool - public var revealed: Bool + public var revealed: Bool? - public init(editable: Bool, editing: Bool, revealed: Bool) { + public init(editable: Bool, editing: Bool, revealed: Bool?) { self.editable = editable self.editing = editing self.revealed = revealed @@ -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,10 +1089,15 @@ 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)) - strongSelf.setRevealOptionsOpened(item.editing.revealed, animated: animated) + if let revealed = item.editing.revealed { + strongSelf.setRevealOptionsOpened(revealed, animated: animated) + } } }) } diff --git a/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift b/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift index 0eb1793f6c..f707e88839 100644 --- a/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift +++ b/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift @@ -31,6 +31,7 @@ public enum ItemListStickerPackItemControl: Equatable { case none case installation(installed: Bool) case selection + case check(checked: Bool) } public final class ItemListStickerPackItem: ListViewItem, ItemListItem { @@ -305,6 +306,8 @@ class ItemListStickerPackItemNode: ItemListRevealOptionsItemNode { case .selection: rightInset += 16.0 checkImage = PresentationResourcesItemList.checkIconImage(item.presentationData.theme) + case .check: + rightInset += 16.0 } var unreadImage: UIImage? @@ -531,6 +534,10 @@ class ItemListStickerPackItemNode: ItemListRevealOptionsItemNode { strongSelf.selectionIconNode.image = image strongSelf.selectionIconNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - image.size.width - floor((44.0 - image.size.width) / 2.0), y: floor((contentSize.height - image.size.height) / 2.0)), size: image.size) } + case let .check(checked): + strongSelf.installationActionNode.isHidden = true + strongSelf.installationActionImageNode.isHidden = true + strongSelf.selectionIconNode.isHidden = true } if strongSelf.backgroundNode.supernode == nil { 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/MediaPlayer/Sources/MediaPlayer.swift b/submodules/MediaPlayer/Sources/MediaPlayer.swift index d57c7d5366..9f3ab99e65 100644 --- a/submodules/MediaPlayer/Sources/MediaPlayer.swift +++ b/submodules/MediaPlayer/Sources/MediaPlayer.swift @@ -530,8 +530,7 @@ private final class MediaPlayerContext { } else { if case let .timecode(time) = seek { self.seek(timestamp: Double(time), action: .play) - } - else if case .playing = self.state { + } else if case .playing = self.state { } else { self.play() } 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..1df3ddb5a0 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, fromChat: false) { (strongSelf.navigationController as? NavigationController)?.pushViewController(infoController) } }) diff --git a/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift b/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift index d8a06b4494..b2604b8881 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift @@ -68,7 +68,7 @@ class SecureIdDocumentGalleryController: ViewController, StandalonePresentableCo private let centralItemTitle = Promise() private let centralItemTitleView = Promise() private let centralItemNavigationStyle = Promise() - private let centralItemFooterContentNode = Promise() + private let centralItemFooterContentNode = Promise<(GalleryFooterContentNode?, GalleryOverlayContentNode?)>() private let centralItemAttributesDisposable = DisposableSet(); private let _hiddenMedia = Promise(nil) @@ -123,7 +123,7 @@ class SecureIdDocumentGalleryController: ViewController, StandalonePresentableCo self?.navigationItem.titleView = titleView })) - self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode in + self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode, _ in self?.galleryNode.updatePresentationState({ $0.withUpdatedFooterContentNode(footerContentNode) }, transition: .immediate) diff --git a/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift b/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift index b4f80aa4d5..857c233cc3 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift @@ -210,8 +210,8 @@ final class SecureIdDocumentGalleryItemNode: ZoomableContentGalleryItemNode { return self._title.get() } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } } 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 30c25a1b5b..2e42e1f680 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift @@ -13,7 +13,7 @@ import GalleryUI public enum AvatarGalleryEntry: Equatable { case topImage([ImageRepresentationWithReference], GalleryItemIndexData?) - case image(TelegramMediaImageReference?, [ImageRepresentationWithReference], Peer, Int32, GalleryItemIndexData?, MessageId?) + case image(TelegramMediaImageReference?, [ImageRepresentationWithReference], Peer?, Int32, GalleryItemIndexData?, MessageId?) public var representations: [ImageRepresentationWithReference] { switch self { @@ -61,7 +61,7 @@ public final class AvatarGalleryControllerPresentationArguments { } } -private func initialAvatarGalleryEntries(peer: Peer) -> [AvatarGalleryEntry]{ +public 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,57 @@ 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 func fetchedAvatarGalleryEntries(account: Account, peer: Peer, firstEntry: AvatarGalleryEntry) -> Signal<[AvatarGalleryEntry], NoError> { + let initialEntries = [firstEntry] + return Signal<[AvatarGalleryEntry], NoError>.single(initialEntries) + |> then( + requestPeerPhotos(account: account, peerId: peer.id) + |> map { photos -> [AvatarGalleryEntry] in + var result: [AvatarGalleryEntry] = [] + let initialEntries = [firstEntry] + 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 + } + } + return result + } + ) } public class AvatarGalleryController: ViewController, StandalonePresentableController { @@ -118,7 +149,7 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr private let centralItemTitle = Promise() private let centralItemTitleView = Promise() private let centralItemNavigationStyle = Promise() - private let centralItemFooterContentNode = Promise() + private let centralItemFooterContentNode = Promise<(GalleryFooterContentNode?, GalleryOverlayContentNode?)>() private let centralItemAttributesDisposable = DisposableSet(); private let _hiddenMedia = Promise(nil) @@ -232,7 +263,7 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr self?.navigationItem.titleView = titleView })) - self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode in + self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode, _ in self?.galleryNode.updatePresentationState({ $0.withUpdatedFooterContentNode(footerContentNode) }, transition: .immediate) diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift index 7132c6cfa2..01cc3e6394 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift @@ -85,7 +85,7 @@ final class AvatarGalleryItemFooterContentNode: GalleryFooterContentNode { var dateText: String? switch entry { case let .image(_, _, peer, date, _, _): - nameText = peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) + nameText = peer?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "" dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: date) default: break diff --git a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift b/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift index 4789f0c18f..995ce56263 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift @@ -127,6 +127,7 @@ final class PeerAvatarImageGalleryItemNode: ZoomableContentGalleryItemNode { self?._ready.set(.single(Void())) } + self.imageNode.contentAnimations = .subsequentUpdates self.imageNode.view.contentMode = .scaleAspectFill self.imageNode.clipsToBounds = true @@ -355,7 +356,7 @@ final class PeerAvatarImageGalleryItemNode: ZoomableContentGalleryItemNode { } } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } } diff --git a/submodules/PeerInfoUI/BUCK b/submodules/PeerInfoUI/BUCK index 47da260275..16d723277d 100644 --- a/submodules/PeerInfoUI/BUCK +++ b/submodules/PeerInfoUI/BUCK @@ -64,6 +64,7 @@ static_library( "//submodules/TelegramIntents:TelegramIntents", "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode", "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader", + "//submodules/StatisticsUI:StatisticsUI", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift index 4f9e7b9035..6e32a759d5 100644 --- a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift @@ -757,6 +757,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI } let controller = ItemListController(context: context, state: signal) + controller.navigationPresentation = .modal dismissImpl = { [weak controller] in controller?.dismiss() } diff --git a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift index 59a2a57ad7..f2751edd1b 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, fromChat: false) { pushControllerImpl?(infoController) } })) diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersController.swift b/submodules/PeerInfoUI/Sources/ChannelMembersController.swift index 85c6dce8d6..cb1c05e765 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, fromChat: 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, fromChat: false) { pushControllerImpl?(infoController) } }, pushController: { c in diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift index 16aa80cbfb..e6ba424e59 100644 --- a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift +++ b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift @@ -17,7 +17,7 @@ import ContactsPeerItem import ChatListSearchItemHeader import ItemListUI -enum ChannelMembersSearchMode { +public enum ChannelMembersSearchMode { case searchMembers case searchAdmins case searchBanned @@ -239,10 +239,10 @@ private struct GroupMembersSearchContextState { var members: [RenderedChannelParticipant] = [] } -final class GroupMembersSearchContext { +public final class GroupMembersSearchContext { fileprivate let state = Promise() - init(context: AccountContext, peerId: PeerId) { + public init(context: AccountContext, peerId: PeerId) { assert(Queue.mainQueue().isCurrent()) let combinedSignal = combineLatest(queue: .mainQueue(), categorySignal(context: context, peerId: peerId, category: .contacts), categorySignal(context: context, peerId: peerId, category: .bots), categorySignal(context: context, peerId: peerId, category: .admins), categorySignal(context: context, peerId: peerId, category: .members)) @@ -275,7 +275,7 @@ private struct ChannelMembersSearchContainerState: Equatable { var removingParticipantIds = Set() } -final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNode { +public final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNode { private let context: AccountContext private let openPeer: (Peer, RenderedChannelParticipant?) -> Void private let mode: ChannelMembersSearchMode @@ -298,7 +298,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod private let presentationDataPromise: Promise - init(context: AccountContext, peerId: PeerId, mode: ChannelMembersSearchMode, filters: [ChannelMembersSearchFilter], searchContext: GroupMembersSearchContext?, openPeer: @escaping (Peer, RenderedChannelParticipant?) -> Void, updateActivity: @escaping (Bool) -> Void, pushController: @escaping (ViewController) -> Void) { + public init(context: AccountContext, peerId: PeerId, mode: ChannelMembersSearchMode, filters: [ChannelMembersSearchFilter], searchContext: GroupMembersSearchContext?, openPeer: @escaping (Peer, RenderedChannelParticipant?) -> Void, updateActivity: @escaping (Bool) -> Void, pushController: @escaping (ViewController) -> Void) { self.context = context self.openPeer = openPeer self.mode = mode @@ -1170,7 +1170,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod self.removeMemberDisposable.dispose() } - override func didLoad() { + override public func didLoad() { super.didLoad() } @@ -1179,7 +1179,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod self.listNode.backgroundColor = theme.chatList.backgroundColor } - override func searchTextUpdated(text: String) { + override public func searchTextUpdated(text: String) { if text.isEmpty { self.searchQuery.set(.single(nil)) } else { @@ -1244,7 +1244,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod } } - override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition) let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition) @@ -1268,7 +1268,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod } } - override func scrollToTop() { + override public func scrollToTop() { if self.listNode.isHidden { self.emptyQueryListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], 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 { diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift b/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift index a9350d7aba..4125fbe79c 100644 --- a/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift @@ -14,7 +14,7 @@ enum ChannelMembersSearchControllerMode { case ban } -enum ChannelMembersSearchFilter { +public enum ChannelMembersSearchFilter { case exclude([PeerId]) case disable([PeerId]) } diff --git a/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift b/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift index 7615d720b0..f1813127e9 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, fromChat: false) { pushControllerImpl?(controller) } }, openKicked: { diff --git a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift index 478b46d720..018c87d2d6 100644 --- a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift @@ -813,7 +813,7 @@ public enum ChannelVisibilityControllerMode { case privateLink } -public func channelVisibilityController(context: AccountContext, peerId: PeerId, mode: ChannelVisibilityControllerMode, upgradedToSupergroup: @escaping (PeerId, @escaping () -> Void) -> Void) -> ViewController { +public func channelVisibilityController(context: AccountContext, peerId: PeerId, mode: ChannelVisibilityControllerMode, upgradedToSupergroup: @escaping (PeerId, @escaping () -> Void) -> Void, onDismissRemoveController: ViewController? = nil) -> ViewController { let statePromise = ValuePromise(ChannelVisibilityControllerState(), ignoreRepeated: true) let stateValue = Atomic(value: ChannelVisibilityControllerState()) let updateState: ((ChannelVisibilityControllerState) -> ChannelVisibilityControllerState) -> Void = { f in @@ -1231,9 +1231,22 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, } let controller = ItemListController(context: context, state: signal) - dismissImpl = { [weak controller] in - controller?.view.endEditing(true) - controller?.dismiss() + dismissImpl = { [weak controller, weak onDismissRemoveController] in + guard let controller = controller else { + return + } + controller.view.endEditing(true) + if let onDismissRemoveController = onDismissRemoveController, let navigationController = controller.navigationController { + navigationController.setViewControllers(navigationController.viewControllers.filter { c in + if c === controller || c === onDismissRemoveController { + return false + } else { + return true + } + }, animated: true) + } else { + controller.dismiss() + } } dismissInputImpl = { [weak controller] in controller?.view.endEditing(true) diff --git a/submodules/PeerInfoUI/Sources/GroupInfoController.swift b/submodules/PeerInfoUI/Sources/GroupInfoController.swift index c5c90866b8..367096905c 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, fromChat: 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, fromChat: 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/PeerInfoUI/Sources/PeerReportController.swift b/submodules/PeerInfoUI/Sources/PeerReportController.swift index 5e057cf581..21fb66aeb3 100644 --- a/submodules/PeerInfoUI/Sources/PeerReportController.swift +++ b/submodules/PeerInfoUI/Sources/PeerReportController.swift @@ -18,26 +18,18 @@ public enum PeerReportSubject { case messages([MessageId]) } -private enum PeerReportOption { +public enum PeerReportOption { case spam case violence case copyright - case pornoghraphy + case pornography case childAbuse case other } -public func presentPeerReportOptions(context: AccountContext, parent: ViewController, contextController: ContextController?, subject: PeerReportSubject, completion: @escaping (Bool) -> Void) { +public func presentPeerReportOptions(context: AccountContext, parent: ViewController, contextController: ContextController?, subject: PeerReportSubject, options: [PeerReportOption] = [.spam, .violence, .pornography, .childAbuse, .copyright, .other], completion: @escaping (Bool) -> Void) { if let contextController = contextController { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let options: [PeerReportOption] = [ - .spam, - .violence, - .pornoghraphy, - .childAbuse, - .copyright, - .other - ] var items: [ContextMenuItem] = [] for option in options { let title: String @@ -47,7 +39,7 @@ public func presentPeerReportOptions(context: AccountContext, parent: ViewContro title = presentationData.strings.ReportPeer_ReasonSpam case .violence: title = presentationData.strings.ReportPeer_ReasonViolence - case .pornoghraphy: + case .pornography: title = presentationData.strings.ReportPeer_ReasonPornography case .childAbuse: title = presentationData.strings.ReportPeer_ReasonChildAbuse @@ -67,7 +59,7 @@ public func presentPeerReportOptions(context: AccountContext, parent: ViewContro reportReason = .spam case .violence: reportReason = .violence - case .pornoghraphy: + case .pornography: reportReason = .porno case .childAbuse: reportReason = .childAbuse @@ -116,7 +108,7 @@ public func peerReportOptionsController(context: AccountContext, subject: PeerRe let options: [PeerReportOption] = [ .spam, .violence, - .pornoghraphy, + .pornography, .childAbuse, .copyright, .other @@ -131,7 +123,7 @@ public func peerReportOptionsController(context: AccountContext, subject: PeerRe title = presentationData.strings.ReportPeer_ReasonSpam case .violence: title = presentationData.strings.ReportPeer_ReasonViolence - case .pornoghraphy: + case .pornography: title = presentationData.strings.ReportPeer_ReasonPornography case .childAbuse: title = presentationData.strings.ReportPeer_ReasonChildAbuse @@ -147,7 +139,7 @@ public func peerReportOptionsController(context: AccountContext, subject: PeerRe reportReason = .spam case .violence: reportReason = .violence - case .pornoghraphy: + case .pornography: reportReason = .porno case .childAbuse: reportReason = .childAbuse diff --git a/submodules/PeersNearbyUI/BUCK b/submodules/PeersNearbyUI/BUCK index 5a6ca7965b..b8e216e8a7 100644 --- a/submodules/PeersNearbyUI/BUCK +++ b/submodules/PeersNearbyUI/BUCK @@ -26,6 +26,9 @@ static_library( "//submodules/PeersNearbyIconNode:PeersNearbyIconNode", "//submodules/Geocoding:Geocoding", "//submodules/AppBundle:AppBundle", + "//submodules/AnimatedStickerNode:AnimatedStickerNode", + "//submodules/TelegramStringFormatting:TelegramStringFormatting", + "//submodules/TelegramNotices:TelegramNotices", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift index 5c6a28bdae..8c900cf15c 100644 --- a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift +++ b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift @@ -20,6 +20,11 @@ import TelegramPermissionsUI import ItemListPeerActionItem import Geocoding import AppBundle +import ContextUI +import TelegramNotices +import TelegramStringFormatting + +private let maxUsersDisplayedLimit: Int32 = 5 private struct PeerNearbyEntry { let peer: (Peer, CachedPeerData?) @@ -49,13 +54,21 @@ private func arePeerNearbyArraysEqual(_ lhs: [PeerNearbyEntry], _ rhs: [PeerNear private final class PeersNearbyControllerArguments { let context: AccountContext + let toggleVisibility: (Bool) -> Void + let openProfile: (Peer) -> Void let openChat: (Peer) -> Void let openCreateGroup: (Double, Double, String?) -> Void + let contextAction: (Peer, ASDisplayNode, ContextGesture?) -> Void + let expandUsers: () -> Void - init(context: AccountContext, openChat: @escaping (Peer) -> Void, openCreateGroup: @escaping (Double, Double, String?) -> Void) { + init(context: AccountContext, toggleVisibility: @escaping (Bool) -> Void, openProfile: @escaping (Peer) -> Void, openChat: @escaping (Peer) -> Void, openCreateGroup: @escaping (Double, Double, String?) -> Void, contextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void, expandUsers: @escaping () -> Void) { self.context = context + self.toggleVisibility = toggleVisibility + self.openProfile = openProfile self.openChat = openChat self.openCreateGroup = openCreateGroup + self.contextAction = contextAction + self.expandUsers = expandUsers } } @@ -71,7 +84,9 @@ private enum PeersNearbyEntry: ItemListNodeEntry { case usersHeader(PresentationTheme, String, Bool) case empty(PresentationTheme, String) + case visibility(PresentationTheme, String, Bool) case user(Int32, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, PeerNearbyEntry) + case expand(PresentationTheme, String) case groupsHeader(PresentationTheme, String, Bool) case createGroup(PresentationTheme, String, Double?, Double?, String?) @@ -84,7 +99,7 @@ private enum PeersNearbyEntry: ItemListNodeEntry { switch self { case .header: return PeersNearbySection.header.rawValue - case .usersHeader, .empty, .user: + case .usersHeader, .empty, .visibility, .user, .expand: return PeersNearbySection.users.rawValue case .groupsHeader, .createGroup, .group: return PeersNearbySection.groups.rawValue @@ -101,14 +116,18 @@ private enum PeersNearbyEntry: ItemListNodeEntry { return 1 case .empty: return 2 + case .visibility: + return 3 case let .user(index, _, _, _, _, _): - return 3 + index - case .groupsHeader: + return 4 + index + case .expand: return 1000 - case .createGroup: + case .groupsHeader: return 1001 + case .createGroup: + return 1002 case let .group(index, _, _, _, _, _): - return 1002 + index + return 1003 + index case .channelsHeader: return 2000 case let .channel(index, _, _, _, _, _): @@ -136,12 +155,25 @@ private enum PeersNearbyEntry: ItemListNodeEntry { } else { return false } + case let .visibility(lhsTheme, lhsText, lhsStop): + if case let .visibility(rhsTheme, rhsText, rhsStop) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsStop == rhsStop { + return true + } else { + return false + } + case let .user(lhsIndex, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsDisplayOrder, lhsPeer): if case let .user(rhsIndex, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsDisplayOrder, rhsPeer) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsDisplayOrder == rhsDisplayOrder, arePeersNearbyEqual(lhsPeer, rhsPeer) { return true } else { return false } + case let .expand(lhsTheme, lhsText): + if case let .expand(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } case let .groupsHeader(lhsTheme, lhsText, lhsLoading): if case let .groupsHeader(rhsTheme, rhsText, rhsLoading) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsLoading == rhsLoading { return true @@ -199,10 +231,25 @@ private enum PeersNearbyEntry: ItemListNodeEntry { return ItemListSectionHeaderItem(presentationData: presentationData, text: text, activityIndicator: loading ? .left : .none, sectionId: self.section) case let .empty(theme, text): return ItemListPlaceholderItem(theme: theme, text: text, sectionId: self.section, style: .blocks) + case let .visibility(theme, title, stop): + return ItemListPeerActionItem(presentationData: presentationData, icon: stop ? PresentationResourcesItemList.makeInvisibleIcon(theme) : PresentationResourcesItemList.makeVisibleIcon(theme), title: title, alwaysPlain: false, sectionId: self.section, color: stop ? .destructive : .accent, editing: false, action: { + arguments.toggleVisibility(!stop) + }) case let .user(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer): - return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text(strings.Map_DistanceAway(stringForDistance(peer.distance)).0), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { - arguments.openChat(peer.peer.0) - }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopGroupInset: false, tag: nil) + var text = strings.Map_DistanceAway(stringForDistance(peer.distance)).0 + let isSelfPeer = peer.peer.0.id == arguments.context.account.peerId + if isSelfPeer { + text = strings.PeopleNearby_VisibleUntil(humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: peer.expires)).0 + } + return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text(text), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: !isSelfPeer, sectionId: self.section, action: { + if !isSelfPeer { + arguments.openProfile(peer.peer.0) + } + }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, contextAction: nil, hasTopGroupInset: false, tag: nil) + case let .expand(theme, title): + return ItemListPeerActionItem(presentationData: presentationData, icon: PresentationResourcesItemList.downArrowImage(theme), title: title, sectionId: self.section, editing: false, action: { + arguments.expandUsers() + }) case let .groupsHeader(theme, text, loading): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, activityIndicator: loading ? .left : .none, sectionId: self.section) case let .createGroup(theme, title, latitude, longitude, address): @@ -220,7 +267,9 @@ private enum PeersNearbyEntry: ItemListNodeEntry { } return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: text, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { arguments.openChat(peer.peer.0) - }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopGroupInset: false, tag: nil) + }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, contextAction: { node, gesture in + arguments.contextAction(peer.peer.0, node, gesture) + }, hasTopGroupInset: false, tag: nil) case let .channelsHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) case let .channel(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer): @@ -232,7 +281,9 @@ private enum PeersNearbyEntry: ItemListNodeEntry { } return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: text, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { arguments.openChat(peer.peer.0) - }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopGroupInset: false, tag: nil) + }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, contextAction: { node, gesture in + arguments.contextAction(peer.peer.0, node, gesture) + }, hasTopGroupInset: false, tag: nil) } } } @@ -241,37 +292,57 @@ private struct PeersNearbyData: Equatable { let latitude: Double let longitude: Double let address: String? + let visible: Bool + let accountPeerId: PeerId let users: [PeerNearbyEntry] let groups: [PeerNearbyEntry] let channels: [PeerNearbyEntry] - init(latitude: Double, longitude: Double, address: String?, users: [PeerNearbyEntry], groups: [PeerNearbyEntry], channels: [PeerNearbyEntry]) { + init(latitude: Double, longitude: Double, address: String?, visible: Bool, accountPeerId: PeerId, users: [PeerNearbyEntry], groups: [PeerNearbyEntry], channels: [PeerNearbyEntry]) { self.latitude = latitude self.longitude = longitude self.address = address + self.visible = visible + self.accountPeerId = accountPeerId self.users = users self.groups = groups self.channels = channels } static func ==(lhs: PeersNearbyData, rhs: PeersNearbyData) -> Bool { - return lhs.latitude == rhs.latitude && lhs.longitude == rhs.longitude && lhs.address == rhs.address && arePeerNearbyArraysEqual(lhs.users, rhs.users) && arePeerNearbyArraysEqual(lhs.groups, rhs.groups) && arePeerNearbyArraysEqual(lhs.channels, rhs.channels) + return lhs.latitude == rhs.latitude && lhs.longitude == rhs.longitude && lhs.address == rhs.address && lhs.visible == rhs.visible && lhs.accountPeerId == rhs.accountPeerId && arePeerNearbyArraysEqual(lhs.users, rhs.users) && arePeerNearbyArraysEqual(lhs.groups, rhs.groups) && arePeerNearbyArraysEqual(lhs.channels, rhs.channels) } } -private func peersNearbyControllerEntries(data: PeersNearbyData?, presentationData: PresentationData, displayLoading: Bool) -> [PeersNearbyEntry] { +private func peersNearbyControllerEntries(data: PeersNearbyData?, state: PeersNearbyState, presentationData: PresentationData, displayLoading: Bool, expanded: Bool) -> [PeersNearbyEntry] { var entries: [PeersNearbyEntry] = [] - entries.append(.header(presentationData.theme, presentationData.strings.PeopleNearby_Description)) + entries.append(.header(presentationData.theme, presentationData.strings.PeopleNearby_DiscoverDescription)) entries.append(.usersHeader(presentationData.theme, presentationData.strings.PeopleNearby_Users.uppercased(), displayLoading && data == nil)) + + let visible = state.visibilityExpires != nil + entries.append(.visibility(presentationData.theme, visible ? presentationData.strings.PeopleNearby_MakeInvisible : presentationData.strings.PeopleNearby_MakeVisible, visible)) + if let data = data, !data.users.isEmpty { var i: Int32 = 0 - for user in data.users { - entries.append(.user(i, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, user)) - i += 1 + var users = data.users + var effectiveExpanded = expanded + if users.count > maxUsersDisplayedLimit && !expanded { + users = Array(users.prefix(Int(maxUsersDisplayedLimit))) + } else { + effectiveExpanded = true + } + + for user in users { + if user.peer.0.id != data.accountPeerId { + entries.append(.user(i, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, user)) + i += 1 + } + } + + if !effectiveExpanded { + entries.append(.expand(presentationData.theme, presentationData.strings.PeopleNearby_ShowMorePeople(Int32(data.users.count) - maxUsersDisplayedLimit))) } - } else { - entries.append(.empty(presentationData.theme, presentationData.strings.PeopleNearby_UsersEmpty)) } entries.append(.groupsHeader(presentationData.theme, presentationData.strings.PeopleNearby_Groups.uppercased(), displayLoading && data == nil)) @@ -295,11 +366,94 @@ private func peersNearbyControllerEntries(data: PeersNearbyData?, presentationDa return entries } +private final class ContextControllerContentSourceImpl: ContextControllerContentSource { + let controller: ViewController + weak var sourceNode: ASDisplayNode? + + let navigationController: NavigationController? = nil + + let passthroughTouches: Bool = true + + 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() { + } +} + +private func peerNearbyContextMenuItems(context: AccountContext, peerId: PeerId, present: @escaping (ViewController) -> Void) -> Signal<[ContextMenuItem], NoError> { + let presentationData = context.sharedContext.currentPresentationData.with({ $0 }) + return context.account.postbox.transaction { transaction -> [ContextMenuItem] in + var items: [ContextMenuItem] = [] +// +// let peer = transaction.getPeer(peerId) +// +// if let peer = peer as? TelegramUser { +// items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChatList_Context_AddToContacts, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor) }, action: { _, f in +// f(.default) +// }))) +// } else { +// items.append(.action(ContextMenuActionItem(text: presentationData.strings.PeopleNearby_Context_JoinGroup, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor) }, action: { _, f in +// let _ = (joinChannel(account: context.account, peerId: peerId) |> deliverOnMainQueue).start(next: { participant in +// f(.default) +// }, error: { error in +//// if let strongSelf = self { +//// if case .tooMuchJoined = error { +//// if let parentNavigationController = strongSelf.parentNavigationController { +//// let context = strongSelf.context +//// let link = strongSelf.link +//// let navigateToPeer = strongSelf.navigateToPeer +//// let resolvedState = strongSelf.resolvedState +//// parentNavigationController.pushViewController(oldChannelsController(context: strongSelf.context, intent: .join, completed: { [weak parentNavigationController] value in +//// if value { +//// (parentNavigationController?.viewControllers.last as? ViewController)?.present(JoinLinkPreviewController(context: context, link: link, navigateToPeer: navigateToPeer, parentNavigationController: parentNavigationController, resolvedState: resolvedState), in: .window(.root)) +//// } +//// })) +//// } else { +//// strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.Join_ChannelsTooMuch, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) +//// } +//// strongSelf.dismiss() +//// } +//// } +// }) +// }))) +// +// items.append(.action(ContextMenuActionItem(text: presentationData.strings.PeopleNearby_Context_UnrelatedLocation, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Report"), color: theme.contextMenu.primaryColor) }, action: { _, f in +// let _ = (TelegramCore.reportPeer(account: context.account, peerId: peerId, reason: .irrelevantLocation) +// |> deliverOnMainQueue).start(completed: { +// let _ = ApplicationSpecificNotice.setIrrelevantPeerGeoReport(postbox: context.account.postbox, peerId: peerId).start() +// +// present(textAlertController(context: context, title: nil, text: presentationData.strings.ReportPeer_AlertSuccess, actions: [TextAlertAction(type: TextAlertActionType.defaultAction, title: presentationData.strings.Common_OK, action: {})])) +// }) +// f(.default) +// }))) +// } + + return items + } +} + + public func peersNearbyController(context: AccountContext) -> ViewController { var pushControllerImpl: ((ViewController) -> Void)? var replaceAllButRootControllerImpl: ((ViewController, Bool) -> Void)? var replaceTopControllerImpl: ((ViewController) -> Void)? var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)? + var presentInGlobalOverlayImpl: ((ViewController) -> Void)? + var navigateToProfileImpl: ((Peer) -> Void)? var navigateToChatImpl: ((Peer) -> Void)? let actionsDisposable = DisposableSet() @@ -308,8 +462,31 @@ public func peersNearbyController(context: AccountContext) -> ViewController { let dataPromise = Promise(nil) let addressPromise = Promise(nil) + let expandedPromise = ValuePromise(false) - let arguments = PeersNearbyControllerArguments(context: context, openChat: { peer in + let coordinatePromise = Promise(nil) + coordinatePromise.set(.single(nil) |> then(currentLocationManagerCoordinate(manager: context.sharedContext.locationManager!, timeout: 5.0))) + + let arguments = PeersNearbyControllerArguments(context: context, toggleVisibility: { visible in + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + + if visible { + presentControllerImpl?(textAlertController(context: context, title: presentationData.strings.PeopleNearby_MakeVisibleTitle, text: presentationData.strings.PeopleNearby_MakeVisibleDescription, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: { + let _ = (coordinatePromise.get() + |> deliverOnMainQueue).start(next: { coordinate in + if let coordinate = coordinate { + let _ = peersNearbyUpdateVisibility(account: context.account, update: .visible(latitude: coordinate.latitude, longitude: coordinate.longitude), background: false).start() + } + }) + })]), nil) + + + } else { + let _ = peersNearbyUpdateVisibility(account: context.account, update: .invisible, background: false).start() + } + }, openProfile: { peer in + navigateToProfileImpl?(peer) + }, openChat: { peer in navigateToChatImpl?(peer) }, openCreateGroup: { latitude, longitude, address in let presentationData = context.sharedContext.currentPresentationData.with { $0 } @@ -350,16 +527,26 @@ public func peersNearbyController(context: AccountContext) -> ViewController { presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.CreateGroup_ErrorLocatedGroupsTooMuch, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil) } })) + }, contextAction: { peer, node, gesture in + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let chatController = context.sharedContext.makeChatController(context: context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true)) + chatController.canReadHistory.set(false) + let contextController = ContextController(account: context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: peerNearbyContextMenuItems(context: context, peerId: peer.id, present: { c in + presentControllerImpl?(c, nil) + }), reactionItems: [], gesture: gesture) + presentInGlobalOverlayImpl?(contextController) + }, expandUsers: { + expandedPromise.set(true) }) - let dataSignal: Signal = currentLocationManagerCoordinate(manager: context.sharedContext.locationManager!, timeout: 5.0) + let dataSignal: Signal = coordinatePromise.get() |> mapToSignal { coordinate -> Signal in guard let coordinate = coordinate else { return .single(nil) } return Signal { subscriber in - let peersNearbyContext = PeersNearbyContext(network: context.account.network, accountStateManager: context.account.stateManager, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude)) + let peersNearbyContext = PeersNearbyContext(network: context.account.network, stateManager: context.account.stateManager, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude)) let peersNearby: Signal = combineLatest(peersNearbyContext.get(), addressPromise.get()) |> mapToSignal { peersNearby, address -> Signal<([PeerNearby]?, String?), NoError> in @@ -379,17 +566,26 @@ public func peersNearbyController(context: AccountContext) -> ViewController { return context.account.postbox.transaction { transaction -> PeersNearbyData? in var users: [PeerNearbyEntry] = [] var groups: [PeerNearbyEntry] = [] + var visible = false for peerNearby in peersNearby { - if peerNearby.id != context.account.peerId, let peer = transaction.getPeer(peerNearby.id) { - if peerNearby.id.namespace == Namespaces.Peer.CloudUser { - users.append(PeerNearbyEntry(peer: (peer, nil), expires: peerNearby.expires, distance: peerNearby.distance)) - } else { - let cachedData = transaction.getPeerCachedData(peerId: peerNearby.id) as? CachedChannelData - groups.append(PeerNearbyEntry(peer: (peer, cachedData), expires: peerNearby.expires, distance: peerNearby.distance)) - } + switch peerNearby { + case let .peer(id, expires, distance): + if let peer = transaction.getPeer(id) { + if id.namespace == Namespaces.Peer.CloudUser { + users.append(PeerNearbyEntry(peer: (peer, nil), expires: expires, distance: distance)) + } else { + let cachedData = transaction.getPeerCachedData(peerId: id) as? CachedChannelData + groups.append(PeerNearbyEntry(peer: (peer, cachedData), expires: expires, distance: distance)) + } + } + case let .selfPeer(expires): + visible = true + if let peer = transaction.getPeer(context.account.peerId) { + users.append(PeerNearbyEntry(peer: (peer, nil), expires: expires, distance: 0)) + } } } - return PeersNearbyData(latitude: coordinate.latitude, longitude: coordinate.longitude, address: address, users: users, groups: groups, channels: []) + return PeersNearbyData(latitude: coordinate.latitude, longitude: coordinate.longitude, address: address, visible: visible, accountPeerId: context.account.peerId, users: users, groups: groups, channels: []) } } @@ -411,11 +607,12 @@ public func peersNearbyController(context: AccountContext) -> ViewController { .single(true) |> delay(1.0, queue: Queue.mainQueue()) ) - - let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get(), displayLoading) + + let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get(), displayLoading, expandedPromise.get(), context.account.postbox.preferencesView(keys: [PreferencesKeys.peersNearby])) |> deliverOnMainQueue - |> map { presentationData, data, displayLoading -> (ItemListControllerState, (ItemListNodeState, Any)) in + |> map { presentationData, data, displayLoading, expanded, view -> (ItemListControllerState, (ItemListNodeState, Any)) in let previous = previousData.swap(data) + let state = view.values[PreferencesKeys.peersNearby] as? PeersNearbyState ?? .default var crossfade = false if (data?.users.isEmpty ?? true) != (previous?.users.isEmpty ?? true) { @@ -426,7 +623,7 @@ public func peersNearbyController(context: AccountContext) -> ViewController { } let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.PeopleNearby_Title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: true) - let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: peersNearbyControllerEntries(data: data, presentationData: presentationData, displayLoading: displayLoading), style: .blocks, emptyStateItem: nil, crossfadeState: crossfade, animateChanges: !crossfade) + let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: peersNearbyControllerEntries(data: data, state: state, presentationData: presentationData, displayLoading: displayLoading, expanded: expanded), style: .blocks, emptyStateItem: nil, crossfadeState: crossfade, animateChanges: !crossfade) return (controllerState, (listState, arguments)) } @@ -438,6 +635,11 @@ public func peersNearbyController(context: AccountContext) -> ViewController { controller.didDisappear = { [weak controller] _ in 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, avatarInitiallyExpanded: peer.largeProfileImage != nil, fromChat: false) { + (navigationController as? NavigationController)?.pushViewController(controller) + } + } navigateToChatImpl = { [weak controller] peer in if let navigationController = controller?.navigationController as? NavigationController { context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peer.id), keepStack: .always, purposefulAction: { [weak navigationController] in @@ -467,6 +669,10 @@ public func peersNearbyController(context: AccountContext) -> ViewController { controller.present(c, in: .window(.root), with: p) } } - + presentInGlobalOverlayImpl = { [weak controller] c in + if let controller = controller { + controller.presentInGlobalOverlay(c) + } + } return controller } diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift index 7bbb9e9428..ed5a84dc13 100644 --- a/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift +++ b/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift @@ -6,7 +6,8 @@ import SwiftSignalKit import TelegramPresentationData import ItemListUI import PresentationDataUtils -import PeersNearbyIconNode +import AnimatedStickerNode +import AppBundle class PeersNearbyHeaderItem: ListViewItem, ItemListItem { let theme: PresentationTheme @@ -60,7 +61,7 @@ private let titleFont = Font.regular(13.0) class PeersNearbyHeaderItemNode: ListViewItemNode { private let titleNode: TextNode - private var iconNode: PeersNearbyIconNode? + private var animationNode: AnimatedStickerNode private var item: PeersNearbyHeaderItem? @@ -70,24 +71,29 @@ class PeersNearbyHeaderItemNode: ListViewItemNode { self.titleNode.contentMode = .left self.titleNode.contentsScale = UIScreen.main.scale + self.animationNode = AnimatedStickerNode() + if let path = getAppBundle().path(forResource: "Compass", ofType: "tgs") { + self.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 192, height: 192, playbackMode: .once, mode: .direct) + self.animationNode.visibility = true + } + super.init(layerBacked: false, dynamicBounce: false) self.addSubnode(self.titleNode) + self.addSubnode(self.animationNode) } func asyncLayout() -> (_ item: PeersNearbyHeaderItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { let makeTitleLayout = TextNode.asyncLayout(self.titleNode) return { item, params, neighbors in - let leftInset: CGFloat = 48.0 + params.leftInset + let leftInset: CGFloat = 32.0 + params.leftInset let topInset: CGFloat = 92.0 let attributedText = NSAttributedString(string: item.text, font: titleFont, textColor: item.theme.list.freeTextColor) let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: attributedText, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - params.rightInset - leftInset * 2.0, height: CGFloat.greatestFiniteMagnitude), alignment: .center, cutout: nil, insets: UIEdgeInsets())) - let contentSize: CGSize - - contentSize = CGSize(width: params.width, height: topInset + titleLayout.size.height) + let contentSize = CGSize(width: params.width, height: topInset + titleLayout.size.height) let insets = itemListNeighborsGroupedInsets(neighbors) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) @@ -96,22 +102,13 @@ class PeersNearbyHeaderItemNode: ListViewItemNode { if let strongSelf = self { strongSelf.item = item strongSelf.accessibilityLabel = attributedText.string - - let iconNode: PeersNearbyIconNode - if let node = strongSelf.iconNode { - iconNode = node - iconNode.updateTheme(item.theme) - } else { - iconNode = PeersNearbyIconNode(theme: item.theme) - strongSelf.iconNode = iconNode - strongSelf.addSubnode(iconNode) - } - - let iconSize = CGSize(width: 60.0, height: 60.0) - iconNode.frame = CGRect(origin: CGPoint(x: floor((layout.size.width - iconSize.width) / 2.0), y: 5.0), size: iconSize) + + let iconSize = CGSize(width: 96.0, height: 96.0) + strongSelf.animationNode.frame = CGRect(origin: CGPoint(x: floor((layout.size.width - iconSize.width) / 2.0), y: -10.0), size: iconSize) + strongSelf.animationNode.updateLayout(size: iconSize) let _ = titleApply() - strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleLayout.size.width) / 2.0), y: topInset), size: titleLayout.size) + strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleLayout.size.width) / 2.0), y: topInset + 8.0), size: titleLayout.size) } }) } 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/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/Views.swift b/submodules/Postbox/Sources/Views.swift index 962d0fe2ec..c593c746e7 100644 --- a/submodules/Postbox/Sources/Views.swift +++ b/submodules/Postbox/Sources/Views.swift @@ -28,289 +28,300 @@ public enum PostboxViewKey: Hashable { 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 let .allChatListHoles(groupId): - return groupId.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 .allChatListHoles(groupId): - if case .allChatListHoles(groupId) = 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 .allChatListHoles(groupId): - return MutableAllChatListHolesView(postbox: postbox, groupId: groupId) + 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/PresentationDataUtils/Sources/SpecialTabBarIcons.swift b/submodules/PresentationDataUtils/Sources/SpecialTabBarIcons.swift new file mode 100644 index 0000000000..0fa053ebd0 --- /dev/null +++ b/submodules/PresentationDataUtils/Sources/SpecialTabBarIcons.swift @@ -0,0 +1,5 @@ +import Foundation + +public func useSpecialTabBarIcons() -> Bool { + return (Date(timeIntervalSince1970: 1581638400)...Date(timeIntervalSince1970: 1581724799)).contains(Date()) +} 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/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 de8449bf1c..a60dc14f82 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/Privacy and Security/BlockedPeersController.swift b/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift index d81c161b2f..8af1364bf1 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, fromChat: false) { pushControllerImpl?(controller) } }) 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/SelectivePrivacySettingsPeersController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift index 627b6c3af5..47875e24b9 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, fromChat: false) else { return } pushControllerImpl?(controller) diff --git a/submodules/SettingsUI/Sources/SettingsController.swift b/submodules/SettingsUI/Sources/SettingsController.swift index 6417452b5e..f9ed1cf03f 100644 --- a/submodules/SettingsUI/Sources/SettingsController.swift +++ b/submodules/SettingsUI/Sources/SettingsController.swift @@ -17,7 +17,6 @@ import AccountContext import OverlayStatusController import AvatarNode import AlertUI -import PresentationDataUtils import TelegramNotices import GalleryUI import LegacyUI @@ -1457,7 +1456,12 @@ public func settingsController(context: AccountContext, accountManager: AccountM actionsDisposable.dispose() } - let icon = UIImage(bundleImageName: "Chat List/Tabs/IconSettings") + let icon: UIImage? + if useSpecialTabBarIcons() { + icon = UIImage(bundleImageName: "Chat List/Tabs/Holiday/IconSettings") + } else { + icon = UIImage(bundleImageName: "Chat List/Tabs/IconSettings") + } let notificationsFromAllAccounts = accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.inAppNotificationSettings]) |> map { sharedData -> Bool in @@ -1497,7 +1501,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/StatisticsUI/BUCK b/submodules/StatisticsUI/BUCK new file mode 100644 index 0000000000..693dcc8cbc --- /dev/null +++ b/submodules/StatisticsUI/BUCK @@ -0,0 +1,30 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "StatisticsUI", + srcs = glob([ + "Sources/**/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/SyncCore:SyncCore#shared", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/AccountContext:AccountContext", + "//submodules/ItemListUI:ItemListUI", + "//submodules/AvatarNode:AvatarNode", + "//submodules/TelegramStringFormatting:TelegramStringFormatting", + "//submodules/AlertUI:AlertUI", + "//submodules/PresentationDataUtils:PresentationDataUtils", + "//submodules/MergeLists:MergeLists", + "//submodules/Charts:Charts", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/StatisticsUI/Info.plist b/submodules/StatisticsUI/Info.plist new file mode 100644 index 0000000000..e1fe4cfb7b --- /dev/null +++ b/submodules/StatisticsUI/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/submodules/StatisticsUI/Sources/StatisticsUI.h b/submodules/StatisticsUI/Sources/StatisticsUI.h new file mode 100644 index 0000000000..89573b3f16 --- /dev/null +++ b/submodules/StatisticsUI/Sources/StatisticsUI.h @@ -0,0 +1,19 @@ +// +// StatisticsUI.h +// StatisticsUI +// +// Created by Peter on 8/13/19. +// Copyright © 2019 Telegram Messenger LLP. All rights reserved. +// + +#import + +//! Project version number for StatisticsUI. +FOUNDATION_EXPORT double StatisticsUIVersionNumber; + +//! Project version string for StatisticsUI. +FOUNDATION_EXPORT const unsigned char StatisticsUIVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/submodules/StatisticsUI/Sources/StatsController.swift b/submodules/StatisticsUI/Sources/StatsController.swift new file mode 100644 index 0000000000..e24f2dc32b --- /dev/null +++ b/submodules/StatisticsUI/Sources/StatsController.swift @@ -0,0 +1,349 @@ +import Foundation +import UIKit +import Display +import SwiftSignalKit +import Postbox +import TelegramCore +import SyncCore +import MapKit +import TelegramPresentationData +import TelegramUIPreferences +import ItemListUI +import PresentationDataUtils +import AccountContext +import PresentationDataUtils +import AppBundle + +private final class StatsArguments { + init() { + } +} + +private enum StatsSection: Int32 { + case overview + case growth + case followers + case notifications + case viewsByHour + case postInteractions + case viewsBySource + case followersBySource + case languages +} + +private enum StatsEntry: ItemListNodeEntry { + case overviewHeader(PresentationTheme, String) + case overview(PresentationTheme, ChannelStats) + + case growthTitle(PresentationTheme, String) + case growthGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + case followersTitle(PresentationTheme, String) + case followersGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + case notificationsTitle(PresentationTheme, String) + case notificationsGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + case viewsByHourTitle(PresentationTheme, String) + case viewsByHourGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + case postInteractionsTitle(PresentationTheme, String) + case postInteractionsGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + case viewsBySourceTitle(PresentationTheme, String) + case viewsBySourceGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + case followersBySourceTitle(PresentationTheme, String) + case followersBySourceGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + case languagesTitle(PresentationTheme, String) + case languagesGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, String, ChannelStatsGraph) + + var section: ItemListSectionId { + switch self { + case .overviewHeader, .overview: + return StatsSection.overview.rawValue + case .growthTitle, .growthGraph: + return StatsSection.growth.rawValue + case .followersTitle, .followersGraph: + return StatsSection.followers.rawValue + case .notificationsTitle, .notificationsGraph: + return StatsSection.notifications.rawValue + case .viewsByHourTitle, .viewsByHourGraph: + return StatsSection.viewsByHour.rawValue + case .postInteractionsTitle, .postInteractionsGraph: + return StatsSection.postInteractions.rawValue + case .viewsBySourceTitle, .viewsBySourceGraph: + return StatsSection.viewsBySource.rawValue + case .followersBySourceTitle, .followersBySourceGraph: + return StatsSection.followersBySource.rawValue + case .languagesTitle, .languagesGraph: + return StatsSection.languages.rawValue + } + } + + var stableId: Int32 { + switch self { + case .overviewHeader: + return 0 + case .overview: + return 1 + case .growthTitle: + return 2 + case .growthGraph: + return 3 + case .followersTitle: + return 4 + case .followersGraph: + return 5 + case .notificationsTitle: + return 6 + case .notificationsGraph: + return 7 + case .viewsByHourTitle: + return 8 + case .viewsByHourGraph: + return 9 + case .postInteractionsTitle: + return 10 + case .postInteractionsGraph: + return 11 + case .viewsBySourceTitle: + return 12 + case .viewsBySourceGraph: + return 13 + case .followersBySourceTitle: + return 14 + case .followersBySourceGraph: + return 15 + case .languagesTitle: + return 16 + case .languagesGraph: + return 17 + } + } + + static func ==(lhs: StatsEntry, rhs: StatsEntry) -> Bool { + switch lhs { + case let .overviewHeader(lhsTheme, lhsText): + if case let .overviewHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .overview(lhsTheme, lhsStats): + if case let .overview(rhsTheme, rhsStats) = rhs, lhsTheme === rhsTheme, lhsStats == rhsStats { + return true + } else { + return false + } + case let .growthTitle(lhsTheme, lhsText): + if case let .growthTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .growthGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .growthGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + case let .followersTitle(lhsTheme, lhsText): + if case let .followersTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .followersGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .followersGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + case let .notificationsTitle(lhsTheme, lhsText): + if case let .notificationsTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .notificationsGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .notificationsGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + case let .viewsByHourTitle(lhsTheme, lhsText): + if case let .viewsByHourTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .viewsByHourGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .viewsByHourGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + case let .postInteractionsTitle(lhsTheme, lhsText): + if case let .postInteractionsTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .postInteractionsGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .postInteractionsGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + case let .viewsBySourceTitle(lhsTheme, lhsText): + if case let .viewsBySourceTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .viewsBySourceGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .viewsBySourceGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + case let .followersBySourceTitle(lhsTheme, lhsText): + if case let .followersBySourceTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .followersBySourceGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .followersBySourceGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + case let .languagesTitle(lhsTheme, lhsText): + if case let .languagesTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .languagesGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsText, lhsGraph): + if case let .languagesGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsText, rhsGraph) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsText == rhsText, lhsGraph == rhsGraph { + return true + } else { + return false + } + } + } + + static func <(lhs: StatsEntry, rhs: StatsEntry) -> Bool { + return lhs.stableId < rhs.stableId + } + + func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem { + switch self { + case let .overviewHeader(theme, text), + let .growthTitle(theme, text), + let .followersTitle(theme, text), + let .notificationsTitle(theme, text), + let .viewsByHourTitle(theme, text), + let .postInteractionsTitle(theme, text), + let .viewsBySourceTitle(theme, text), + let .followersBySourceTitle(theme, text), + let .languagesTitle(theme, text): + return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) + case let .overview(theme, stats): + return StatsOverviewItem(presentationData: presentationData, stats: stats, sectionId: self.section, style: .blocks) + case let .growthGraph(theme, strings, dateTimeFormat, title, graph), + let .followersGraph(theme, strings, dateTimeFormat, title, graph), + let .notificationsGraph(theme, strings, dateTimeFormat, title, graph), + let .viewsByHourGraph(theme, strings, dateTimeFormat, title, graph), + let .postInteractionsGraph(theme, strings, dateTimeFormat, title, graph), + let .viewsBySourceGraph(theme, strings, dateTimeFormat, title, graph), + let .followersBySourceGraph(theme, strings, dateTimeFormat, title, graph), + let .languagesGraph(theme, strings, dateTimeFormat, title, graph): + return StatsGraphItem(presentationData: presentationData, title: title, graph: graph, sectionId: self.section, style: .blocks) + } + } +} + +private func statsControllerEntries(data: ChannelStats?, presentationData: PresentationData) -> [StatsEntry] { + var entries: [StatsEntry] = [] + + if let data = data { + entries.append(.overviewHeader(presentationData.theme, "OVERVIEW")) + entries.append(.overview(presentationData.theme, data)) + + entries.append(.growthTitle(presentationData.theme, "GROWTH")) + entries.append(.growthGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, "Growth", data.growthGraph)) + + entries.append(.followersTitle(presentationData.theme, "FOLLOWERS")) + entries.append(.followersGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, "Followers", data.followersGraph)) + + entries.append(.notificationsTitle(presentationData.theme, "NOTIFICATIONS")) + entries.append(.notificationsGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, "Notifications", data.muteGraph)) + } + + return entries +} + +public func channelStatsController(context: AccountContext, peer: Peer, cachedPeerData: CachedPeerData) -> ViewController { + var pushControllerImpl: ((ViewController) -> Void)? + var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)? + var navigateToChatImpl: ((Peer) -> Void)? + + let actionsDisposable = DisposableSet() + let checkCreationAvailabilityDisposable = MetaDisposable() + actionsDisposable.add(checkCreationAvailabilityDisposable) + + let dataPromise = Promise(nil) + + var datacenterId: Int32 = 0 + if let cachedData = cachedPeerData as? CachedChannelData { + datacenterId = cachedData.statsDatacenterId + } + + let statsContext = ChannelStatsContext(network: context.account.network, datacenterId: datacenterId, peer: peer) + let dataSignal: Signal = statsContext.state + |> map { state in + return state.stats + } |> afterNext({ [weak statsContext] a in + if let w = statsContext, let a = a { + if case .OnDemand = a.interactionsGraph { + w.loadInteractionsGraph() + } + } + }) + dataPromise.set(.single(nil) |> then(dataSignal)) + + let arguments = StatsArguments() + + let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get()) + |> deliverOnMainQueue + |> map { presentationData, data -> (ItemListControllerState, (ItemListNodeState, Any)) in + let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.ChannelInfo_Stats), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: true) + let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: statsControllerEntries(data: data, presentationData: presentationData), style: .blocks, emptyStateItem: nil, crossfadeState: false, animateChanges: false) + + return (controllerState, (listState, arguments)) + } + |> afterDisposed { + actionsDisposable.dispose() + let _ = statsContext.state + } + + let controller = ItemListController(context: context, state: signal) + controller.didDisappear = { [weak controller] _ in + controller?.clearItemNodesHighlight(animated: true) + } + pushControllerImpl = { [weak controller] c in + if let controller = controller { + (controller.navigationController as? NavigationController)?.pushViewController(c, animated: true) + } + } + presentControllerImpl = { [weak controller] c, a in + if let controller = controller { + controller.present(c, in: .window(.root), with: a) + } + } + return controller +} diff --git a/submodules/StatisticsUI/Sources/StatsGraphItem.swift b/submodules/StatisticsUI/Sources/StatsGraphItem.swift new file mode 100644 index 0000000000..a800baf8e9 --- /dev/null +++ b/submodules/StatisticsUI/Sources/StatsGraphItem.swift @@ -0,0 +1,205 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import SwiftSignalKit +import TelegramCore +import SyncCore +import TelegramPresentationData +import ItemListUI +import PresentationDataUtils +import Charts + +class StatsGraphItem: ListViewItem, ItemListItem { + let presentationData: ItemListPresentationData + let title: String + let graph: ChannelStatsGraph + let sectionId: ItemListSectionId + let style: ItemListStyle + + init(presentationData: ItemListPresentationData, title: String, graph: ChannelStatsGraph, sectionId: ItemListSectionId, style: ItemListStyle) { + self.presentationData = presentationData + self.title = title + self.graph = graph + self.sectionId = sectionId + self.style = style + } + + 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 = StatsGraphItemNode() + 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? StatsGraphItemNode { + 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() + }) + } + } + } + } + } + + var selectable: Bool = false +} + +class StatsGraphItemNode: ListViewItemNode { + private let backgroundNode: ASDisplayNode + private let topStripeNode: ASDisplayNode + private let bottomStripeNode: ASDisplayNode + + let chartNode: ChartNode + + private var item: StatsGraphItem? + + init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + self.backgroundNode.backgroundColor = .white + + self.topStripeNode = ASDisplayNode() + self.topStripeNode.isLayerBacked = true + + self.bottomStripeNode = ASDisplayNode() + self.bottomStripeNode.isLayerBacked = true + + self.chartNode = ChartNode() + + super.init(layerBacked: false, dynamicBounce: false) + + self.clipsToBounds = true + + self.addSubnode(self.chartNode) + } + + func asyncLayout() -> (_ item: StatsGraphItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + let currentItem = self.item + + return { item, params, neighbors in + let leftInset = params.leftInset + let rightInset: CGFloat = params.rightInset + var updatedTheme: PresentationTheme? + var updatedGraph: ChannelStatsGraph? + + if currentItem?.presentationData.theme !== item.presentationData.theme { + updatedTheme = item.presentationData.theme + } + + if currentItem?.graph != item.graph { + updatedGraph = item.graph + } + + let contentSize: CGSize + let insets: UIEdgeInsets + let separatorHeight = UIScreenPixel + let itemBackgroundColor: UIColor + let itemSeparatorColor: UIColor + + switch item.style { + case .plain: + itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor + contentSize = CGSize(width: params.width, height: 320.0) + insets = itemListNeighborsPlainInsets(neighbors) + case .blocks: + itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor + contentSize = CGSize(width: params.width, height: 320.0) + insets = itemListNeighborsGroupedInsets(neighbors) + } + + let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) + + return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in + if let strongSelf = self { + strongSelf.item = item + + if let _ = updatedTheme { + strongSelf.topStripeNode.backgroundColor = itemSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor + strongSelf.backgroundNode.backgroundColor = itemBackgroundColor + } + + if let updatedGraph = updatedGraph, case let .Loaded(data) = updatedGraph { + strongSelf.chartNode.setup(data) + } + + switch item.style { + case .plain: + if strongSelf.backgroundNode.supernode != nil { + strongSelf.backgroundNode.removeFromSupernode() + } + if strongSelf.topStripeNode.supernode != nil { + strongSelf.topStripeNode.removeFromSupernode() + } + if strongSelf.bottomStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0) + } + + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight)) + case .blocks: + 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) + } + switch neighbors.top { + case .sameSection(false): + strongSelf.topStripeNode.isHidden = true + default: + strongSelf.topStripeNode.isHidden = false + } + let bottomStripeInset: CGFloat + switch neighbors.bottom { + case .sameSection(false): + bottomStripeInset = leftInset + default: + bottomStripeInset = 0.0 + } + + strongSelf.chartNode.frame = CGRect(origin: CGPoint(x: leftInset, y: -30.0), size: CGSize(width: layout.size.width - leftInset - rightInset, height: 350.0)) + + 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.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: separatorHeight)) + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - bottomStripeInset, height: separatorHeight)) + } + } + }) + } + } + + override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4) + } + + override func animateAdded(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } + + override func animateRemoved(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) + } +} + diff --git a/submodules/StatisticsUI/Sources/StatsOverviewItem.swift b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift new file mode 100644 index 0000000000..5e85186e30 --- /dev/null +++ b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift @@ -0,0 +1,292 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import SwiftSignalKit +import TelegramCore +import SyncCore +import TelegramPresentationData +import ItemListUI +import PresentationDataUtils +import Charts + +class StatsOverviewItem: ListViewItem, ItemListItem { + let presentationData: ItemListPresentationData + let stats: ChannelStats + let sectionId: ItemListSectionId + let style: ItemListStyle + + init(presentationData: ItemListPresentationData, stats: ChannelStats, sectionId: ItemListSectionId, style: ItemListStyle) { + self.presentationData = presentationData + self.stats = stats + self.sectionId = sectionId + self.style = style + } + + 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 = StatsOverviewItemNode() + 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? StatsOverviewItemNode { + 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() + }) + } + } + } + } + } + + var selectable: Bool = false +} + +class StatsOverviewItemNode: ListViewItemNode { + private let backgroundNode: ASDisplayNode + private let topStripeNode: ASDisplayNode + private let bottomStripeNode: ASDisplayNode + + private let followersValueLabel: ImmediateTextNode + private let viewsPerPostValueLabel: ImmediateTextNode + private let sharesPerPostValueLabel: ImmediateTextNode + private let enabledNotificationsValueLabel: ImmediateTextNode + + private let followersTitleLabel: ImmediateTextNode + private let viewsPerPostTitleLabel: ImmediateTextNode + private let sharesPerPostTitleLabel: ImmediateTextNode + private let enabledNotificationsTitleLabel: ImmediateTextNode + + private let followersDeltaLabel: ImmediateTextNode + private let viewsPerPostDeltaLabel: ImmediateTextNode + private let sharesPerPostDeltaLabel: ImmediateTextNode + + private var item: StatsOverviewItem? + + init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + self.backgroundNode.backgroundColor = .white + + self.topStripeNode = ASDisplayNode() + self.topStripeNode.isLayerBacked = true + + self.bottomStripeNode = ASDisplayNode() + self.bottomStripeNode.isLayerBacked = true + + self.followersValueLabel = ImmediateTextNode() + self.viewsPerPostValueLabel = ImmediateTextNode() + self.sharesPerPostValueLabel = ImmediateTextNode() + self.enabledNotificationsValueLabel = ImmediateTextNode() + + self.followersTitleLabel = ImmediateTextNode() + self.viewsPerPostTitleLabel = ImmediateTextNode() + self.sharesPerPostTitleLabel = ImmediateTextNode() + self.enabledNotificationsTitleLabel = ImmediateTextNode() + + self.followersDeltaLabel = ImmediateTextNode() + self.viewsPerPostDeltaLabel = ImmediateTextNode() + self.sharesPerPostDeltaLabel = ImmediateTextNode() + + super.init(layerBacked: false, dynamicBounce: false) + + self.clipsToBounds = true + + self.addSubnode(self.followersValueLabel) + self.addSubnode(self.viewsPerPostValueLabel) + self.addSubnode(self.sharesPerPostValueLabel) + self.addSubnode(self.enabledNotificationsValueLabel) + + self.addSubnode(self.followersTitleLabel) + self.addSubnode(self.viewsPerPostTitleLabel) + self.addSubnode(self.sharesPerPostTitleLabel) + self.addSubnode(self.enabledNotificationsTitleLabel) + + self.addSubnode(self.followersDeltaLabel) + self.addSubnode(self.viewsPerPostDeltaLabel) + self.addSubnode(self.sharesPerPostDeltaLabel) + } + + func asyncLayout() -> (_ item: StatsOverviewItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + let makeFollowersValueLabelLayout = TextNode.asyncLayout(self.followersValueLabel) + let makeViewsPerPostValueLabelLayout = TextNode.asyncLayout(self.viewsPerPostValueLabel) + let makeSharesPerPostValueLabelLayout = TextNode.asyncLayout(self.sharesPerPostValueLabel) + let makeEnabledNotificationsValueLabelLayout = TextNode.asyncLayout(self.enabledNotificationsValueLabel) + + let makeFollowersTitleLabelLayout = TextNode.asyncLayout(self.followersTitleLabel) + let makeViewsPerPostTitleLabelLayout = TextNode.asyncLayout(self.viewsPerPostTitleLabel) + let makeSharesPerPostTitleLabelLayout = TextNode.asyncLayout(self.sharesPerPostTitleLabel) + let makeEnabledNotificationsTitleLabelLayout = TextNode.asyncLayout(self.enabledNotificationsTitleLabel) + + let makeFollowersDeltaLabelLayout = TextNode.asyncLayout(self.followersDeltaLabel) + let makeViewsPerPostDeltaLabelLayout = TextNode.asyncLayout(self.viewsPerPostDeltaLabel) + let makeSharesPerPostDeltaLabelLayout = TextNode.asyncLayout(self.sharesPerPostDeltaLabel) + + let currentItem = self.item + + return { item, params, neighbors in + let leftInset = params.leftInset + let rightInset: CGFloat = params.rightInset + var updatedTheme: PresentationTheme? + var updatedGraph: ChannelStatsGraph? + + if currentItem?.presentationData.theme !== item.presentationData.theme { + updatedTheme = item.presentationData.theme + } + + let valueFont = Font.regular(item.presentationData.fontSize.itemListBaseHeaderFontSize) + let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseHeaderFontSize) + let deltaFont = Font.regular(item.presentationData.fontSize.itemListBaseHeaderFontSize) + + let (followersValueLabelLayout, followersValueLabelApply) = makeFollowersValueLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "221K", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (viewsPerPostValueLabelLayout, viewsPerPostValueLabelApply) = makeViewsPerPostValueLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "120K", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (sharesPerPostValueLabelLayout, sharesPerPostValueLabelApply) = makeSharesPerPostValueLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "350", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (enabledNotificationsValueLabelLayout, enabledNotificationsValueLabelApply) = makeEnabledNotificationsValueLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "22.77%", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + + let (followersTitleLabelLayout, followersTitleLabelApply) = makeFollowersTitleLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "Followers", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (viewsPerPostTitleLabelLayout, viewsPerPostTitleLabelApply) = makeViewsPerPostTitleLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "Views Per Post", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (sharesPerPostTitleLabelLayout, sharesPerPostTitleLabelApply) = makeSharesPerPostTitleLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "Shares Per Post", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (enabledNotificationsTitleLabelLayout, enabledNotificationsTitleLabelApply) = makeEnabledNotificationsTitleLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "Enabled Notifications", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (followersDeltaLabelLayout, followersDeltaLabelApply) = makeFollowersDeltaLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "+474 (0.21%)", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (viewsPerPostDeltaLabelLayout, viewsPerPostDeltaLabelApply) = makeViewsPerPostDeltaLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "-14K (10.68%)", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (sharesPerPostDeltaLabelLayout, sharesPerPostDeltaLabelApply) = makeSharesPerPostDeltaLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "-134 (27.68%)", font: valueFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let contentSize: CGSize + let insets: UIEdgeInsets + let separatorHeight = UIScreenPixel + let itemBackgroundColor: UIColor + let itemSeparatorColor: UIColor + + switch item.style { + case .plain: + itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor + contentSize = CGSize(width: params.width, height: 120.0) + insets = itemListNeighborsPlainInsets(neighbors) + case .blocks: + itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor + contentSize = CGSize(width: params.width, height: 120.0) + insets = itemListNeighborsGroupedInsets(neighbors) + } + + let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) + + return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in + if let strongSelf = self { + strongSelf.item = item + + let _ = followersValueLabelApply() + let _ = viewsPerPostValueLabelApply() + let _ = sharesPerPostValueLabelApply() + let _ = enabledNotificationsValueLabelApply() + + let _ = followersTitleLabelApply() + let _ = viewsPerPostTitleLabelApply() + let _ = sharesPerPostTitleLabelApply() + let _ = enabledNotificationsTitleLabelApply() + + let _ = followersDeltaLabelApply() + let _ = viewsPerPostDeltaLabelApply() + let _ = sharesPerPostDeltaLabelApply() + + if let _ = updatedTheme { + strongSelf.topStripeNode.backgroundColor = itemSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor + strongSelf.backgroundNode.backgroundColor = itemBackgroundColor + } + + switch item.style { + case .plain: + if strongSelf.backgroundNode.supernode != nil { + strongSelf.backgroundNode.removeFromSupernode() + } + if strongSelf.topStripeNode.supernode != nil { + strongSelf.topStripeNode.removeFromSupernode() + } + if strongSelf.bottomStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0) + } + + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight)) + case .blocks: + 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) + } + switch neighbors.top { + case .sameSection(false): + strongSelf.topStripeNode.isHidden = true + default: + strongSelf.topStripeNode.isHidden = false + } + let bottomStripeInset: CGFloat + switch neighbors.bottom { + case .sameSection(false): + bottomStripeInset = leftInset + default: + bottomStripeInset = 0.0 + } + + 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.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: separatorHeight)) + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - bottomStripeInset, height: separatorHeight)) + } + + strongSelf.followersValueLabel.frame = CGRect(origin: CGPoint(x: leftInset, y: 7.0), size: followersValueLabelLayout.size) + + strongSelf.viewsPerPostValueLabel.frame = CGRect(origin: CGPoint(x: leftInset, y: 44.0), size: viewsPerPostValueLabelLayout.size) + + strongSelf.sharesPerPostValueLabel.frame = CGRect(origin: CGPoint(x: layout.size.width / 2.0, y: 44.0), size: sharesPerPostValueLabelLayout.size) + + strongSelf.enabledNotificationsValueLabel.frame = CGRect(origin: CGPoint(x: layout.size.width / 2.0, y: 7.0), size: enabledNotificationsValueLabelLayout.size) + } + }) + } + } + + override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4) + } + + override func animateAdded(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } + + override func animateRemoved(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) + } +} + diff --git a/submodules/SyncCore/Sources/CachedChannelData.swift b/submodules/SyncCore/Sources/CachedChannelData.swift index c00a913477..49bcb7c71c 100644 --- a/submodules/SyncCore/Sources/CachedChannelData.swift +++ b/submodules/SyncCore/Sources/CachedChannelData.swift @@ -166,6 +166,7 @@ public final class CachedChannelData: CachedPeerData { public let slowModeTimeout: Int32? public let slowModeValidUntilTimestamp: Int32? public let hasScheduledMessages: Bool + public let statsDatacenterId: Int32 public let peerIds: Set public let messageIds: Set @@ -192,9 +193,10 @@ public final class CachedChannelData: CachedPeerData { self.slowModeTimeout = nil self.slowModeValidUntilTimestamp = nil self.hasScheduledMessages = false + self.statsDatacenterId = 0 } - public init(isNotAccessible: Bool, flags: CachedChannelFlags, about: String?, participantsSummary: CachedChannelParticipantsSummary, exportedInvitation: ExportedInvitation?, botInfos: [CachedPeerBotInfo], peerStatusSettings: PeerStatusSettings?, pinnedMessageId: MessageId?, stickerPack: StickerPackCollectionInfo?, minAvailableMessageId: MessageId?, migrationReference: ChannelMigrationReference?, linkedDiscussionPeerId: PeerId?, peerGeoLocation: PeerGeoLocation?, slowModeTimeout: Int32?, slowModeValidUntilTimestamp: Int32?, hasScheduledMessages: Bool) { + public init(isNotAccessible: Bool, flags: CachedChannelFlags, about: String?, participantsSummary: CachedChannelParticipantsSummary, exportedInvitation: ExportedInvitation?, botInfos: [CachedPeerBotInfo], peerStatusSettings: PeerStatusSettings?, pinnedMessageId: MessageId?, stickerPack: StickerPackCollectionInfo?, minAvailableMessageId: MessageId?, migrationReference: ChannelMigrationReference?, linkedDiscussionPeerId: PeerId?, peerGeoLocation: PeerGeoLocation?, slowModeTimeout: Int32?, slowModeValidUntilTimestamp: Int32?, hasScheduledMessages: Bool, statsDatacenterId: Int32) { self.isNotAccessible = isNotAccessible self.flags = flags self.about = about @@ -211,6 +213,7 @@ public final class CachedChannelData: CachedPeerData { self.slowModeTimeout = slowModeTimeout self.slowModeValidUntilTimestamp = slowModeValidUntilTimestamp self.hasScheduledMessages = hasScheduledMessages + self.statsDatacenterId = statsDatacenterId var peerIds = Set() for botInfo in botInfos { @@ -231,67 +234,71 @@ public final class CachedChannelData: CachedPeerData { } public func withUpdatedIsNotAccessible(_ isNotAccessible: Bool) -> CachedChannelData { - return CachedChannelData(isNotAccessible: isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedFlags(_ flags: CachedChannelFlags) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedAbout(_ about: String?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedParticipantsSummary(_ participantsSummary: CachedChannelParticipantsSummary) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedExportedInvitation(_ exportedInvitation: ExportedInvitation?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedBotInfos(_ botInfos: [CachedPeerBotInfo]) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedPeerStatusSettings(_ peerStatusSettings: PeerStatusSettings?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedPinnedMessageId(_ pinnedMessageId: MessageId?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedStickerPack(_ stickerPack: StickerPackCollectionInfo?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedMinAvailableMessageId(_ minAvailableMessageId: MessageId?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedMigrationReference(_ migrationReference: ChannelMigrationReference?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedLinkedDiscussionPeerId(_ linkedDiscussionPeerId: PeerId?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedPeerGeoLocation(_ peerGeoLocation: PeerGeoLocation?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedSlowModeTimeout(_ slowModeTimeout: Int32?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedSlowModeValidUntilTimestamp(_ slowModeValidUntilTimestamp: Int32?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) } public func withUpdatedHasScheduledMessages(_ hasScheduledMessages: Bool) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: hasScheduledMessages) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: hasScheduledMessages, statsDatacenterId: self.statsDatacenterId) + } + + public func withUpdatedStatsDatacenterId(_ statsDatacenterId: Int32) -> CachedChannelData { + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation, slowModeTimeout: self.slowModeTimeout, slowModeValidUntilTimestamp: self.slowModeValidUntilTimestamp, hasScheduledMessages: self.hasScheduledMessages, statsDatacenterId: statsDatacenterId) } public init(decoder: PostboxDecoder) { @@ -346,6 +353,7 @@ public final class CachedChannelData: CachedPeerData { self.slowModeTimeout = decoder.decodeOptionalInt32ForKey("smt") self.slowModeValidUntilTimestamp = decoder.decodeOptionalInt32ForKey("smv") self.hasScheduledMessages = decoder.decodeBoolForKey("hsm", orElse: false) + self.statsDatacenterId = decoder.decodeInt32ForKey("sdi", orElse: 0) if let linkedDiscussionPeerId = self.linkedDiscussionPeerId { peerIds.insert(linkedDiscussionPeerId) @@ -430,6 +438,7 @@ public final class CachedChannelData: CachedPeerData { encoder.encodeNil(forKey: "smv") } encoder.encodeBool(self.hasScheduledMessages, forKey: "hsm") + encoder.encodeInt32(self.statsDatacenterId, forKey: "sdi") } public func isEqual(to: CachedPeerData) -> Bool { @@ -497,6 +506,14 @@ public final class CachedChannelData: CachedPeerData { return false } + if other.hasScheduledMessages != self.hasScheduledMessages { + return false + } + + if other.statsDatacenterId != self.statsDatacenterId { + return false + } + return true } } diff --git a/submodules/SyncCore/Sources/Namespaces.swift b/submodules/SyncCore/Sources/Namespaces.swift index 5317234ea5..1af4170023 100644 --- a/submodules/SyncCore/Sources/Namespaces.swift +++ b/submodules/SyncCore/Sources/Namespaces.swift @@ -196,6 +196,8 @@ private enum PreferencesKeyValues: Int32 { case secretChatSettings = 17 case walletCollection = 18 case contentSettings = 19 + case chatListFilters = 20 + case peersNearby = 21 } public func applicationSpecificPreferencesKey(_ value: Int32) -> ValueBoxKey { @@ -306,6 +308,18 @@ 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 + }() + + public static let peersNearby: ValueBoxKey = { + let key = ValueBoxKey(length: 4) + key.setInt32(0, value: PreferencesKeyValues.peersNearby.rawValue) + return key + }() } private enum SharedDataKeyValues: Int32 { diff --git a/submodules/SyncCore/Sources/TextEntitiesMessageAttribute.swift b/submodules/SyncCore/Sources/TextEntitiesMessageAttribute.swift index 79fe68a5ed..e0c3f565a9 100644 --- a/submodules/SyncCore/Sources/TextEntitiesMessageAttribute.swift +++ b/submodules/SyncCore/Sources/TextEntitiesMessageAttribute.swift @@ -19,6 +19,7 @@ public enum MessageTextEntityType: Equatable { case Strikethrough case BlockQuote case Underline + case BankCard case Custom(type: CustomEntityType) } @@ -65,6 +66,8 @@ public struct MessageTextEntity: PostboxCoding, Equatable { self.type = .BlockQuote case 15: self.type = .Underline + case 16: + self.type = .BankCard case Int32.max: self.type = .Custom(type: decoder.decodeInt32ForKey("type", orElse: 0)) default: @@ -110,6 +113,8 @@ public struct MessageTextEntity: PostboxCoding, Equatable { encoder.encodeInt32(14, forKey: "_rawValue") case .Underline: encoder.encodeInt32(15, forKey: "_rawValue") + case .BankCard: + encoder.encodeInt32(16, forKey: "_rawValue") case let .Custom(type): encoder.encodeInt32(Int32.max, forKey: "_rawValue") encoder.encodeInt32(type, forKey: "type") diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift index ab2f4a7b7b..da72996990 100644 --- a/submodules/TelegramApi/Sources/Api0.swift +++ b/submodules/TelegramApi/Sources/Api0.swift @@ -551,6 +551,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1739392570] = { return Api.DocumentAttribute.parse_documentAttributeAudio($0) } dict[358154344] = { return Api.DocumentAttribute.parse_documentAttributeFilename($0) } dict[-1744710921] = { return Api.DocumentAttribute.parse_documentAttributeHasStickers($0) } + dict[-177732982] = { return Api.BankCardOpenUrl.parse_bankCardOpenUrl($0) } dict[307276766] = { return Api.account.Authorizations.parse_authorizations($0) } dict[935395612] = { return Api.ChatPhoto.parse_chatPhotoEmpty($0) } dict[1197267925] = { return Api.ChatPhoto.parse_chatPhoto($0) } @@ -782,6 +783,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1672577397] = { return Api.MessageEntity.parse_messageEntityUnderline($0) } dict[-1090087980] = { return Api.MessageEntity.parse_messageEntityStrike($0) } dict[34469328] = { return Api.MessageEntity.parse_messageEntityBlockquote($0) } + dict[1981704948] = { return Api.MessageEntity.parse_messageEntityBankCard($0) } dict[483901197] = { return Api.InputPhoto.parse_inputPhotoEmpty($0) } dict[1001634122] = { return Api.InputPhoto.parse_inputPhoto($0) } dict[-567906571] = { return Api.contacts.TopPeers.parse_topPeersNotModified($0) } @@ -799,11 +801,13 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-94974410] = { return Api.EncryptedChat.parse_encryptedChat($0) } dict[332848423] = { return Api.EncryptedChat.parse_encryptedChatDiscarded($0) } dict[-901375139] = { return Api.PeerLocated.parse_peerLocated($0) } + dict[-118740917] = { return Api.PeerLocated.parse_peerSelfLocated($0) } dict[922273905] = { return Api.Document.parse_documentEmpty($0) } dict[-1683841855] = { return Api.Document.parse_document($0) } dict[-1707344487] = { return Api.messages.HighScores.parse_highScores($0) } dict[-892779534] = { return Api.WebAuthorization.parse_webAuthorization($0) } dict[-805141448] = { return Api.ImportedContact.parse_importedContact($0) } + dict[1042605427] = { return Api.payments.BankCardData.parse_bankCardData($0) } return dict }() @@ -1213,6 +1217,8 @@ public struct Api { _1.serialize(buffer, boxed) case let _1 as Api.DocumentAttribute: _1.serialize(buffer, boxed) + case let _1 as Api.BankCardOpenUrl: + _1.serialize(buffer, boxed) case let _1 as Api.account.Authorizations: _1.serialize(buffer, boxed) case let _1 as Api.ChatPhoto: @@ -1409,6 +1415,8 @@ public struct Api { _1.serialize(buffer, boxed) case let _1 as Api.ImportedContact: _1.serialize(buffer, boxed) + case let _1 as Api.payments.BankCardData: + _1.serialize(buffer, boxed) default: break } diff --git a/submodules/TelegramApi/Sources/Api1.swift b/submodules/TelegramApi/Sources/Api1.swift index 9e6d38f6d1..be520b8f94 100644 --- a/submodules/TelegramApi/Sources/Api1.swift +++ b/submodules/TelegramApi/Sources/Api1.swift @@ -15694,6 +15694,44 @@ public extension Api { return Api.DocumentAttribute.documentAttributeHasStickers } + } + public enum BankCardOpenUrl: TypeConstructorDescription { + case bankCardOpenUrl(url: String, name: String) + + public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { + switch self { + case .bankCardOpenUrl(let url, let name): + if boxed { + buffer.appendInt32(-177732982) + } + serializeString(url, buffer: buffer, boxed: false) + serializeString(name, buffer: buffer, boxed: false) + break + } + } + + public func descriptionFields() -> (String, [(String, Any)]) { + switch self { + case .bankCardOpenUrl(let url, let name): + return ("bankCardOpenUrl", [("url", url), ("name", name)]) + } + } + + public static func parse_bankCardOpenUrl(_ reader: BufferReader) -> BankCardOpenUrl? { + var _1: String? + _1 = parseString(reader) + var _2: String? + _2 = parseString(reader) + let _c1 = _1 != nil + let _c2 = _2 != nil + if _c1 && _c2 { + return Api.BankCardOpenUrl.bankCardOpenUrl(url: _1!, name: _2!) + } + else { + return nil + } + } + } public enum ChatPhoto: TypeConstructorDescription { case chatPhotoEmpty @@ -20982,6 +21020,7 @@ public extension Api { case messageEntityUnderline(offset: Int32, length: Int32) case messageEntityStrike(offset: Int32, length: Int32) case messageEntityBlockquote(offset: Int32, length: Int32) + case messageEntityBankCard(offset: Int32, length: Int32) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -21115,6 +21154,13 @@ public extension Api { serializeInt32(offset, buffer: buffer, boxed: false) serializeInt32(length, buffer: buffer, boxed: false) break + case .messageEntityBankCard(let offset, let length): + if boxed { + buffer.appendInt32(1981704948) + } + serializeInt32(offset, buffer: buffer, boxed: false) + serializeInt32(length, buffer: buffer, boxed: false) + break } } @@ -21156,6 +21202,8 @@ public extension Api { return ("messageEntityStrike", [("offset", offset), ("length", length)]) case .messageEntityBlockquote(let offset, let length): return ("messageEntityBlockquote", [("offset", offset), ("length", length)]) + case .messageEntityBankCard(let offset, let length): + return ("messageEntityBankCard", [("offset", offset), ("length", length)]) } } @@ -21425,6 +21473,20 @@ public extension Api { return nil } } + public static func parse_messageEntityBankCard(_ reader: BufferReader) -> MessageEntity? { + var _1: Int32? + _1 = reader.readInt32() + var _2: Int32? + _2 = reader.readInt32() + let _c1 = _1 != nil + let _c2 = _2 != nil + if _c1 && _c2 { + return Api.MessageEntity.messageEntityBankCard(offset: _1!, length: _2!) + } + else { + return nil + } + } } public enum InputPhoto: TypeConstructorDescription { @@ -21727,6 +21789,7 @@ public extension Api { } public enum PeerLocated: TypeConstructorDescription { case peerLocated(peer: Api.Peer, expires: Int32, distance: Int32) + case peerSelfLocated(expires: Int32) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -21738,6 +21801,12 @@ public extension Api { serializeInt32(expires, buffer: buffer, boxed: false) serializeInt32(distance, buffer: buffer, boxed: false) break + case .peerSelfLocated(let expires): + if boxed { + buffer.appendInt32(-118740917) + } + serializeInt32(expires, buffer: buffer, boxed: false) + break } } @@ -21745,6 +21814,8 @@ public extension Api { switch self { case .peerLocated(let peer, let expires, let distance): return ("peerLocated", [("peer", peer), ("expires", expires), ("distance", distance)]) + case .peerSelfLocated(let expires): + return ("peerSelfLocated", [("expires", expires)]) } } @@ -21767,6 +21838,17 @@ public extension Api { return nil } } + public static func parse_peerSelfLocated(_ reader: BufferReader) -> PeerLocated? { + var _1: Int32? + _1 = reader.readInt32() + let _c1 = _1 != nil + if _c1 { + return Api.PeerLocated.peerSelfLocated(expires: _1!) + } + else { + return nil + } + } } public enum Document: TypeConstructorDescription { diff --git a/submodules/TelegramApi/Sources/Api2.swift b/submodules/TelegramApi/Sources/Api2.swift index f0cb6195e9..b83eff3dc4 100644 --- a/submodules/TelegramApi/Sources/Api2.swift +++ b/submodules/TelegramApi/Sources/Api2.swift @@ -490,6 +490,50 @@ public struct payments { } } + public enum BankCardData: TypeConstructorDescription { + case bankCardData(title: String, openUrls: [Api.BankCardOpenUrl]) + + public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { + switch self { + case .bankCardData(let title, let openUrls): + if boxed { + buffer.appendInt32(1042605427) + } + serializeString(title, buffer: buffer, boxed: false) + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(openUrls.count)) + for item in openUrls { + item.serialize(buffer, true) + } + break + } + } + + public func descriptionFields() -> (String, [(String, Any)]) { + switch self { + case .bankCardData(let title, let openUrls): + return ("bankCardData", [("title", title), ("openUrls", openUrls)]) + } + } + + public static func parse_bankCardData(_ reader: BufferReader) -> BankCardData? { + var _1: String? + _1 = parseString(reader) + var _2: [Api.BankCardOpenUrl]? + if let _ = reader.readInt32() { + _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.BankCardOpenUrl.self) + } + let _c1 = _1 != nil + let _c2 = _2 != nil + if _c1 && _c2 { + return Api.payments.BankCardData.bankCardData(title: _1!, openUrls: _2!) + } + else { + return nil + } + } + + } } } public extension Api { diff --git a/submodules/TelegramApi/Sources/Api3.swift b/submodules/TelegramApi/Sources/Api3.swift index 74e4884bf6..9d5351bb9e 100644 --- a/submodules/TelegramApi/Sources/Api3.swift +++ b/submodules/TelegramApi/Sources/Api3.swift @@ -3885,6 +3885,20 @@ public extension Api { return result }) } + + public static func getBankCardData(number: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(779736953) + serializeString(number, buffer: buffer, boxed: false) + return (FunctionDescription(name: "payments.getBankCardData", parameters: [("number", number)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.BankCardData? in + let reader = BufferReader(buffer) + var result: Api.payments.BankCardData? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.payments.BankCardData + } + return result + }) + } } public struct auth { public static func checkPhone(phoneNumber: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { @@ -4558,11 +4572,13 @@ public extension Api { }) } - public static func getLocated(geoPoint: Api.InputGeoPoint) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + public static func getLocated(flags: Int32, geoPoint: Api.InputGeoPoint, selfExpires: Int32?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { let buffer = Buffer() - buffer.appendInt32(171270230) + buffer.appendInt32(-750207932) + serializeInt32(flags, buffer: buffer, boxed: false) geoPoint.serialize(buffer, true) - return (FunctionDescription(name: "contacts.getLocated", parameters: [("geoPoint", geoPoint)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in + if Int(flags) & Int(1 << 0) != 0 {serializeInt32(selfExpires!, buffer: buffer, boxed: false)} + return (FunctionDescription(name: "contacts.getLocated", parameters: [("flags", flags), ("geoPoint", geoPoint), ("selfExpires", selfExpires)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in let reader = BufferReader(buffer) var result: Api.Updates? if let signature = reader.readInt32() { diff --git a/submodules/TelegramCore/Sources/Account.swift b/submodules/TelegramCore/Sources/Account.swift index 65f1145eae..d28d1ee0a1 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..95a689aa1d 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 5cc2c88aa7..6dd6553c6f 100644 --- a/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift +++ b/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift @@ -1295,8 +1295,13 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo } case let .updatePeerLocated(peers): var peersNearby: [PeerNearby] = [] - for case let .peerLocated(peer, expires, distance) in peers { - peersNearby.append(PeerNearby(id: peer.peerId, expires: expires, distance: distance)) + for peer in peers { + switch peer { + case let .peerLocated(peer, expires, distance): + peersNearby.append(.peer(id: peer.peerId, expires: expires, distance: distance)) + case let .peerSelfLocated(expires): + peersNearby.append(.selfPeer(expires: expires)) + } } updatedState.updatePeersNearby(peersNearby) case let .updateNewScheduledMessage(apiMessage): diff --git a/submodules/TelegramCore/Sources/AccountViewTracker.swift b/submodules/TelegramCore/Sources/AccountViewTracker.swift index 23b6ecfb54..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() diff --git a/submodules/TelegramCore/Sources/AuthTransfer.swift b/submodules/TelegramCore/Sources/AuthTransfer.swift index 793079c53e..e661aa715d 100644 --- a/submodules/TelegramCore/Sources/AuthTransfer.swift +++ b/submodules/TelegramCore/Sources/AuthTransfer.swift @@ -18,7 +18,7 @@ public enum ExportAuthTransferTokenResult { case displayToken(AuthTransferExportedToken) case changeAccountAndRetry(UnauthorizedAccount) case loggedIn - case passwordRequested + case passwordRequested(UnauthorizedAccount) } public func exportAuthTransferToken(accountManager: AccountManager, account: UnauthorizedAccount, otherAccountUserIds: [Int32], syncContacts: Bool) -> Signal { @@ -42,8 +42,6 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una return nil } |> castError(ExportAuthTransferTokenError.self) - - return .single(nil) } } } else { @@ -52,7 +50,7 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una } |> mapToSignal { result -> Signal in guard let result = result else { - return .single(.passwordRequested) + return .single(.passwordRequested(account)) } switch result { case let .loginToken(expires, token): @@ -66,7 +64,7 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una |> map(Optional.init) |> `catch` { error -> Signal in if error.errorDescription == "SESSION_PASSWORD_NEEDED" { - return account.network.request(Api.functions.account.getPassword(), automaticFloodWait: false) + return updatedAccount.network.request(Api.functions.account.getPassword(), automaticFloodWait: false) |> mapError { error -> ExportAuthTransferTokenError in if error.errorDescription.hasPrefix("FLOOD_WAIT") { return .limitExceeded @@ -77,13 +75,11 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una |> mapToSignal { result -> Signal in switch result { case let .password(password): - return account.postbox.transaction { transaction -> Api.auth.LoginToken? in - transaction.setState(UnauthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, contents: .passwordEntry(hint: password.hint ?? "", number: nil, code: nil, suggestReset: false, syncContacts: syncContacts))) + return updatedAccount.postbox.transaction { transaction -> Api.auth.LoginToken? in + transaction.setState(UnauthorizedAccountState(isTestingEnvironment: updatedAccount.testingEnvironment, masterDatacenterId: updatedAccount.masterDatacenterId, contents: .passwordEntry(hint: password.hint ?? "", number: nil, code: nil, suggestReset: false, syncContacts: syncContacts))) return nil } |> castError(ExportAuthTransferTokenError.self) - - return .single(nil) } } } else { @@ -91,8 +87,11 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una } } |> mapToSignal { result -> Signal in + guard let result = result else { + return .single(.passwordRequested(updatedAccount)) + } switch result { - case let .loginTokenSuccess(authorization)?: + case let .loginTokenSuccess(authorization): switch authorization { case let .authorization(_, _, user): return updatedAccount.postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/Sources/BankCards.swift b/submodules/TelegramCore/Sources/BankCards.swift new file mode 100644 index 0000000000..b600491d83 --- /dev/null +++ b/submodules/TelegramCore/Sources/BankCards.swift @@ -0,0 +1,59 @@ +import Foundation +import Postbox +import TelegramApi +import SyncCore +import MtProtoKit +import SwiftSignalKit + +public struct BankCardUrl { + public let title: String + public let url: String +} + +public struct BankCardInfo { + public let title: String + public let urls: [BankCardUrl] +} + +public func getBankCardInfo(account: Account, cardNumber: String) -> Signal { + return currentWebDocumentsHostDatacenterId(postbox: account.postbox, isTestingEnvironment: false) + |> mapToSignal { datacenterId in + let signal: Signal + if account.network.datacenterId != datacenterId { + signal = account.network.download(datacenterId: Int(datacenterId), isMedia: false, tag: nil) + |> castError(MTRpcError.self) + |> mapToSignal { worker in + return worker.request(Api.functions.payments.getBankCardData(number: cardNumber)) + } + } else { + signal = account.network.request(Api.functions.payments.getBankCardData(number: cardNumber)) + } + return signal + |> map { result -> BankCardInfo? in + return BankCardInfo(apiBankCardData: result) + } + |> `catch` { _ -> Signal in + return .single(nil) + } + } +} + +extension BankCardUrl { + init(apiBankCardOpenUrl: Api.BankCardOpenUrl) { + switch apiBankCardOpenUrl { + case let .bankCardOpenUrl(url, name): + self.title = name + self.url = url + } + } +} + +extension BankCardInfo { + init(apiBankCardData: Api.payments.BankCardData) { + switch apiBankCardData { + case let .bankCardData(title, urls): + self.title = title + self.urls = urls.map { BankCardUrl(apiBankCardOpenUrl: $0) } + } + } +} diff --git a/submodules/TelegramCore/Sources/ChannelStatistics.swift b/submodules/TelegramCore/Sources/ChannelStatistics.swift new file mode 100644 index 0000000000..ff2a71fdfd --- /dev/null +++ b/submodules/TelegramCore/Sources/ChannelStatistics.swift @@ -0,0 +1,427 @@ +import Foundation +import SwiftSignalKit +import Postbox +import TelegramApi +import MtProtoKit +import SyncCore + +public struct ChannelStatsDateRange: Equatable { + public let minDate: Int32 + public let maxDate: Int32 +} + +public struct ChannelStatsValue: Equatable { + public let current: Double + public let previous: Double +} + +public struct ChannelStatsPercentValue: Equatable { + public let fraction: Double + public let total: Double +} + +public struct ChannelStatsNamedValue: Equatable { + public let id: String + public let title: String + public let shortTitle: String + public let value: ChannelStatsValue +} + +public enum ChannelStatsGraph: Equatable { + case OnDemand(token: String) + case Failed(error: String) + case Loaded(data: String) +} + +public final class ChannelStats: Equatable { + public let period: ChannelStatsDateRange + public let followers: ChannelStatsValue + public let viewsPerPost: ChannelStatsValue + public let sharesPerPost: ChannelStatsValue + public let enabledNotifications: ChannelStatsPercentValue + public let viewsBySource: [ChannelStatsNamedValue] + public let newFollowersBySource: [ChannelStatsNamedValue] + public let languages: [ChannelStatsNamedValue] + public let growthGraph: ChannelStatsGraph + public let followersGraph: ChannelStatsGraph + public let muteGraph: ChannelStatsGraph + public let topHoursGraph: ChannelStatsGraph + public let interactionsGraph: ChannelStatsGraph + + public init(period: ChannelStatsDateRange, followers: ChannelStatsValue, viewsPerPost: ChannelStatsValue, sharesPerPost: ChannelStatsValue, enabledNotifications: ChannelStatsPercentValue, viewsBySource: [ChannelStatsNamedValue], newFollowersBySource: [ChannelStatsNamedValue], languages: [ChannelStatsNamedValue], growthGraph: ChannelStatsGraph, followersGraph: ChannelStatsGraph, muteGraph: ChannelStatsGraph, topHoursGraph: ChannelStatsGraph, interactionsGraph: ChannelStatsGraph) { + self.period = period + self.followers = followers + self.viewsPerPost = viewsPerPost + self.sharesPerPost = sharesPerPost + self.enabledNotifications = enabledNotifications + self.viewsBySource = viewsBySource + self.newFollowersBySource = newFollowersBySource + self.languages = languages + self.growthGraph = growthGraph + self.followersGraph = followersGraph + self.muteGraph = muteGraph + self.topHoursGraph = topHoursGraph + self.interactionsGraph = interactionsGraph + } + + public static func == (lhs: ChannelStats, rhs: ChannelStats) -> Bool { + if lhs.period != rhs.period { + return false + } + if lhs.followers != rhs.followers { + return false + } + if lhs.viewsPerPost != rhs.viewsPerPost { + return false + } + if lhs.sharesPerPost != rhs.sharesPerPost { + return false + } + if lhs.enabledNotifications != rhs.enabledNotifications { + return false + } + if lhs.viewsBySource != rhs.viewsBySource { + return false + } + if lhs.newFollowersBySource != rhs.newFollowersBySource { + return false + } + if lhs.languages != rhs.languages { + return false + } + if lhs.growthGraph != rhs.growthGraph { + return false + } + if lhs.followersGraph != rhs.followersGraph { + return false + } + if lhs.muteGraph != rhs.muteGraph { + return false + } + if lhs.topHoursGraph != rhs.topHoursGraph { + return false + } + if lhs.interactionsGraph != rhs.interactionsGraph { + return false + } + return true + } + + public func withUpdatedGrowthGraph(_ growthGraph: ChannelStatsGraph) -> ChannelStats { + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, viewsBySource: self.viewsBySource, newFollowersBySource: self.newFollowersBySource, languages: self.languages, growthGraph: growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph) + } + + public func withUpdatedFollowersGraph(_ followersGraph: ChannelStatsGraph) -> ChannelStats { + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, viewsBySource: self.viewsBySource, newFollowersBySource: self.newFollowersBySource, languages: self.languages, growthGraph: self.growthGraph, followersGraph: followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph) + } + + public func withUpdatedMuteGraph(_ muteGraph: ChannelStatsGraph) -> ChannelStats { + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, viewsBySource: self.viewsBySource, newFollowersBySource: self.newFollowersBySource, languages: self.languages, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph) + } + + public func withUpdatedTopHoursGraph(_ viewsByHourGraph: ChannelStatsGraph) -> ChannelStats { + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, viewsBySource: self.viewsBySource, newFollowersBySource: self.newFollowersBySource, languages: self.languages, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: viewsByHourGraph, interactionsGraph: self.interactionsGraph) + } + + public func withUpdatedInteractionsGraph(_ interactionsGraph: ChannelStatsGraph) -> ChannelStats { + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, viewsBySource: self.viewsBySource, newFollowersBySource: self.newFollowersBySource, languages: self.languages, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: interactionsGraph) + } +} + +public struct ChannelStatsContextState: Equatable { + public var stats: ChannelStats? +} + +private func requestStats(network: Network, datacenterId: Int32, peer: Peer, dark: Bool = false) -> Signal { + return .never() + /*guard let inputChannel = apiInputChannel(peer) else { + return .never() + } + + var flags: Int32 = 0 + if dark { + flags |= (1 << 1) + } + + let signal: Signal + if network.datacenterId != datacenterId { + signal = network.download(datacenterId: Int(datacenterId), isMedia: false, tag: nil) + |> castError(MTRpcError.self) + |> mapToSignal { worker in + return worker.request(Api.functions.stats.getBroadcastStats(flags: flags, channel: inputChannel)) + } + } else { + signal = network.request(Api.functions.stats.getBroadcastStats(flags: flags, channel: inputChannel)) + } + + return signal + |> map { result -> ChannelStats? in + return ChannelStats(apiBroadcastStats: result) + } + |> `catch` { _ -> Signal in + return .single(nil) + }*/ +} + +private func requestGraph(network: Network, datacenterId: Int32, token: String) -> Signal { + return .never() + /*let signal: Signal + if network.datacenterId != datacenterId { + signal = network.download(datacenterId: Int(datacenterId), isMedia: false, tag: nil) + |> castError(MTRpcError.self) + |> mapToSignal { worker in + return worker.request(Api.functions.stats.loadAsyncGraph(token: token)) + } + } else { + signal = network.request(Api.functions.stats.loadAsyncGraph(token: token)) + } + + return signal + |> map { result -> ChannelStatsGraph? in + return ChannelStatsGraph(apiStatsGraph: result) + } + |> `catch` { _ -> Signal in + return .single(nil) + }*/ +} + +private final class ChannelStatsContextImpl { + private let network: Network + private let peer: Peer + private let datacenterId: Int32 + + private var _state: ChannelStatsContextState { + didSet { + if self._state != oldValue { + self._statePromise.set(.single(self._state)) + } + } + } + private let _statePromise = Promise() + var state: Signal { + return self._statePromise.get() + } + + private let disposable = MetaDisposable() + private let disposables = DisposableDict() + + init(network: Network, datacenterId: Int32, peer: Peer) { + assert(Queue.mainQueue().isCurrent()) + + self.network = network + self.peer = peer + self.datacenterId = datacenterId + self._state = ChannelStatsContextState(stats: nil) + self._statePromise.set(.single(self._state)) + + self.load() + } + + deinit { + assert(Queue.mainQueue().isCurrent()) + self.disposable.dispose() + self.disposables.dispose() + } + + private func load() { + assert(Queue.mainQueue().isCurrent()) + + self.disposable.set((requestStats(network: self.network, datacenterId: self.datacenterId, peer: self.peer) + |> deliverOnMainQueue).start(next: { [weak self] stats in + if let strongSelf = self { + strongSelf._state = ChannelStatsContextState(stats: stats) + strongSelf._statePromise.set(.single(strongSelf._state)) + } + })) + } + + func loadGrowthGraph() { + guard let stats = self._state.stats else { + return + } + if case let .OnDemand(token) = stats.growthGraph { + self.disposables.set((requestGraph(network: self.network, datacenterId: self.datacenterId, token: token) + |> deliverOnMainQueue).start(next: { [weak self] graph in + if let strongSelf = self, let graph = graph { + strongSelf._state = ChannelStatsContextState(stats: strongSelf._state.stats?.withUpdatedGrowthGraph(graph)) + strongSelf._statePromise.set(.single(strongSelf._state)) + } + }), forKey: token) + } + } + + func loadFollowersGraph() { + guard let stats = self._state.stats else { + return + } + if case let .OnDemand(token) = stats.followersGraph { + self.disposables.set((requestGraph(network: self.network, datacenterId: self.datacenterId, token: token) + |> deliverOnMainQueue).start(next: { [weak self] graph in + if let strongSelf = self, let graph = graph { + strongSelf._state = ChannelStatsContextState(stats: strongSelf._state.stats?.withUpdatedFollowersGraph(graph)) + strongSelf._statePromise.set(.single(strongSelf._state)) + } + }), forKey: token) + } + } + + func loadMuteGraph() { + guard let stats = self._state.stats else { + return + } + if case let .OnDemand(token) = stats.muteGraph { + self.disposables.set((requestGraph(network: self.network, datacenterId: self.datacenterId, token: token) + |> deliverOnMainQueue).start(next: { [weak self] graph in + if let strongSelf = self, let graph = graph { + strongSelf._state = ChannelStatsContextState(stats: strongSelf._state.stats?.withUpdatedMuteGraph(graph)) + strongSelf._statePromise.set(.single(strongSelf._state)) + } + }), forKey: token) + } + } + + func loadTopHoursGraph() { + guard let stats = self._state.stats else { + return + } + if case let .OnDemand(token) = stats.topHoursGraph { + self.disposables.set((requestGraph(network: self.network, datacenterId: self.datacenterId, token: token) + |> deliverOnMainQueue).start(next: { [weak self] graph in + if let strongSelf = self, let graph = graph { + strongSelf._state = ChannelStatsContextState(stats: strongSelf._state.stats?.withUpdatedTopHoursGraph(graph)) + strongSelf._statePromise.set(.single(strongSelf._state)) + } + }), forKey: token) + } + } + + func loadInteractionsGraph() { + guard let stats = self._state.stats else { + return + } + if case let .OnDemand(token) = stats.interactionsGraph { + self.disposables.set((requestGraph(network: self.network, datacenterId: self.datacenterId, token: token) + |> deliverOnMainQueue).start(next: { [weak self] graph in + if let strongSelf = self, let graph = graph { + strongSelf._state = ChannelStatsContextState(stats: strongSelf._state.stats?.withUpdatedInteractionsGraph(graph)) + strongSelf._statePromise.set(.single(strongSelf._state)) + } + }), forKey: token) + } + } +} + +public final class ChannelStatsContext { + private let impl: QueueLocalObject + + public 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 + } + } + + public init(network: Network, datacenterId: Int32, peer: Peer) { + self.impl = QueueLocalObject(queue: Queue.mainQueue(), generate: { + return ChannelStatsContextImpl(network: network, datacenterId: datacenterId, peer: peer) + }) + } + + public func loadGrowthGraph() { + self.impl.with { impl in + impl.loadGrowthGraph() + } + } + + public func loadFollowersGraph() { + self.impl.with { impl in + impl.loadFollowersGraph() + } + } + + public func loadMuteGraph() { + self.impl.with { impl in + impl.loadMuteGraph() + } + } + + public func loadTopHoursGraph() { + self.impl.with { impl in + impl.loadTopHoursGraph() + } + } + + public func loadInteractionsGraph() { + self.impl.with { impl in + impl.loadInteractionsGraph() + } + } +} + +/*extension ChannelStatsGraph { + init(apiStatsGraph: Api.StatsGraph) { + switch apiStatsGraph { + case let .statsGraph(json): + if case let .dataJSON(string) = json { + self = .Loaded(data: string) + } else { + self = .Failed(error: "") + } + case let .statsGraphError(error): + self = .Failed(error: error) + case let .statsGraphAsync(token): + self = .OnDemand(token: token) + } + } +} + +extension ChannelStatsDateRange { + init(apiStatsDateRangeDays: Api.StatsDateRangeDays) { + switch apiStatsDateRangeDays { + case let .statsDateRangeDays(minDate, maxDate): + self = ChannelStatsDateRange(minDate: minDate, maxDate: maxDate) + } + } +} + +extension ChannelStatsValue { + init(apiStatsAbsValueAndPrev: Api.StatsAbsValueAndPrev) { + switch apiStatsAbsValueAndPrev { + case let .statsAbsValueAndPrev(current, previous): + self = ChannelStatsValue(current: current, previous: previous) + } + } +} + +extension ChannelStatsNamedValue { + init(apiStatsRowAbsValueAndPrev: Api.StatsRowAbsValueAndPrev) { + switch apiStatsRowAbsValueAndPrev { + case let .statsRowAbsValueAndPrev(id, title, shortTitle, values): + self = ChannelStatsNamedValue(id: id, title: title, shortTitle: shortTitle, value: ChannelStatsValue(apiStatsAbsValueAndPrev: values)) + } + } +} + +extension ChannelStatsPercentValue { + init(apiPercentValue: Api.StatsPercentValue) { + switch apiPercentValue { + case let .statsPercentValue(part, total): + self = ChannelStatsPercentValue(fraction: part, total: total) + } + } +} + +extension ChannelStats { + convenience init(apiBroadcastStats: Api.stats.BroadcastStats) { + switch apiBroadcastStats { + case let .broadcastStats(period, followers, viewsPerPost, sharesPerPost, enabledNotifications, viewsBySource, newFollowersBySource, languages, growthGraph, followersGraph, muteGraph, topHoursGraph, interactionsGraph): + self.init(period: ChannelStatsDateRange(apiStatsDateRangeDays: period), followers: ChannelStatsValue(apiStatsAbsValueAndPrev: followers), viewsPerPost: ChannelStatsValue(apiStatsAbsValueAndPrev: viewsPerPost), sharesPerPost: ChannelStatsValue(apiStatsAbsValueAndPrev: sharesPerPost), enabledNotifications: ChannelStatsPercentValue(apiPercentValue: enabledNotifications), viewsBySource: viewsBySource.map { ChannelStatsNamedValue(apiStatsRowAbsValueAndPrev: $0) }, newFollowersBySource: newFollowersBySource.map { ChannelStatsNamedValue(apiStatsRowAbsValueAndPrev: $0) }, languages: languages.map { ChannelStatsNamedValue(apiStatsRowAbsValueAndPrev: $0) }, growthGraph: ChannelStatsGraph(apiStatsGraph: growthGraph), followersGraph: ChannelStatsGraph(apiStatsGraph: followersGraph), muteGraph: ChannelStatsGraph(apiStatsGraph: muteGraph), topHoursGraph: ChannelStatsGraph(apiStatsGraph: topHoursGraph), interactionsGraph: ChannelStatsGraph(apiStatsGraph: interactionsGraph)) + } + } +} +*/ diff --git a/submodules/TelegramCore/Sources/ChatListFiltering.swift b/submodules/TelegramCore/Sources/ChatListFiltering.swift new file mode 100644 index 0000000000..f9966602c1 --- /dev/null +++ b/submodules/TelegramCore/Sources/ChatListFiltering.swift @@ -0,0 +1,379 @@ +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/GroupsInCommon.swift b/submodules/TelegramCore/Sources/GroupsInCommon.swift index 4c4efd13c5..2a6d4eb7cf 100644 --- a/submodules/TelegramCore/Sources/GroupsInCommon.swift +++ b/submodules/TelegramCore/Sources/GroupsInCommon.swift @@ -3,7 +3,156 @@ import Postbox import TelegramApi import SwiftSignalKit -public func groupsInCommon(account:Account, peerId:PeerId) -> Signal<[Peer], NoError> { +public enum GroupsInCommonDataState: Equatable { + case loading + case ready(canLoadMore: Bool) +} + +public struct GroupsInCommonState: Equatable { + public var peers: [RenderedPeer] + public var count: Int? + public var dataState: GroupsInCommonDataState +} + +private final class GroupsInCommonContextImpl { + private let queue: Queue + private let account: Account + private let peerId: PeerId + + private let disposable = MetaDisposable() + + private var peers: [RenderedPeer] = [] + private var count: Int? + private var dataState: GroupsInCommonDataState = .ready(canLoadMore: true) + + private let stateValue = Promise() + var state: Signal { + return self.stateValue.get() + } + + init(queue: Queue, account: Account, peerId: PeerId) { + self.queue = queue + self.account = account + self.peerId = peerId + + self.loadMore(limit: 32) + } + + deinit { + self.disposable.dispose() + } + + func loadMore(limit: Int32) { + if case .ready(true) = self.dataState { + self.dataState = .loading + self.pushState() + + let maxId = self.peers.last?.peerId.id + let peerId = self.peerId + let network = self.account.network + let postbox = self.account.postbox + let signal: Signal<([Peer], Int), NoError> = self.account.postbox.transaction { transaction -> Api.InputUser? in + return transaction.getPeer(peerId).flatMap(apiInputUser) + } + |> mapToSignal { inputUser -> Signal<([Peer], Int), NoError> in + guard let inputUser = inputUser else { + return .single(([], 0)) + } + return network.request(Api.functions.messages.getCommonChats(userId: inputUser, maxId: maxId ?? 0, limit: limit)) + |> map(Optional.init) + |> `catch` { _ -> Signal in + return .single(nil) + } + |> mapToSignal { result -> Signal<([Peer], Int), NoError> in + let chats: [Api.Chat] + let count: Int? + switch result { + case .none: + chats = [] + count = nil + case let .chats(apiChats): + chats = apiChats + count = nil + case let .chatsSlice(apiCount, apiChats): + chats = apiChats + count = Int(apiCount) + } + + return postbox.transaction { transaction -> ([Peer], Int) in + var peers: [Peer] = [] + for chat in chats { + if let peer = parseTelegramGroupOrChannel(chat: chat) { + peers.append(peer) + } + } + updatePeers(transaction: transaction, peers: peers, update: { _, updated -> Peer? in + return updated + }) + + return (peers, count ?? 0) + } + } + } + + self.disposable.set((signal + |> deliverOn(self.queue)).start(next: { [weak self] (peers, count) in + guard let strongSelf = self else { + return + } + var existingPeers = Set(strongSelf.peers.map { $0.peerId }) + for peer in peers { + if !existingPeers.contains(peer.id) { + existingPeers.insert(peer.id) + strongSelf.peers.append(RenderedPeer(peer: peer)) + } + } + + let updatedCount = max(strongSelf.peers.count, count) + strongSelf.count = updatedCount + strongSelf.dataState = .ready(canLoadMore: count != 0 && updatedCount > strongSelf.peers.count) + strongSelf.pushState() + })) + } + } + + private func pushState() { + self.stateValue.set(.single(GroupsInCommonState(peers: self.peers, count: self.count, dataState: self.dataState))) + } +} + +public final class GroupsInCommonContext { + private let queue: Queue = .mainQueue() + private let impl: QueueLocalObject + + public 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 + } + } + + public init(account: Account, peerId: PeerId) { + let queue = self.queue + self.impl = QueueLocalObject(queue: queue, generate: { + return GroupsInCommonContextImpl(queue: queue, account: account, peerId: peerId) + }) + } + + public func loadMore() { + self.impl.with { impl in + impl.loadMore(limit: 32) + } + } +} + +public func groupsInCommon(account: Account, peerId: PeerId) -> Signal<[Peer], NoError> { return account.postbox.transaction { transaction -> Signal<[Peer], NoError> in if let peer = transaction.getPeer(peerId), let inputUser = apiInputUser(peer) { return account.network.request(Api.functions.messages.getCommonChats(userId: inputUser, maxId: 0, limit: 100)) @@ -18,7 +167,7 @@ public func groupsInCommon(account:Account, peerId:PeerId) -> Signal<[Peer], NoE } return account.postbox.transaction { transaction -> [Peer] in - var peers:[Peer] = [] + var peers: [Peer] = [] for chat in chats { if let peer = parseTelegramGroupOrChannel(chat: chat) { peers.append(peer) diff --git a/submodules/TelegramCore/Sources/JSON.swift b/submodules/TelegramCore/Sources/JSON.swift index 556085328b..43dd62bebd 100644 --- a/submodules/TelegramCore/Sources/JSON.swift +++ b/submodules/TelegramCore/Sources/JSON.swift @@ -28,8 +28,7 @@ extension JSON { } } self = .array(values) - } - else if let value = object as? String { + } else if let value = object as? String { self = .string(value) } else if let value = object as? Int { self = .number(Double(value)) diff --git a/submodules/TelegramCore/Sources/ManagedChatListHoles.swift b/submodules/TelegramCore/Sources/ManagedChatListHoles.swift index 4783619e83..ce36e13ef9 100644 --- a/submodules/TelegramCore/Sources/ManagedChatListHoles.swift +++ b/submodules/TelegramCore/Sources/ManagedChatListHoles.swift @@ -59,7 +59,7 @@ func managedChatListHoles(network: Network, postbox: Postbox, accountPeerId: Pee 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 + //additionalLatestHole = topRootHole.latestHole } let (removed, added, addedAdditionalLatestHole) = state.with { state in diff --git a/submodules/TelegramCore/Sources/ManagedSecretChatOutgoingOperations.swift b/submodules/TelegramCore/Sources/ManagedSecretChatOutgoingOperations.swift index 7754b00b97..d490602165 100644 --- a/submodules/TelegramCore/Sources/ManagedSecretChatOutgoingOperations.swift +++ b/submodules/TelegramCore/Sources/ManagedSecretChatOutgoingOperations.swift @@ -676,6 +676,8 @@ private func decryptedEntities73(_ entities: [MessageTextEntity]?) -> [SecretApi break case .Underline: break + case .BankCard: + break case .Custom: break } @@ -723,6 +725,8 @@ private func decryptedEntities101(_ entities: [MessageTextEntity]?) -> [SecretAp result.append(.messageEntityBlockquote(offset: Int32(entity.range.lowerBound), length: Int32(entity.range.count))) case .Underline: result.append(.messageEntityUnderline(offset: Int32(entity.range.lowerBound), length: Int32(entity.range.count))) + case .BankCard: + break case .Custom: break } diff --git a/submodules/TelegramCore/Sources/PeersNearby.swift b/submodules/TelegramCore/Sources/PeersNearby.swift index b872ec5837..99e8dedf7e 100644 --- a/submodules/TelegramCore/Sources/PeersNearby.swift +++ b/submodules/TelegramCore/Sources/PeersNearby.swift @@ -7,12 +7,69 @@ import SyncCore private typealias SignalKitTimer = SwiftSignalKit.Timer +public enum PeerNearby { + case selfPeer(expires: Int32) + case peer(id: PeerId, expires: Int32, distance: Int32) + + var expires: Int32 { + switch self { + case let .selfPeer(expires), let .peer(_, expires, _): + return expires + } + } +} +public enum PeerNearbyVisibilityUpdate { + case visible(latitude: Double, longitude: Double) + case location(latitude: Double, longitude: Double) + case invisible +} -public struct PeerNearby { - public let id: PeerId - public let expires: Int32 - public let distance: Int32 +public func peersNearbyUpdateVisibility(account: Account, update: PeerNearbyVisibilityUpdate, background: Bool) -> Signal { + var flags: Int32 = 0 + var geoPoint: Api.InputGeoPoint + var selfExpires: Int32? + + switch update { + case let .visible(latitude, longitude): + flags |= (1 << 0) + geoPoint = .inputGeoPoint(lat: latitude, long: longitude) + selfExpires = 0x7fffffff + case let .location(latitude, longitude): + geoPoint = .inputGeoPoint(lat: latitude, long: longitude) + case .invisible: + flags |= (1 << 0) + geoPoint = .inputGeoPointEmpty + selfExpires = 0 + } + + let _ = (account.postbox.transaction { transaction in + transaction.updatePreferencesEntry(key: PreferencesKeys.peersNearby, { entry in + var settings = entry as? PeersNearbyState ?? PeersNearbyState.default + if case .invisible = update { + settings.visibilityExpires = nil + } else if let expires = selfExpires { + settings.visibilityExpires = expires + } + return settings + }) + }).start() + + if background { + flags |= (1 << 1) + } + + return account.network.request(Api.functions.contacts.getLocated(flags: flags, geoPoint: geoPoint, selfExpires: selfExpires)) + |> map(Optional.init) + |> `catch` { _ -> Signal in + return .single(nil) + } + |> mapToSignal { updates -> Signal in + if let updates = updates { + account.stateManager.addUpdates(updates) + } + return .complete() + } } public final class PeersNearbyContext { @@ -23,10 +80,10 @@ public final class PeersNearbyContext { private var entries: [PeerNearby]? - public init(network: Network, accountStateManager: AccountStateManager, coordinate: (latitude: Double, longitude: Double)) { + public init(network: Network, stateManager: AccountStateManager, coordinate: (latitude: Double, longitude: Double)) { let expiryExtension: Double = 10.0 - let poll = network.request(Api.functions.contacts.getLocated(geoPoint: .inputGeoPoint(lat: coordinate.latitude, long: coordinate.longitude))) + let poll = network.request(Api.functions.contacts.getLocated(flags: 0, geoPoint: .inputGeoPoint(lat: coordinate.latitude, long: coordinate.longitude), selfExpires: nil)) |> map(Optional.init) |> `catch` { _ -> Signal in return .single(nil) @@ -39,23 +96,28 @@ public final class PeersNearbyContext { case let .updates(updates, _, _, _, _): for update in updates { if case let .updatePeerLocated(peers) = update { - for case let .peerLocated(peer, expires, distance) in peers { - peersNearby.append(PeerNearby(id: peer.peerId, expires: expires, distance: distance)) + for peer in peers { + switch peer { + case let .peerLocated(peer, expires, distance): + peersNearby.append(.peer(id: peer.peerId, expires: expires, distance: distance)) + case let .peerSelfLocated(expires): + peersNearby.append(.selfPeer(expires: expires)) + } } } } default: break } - accountStateManager.addUpdates(updates) + stateManager.addUpdates(updates) } return .single(peersNearby) |> then( - accountStateManager.updatedPeersNearby() + stateManager.updatedPeersNearby() |> castError(Void.self) ) } - + let error: Signal = .single(Void()) |> then(Signal.fail(Void()) |> suspendAwareDelay(25.0, queue: self.queue)) let combined = combineLatest(poll, error) |> map { data, _ -> [PeerNearby] in @@ -77,18 +139,37 @@ public final class PeersNearbyContext { let updatedEntries = updatedEntries.filter { Double($0.expires) + expiryExtension > timestamp } var existingPeerIds: [PeerId: Int] = [:] + var existingSelfPeer: Int? for i in 0 ..< entries.count { - existingPeerIds[entries[i].id] = i + if case let .peer(id, _, _) = entries[i] { + existingPeerIds[id] = i + } else if case .selfPeer = entries[i] { + existingSelfPeer = i + } } + var selfPeer: PeerNearby? for entry in updatedEntries { - if let index = existingPeerIds[entry.id] { - entries[index] = entry - } else { - entries.append(entry) + switch entry { + case let .selfPeer: + if let index = existingSelfPeer { + entries[index] = entry + } else { + selfPeer = entry + } + case let .peer(id, _, _): + if let index = existingPeerIds[id] { + entries[index] = entry + } else { + entries.append(entry) + } } } + if let peer = selfPeer { + entries.insert(peer, at: 0) + } + strongSelf.entries = entries for subscriber in strongSelf.subscribers.copyItems() { subscriber(strongSelf.entries) @@ -189,3 +270,33 @@ public func updateChannelGeoLocation(postbox: Postbox, network: Network, channel } } } + +public struct PeersNearbyState: PreferencesEntry, Equatable { + public var visibilityExpires: Int32? + + public static var `default` = PeersNearbyState(visibilityExpires: nil) + + public init(visibilityExpires: Int32?) { + self.visibilityExpires = visibilityExpires + } + + public init(decoder: PostboxDecoder) { + self.visibilityExpires = decoder.decodeOptionalInt32ForKey("expires") + } + + public func encode(_ encoder: PostboxEncoder) { + if let expires = self.visibilityExpires { + encoder.encodeInt32(expires, forKey: "expires") + } else { + encoder.encodeNil(forKey: "expires") + } + } + + public func isEqual(to: PreferencesEntry) -> Bool { + if let to = to as? PeersNearbyState, self == to { + return true + } else { + return false + } + } +} diff --git a/submodules/TelegramCore/Sources/Serialization.swift b/submodules/TelegramCore/Sources/Serialization.swift index 02470ccbac..15b20dd3d8 100644 --- a/submodules/TelegramCore/Sources/Serialization.swift +++ b/submodules/TelegramCore/Sources/Serialization.swift @@ -210,7 +210,7 @@ public class BoxedMessage: NSObject { public class Serialization: NSObject, MTSerialization { public func currentLayer() -> UInt { - return 109 + return 110 } public func parseMessage(_ data: Data!) -> Any! { diff --git a/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift b/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift index d5c0b31029..44751ce910 100644 --- a/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift +++ b/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift @@ -386,6 +386,8 @@ func messageTextEntitiesFromApiEntities(_ entities: [Api.MessageEntity]) -> [Mes result.append(MessageTextEntity(range: Int(offset) ..< Int(offset + length), type: .Strikethrough)) case let .messageEntityBlockquote(offset, length): result.append(MessageTextEntity(range: Int(offset) ..< Int(offset + length), type: .BlockQuote)) + case let .messageEntityBankCard(offset, length): + result.append(MessageTextEntity(range: Int(offset) ..< Int(offset + length), type: .BankCard)) } } return result diff --git a/submodules/TelegramCore/Sources/TextEntitiesMessageAttribute.swift b/submodules/TelegramCore/Sources/TextEntitiesMessageAttribute.swift index c898bed30f..1702002184 100644 --- a/submodules/TelegramCore/Sources/TextEntitiesMessageAttribute.swift +++ b/submodules/TelegramCore/Sources/TextEntitiesMessageAttribute.swift @@ -45,6 +45,8 @@ func apiEntitiesFromMessageTextEntities(_ entities: [MessageTextEntity], associa apiEntities.append(.messageEntityBlockquote(offset: offset, length: length)) case .Underline: apiEntities.append(.messageEntityUnderline(offset: offset, length: length)) + case .BankCard: + apiEntities.append(.messageEntityBankCard(offset: offset, length: length)) case .Custom: break } diff --git a/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift b/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift index 1050b92be7..d0f10bfb51 100644 --- a/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift +++ b/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift @@ -450,6 +450,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI .withUpdatedSlowModeTimeout(slowmodeSeconds) .withUpdatedSlowModeValidUntilTimestamp(slowmodeNextSendDate) .withUpdatedHasScheduledMessages(hasScheduledMessages) +// .withUpdatedStatsDatacenterId(statsDc ?? 0) }) if let minAvailableMessageId = minAvailableMessageId, minAvailableMessageIdUpdated { 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/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 05eee7ac5d..acb68d246d 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -239,4744 +239,4764 @@ 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 Map_Search: String { return self._s[139]! } - public var ClearCache_StorageFree: String { return self._s[141]! } - public var Login_TermsOfServiceHeader: String { return self._s[142]! } + 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[143]!, self._r[143]!, [_0]) - } - public func Channel_AdminLog_MessageToggleSignaturesOn(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[145]!, self._r[145]!, [_0]) } - public var Wallet_Sent_Title: String { return self._s[146]! } - public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[147]! } - public var Weekday_Today: String { return self._s[148]! } + public func Channel_AdminLog_MessageToggleSignaturesOn(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[147]!, self._r[147]!, [_0]) + } + 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[150]!, self._r[150]!, [_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[151]!, self._r[151]!, ["\(_1)"]) + return formatWithArgumentRanges(self._s[153]!, self._r[153]!, ["\(_1)"]) } - public var Notification_PassportValuePersonalDetails: String { return self._s[153]! } - public var Channel_AdminLog_MessagePreviousLink: String { return self._s[154]! } - public var ChangePhoneNumberNumber_NewNumber: String { return self._s[155]! } - public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[156]! } - public var TwoStepAuth_ChangePasswordDescription: String { return self._s[157]! } - public var PhotoEditor_BlurToolLinear: String { return self._s[158]! } - public var Contacts_PermissionsAllowInSettings: String { return self._s[159]! } - public var Weekday_ShortMonday: String { return self._s[160]! } - public var Cache_KeepMedia: String { return self._s[161]! } - public var Passport_FieldIdentitySelfieHelp: String { return self._s[162]! } + 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[163]!, self._r[163]!, [_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[164]!, self._r[164]!, [_0]) + return formatWithArgumentRanges(self._s[166]!, self._r[166]!, [_0]) } - public var Wallet_Receive_ShareUrlInfo: String { return self._s[165]! } - public var Conversation_ClousStorageInfo_Description4: String { return self._s[166]! } - public var Wallet_RestoreFailed_Title: String { return self._s[167]! } - public var Passport_Language_ru: String { return self._s[168]! } + 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[169]!, self._r[169]!, [_0, _1]) + return formatWithArgumentRanges(self._s[171]!, self._r[171]!, [_0, _1]) } - public var WallpaperPreview_PatternIntensity: String { return self._s[170]! } - public var WebBrowser_InAppSafari: String { return self._s[173]! } - public var TwoStepAuth_RecoveryUnavailable: String { return self._s[174]! } - public var EnterPasscode_TouchId: String { return self._s[175]! } - public var PhotoEditor_QualityVeryHigh: String { return self._s[178]! } - public var Checkout_NewCard_SaveInfo: String { return self._s[180]! } - public var Gif_NoGifsPlaceholder: String { return self._s[182]! } + 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[184]!, self._r[184]!, [_0, _1]) + return formatWithArgumentRanges(self._s[186]!, self._r[186]!, [_0, _1]) } - public var ChatSettings_AutoDownloadEnabled: String { return self._s[185]! } - public var NetworkUsageSettings_BytesSent: String { return self._s[186]! } - public var Checkout_PasswordEntry_Pay: String { return self._s[187]! } - public var AuthSessions_TerminateSession: String { return self._s[188]! } - public var Message_File: String { return self._s[189]! } - public var MediaPicker_VideoMuteDescription: String { return self._s[190]! } - public var SocksProxySetup_ProxyStatusConnected: String { return self._s[191]! } - public var TwoStepAuth_RecoveryCode: String { return self._s[192]! } - public var EnterPasscode_EnterCurrentPasscode: String { return self._s[193]! } + 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[194]!, self._r[194]!, [_0]) - } - public var Conversation_Moderate_Report: String { return self._s[196]! } - public var TwoStepAuth_EmailInvalid: String { return self._s[197]! } - public var Passport_Language_ms: String { return self._s[198]! } - public var Channel_Edit_AboutItem: String { return self._s[200]! } - public var DialogList_SearchSectionGlobal: String { return self._s[204]! } - public var AttachmentMenu_WebSearch: String { return self._s[205]! } - public var PasscodeSettings_TurnPasscodeOn: String { return self._s[206]! } - public var Channel_BanUser_Title: String { return self._s[207]! } - public var WallpaperPreview_SwipeTopText: String { return self._s[208]! } - public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[209]! } - public var ArchivedChats_IntroText2: String { return self._s[210]! } - public var Conversation_OpenBotLinkTitle: String { return self._s[211]! } - public var ChatSearch_SearchPlaceholder: String { return self._s[213]! } - public var Notification_Exceptions_DeleteAll: String { return self._s[214]! } - public var Passport_FieldAddressTranslationHelp: String { return self._s[215]! } - public var NotificationsSound_Aurora: String { return self._s[216]! } - public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[217]!, self._r[217]!, [_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[218]!, self._r[218]!, [_0]) + return formatWithArgumentRanges(self._s[220]!, self._r[220]!, [_0]) } - public var AuthSessions_LoggedInWithTelegram: String { return self._s[221]! } + 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[222]!, self._r[222]!, [_0, _1]) + return formatWithArgumentRanges(self._s[224]!, self._r[224]!, [_0, _1]) } - public var Passport_PasswordNext: String { return self._s[223]! } - public var Bot_GroupStatusReadsHistory: String { return self._s[224]! } - public var EmptyGroupInfo_Line2: String { return self._s[225]! } - public var VoiceOver_Chat_SeenByRecipients: String { return self._s[226]! } - public var Settings_FAQ_Intro: String { return self._s[229]! } - public var PrivacySettings_PasscodeAndTouchId: String { return self._s[231]! } - public var FeaturedStickerPacks_Title: String { return self._s[232]! } - public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[234]! } - public var Username_Title: String { return self._s[235]! } + 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[236]!, self._r[236]!, [_0]) + return formatWithArgumentRanges(self._s[239]!, self._r[239]!, [_0]) } - public var PasscodeSettings_AlphanumericCode: String { return self._s[237]! } - public var Localization_LanguageOther: String { return self._s[238]! } - public var Stickers_SuggestStickers: String { return self._s[239]! } + 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[240]!, self._r[240]!, [_0]) + return formatWithArgumentRanges(self._s[243]!, self._r[243]!, [_0]) } - public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[241]! } - public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[242]! } - public var Conversation_DefaultRestrictedStickers: String { return self._s[243]! } + 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[244]!, self._r[244]!, [_0]) + return formatWithArgumentRanges(self._s[247]!, self._r[247]!, [_0]) } - public var Wallet_TransactionInfo_CopyAddress: String { return self._s[246]! } - public var Group_UpgradeConfirmation: String { return self._s[247]! } - public var DialogList_Unpin: String { return self._s[248]! } - public var Passport_Identity_DateOfBirth: String { return self._s[249]! } - public var Month_ShortOctober: String { return self._s[250]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[251]! } - public var TwoFactorSetup_Done_Text: String { return self._s[252]! } - public var Notification_CallCanceledShort: String { return self._s[253]! } - public var Conversation_StopQuiz: String { return self._s[254]! } - public var Passport_Phone_Help: String { return self._s[255]! } - public var Passport_Language_az: String { return self._s[257]! } - public var CreatePoll_TextPlaceholder: String { return self._s[259]! } - public var VoiceOver_Chat_AnonymousPoll: String { return self._s[260]! } - public var Passport_Identity_DocumentNumber: String { return self._s[261]! } - public var PhotoEditor_CurvesRed: String { return self._s[262]! } - public var PhoneNumberHelp_Alert: String { return self._s[264]! } - public var SocksProxySetup_Port: String { return self._s[265]! } - public var Checkout_PayNone: String { return self._s[266]! } - public var AutoDownloadSettings_WiFi: String { return self._s[267]! } - public var GroupInfo_GroupType: String { return self._s[268]! } - public var StickerSettings_ContextHide: String { return self._s[269]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[270]! } - public var Group_Setup_HistoryTitle: String { return self._s[272]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[273]! } - public var PasscodeSettings_AutoLock: String { return self._s[274]! } - public var Passport_Title: String { return self._s[275]! } - public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[276]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[277]! } - public var GroupPermission_NoSendGifs: String { return self._s[278]! } - public var PrivacySettings_PasscodeOn: String { return self._s[279]! } + 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[280]!, self._r[280]!, [_0]) + return formatWithArgumentRanges(self._s[283]!, self._r[283]!, [_0]) } - public var State_WaitingForNetwork: String { return self._s[283]! } + public var State_WaitingForNetwork: String { return self._s[286]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[284]!, self._r[284]!, [_0, _1]) + return formatWithArgumentRanges(self._s[287]!, self._r[287]!, [_0, _1]) } - public var Calls_NotNow: String { return self._s[286]! } + public var Calls_NotNow: String { return self._s[289]! } public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[287]!, self._r[287]!, [_0]) + return formatWithArgumentRanges(self._s[290]!, self._r[290]!, [_0]) } - public var UserInfo_SendMessage: String { return self._s[288]! } - public var TwoStepAuth_PasswordSet: String { return self._s[289]! } - public var Passport_DeleteDocument: String { return self._s[290]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[291]! } + 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[292]!, self._r[292]!, [_1]) + return formatWithArgumentRanges(self._s[295]!, self._r[295]!, [_1]) } - public var AuthSessions_AddedDeviceTitle: String { return self._s[293]! } - public var GroupRemoved_Remove: String { return self._s[294]! } - public var Passport_FieldIdentity: String { return self._s[295]! } - public var Group_Setup_TypePrivateHelp: String { return self._s[296]! } - public var Conversation_Processing: String { return self._s[299]! } - public var Wallet_Settings_BackupWallet: String { return self._s[301]! } - public var ChatSettings_AutoPlayAnimations: String { return self._s[302]! } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[305]! } - public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[306]! } - public var Month_GenFebruary: String { return self._s[307]! } - public var Wallet_Send_NetworkErrorTitle: String { return self._s[308]! } + 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[310]!, self._r[310]!, [_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[311]! } - public var Wallet_Month_ShortJune: String { return self._s[313]! } - public var AutoDownloadSettings_DataUsageMedium: String { return self._s[314]! } - public var GroupInfo_AddParticipant: String { return self._s[315]! } - public var KeyCommand_SendMessage: String { return self._s[316]! } - public var VoiceOver_Chat_YourContact: String { return self._s[318]! } - public var Map_LiveLocationShowAll: String { return self._s[319]! } - public var WallpaperSearch_ColorOrange: String { return self._s[321]! } - public var Appearance_AppIconDefaultX: String { return self._s[322]! } - public var Checkout_Receipt_Title: String { return self._s[323]! } - public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[324]! } - public var WallpaperPreview_PreviewTopText: String { return self._s[325]! } - public var Message_Contact: String { return self._s[326]! } - public var Call_StatusIncoming: String { return self._s[327]! } - public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[328]! } + 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[329]!, self._r[329]!, [_1]) + return formatWithArgumentRanges(self._s[332]!, self._r[332]!, [_1]) } public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[331]!, self._r[331]!, [_1]) + return formatWithArgumentRanges(self._s[334]!, self._r[334]!, [_1]) } - public var VoiceOver_Media_PlaybackRate: String { return self._s[332]! } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[333]! } - public var Conversation_ViewChannel: String { return self._s[334]! } + 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[335]!, self._r[335]!, [_0]) + return formatWithArgumentRanges(self._s[338]!, self._r[338]!, [_0]) } - public var Theme_Colors_Accent: String { return self._s[336]! } - public var Passport_Language_nl: String { return self._s[338]! } - public var Camera_Retake: String { return self._s[339]! } + 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[340]!, self._r[340]!, [_0]) + return formatWithArgumentRanges(self._s[343]!, self._r[343]!, [_0]) } - public var AuthSessions_LogOutApplications: String { return self._s[341]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[342]! } - public var Tour_Title6: String { return self._s[343]! } - public var Map_ChooseAPlace: String { return self._s[344]! } - public var CallSettings_Never: String { return self._s[346]! } + 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[347]!, self._r[347]!, [_0]) + return formatWithArgumentRanges(self._s[350]!, self._r[350]!, [_0]) } - public var ChannelRemoved_RemoveInfo: String { return self._s[348]! } + public var ChannelRemoved_RemoveInfo: String { return self._s[351]! } public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[349]!, self._r[349]!, [_0]) + return formatWithArgumentRanges(self._s[352]!, self._r[352]!, [_0]) } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[350]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[353]! } public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[351]!, self._r[351]!, [_0]) + return formatWithArgumentRanges(self._s[354]!, self._r[354]!, [_0]) } - public var GroupInfo_InviteLink_Title: String { return self._s[352]! } + 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[353]!, self._r[353]!, [_1, _2]) + return formatWithArgumentRanges(self._s[356]!, self._r[356]!, [_1, _2]) } - public var KeyCommand_ScrollUp: String { return self._s[354]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[355]! } - public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[356]! } + 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[357]!, self._r[357]!, [_0]) + return formatWithArgumentRanges(self._s[360]!, self._r[360]!, [_0]) } - public var TwoFactorSetup_Done_Title: String { return self._s[358]! } + public var TwoFactorSetup_Done_Title: String { return self._s[361]! } public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[359]!, self._r[359]!, [_0]) + return formatWithArgumentRanges(self._s[362]!, self._r[362]!, [_0]) } - public var CallFeedback_ReasonDistortedSpeech: String { return self._s[360]! } - public var Watch_LastSeen_WithinAWeek: String { return self._s[361]! } - public var ContactList_Context_SendMessage: String { return self._s[363]! } - public var Weekday_Tuesday: String { return self._s[364]! } - public var Wallet_Created_Title: String { return self._s[366]! } - public var ScheduledMessages_Delete: String { return self._s[367]! } - public var UserInfo_StartSecretChat: String { return self._s[368]! } - public var Passport_Identity_FilesTitle: String { return self._s[369]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[370]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[372]! } - public var ChatList_UndoArchiveRevealedTitle: String { return self._s[373]! } + 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[374]!, self._r[374]!, [_0]) - } - public var AuthSessions_Sessions: String { return self._s[375]! } - public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[377]!, self._r[377]!, [_0]) } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[378]! } - public var Call_StatusWaiting: String { return self._s[379]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[380]! } - public var FastTwoStepSetup_HintHelp: String { return self._s[381]! } - public var WallpaperPreview_CustomColorBottomText: String { return self._s[382]! } - public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[383]! } - public var LogoutOptions_AddAccountText: String { return self._s[384]! } - public var PasscodeSettings_6DigitCode: String { return self._s[385]! } - public var Settings_LogoutConfirmationText: String { return self._s[386]! } - public var Passport_Identity_TypePassport: String { return self._s[388]! } - public var Map_Work: String { return self._s[391]! } + public var AuthSessions_Sessions: String { return self._s[378]! } + public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_0]) + } + 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[392]!, self._r[392]!, [_1, _2]) + return formatWithArgumentRanges(self._s[395]!, self._r[395]!, [_1, _2]) } - public var SocksProxySetup_SaveProxy: String { return self._s[393]! } - public var AccessDenied_SaveMedia: String { return self._s[394]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[396]! } - public var CreatePoll_MultipleChoice: String { return self._s[397]! } - public var Settings_Title: String { return self._s[399]! } - public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[400]! } - public var Contacts_InviteSearchLabel: String { return self._s[402]! } - public var PrivacySettings_WebSessions: String { return self._s[403]! } - public var ConvertToSupergroup_Title: String { return self._s[404]! } + 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[405]!, self._r[405]!, [_0]) + return formatWithArgumentRanges(self._s[408]!, self._r[408]!, [_0]) } - public var TwoFactorSetup_Hint_Text: String { return self._s[406]! } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[407]! } + 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[408]!, self._r[408]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[411]!, self._r[411]!, [_1, _2, _3]) } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[409]! } - public var UserInfo_BotHelp: String { return self._s[410]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[411]! } - public var Checkout_Name: String { return self._s[412]! } - public var AutoDownloadSettings_DataUsage: String { return self._s[413]! } - public var Channel_BanUser_BlockFor: String { return self._s[414]! } - public var Checkout_ShippingAddress: String { return self._s[415]! } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[416]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[417]! } - public var Privacy_Forwards: String { return self._s[418]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[419]! } - public var Appearance_ThemeCarouselNewNight: String { return self._s[420]! } + 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[423]!, self._r[423]!, [_0]) + return formatWithArgumentRanges(self._s[426]!, self._r[426]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[424]! } - public var Group_OwnershipTransfer_Title: String { return self._s[425]! } - public var VoiceOver_Chat_OpenHint: String { return self._s[427]! } - public var Group_LeaveGroup: String { return self._s[428]! } - public var Settings_UsernameEmpty: String { return self._s[429]! } + 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[430]!, self._r[430]!, [_0]) + return formatWithArgumentRanges(self._s[433]!, self._r[433]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[431]!, self._r[431]!, [_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[432]!, self._r[432]!, [_1, _2]) + return formatWithArgumentRanges(self._s[435]!, self._r[435]!, [_1, _2]) } - public var Message_ImageExpired: String { return self._s[433]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[435]! } - public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[436]! } - public var UserInfo_AddToExisting: String { return self._s[437]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[438]! } - public var Wallet_Send_SyncInProgress: String { return self._s[439]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[440]! } + 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[441]!, self._r[441]!, [_1]) + return formatWithArgumentRanges(self._s[444]!, self._r[444]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[442]! } - public var Passport_Language_km: String { return self._s[443]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[445]! } - public var VoiceOver_Media_PlaybackPlay: String { return self._s[446]! } - public var Notification_CallMissedShort: String { return self._s[447]! } - public var Wallet_Info_YourBalance: String { return self._s[448]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[449]! } - public var Watch_Compose_Send: String { return self._s[450]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[453]! } - public var TwoFactorSetup_Email_Action: String { return self._s[454]! } - public var Conversation_HoldForVideo: String { return self._s[455]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[456]! } - public var AuthSessions_OtherDevices: String { return self._s[457]! } - public var Wallet_TransactionInfo_CommentHeader: String { return self._s[458]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[460]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[462]! } - public var Channel_LinkItem: String { return self._s[463]! } + 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[464]!, self._r[464]!, [_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[467]!, self._r[467]!, [_0]) + return formatWithArgumentRanges(self._s[471]!, self._r[471]!, [_0]) } - public var VoiceOver_Recording_StopAndPreview: String { return self._s[468]! } - public var Passport_Language_dv: String { return self._s[469]! } - public var Undo_LeftChannel: String { return self._s[470]! } - public var Notifications_ExceptionsMuted: String { return self._s[471]! } - public var ChatList_UnhideAction: String { return self._s[472]! } - public var Conversation_ContextMenuShare: String { return self._s[473]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[474]! } - public var ShareFileTip_Title: String { return self._s[475]! } - public var NotificationsSound_Chord: String { return self._s[476]! } - public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[477]! } + 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[478]!, self._r[478]!, [_1, _2]) + return formatWithArgumentRanges(self._s[482]!, self._r[482]!, [_1, _2]) } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[479]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[483]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[480]!, self._r[480]!, [_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[481]!, self._r[481]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[485]!, self._r[485]!, [_1, _2, _3]) } - public var Wallet_Settings_ConfigurationInfo: String { return self._s[482]! } - public var Wallpaper_ErrorNotFound: String { return self._s[483]! } - public var Notification_CallOutgoingShort: String { return self._s[485]! } - public var Wallet_WordImport_IncorrectText: String { return self._s[486]! } + 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[487]!, self._r[487]!, [_1, _2]) + return formatWithArgumentRanges(self._s[491]!, self._r[491]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[488]! } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[489]! } - public var ReportPeer_Report: String { return self._s[490]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[491]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[492]! } + 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[493]!, self._r[493]!, [_1, _2]) + return formatWithArgumentRanges(self._s[497]!, self._r[497]!, [_1, _2]) } - public var StickerPack_Send: String { return self._s[494]! } - public var Login_CodeSentInternal: String { return self._s[495]! } - public var Wallet_Month_GenJanuary: String { return self._s[496]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[497]! } + 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[498]!, self._r[498]!, [_0]) + return formatWithArgumentRanges(self._s[502]!, self._r[502]!, [_0]) } public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[500]!, self._r[500]!, [_0]) + return formatWithArgumentRanges(self._s[504]!, self._r[504]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[501]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[505]! } public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[502]!, self._r[502]!, [_1]) + return formatWithArgumentRanges(self._s[506]!, self._r[506]!, [_1]) } - public var ReportPeer_ReasonViolence: String { return self._s[504]! } - public var Appearance_ShareThemeColor: String { return self._s[505]! } - public var Map_Locating: String { return self._s[506]! } + 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[507]!, self._r[507]!, [_0]) + return formatWithArgumentRanges(self._s[511]!, self._r[511]!, [_0]) } public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[508]!, self._r[508]!, [_1]) + return formatWithArgumentRanges(self._s[512]!, self._r[512]!, [_1]) } - public var AutoDownloadSettings_GroupChats: String { return self._s[510]! } - public var CheckoutInfo_SaveInfo: String { return self._s[511]! } - public var SharedMedia_EmptyLinksText: String { return self._s[513]! } - public var Passport_Address_CityPlaceholder: String { return self._s[514]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[515]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[516]! } - public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[518]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[519]! } + 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[520]!, self._r[520]!, [_1]) + return formatWithArgumentRanges(self._s[524]!, self._r[524]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[521]!, self._r[521]!, [_0]) + return formatWithArgumentRanges(self._s[525]!, self._r[525]!, [_0]) } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[522]! } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[523]! } - public var ChangePhoneNumberCode_Code: String { return self._s[524]! } - public var Appearance_CreateTheme: String { return self._s[525]! } + 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[526]!, self._r[526]!, [_0]) + return formatWithArgumentRanges(self._s[530]!, self._r[530]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[527]! } - public var HashtagSearch_AllChats: String { return self._s[528]! } - public var MediaPlayer_UnknownTrack: String { return self._s[529]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[531]! } + 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[532]!, self._r[532]!, [_0]) + return formatWithArgumentRanges(self._s[536]!, self._r[536]!, [_0]) } - public var PhotoEditor_QualityHigh: String { return self._s[534]! } + public var PhotoEditor_QualityHigh: String { return self._s[538]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[535]!, self._r[535]!, [_0]) + return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[536]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[537]! } - public var Message_LiveLocation: String { return self._s[538]! } - public var Cache_LowDiskSpaceText: String { return self._s[539]! } - public var Wallet_Receive_ShareAddress: String { return self._s[540]! } - public var EditTheme_ErrorLinkTaken: String { return self._s[541]! } - public var Conversation_SendMessage: String { return self._s[542]! } - public var AuthSessions_EmptyTitle: String { return self._s[543]! } - public var Privacy_PhoneNumber: String { return self._s[544]! } - public var PeopleNearby_CreateGroup: String { return self._s[545]! } - public var CallSettings_UseLessData: String { return self._s[546]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[547]! } - public var Stickers_AddToFavorites: String { return self._s[548]! } - public var Wallet_WordImport_Title: String { return self._s[549]! } - public var PhotoEditor_QualityLow: String { return self._s[550]! } - public var Watch_UserInfo_Unblock: String { return self._s[551]! } - public var Settings_Logout: String { return self._s[552]! } + 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[553]!, self._r[553]!, [_1]) + return formatWithArgumentRanges(self._s[558]!, self._r[558]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[554]! } - public var ChannelInfo_Stats: String { return self._s[555]! } - public var TextFormat_Link: String { return self._s[556]! } + 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[557]!, self._r[557]!, [_1, _2]) + return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_1, _2]) } - public var Wallet_TransactionInfo_Title: String { return self._s[558]! } + public var Wallet_TransactionInfo_Title: String { return self._s[563]! } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[559]!, self._r[559]!, [_0]) + return formatWithArgumentRanges(self._s[564]!, self._r[564]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[560]! } - public var Group_Setup_TypePublicHelp: String { return self._s[561]! } - public var Passport_Scans_UploadNew: String { return self._s[562]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[563]! } - public var DialogList_Title: String { return self._s[566]! } - public var NotificationSettings_ContactJoined: String { return self._s[567]! } - public var GroupInfo_LabelAdmin: String { return self._s[568]! } - public var KeyCommand_ChatInfo: String { return self._s[569]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[570]! } - public var Call_ReportIncludeLog: String { return self._s[571]! } + 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[574]!, self._r[574]!, [_0]) + return formatWithArgumentRanges(self._s[579]!, self._r[579]!, [_0]) } - public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[575]! } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[576]! } - public var LocalGroup_IrrelevantWarning: String { return self._s[577]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[578]! } - public var Message_Sticker: String { return self._s[579]! } - public var LastSeen_JustNow: String { return self._s[581]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[583]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[584]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[585]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[586]! } - public var TwoStepAuth_Email: String { return self._s[587]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[588]! } - public var PhotoEditor_BlurToolOff: String { return self._s[589]! } - public var Message_PinnedStickerMessage: String { return self._s[590]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[591]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[592]! } - public var Passport_DiscardMessageTitle: String { return self._s[593]! } - public var Privacy_PaymentsTitle: String { return self._s[594]! } - public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[595]! } - public var ClearCache_StorageCache: String { return self._s[596]! } - public var Appearance_TextSizeSetting: String { return self._s[597]! } - public var Channel_DiscussionGroup_Header: String { return self._s[599]! } - public var VoiceOver_Chat_OptionSelected: String { return self._s[600]! } - public var Appearance_ColorTheme: String { return self._s[601]! } - public var UserInfo_ShareContact: String { return self._s[602]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[603]! } - public var Common_More: String { return self._s[604]! } - public var Watch_Message_Call: String { return self._s[605]! } - public var Profile_EncryptionKey: String { return self._s[608]! } - public var Privacy_TopPeers: String { return self._s[609]! } - public var Conversation_StopPollConfirmation: String { return self._s[610]! } - public var Wallet_Words_NotDoneText: String { return self._s[612]! } - public var Privacy_TopPeersWarning: String { return self._s[614]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[615]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[616]! } - public var Wallet_RestoreFailed_EnterWords: String { return self._s[619]! } - public var DialogList_SearchSectionMessages: String { return self._s[620]! } - public var Notifications_ChannelNotifications: String { return self._s[621]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[622]! } - public var Passport_Language_sk: String { return self._s[623]! } - public var Notification_MessageLifetime1h: String { return self._s[624]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[625]! } - public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[626]! } - public var Call_ReportSkip: String { return self._s[628]! } - public var Cache_ServiceFiles: String { return self._s[629]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[630]! } - public var VoiceOver_Chat_YourFile: String { return self._s[631]! } - public var Map_Hybrid: String { return self._s[632]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[634]! } + 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[635]!, self._r[635]!, [_1]) + return formatWithArgumentRanges(self._s[640]!, self._r[640]!, [_1]) } - public var ChatSettings_AutoDownloadVideos: String { return self._s[637]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[638]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[639]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[642]! } + 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[643]!, self._r[643]!, [_1]) + return formatWithArgumentRanges(self._s[648]!, self._r[648]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[645]! } - public var ScheduledMessages_ScheduledToday: String { return self._s[646]! } + 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[647]!, self._r[647]!, [_1, _2]) + return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_1, _2]) } - public var Conversation_LiveLocationYou: String { return self._s[648]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[649]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[650]! } - public var UserInfo_ShareBot: String { return self._s[653]! } + 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[654]!, self._r[654]!, [_1, _2]) + return formatWithArgumentRanges(self._s[659]!, self._r[659]!, [_1, _2]) } - public var Conversation_ClearCache: String { return self._s[655]! } - public var PhotoEditor_ShadowsTint: String { return self._s[656]! } - public var Message_Audio: String { return self._s[657]! } - public var Passport_Language_lt: String { return self._s[658]! } + 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[659]!, self._r[659]!, [_0]) + return formatWithArgumentRanges(self._s[664]!, self._r[664]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[660]! } - public var Conversation_FileICloudDrive: String { return self._s[661]! } - public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[662]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[663]! } + 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[664]!, self._r[664]!, [_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[665]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[670]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[666]!, self._r[666]!, [_0]) + return formatWithArgumentRanges(self._s[671]!, self._r[671]!, [_0]) } - public var Channel_SignMessages: String { return self._s[667]! } + public var Channel_SignMessages: String { return self._s[672]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[668]!, self._r[668]!, [_1]) + return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[669]! } - public var Passport_ScanPassport: String { return self._s[670]! } - public var Watch_Suggestion_Thanks: String { return self._s[671]! } - public var BlockedUsers_AddNew: String { return self._s[672]! } + 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[673]!, self._r[673]!, [_1, _2]) + return formatWithArgumentRanges(self._s[678]!, self._r[678]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[674]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[675]! } - public var Month_GenJuly: String { return self._s[676]! } - public var CreatePoll_QuizInfo: String { return self._s[677]! } - public var UserInfo_StartSecretChatStart: String { return self._s[678]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[679]! } - public var IntentsSettings_SuggestByShare: String { return self._s[681]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[682]! } - public var Notification_ChannelInviterSelf: String { return self._s[683]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[684]! } + 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[685]!, self._r[685]!, [_1, _2]) + return formatWithArgumentRanges(self._s[690]!, self._r[690]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[686]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[687]! } + 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[688]!, self._r[688]!, [_0]) + return formatWithArgumentRanges(self._s[693]!, self._r[693]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[689]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[690]! } - public var Passport_Language_de: String { return self._s[691]! } - public var Update_Title: String { return self._s[692]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[693]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[694]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[695]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[696]! } - public var NotificationsSound_Telegraph: String { return self._s[697]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[698]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[699]! } + 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[700]!, self._r[700]!, [_0]) - } - public var ClearCache_Description: String { return self._s[701]! } - public var Stickers_SuggestAll: String { return self._s[702]! } - public var Conversation_ForwardTitle: String { return self._s[703]! } - public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[704]! } - public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[705]!, self._r[705]!, [_0]) } - public var Calls_NewCall: String { return self._s[706]! } - public var Call_StatusEnded: String { return self._s[707]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[708]! } - public var Settings_ProxyConnected: String { return self._s[709]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[710]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[711]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[712]! } - public var Passport_PasswordPlaceholder: String { return self._s[713]! } - public var Message_PinnedInvoice: String { return self._s[714]! } - public var Passport_Identity_IssueDate: String { return self._s[715]! } - public var Passport_Language_pl: String { return self._s[716]! } + 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[710]!, self._r[710]!, [_0]) + } + 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[717]!, self._r[717]!, [_0]) + return formatWithArgumentRanges(self._s[722]!, self._r[722]!, [_0]) } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[718]! } - public var Call_StatusConnecting: String { return self._s[719]! } + 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[720]!, self._r[720]!, [_0]) - } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[722]! } - public var Common_Edit: String { return self._s[723]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[724]! } - public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[725]!, self._r[725]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[726]! } - public var PrivateDataSettings_Title: String { return self._s[727]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[728]! } - public var ChatList_Read: String { return self._s[729]! } - public var Wallet_WordImport_Text: String { return self._s[730]! } - public var Undo_ChatClearedForBothSides: String { return self._s[731]! } - public var GroupPermission_SectionTitle: String { return self._s[732]! } - public var TwoFactorSetup_Intro_Title: String { return self._s[734]! } + 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[730]!, self._r[730]!, [_0]) + } + 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[735]!, self._r[735]!, [_1, _2]) + return formatWithArgumentRanges(self._s[740]!, self._r[740]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[736]! } - public var Update_UpdateApp: String { return self._s[737]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[738]! } - public var Settings_Appearance: String { return self._s[739]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[743]! } - public var Watch_Location_Access: String { return self._s[744]! } - public var ShareMenu_CopyShareLink: String { return self._s[746]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[747]! } - public var Conversation_Theme: String { return self._s[749]! } + 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[750]!, self._r[750]!, [_0]) + return formatWithArgumentRanges(self._s[755]!, self._r[755]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[751]! } - public var Weekday_ShortWednesday: String { return self._s[752]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[753]! } - public var Undo_LeftGroup: String { return self._s[756]! } - public var Wallet_RestoreFailed_Text: String { return self._s[757]! } - public var Conversation_LinkDialogCopy: String { return self._s[758]! } - public var Wallet_TransactionInfo_NoAddress: String { return self._s[760]! } - public var Wallet_Navigation_Back: String { return self._s[761]! } - public var KeyCommand_FocusOnInputField: String { return self._s[762]! } - public var Contacts_SelectAll: String { return self._s[763]! } - public var Preview_SaveToCameraRoll: String { return self._s[764]! } - public var PrivacySettings_PasscodeOff: String { return self._s[765]! } - public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[766]! } + 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[767]!, self._r[767]!, [_1]) + return formatWithArgumentRanges(self._s[772]!, self._r[772]!, [_1]) } - public var Wallpaper_Title: String { return self._s[768]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[769]! } - public var AccessDenied_Camera: String { return self._s[770]! } - public var Watch_Compose_CurrentLocation: String { return self._s[771]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[773]! } + 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 PeerInfo_ButtonMessage: String { return self._s[778]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[779]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[774]!, self._r[774]!, [_0]) - } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[775]! } - public var Passport_Language_ro: String { return self._s[776]! } - public var EditTheme_UploadNewTheme: String { return self._s[777]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[778]! } - public var Wallet_Intro_Terms: String { return self._s[779]! } - public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[780]!, self._r[780]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[781]! } - public var State_ConnectingToProxy: String { return self._s[782]! } - public var Calls_RatingTitle: String { return self._s[783]! } - public var Generic_ErrorMoreInfo: String { return self._s[784]! } - public var ChatList_Search_ShowMore: String { return self._s[785]! } - public var Appearance_PreviewReplyText: String { return self._s[786]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[787]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[781]! } + public var Passport_Language_ro: String { return self._s[782]! } + public var EditTheme_UploadNewTheme: String { return self._s[783]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[784]! } + public var Wallet_Intro_Terms: String { return self._s[785]! } + public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[786]!, self._r[786]!, [_0]) + } + public var Login_CancelPhoneVerification: String { return self._s[787]! } + public var State_ConnectingToProxy: String { return self._s[788]! } + public var Calls_RatingTitle: String { return self._s[789]! } + public var Generic_ErrorMoreInfo: String { return self._s[790]! } + public var ChatList_Search_ShowMore: String { return self._s[791]! } + public var Appearance_PreviewReplyText: String { return self._s[792]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[793]! } public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[788]!, self._r[788]!, [_0]) + return formatWithArgumentRanges(self._s[794]!, self._r[794]!, [_0]) } - public var IntentsSettings_SuggestedChatsContacts: String { return self._s[789]! } - public var SharedMedia_CategoryLinks: String { return self._s[790]! } - public var Calls_Missed: String { return self._s[791]! } - public var Cache_Photos: String { return self._s[795]! } - public var GroupPermission_NoAddMembers: String { return self._s[796]! } - public var ScheduledMessages_Title: String { return self._s[797]! } + public var IntentsSettings_SuggestedChatsContacts: String { return self._s[795]! } + public var SharedMedia_CategoryLinks: String { return self._s[796]! } + public var Calls_Missed: String { return self._s[797]! } + public var Cache_Photos: String { return self._s[801]! } + public var GroupPermission_NoAddMembers: String { return self._s[802]! } + public var ScheduledMessages_Title: String { return self._s[803]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[798]!, self._r[798]!, [_0]) + return formatWithArgumentRanges(self._s[804]!, self._r[804]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[799]! } - public var Settings_ProxyDisabled: String { return self._s[800]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[805]! } + public var Settings_ProxyDisabled: String { return self._s[806]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[801]!, self._r[801]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[807]!, self._r[807]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[802]!, self._r[802]!, [_0]) + return formatWithArgumentRanges(self._s[808]!, self._r[808]!, [_0]) } - public var ChatList_Context_RemoveFromRecents: String { return self._s[804]! } - public var Appearance_Title: String { return self._s[805]! } + public var ChatList_Context_RemoveFromRecents: String { return self._s[810]! } + public var Appearance_Title: String { return self._s[811]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[807]!, self._r[807]!, [_0]) + return formatWithArgumentRanges(self._s[813]!, self._r[813]!, [_0]) } - public var Conversation_WalletRequiredText: String { return self._s[808]! } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[809]! } - public var OldChannels_NoticeCreateText: String { return self._s[810]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[811]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[812]! } - public var Preview_DeletePhoto: String { return self._s[813]! } - public var Appearance_AppIconFilledX: String { return self._s[814]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[815]! } + public var Conversation_WalletRequiredText: String { return self._s[814]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[815]! } + public var OldChannels_NoticeCreateText: String { return self._s[816]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[817]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[818]! } + public var Preview_DeletePhoto: String { return self._s[819]! } + public var Appearance_AppIconFilledX: String { return self._s[820]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[821]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[816]!, self._r[816]!, [_0]) + return formatWithArgumentRanges(self._s[822]!, self._r[822]!, [_0]) } - public var Coub_TapForSound: String { return self._s[819]! } - public var Map_LocatingError: String { return self._s[820]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[822]! } - public var Conversation_SendMessage_SendSilently: String { return self._s[823]! } - public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[824]! } + public var Coub_TapForSound: String { return self._s[825]! } + public var Map_LocatingError: String { return self._s[826]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[828]! } + public var Conversation_SendMessage_SendSilently: String { return self._s[829]! } + public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[830]! } public func Wallet_Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[825]!, self._r[825]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[831]!, self._r[831]!, [_1, _2, _3]) } - public var Passport_ForgottenPassword: String { return self._s[826]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[827]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[828]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[830]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[831]! } - public var Message_Location: String { return self._s[832]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[833]! } - public var Channel_Management_Title: String { return self._s[834]! } - public var DialogList_SearchSectionDialogs: String { return self._s[836]! } - public var Compose_NewChannel_Members: String { return self._s[837]! } + public var Passport_ForgottenPassword: String { return self._s[832]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[833]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[834]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[836]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[837]! } + public var Message_Location: String { return self._s[838]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[839]! } + public var Channel_Management_Title: String { return self._s[840]! } + public var DialogList_SearchSectionDialogs: String { return self._s[842]! } + public var Compose_NewChannel_Members: String { return self._s[843]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[838]!, self._r[838]!, [_0]) + return formatWithArgumentRanges(self._s[844]!, self._r[844]!, [_0]) } - public var GroupInfo_Location: String { return self._s[839]! } - public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[840]! } - public var ClearCache_Clear: String { return self._s[841]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[842]! } - public var PhotoEditor_WarmthTool: String { return self._s[843]! } - public var Passport_Language_tr: String { return self._s[844]! } + public var GroupInfo_Location: String { return self._s[845]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[846]! } + public var ClearCache_Clear: String { return self._s[847]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[848]! } + public var PhotoEditor_WarmthTool: String { return self._s[849]! } + public var Passport_Language_tr: String { return self._s[850]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[845]!, self._r[845]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[851]!, self._r[851]!, [_1, _2, _3]) } - public var OldChannels_NoticeUpgradeText: String { return self._s[846]! } - public var Login_ResetAccountProtected_Reset: String { return self._s[848]! } - public var Watch_PhotoView_Title: String { return self._s[849]! } - public var Passport_Phone_Delete: String { return self._s[850]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[851]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[852]! } - public var GroupInfo_Permissions: String { return self._s[853]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[854]! } - public var Profile_ShareContactButton: String { return self._s[855]! } - public var ChatSettings_Other: String { return self._s[856]! } - public var UserInfo_NotificationsDisabled: String { return self._s[857]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[858]! } - public var LastSeen_WithinAMonth: String { return self._s[859]! } - public var VoiceOver_Chat_PlayHint: String { return self._s[860]! } - public var Conversation_ReportGroupLocation: String { return self._s[861]! } - public var Conversation_EncryptionCanceled: String { return self._s[862]! } - public var MediaPicker_GroupDescription: String { return self._s[863]! } - public var WebSearch_Images: String { return self._s[864]! } + public var OldChannels_NoticeUpgradeText: String { return self._s[852]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[854]! } + public var Watch_PhotoView_Title: String { return self._s[855]! } + public var Passport_Phone_Delete: String { return self._s[856]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[857]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[858]! } + public var GroupInfo_Permissions: String { return self._s[859]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[860]! } + public var Profile_ShareContactButton: String { return self._s[861]! } + public var ChatSettings_Other: String { return self._s[862]! } + public var UserInfo_NotificationsDisabled: String { return self._s[863]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[864]! } + public var LastSeen_WithinAMonth: String { return self._s[865]! } + public var VoiceOver_Chat_PlayHint: String { return self._s[866]! } + public var Conversation_ReportGroupLocation: String { return self._s[867]! } + public var Conversation_EncryptionCanceled: String { return self._s[868]! } + public var MediaPicker_GroupDescription: String { return self._s[869]! } + public var WebSearch_Images: String { return self._s[870]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[865]!, self._r[865]!, [_0]) + return formatWithArgumentRanges(self._s[871]!, self._r[871]!, [_0]) } - public var Message_Photo: String { return self._s[866]! } - public var PasscodeSettings_HelpBottom: String { return self._s[867]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[868]! } - public var VoiceOver_Media_PlaybackRateChange: String { return self._s[869]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[870]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[871]! } - public var NotificationsSound_Calypso: String { return self._s[872]! } - public var Map_Map: String { return self._s[873]! } + public var Message_Photo: String { return self._s[872]! } + public var PasscodeSettings_HelpBottom: String { return self._s[873]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[874]! } + public var VoiceOver_Media_PlaybackRateChange: String { return self._s[875]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[876]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[877]! } + public var NotificationsSound_Calypso: String { return self._s[878]! } + public var Map_Map: String { return self._s[879]! } public func Conversation_LiveLocationYouAndOther(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[874]!, self._r[874]!, [_0]) + return formatWithArgumentRanges(self._s[880]!, self._r[880]!, [_0]) } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[876]! } - public var ChatSettings_TextSizeUnits: String { return self._s[877]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[882]! } + public var ChatSettings_TextSizeUnits: String { return self._s[883]! } public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[878]!, self._r[878]!, [_0]) + return formatWithArgumentRanges(self._s[884]!, self._r[884]!, [_0]) } - public var Common_of: String { return self._s[879]! } - public var Conversation_ForwardContacts: String { return self._s[882]! } - public var IntentsSettings_SuggestByAll: String { return self._s[884]! } + public var Common_of: String { return self._s[885]! } + public var Conversation_ForwardContacts: String { return self._s[888]! } + public var IntentsSettings_SuggestByAll: String { return self._s[890]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[885]!, self._r[885]!, [_0]) + return formatWithArgumentRanges(self._s[891]!, self._r[891]!, [_0]) } - public var Passport_Language_hy: String { return self._s[886]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[887]! } - public var AutoDownloadSettings_Reset: String { return self._s[888]! } - public var Wallet_TransactionInfo_AddressCopied: String { return self._s[889]! } - public var Paint_ClearConfirm: String { return self._s[890]! } - public var Camera_VideoMode: String { return self._s[891]! } + public var Passport_Language_hy: String { return self._s[892]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[893]! } + public var AutoDownloadSettings_Reset: String { return self._s[894]! } + public var Wallet_TransactionInfo_AddressCopied: String { return self._s[895]! } + public var Paint_ClearConfirm: String { return self._s[896]! } + public var Camera_VideoMode: String { return self._s[897]! } public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[892]!, self._r[892]!, [_0]) + return formatWithArgumentRanges(self._s[898]!, self._r[898]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[893]! } - public var Conversation_ViewBackground: String { return self._s[894]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[899]! } + public var Conversation_ViewBackground: String { return self._s[900]! } public func Wallet_Info_TransactionDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[895]!, self._r[895]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[901]!, self._r[901]!, [_1, _2, _3]) } - public var Passport_Language_el: String { return self._s[896]! } - public var PhotoEditor_Original: String { return self._s[897]! } - public var Settings_FAQ_Button: String { return self._s[899]! } - public var Channel_Setup_PublicNoLink: String { return self._s[901]! } - public var Conversation_UnsupportedMedia: String { return self._s[902]! } - public var Conversation_SlideToCancel: String { return self._s[903]! } - public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[904]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[905]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[906]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[907]! } - public var AutoNightTheme_NotAvailable: String { return self._s[908]! } - public var Conversation_Owner: String { return self._s[909]! } - public var Common_Create: String { return self._s[910]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[911]! } - public var ContactList_Context_Call: String { return self._s[912]! } - public var Localization_ChooseLanguage: String { return self._s[914]! } - public var ChatList_Context_AddToContacts: String { return self._s[916]! } - public var OldChannels_NoticeTitle: String { return self._s[917]! } - public var Settings_Proxy: String { return self._s[919]! } - public var Privacy_TopPeersHelp: String { return self._s[920]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[921]! } - public var Chat_UnsendMyMessages: String { return self._s[922]! } + public var Passport_Language_el: String { return self._s[902]! } + public var PhotoEditor_Original: String { return self._s[903]! } + public var Settings_FAQ_Button: String { return self._s[905]! } + public var Channel_Setup_PublicNoLink: String { return self._s[907]! } + public var Conversation_UnsupportedMedia: String { return self._s[908]! } + public var Conversation_SlideToCancel: String { return self._s[909]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[910]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[911]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[912]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[913]! } + public var AutoNightTheme_NotAvailable: String { return self._s[914]! } + public var Conversation_Owner: String { return self._s[915]! } + public var Common_Create: String { return self._s[916]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[917]! } + public var ContactList_Context_Call: String { return self._s[918]! } + public var Localization_ChooseLanguage: String { return self._s[920]! } + public var ChatList_Context_AddToContacts: String { return self._s[922]! } + public var OldChannels_NoticeTitle: String { return self._s[923]! } + public var Settings_Proxy: String { return self._s[925]! } + public var Privacy_TopPeersHelp: String { return self._s[926]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[927]! } + public var Chat_UnsendMyMessages: String { return self._s[928]! } public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[923]!, self._r[923]!, [_0]) + return formatWithArgumentRanges(self._s[929]!, self._r[929]!, [_0]) } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[924]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[930]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[926]!, self._r[926]!, [_0]) + return formatWithArgumentRanges(self._s[932]!, self._r[932]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[927]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[928]! } - public var Cache_Title: String { return self._s[929]! } + public var Contacts_SortedByPresence: String { return self._s[933]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[934]! } + public var Cache_Title: String { return self._s[935]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[930]!, self._r[930]!, [_0]) + return formatWithArgumentRanges(self._s[936]!, self._r[936]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[931]! } - public var Channel_Moderator_Title: String { return self._s[932]! } - public var InstantPage_AutoNightTheme: String { return self._s[934]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[937]! } + public var Channel_Moderator_Title: String { return self._s[938]! } + public var InstantPage_AutoNightTheme: String { return self._s[940]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[937]!, self._r[937]!, [_1]) + return formatWithArgumentRanges(self._s[943]!, self._r[943]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[938]! } - public var Undo_Undo: String { return self._s[940]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[941]! } - public var TwoStepAuth_RemovePassword: String { return self._s[942]! } - public var Common_Delete: String { return self._s[943]! } - public var Contacts_AddPeopleNearby: String { return self._s[945]! } - public var Conversation_ContextMenuDelete: String { return self._s[946]! } - public var SocksProxySetup_Credentials: String { return self._s[947]! } - public var Appearance_EditTheme: String { return self._s[949]! } - public var ClearCache_StorageOtherApps: String { return self._s[950]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[951]! } - public var Wallet_Send_NetworkErrorText: String { return self._s[952]! } - public var AuthSessions_DevicesTitle: String { return self._s[954]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[956]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[957]! } - public var Passport_Language_id: String { return self._s[959]! } - public var WallpaperSearch_ColorTeal: String { return self._s[960]! } - public var ChannelIntro_Title: String { return self._s[961]! } + public var Passport_Scans_Upload: String { return self._s[944]! } + public var Undo_Undo: String { return self._s[946]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[947]! } + public var TwoStepAuth_RemovePassword: String { return self._s[948]! } + public var Common_Delete: String { return self._s[949]! } + public var Contacts_AddPeopleNearby: String { return self._s[951]! } + public var Conversation_ContextMenuDelete: String { return self._s[952]! } + public var SocksProxySetup_Credentials: String { return self._s[953]! } + public var Appearance_EditTheme: String { return self._s[955]! } + public var ClearCache_StorageOtherApps: String { return self._s[956]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[957]! } + public var Wallet_Send_NetworkErrorText: String { return self._s[958]! } + public var AuthSessions_DevicesTitle: String { return self._s[960]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[962]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[963]! } + public var Passport_Language_id: String { return self._s[965]! } + public var WallpaperSearch_ColorTeal: String { return self._s[966]! } + public var ChannelIntro_Title: String { return self._s[967]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[962]!, self._r[962]!, [_0]) + return formatWithArgumentRanges(self._s[968]!, self._r[968]!, [_0]) } - public var VoiceOver_Chat_OpenLinkHint: String { return self._s[964]! } - public var VoiceOver_Chat_Reply: String { return self._s[965]! } - public var ScheduledMessages_BotActionUnavailable: String { return self._s[966]! } - public var Channel_Info_Description: String { return self._s[967]! } - public var Stickers_FavoriteStickers: String { return self._s[968]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[969]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[970]! } - public var ChatSearch_ResultsTooltip: String { return self._s[971]! } - public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[972]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[973]! } - public var Group_PublicLink_Placeholder: String { return self._s[974]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[975]! } + public var VoiceOver_Chat_OpenLinkHint: String { return self._s[970]! } + public var VoiceOver_Chat_Reply: String { return self._s[971]! } + public var ScheduledMessages_BotActionUnavailable: String { return self._s[972]! } + public var Channel_Info_Description: String { return self._s[973]! } + public var Stickers_FavoriteStickers: String { return self._s[974]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[975]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[976]! } + public var ChatSearch_ResultsTooltip: String { return self._s[977]! } + public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[978]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[979]! } + public var Group_PublicLink_Placeholder: String { return self._s[980]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[981]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[976]!, self._r[976]!, [_1]) + return formatWithArgumentRanges(self._s[982]!, self._r[982]!, [_1]) } - public var TextFormat_Underline: String { return self._s[977]! } + public var TextFormat_Underline: String { return self._s[983]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[979]!, self._r[979]!, [_1, _2]) + return formatWithArgumentRanges(self._s[985]!, self._r[985]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[980]!, self._r[980]!, [_0]) + return formatWithArgumentRanges(self._s[986]!, self._r[986]!, [_0]) } - public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[981]! } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[987]! } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[982]!, self._r[982]!, [_1, _2]) + return formatWithArgumentRanges(self._s[988]!, self._r[988]!, [_1, _2]) } - public var Wallet_Intro_ImportExisting: String { return self._s[983]! } - public var GroupPermission_Delete: String { return self._s[984]! } - public var Passport_Language_uk: String { return self._s[985]! } - public var StickerPack_HideStickers: String { return self._s[987]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[988]! } + public var Wallet_Intro_ImportExisting: String { return self._s[989]! } + public var GroupPermission_Delete: String { return self._s[990]! } + public var Passport_Language_uk: String { return self._s[991]! } + public var StickerPack_HideStickers: String { return self._s[993]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[994]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[989]!, self._r[989]!, [_1, _2]) + return formatWithArgumentRanges(self._s[995]!, self._r[995]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[990]! } + public var Activity_UploadingVideoMessage: String { return self._s[996]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[991]!, self._r[991]!, [_0]) + return formatWithArgumentRanges(self._s[997]!, self._r[997]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[992]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[993]! } - public var Settings_CallSettings: String { return self._s[994]! } - public var Camera_SquareMode: String { return self._s[995]! } - public var Conversation_SendMessage_ScheduleMessage: String { return self._s[996]! } - public var GroupInfo_SharedMediaNone: String { return self._s[997]! } + public var Channel_TitleInfo: String { return self._s[998]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[999]! } + public var Settings_CallSettings: String { return self._s[1000]! } + public var Camera_SquareMode: String { return self._s[1001]! } + public var Conversation_SendMessage_ScheduleMessage: String { return self._s[1002]! } + public var GroupInfo_SharedMediaNone: String { return self._s[1003]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[998]!, self._r[998]!, [_1]) + return formatWithArgumentRanges(self._s[1004]!, self._r[1004]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[999]! } - public var Application_Update: String { return self._s[1001]! } - public var Month_ShortJanuary: String { return self._s[1002]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[1003]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[1004]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[1005]! } - public var Passport_Address_Street2Placeholder: String { return self._s[1006]! } + public var Bot_GenericBotStatus: String { return self._s[1005]! } + public var Application_Update: String { return self._s[1007]! } + public var Month_ShortJanuary: String { return self._s[1008]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[1009]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[1010]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[1011]! } + public var Passport_Address_Street2Placeholder: String { return self._s[1012]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1007]!, self._r[1007]!, [_0]) + return formatWithArgumentRanges(self._s[1013]!, self._r[1013]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[1008]! } - public var Appearance_PreviewOutgoingText: String { return self._s[1009]! } + public var NetworkUsageSettings_Cellular: String { return self._s[1014]! } + public var Appearance_PreviewOutgoingText: String { return self._s[1015]! } public func StickerPackActionInfo_RemovedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1010]!, self._r[1010]!, [_0]) + return formatWithArgumentRanges(self._s[1016]!, self._r[1016]!, [_0]) } - public var Notifications_PermissionsAllowInSettings: String { return self._s[1011]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[1013]! } - public var Map_Directions: String { return self._s[1014]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[1016]! } - public var Appearance_ThemeDay: String { return self._s[1017]! } - public var LogoutOptions_LogOut: String { return self._s[1018]! } - public var Group_PublicLink_Title: String { return self._s[1020]! } - public var Channel_AddBotErrorNoRights: String { return self._s[1021]! } - public var ChatList_Search_ShowLess: String { return self._s[1022]! } - public var Passport_Identity_AddPassport: String { return self._s[1023]! } - public var LocalGroup_ButtonTitle: String { return self._s[1024]! } - public var Call_Message: String { return self._s[1025]! } - public var PhotoEditor_ExposureTool: String { return self._s[1026]! } - public var Wallet_Receive_CommentInfo: String { return self._s[1028]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[1029]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[1031]! } - public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1032]! } - public var Appearance_Preview: String { return self._s[1033]! } - public var Compose_ChannelMembers: String { return self._s[1034]! } - public var Conversation_DeleteManyMessages: String { return self._s[1035]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[1036]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1037]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1038]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[1041]! } - public var Conversation_UpdateTelegram: String { return self._s[1042]! } - public var EditTheme_Create_TopInfo: String { return self._s[1043]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[1017]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[1019]! } + public var Map_Directions: String { return self._s[1020]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[1022]! } + public var Appearance_ThemeDay: String { return self._s[1023]! } + public var LogoutOptions_LogOut: String { return self._s[1024]! } + public var Group_PublicLink_Title: String { return self._s[1026]! } + public var Channel_AddBotErrorNoRights: String { return self._s[1027]! } + public var ChatList_Search_ShowLess: String { return self._s[1028]! } + public var Passport_Identity_AddPassport: String { return self._s[1029]! } + public var LocalGroup_ButtonTitle: String { return self._s[1030]! } + public var Call_Message: String { return self._s[1031]! } + public var PhotoEditor_ExposureTool: String { return self._s[1032]! } + public var Wallet_Receive_CommentInfo: String { return self._s[1034]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[1035]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[1037]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1038]! } + public var Appearance_Preview: String { return self._s[1039]! } + public var Compose_ChannelMembers: String { return self._s[1040]! } + public var Conversation_DeleteManyMessages: String { return self._s[1041]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[1042]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1043]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1044]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[1047]! } + public var Conversation_UpdateTelegram: String { return self._s[1048]! } + public var EditTheme_Create_TopInfo: String { return self._s[1049]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1044]!, self._r[1044]!, [_0]) + return formatWithArgumentRanges(self._s[1050]!, self._r[1050]!, [_0]) } - public var Wallet_WordCheck_Continue: String { return self._s[1045]! } - public var TwoFactorSetup_Hint_Action: String { return self._s[1046]! } - public var IntentsSettings_ResetAll: String { return self._s[1047]! } + public var Wallet_WordCheck_Continue: String { return self._s[1051]! } + public var TwoFactorSetup_Hint_Action: String { return self._s[1052]! } + public var IntentsSettings_ResetAll: String { return self._s[1053]! } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1048]!, self._r[1048]!, [_1]) + return formatWithArgumentRanges(self._s[1054]!, self._r[1054]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[1049]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[1050]! } + public var GroupInfo_Administrators_Title: String { return self._s[1055]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[1056]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1051]!, self._r[1051]!, [_0]) + return formatWithArgumentRanges(self._s[1057]!, self._r[1057]!, [_0]) } - public var Tour_Title3: String { return self._s[1052]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1053]! } - public var Clipboard_SendPhoto: String { return self._s[1057]! } - public var MediaPicker_Videos: String { return self._s[1058]! } - public var Passport_Email_Title: String { return self._s[1059]! } + public var Tour_Title3: String { return self._s[1058]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1059]! } + public var Clipboard_SendPhoto: String { return self._s[1063]! } + public var MediaPicker_Videos: String { return self._s[1064]! } + public var Passport_Email_Title: String { return self._s[1065]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1060]!, self._r[1060]!, [_0]) + return formatWithArgumentRanges(self._s[1066]!, self._r[1066]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[1061]! } - public var Conversation_MessageDialogDelete: String { return self._s[1062]! } - public var Privacy_Calls_CustomHelp: String { return self._s[1064]! } - public var Message_Wallpaper: String { return self._s[1065]! } - public var MemberSearch_BotSection: String { return self._s[1066]! } - public var GroupInfo_SetSound: String { return self._s[1067]! } - public var Core_ServiceUserStatus: String { return self._s[1068]! } - public var LiveLocationUpdated_JustNow: String { return self._s[1069]! } - public var Call_StatusFailed: String { return self._s[1070]! } - public var TwoFactorSetup_Email_Placeholder: String { return self._s[1071]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1072]! } - public var TwoStepAuth_SetPassword: String { return self._s[1073]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[1074]! } + public var StickerPacksSettings_Title: String { return self._s[1067]! } + public var Conversation_MessageDialogDelete: String { return self._s[1068]! } + public var Privacy_Calls_CustomHelp: String { return self._s[1070]! } + public var Message_Wallpaper: String { return self._s[1071]! } + public var MemberSearch_BotSection: String { return self._s[1072]! } + public var GroupInfo_SetSound: String { return self._s[1073]! } + public func Time_TomorrowAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1074]!, self._r[1074]!, [_0]) + } + public var Core_ServiceUserStatus: String { return self._s[1075]! } + public var LiveLocationUpdated_JustNow: String { return self._s[1076]! } + public var Call_StatusFailed: String { return self._s[1077]! } + public var TwoFactorSetup_Email_Placeholder: String { return self._s[1078]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1079]! } + public var TwoStepAuth_SetPassword: String { return self._s[1080]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[1081]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1076]!, self._r[1076]!, [_0]) + return formatWithArgumentRanges(self._s[1083]!, self._r[1083]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[1077]! } - public var Map_NoPlacesNearby: String { return self._s[1078]! } - public var Profile_Username: String { return self._s[1079]! } - public var Bot_DescriptionTitle: String { return self._s[1080]! } - public var MaskStickerSettings_Title: String { return self._s[1081]! } - public var SharedMedia_CategoryOther: String { return self._s[1082]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[1083]! } - public var Common_NotNow: String { return self._s[1084]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[1085]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[1086]! } - public var Map_Location: String { return self._s[1087]! } - public var Invitation_JoinGroup: String { return self._s[1088]! } - public var AutoDownloadSettings_Title: String { return self._s[1090]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1091]! } - public var Channel_ErrorAddBlocked: String { return self._s[1092]! } - public var Conversation_UnblockUser: String { return self._s[1093]! } - public var EditTheme_Edit_TopInfo: String { return self._s[1094]! } - public var Watch_Bot_Restart: String { return self._s[1095]! } - public var TwoStepAuth_Title: String { return self._s[1096]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[1097]! } - public var Checkout_ShippingMethod: String { return self._s[1098]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1099]! } + public var Calls_SubmitRating: String { return self._s[1084]! } + public var Map_NoPlacesNearby: String { return self._s[1085]! } + public var Profile_Username: String { return self._s[1086]! } + public var Bot_DescriptionTitle: String { return self._s[1087]! } + public var MaskStickerSettings_Title: String { return self._s[1088]! } + public var SharedMedia_CategoryOther: String { return self._s[1089]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[1090]! } + public var Common_NotNow: String { return self._s[1091]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[1092]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[1093]! } + public var Map_Location: String { return self._s[1094]! } + public var Invitation_JoinGroup: String { return self._s[1095]! } + public var AutoDownloadSettings_Title: String { return self._s[1097]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1098]! } + public var Channel_ErrorAddBlocked: String { return self._s[1099]! } + public var Conversation_UnblockUser: String { return self._s[1100]! } + public var EditTheme_Edit_TopInfo: String { return self._s[1101]! } + public var Watch_Bot_Restart: String { return self._s[1102]! } + public var TwoStepAuth_Title: String { return self._s[1103]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[1104]! } + public var Checkout_ShippingMethod: String { return self._s[1105]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1106]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1100]!, self._r[1100]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1107]!, self._r[1107]!, [_1, _2, _3]) } - public var EditTheme_ChangeColors: String { return self._s[1102]! } + public var PeerInfo_ButtonDiscuss: String { return self._s[1108]! } + public var EditTheme_ChangeColors: String { return self._s[1110]! } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1103]!, self._r[1103]!, [_0]) + return formatWithArgumentRanges(self._s[1111]!, self._r[1111]!, [_0]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1104]!, self._r[1104]!, [_0]) + return formatWithArgumentRanges(self._s[1112]!, self._r[1112]!, [_0]) } - public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1105]! } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1106]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[1107]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[1108]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[1109]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1110]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1111]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[1112]! } - public var Checkout_PaymentMethod_Title: String { return self._s[1113]! } - public var SocksProxySetup_Connection: String { return self._s[1114]! } - public var Group_MessagePhotoRemoved: String { return self._s[1115]! } - public var Channel_Stickers_NotFound: String { return self._s[1118]! } - public var Group_About_Help: String { return self._s[1119]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[1120]! } - public var PeopleNearby_Title: String { return self._s[1122]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1113]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1114]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[1115]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[1116]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[1117]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1118]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1119]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[1120]! } + public var Checkout_PaymentMethod_Title: String { return self._s[1121]! } + public var SocksProxySetup_Connection: String { return self._s[1122]! } + public var Group_MessagePhotoRemoved: String { return self._s[1123]! } + public var PeopleNearby_MakeInvisible: String { return self._s[1125]! } + public var Channel_Stickers_NotFound: String { return self._s[1127]! } + public var Group_About_Help: String { return self._s[1128]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[1129]! } + public var PeopleNearby_Title: String { return self._s[1131]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1123]!, self._r[1123]!, [_1]) - } - public var Map_Home: String { return self._s[1124]! } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1126]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1127]! } - public var SocksProxySetup_Password: String { return self._s[1128]! } - public var Notifications_PermissionsEnable: String { return self._s[1129]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[1131]! } - public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1132]!, self._r[1132]!, [_1]) } + public var Map_Home: String { return self._s[1133]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1135]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1136]! } + public var SocksProxySetup_Password: String { return self._s[1137]! } + public var Notifications_PermissionsEnable: String { return self._s[1138]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[1140]! } + public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1141]!, self._r[1141]!, [_1]) + } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1134]!, self._r[1134]!, [_0]) + return formatWithArgumentRanges(self._s[1143]!, self._r[1143]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[1135]! } - public var ArchivedPacksAlert_Title: String { return self._s[1136]! } - public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1137]! } - public var Map_PlacesNearby: String { return self._s[1138]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[1144]! } + public var ArchivedPacksAlert_Title: String { return self._s[1145]! } + public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1146]! } + public var Map_PlacesNearby: String { return self._s[1147]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1139]!, self._r[1139]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1148]!, self._r[1148]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1140]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1142]! } - public var Conversation_StatusTyping: String { return self._s[1143]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[1144]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[1145]! } - public var UserInfo_CreateNewContact: String { return self._s[1146]! } - public var Passport_Identity_FrontSide: String { return self._s[1147]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1148]! } - public var Calls_CallTabTitle: String { return self._s[1149]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1150]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1149]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1151]! } + public var Conversation_StatusTyping: String { return self._s[1152]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[1153]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[1154]! } + public var UserInfo_CreateNewContact: String { return self._s[1155]! } + public var Passport_Identity_FrontSide: String { return self._s[1156]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1157]! } + public var Calls_CallTabTitle: String { return self._s[1158]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1159]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1152]!, self._r[1152]!, [_0]) + return formatWithArgumentRanges(self._s[1161]!, self._r[1161]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[1153]! } - public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1154]! } - public var SharedMedia_EmptyMusicText: String { return self._s[1155]! } - public var Wallet_Completed_Text: String { return self._s[1156]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1157]! } - public var Paint_Stickers: String { return self._s[1158]! } - public var Privacy_GroupsAndChannels: String { return self._s[1159]! } - public var ChatList_Context_Delete: String { return self._s[1161]! } - public var UserInfo_AddContact: String { return self._s[1162]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[1162]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1163]! } + public var SharedMedia_EmptyMusicText: String { return self._s[1164]! } + public var Wallet_Completed_Text: String { return self._s[1165]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1166]! } + public var Paint_Stickers: String { return self._s[1167]! } + public var Privacy_GroupsAndChannels: String { return self._s[1168]! } + public var ChatList_Context_Delete: String { return self._s[1170]! } + public var UserInfo_AddContact: String { return self._s[1171]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1163]!, self._r[1163]!, [_0]) + return formatWithArgumentRanges(self._s[1172]!, self._r[1172]!, [_0]) } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[1165]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[1174]! } public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1167]!, self._r[1167]!, [_0]) + return formatWithArgumentRanges(self._s[1176]!, self._r[1176]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[1168]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[1169]! } - public var BlockedUsers_BlockUser: String { return self._s[1170]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[1171]! } - public var MediaPicker_UngroupDescription: String { return self._s[1173]! } - public var Watch_NoConnection: String { return self._s[1174]! } - public var Month_GenSeptember: String { return self._s[1175]! } - public var Conversation_ViewGroup: String { return self._s[1177]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1180]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[1181]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1182]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1183]! } - public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1184]! } - public var MediaPicker_CameraRoll: String { return self._s[1186]! } - public var Month_GenAugust: String { return self._s[1187]! } - public var Wallet_Configuration_SourceHeader: String { return self._s[1188]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[1189]! } - public var SharedMedia_EmptyText: String { return self._s[1190]! } - public var Map_ShareLiveLocation: String { return self._s[1191]! } - public var Calls_All: String { return self._s[1192]! } - public var Map_SendThisPlace: String { return self._s[1194]! } - public var Appearance_ThemeNight: String { return self._s[1196]! } - public var Conversation_HoldForAudio: String { return self._s[1197]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[1200]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[1201]! } - public var SocksProxySetup_Secret: String { return self._s[1202]! } + public var DialogList_NoMessagesTitle: String { return self._s[1177]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[1178]! } + public var BlockedUsers_BlockUser: String { return self._s[1179]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[1180]! } + public var MediaPicker_UngroupDescription: String { return self._s[1182]! } + public var Watch_NoConnection: String { return self._s[1183]! } + public var Month_GenSeptember: String { return self._s[1184]! } + public var Conversation_ViewGroup: String { return self._s[1186]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1189]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[1190]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1191]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1192]! } + public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1193]! } + public var MediaPicker_CameraRoll: String { return self._s[1195]! } + public var Month_GenAugust: String { return self._s[1196]! } + public var Wallet_Configuration_SourceHeader: String { return self._s[1197]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[1198]! } + public var SharedMedia_EmptyText: String { return self._s[1199]! } + public var Map_ShareLiveLocation: String { return self._s[1200]! } + public var Calls_All: String { return self._s[1201]! } + public var Map_SendThisPlace: String { return self._s[1203]! } + public var Appearance_ThemeNight: String { return self._s[1205]! } + public var Conversation_HoldForAudio: String { return self._s[1206]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[1209]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1210]! } + public var SocksProxySetup_Secret: String { return self._s[1211]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1203]!, self._r[1203]!, [_0]) + return formatWithArgumentRanges(self._s[1212]!, self._r[1212]!, [_0]) } - public var Channel_BanList_RestrictedTitle: String { return self._s[1205]! } - public var Conversation_Location: String { return self._s[1206]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1214]! } + public var Conversation_Location: String { return self._s[1215]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1207]!, self._r[1207]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1216]!, self._r[1216]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1209]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1210]! } - public var Notifications_PermissionsText: String { return self._s[1211]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1212]! } - public var Call_Flip: String { return self._s[1213]! } - public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1215]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1216]! } - public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1217]! } - public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1218]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1220]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1222]! } - public var Channel_TooMuchBots: String { return self._s[1224]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1225]! } - public var Login_InvalidCodeError: String { return self._s[1226]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1227]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1218]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1219]! } + public var Notifications_PermissionsText: String { return self._s[1220]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1221]! } + public var Call_Flip: String { return self._s[1222]! } + public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1224]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1225]! } + public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1226]! } + public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1227]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1229]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1231]! } + public var Channel_TooMuchBots: String { return self._s[1233]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1234]! } + public var Login_InvalidCodeError: String { return self._s[1235]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1236]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1228]!, self._r[1228]!, [_0]) + return formatWithArgumentRanges(self._s[1237]!, self._r[1237]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1229]!, self._r[1229]!, [_0]) + return formatWithArgumentRanges(self._s[1238]!, self._r[1238]!, [_0]) } - public var VoiceOver_Navigation_ProxySettings: String { return self._s[1230]! } - public var Call_CallInProgressTitle: String { return self._s[1231]! } - public var Month_ShortSeptember: String { return self._s[1232]! } - public var Watch_ChannelInfo_Title: String { return self._s[1233]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1236]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1237]! } - public var Chat_MultipleTextMessagesDisabled: String { return self._s[1238]! } - public var Wallet_Receive_Title: String { return self._s[1239]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1240]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1241]! } - public var PhotoEditor_CropReset: String { return self._s[1242]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1244]! } - public var Channel_Management_LabelEditor: String { return self._s[1245]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1247]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1248]! } - public var Wallet_Info_WalletCreated: String { return self._s[1249]! } - public var UserInfo_Title: String { return self._s[1250]! } - public var ChatList_HideAction: String { return self._s[1251]! } - public var AccessDenied_Title: String { return self._s[1252]! } - public var DialogList_SearchLabel: String { return self._s[1253]! } - public var Group_Setup_HistoryHidden: String { return self._s[1254]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1255]! } - public var State_Updating: String { return self._s[1257]! } - public var Contacts_TabTitle: String { return self._s[1258]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1260]! } - public var GroupInfo_GroupHistory: String { return self._s[1261]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1262]! } - public var Wallpaper_SetColor: String { return self._s[1263]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1264]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1265]! } - public var Chat_AttachmentLimitReached: String { return self._s[1266]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1267]! } - public var Contacts_NotRegisteredSection: String { return self._s[1268]! } + public var VoiceOver_Navigation_ProxySettings: String { return self._s[1239]! } + public var Call_CallInProgressTitle: String { return self._s[1240]! } + public var Month_ShortSeptember: String { return self._s[1241]! } + public var Watch_ChannelInfo_Title: String { return self._s[1242]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1245]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1246]! } + public var Chat_MultipleTextMessagesDisabled: String { return self._s[1247]! } + public var Wallet_Receive_Title: String { return self._s[1248]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1249]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1250]! } + public var PhotoEditor_CropReset: String { return self._s[1251]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1253]! } + public var Channel_Management_LabelEditor: String { return self._s[1254]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1256]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1257]! } + public var Wallet_Info_WalletCreated: String { return self._s[1258]! } + public var UserInfo_Title: String { return self._s[1259]! } + public var ChatList_HideAction: String { return self._s[1260]! } + public var AccessDenied_Title: String { return self._s[1261]! } + public var DialogList_SearchLabel: String { return self._s[1262]! } + public var Group_Setup_HistoryHidden: String { return self._s[1263]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1264]! } + public var State_Updating: String { return self._s[1266]! } + public var Contacts_TabTitle: String { return self._s[1267]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1269]! } + public var GroupInfo_GroupHistory: String { return self._s[1270]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1271]! } + public var Wallpaper_SetColor: String { return self._s[1272]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1273]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1274]! } + public var Chat_AttachmentLimitReached: String { return self._s[1275]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1276]! } + public var Contacts_NotRegisteredSection: String { return self._s[1277]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1269]!, self._r[1269]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1278]!, self._r[1278]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1270]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1271]! } - public var SocksProxySetup_Connecting: String { return self._s[1272]! } - public var ExplicitContent_AlertChannel: String { return self._s[1273]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1274]! } - public var Conversation_Contact: String { return self._s[1275]! } - public var Login_CodeExpired: String { return self._s[1276]! } - public var Passport_DiscardMessageAction: String { return self._s[1277]! } - public var ChatList_Context_Unpin: String { return self._s[1278]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1279]! } + public var Paint_Clear: String { return self._s[1279]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1280]! } + public var SocksProxySetup_Connecting: String { return self._s[1281]! } + public var ExplicitContent_AlertChannel: String { return self._s[1282]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1283]! } + public var Conversation_Contact: String { return self._s[1284]! } + public var Login_CodeExpired: String { return self._s[1285]! } + public var Passport_DiscardMessageAction: String { return self._s[1286]! } + public var ChatList_Context_Unpin: String { return self._s[1287]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1288]! } public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1280]!, self._r[1280]!, [_0]) + return formatWithArgumentRanges(self._s[1289]!, self._r[1289]!, [_0]) } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1281]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1282]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1290]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1291]! } public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1283]!, self._r[1283]!, [_0]) + return formatWithArgumentRanges(self._s[1292]!, self._r[1292]!, [_0]) } - public var Month_ShortApril: String { return self._s[1284]! } - public var AuthSessions_CurrentSession: String { return self._s[1285]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1288]! } - public var Wallet_Navigation_Cancel: String { return self._s[1290]! } - public var WallpaperPreview_CropTopText: String { return self._s[1291]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1292]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1293]! } + public var Month_ShortApril: String { return self._s[1293]! } + public var AuthSessions_CurrentSession: String { return self._s[1294]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1297]! } + public var Wallet_Navigation_Cancel: String { return self._s[1299]! } + public var WallpaperPreview_CropTopText: String { return self._s[1300]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1301]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1302]! } public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1294]!, self._r[1294]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1303]!, self._r[1303]!, [_0, _1]) } - public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1295]! } - public var Channel_Setup_TypePrivate: String { return self._s[1297]! } - public var Forward_ChannelReadOnly: String { return self._s[1300]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1301]! } - public var AddContact_SharedContactException: String { return self._s[1302]! } - public var UserInfo_BotPrivacy: String { return self._s[1304]! } - public var Wallet_CreateInvoice_Title: String { return self._s[1305]! } - public var Notification_PassportValueEmail: String { return self._s[1306]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1307]! } - public var GroupPermission_NewTitle: String { return self._s[1308]! } - public var CallFeedback_ReasonDropped: String { return self._s[1309]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1310]! } - public var Channel_SignMessages_Help: String { return self._s[1312]! } - public var Undo_ChatDeleted: String { return self._s[1314]! } - public var Conversation_ChatBackground: String { return self._s[1315]! } + public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1304]! } + public var Channel_Setup_TypePrivate: String { return self._s[1306]! } + public var Forward_ChannelReadOnly: String { return self._s[1309]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1310]! } + public var AddContact_SharedContactException: String { return self._s[1311]! } + public var UserInfo_BotPrivacy: String { return self._s[1313]! } + public var Wallet_CreateInvoice_Title: String { return self._s[1314]! } + public var Notification_PassportValueEmail: String { return self._s[1315]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1316]! } + public var GroupPermission_NewTitle: String { return self._s[1317]! } + public var CallFeedback_ReasonDropped: String { return self._s[1318]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1319]! } + public var Channel_SignMessages_Help: String { return self._s[1321]! } + public var Undo_ChatDeleted: String { return self._s[1323]! } + public var Conversation_ChatBackground: String { return self._s[1324]! } public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1316]!, self._r[1316]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1325]!, self._r[1325]!, [_1, _2, _3]) } public func PUSH_CHAT_MESSAGE_QUIZ(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1317]!, self._r[1317]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1326]!, self._r[1326]!, [_1, _2, _3]) } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1318]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1319]! } - public var Passport_Language_pt: String { return self._s[1320]! } - public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1321]! } - public var NotificationsSound_Popcorn: String { return self._s[1324]! } - public var AutoNightTheme_Disabled: String { return self._s[1325]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1326]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1327]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1328]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1329]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1327]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1328]! } + public var Passport_Language_pt: String { return self._s[1329]! } + public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1330]! } + public var NotificationsSound_Popcorn: String { return self._s[1333]! } + public var AutoNightTheme_Disabled: String { return self._s[1334]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1335]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1336]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1337]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1338]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1330]!, self._r[1330]!, [_0]) + return formatWithArgumentRanges(self._s[1339]!, self._r[1339]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1331]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1332]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1334]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1340]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1341]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1343]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1335]!, self._r[1335]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1344]!, self._r[1344]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1338]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1339]! } - public var Compose_NewEncryptedChat: String { return self._s[1340]! } - public var Login_CodeFloodError: String { return self._s[1341]! } - public var Calls_TabTitle: String { return self._s[1342]! } - public var Privacy_ProfilePhoto: String { return self._s[1343]! } - public var Passport_Language_he: String { return self._s[1344]! } + public var SocksProxySetup_Hostname: String { return self._s[1347]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1348]! } + public var Compose_NewEncryptedChat: String { return self._s[1349]! } + public var Login_CodeFloodError: String { return self._s[1350]! } + public var Calls_TabTitle: String { return self._s[1351]! } + public var Privacy_ProfilePhoto: String { return self._s[1352]! } + public var Passport_Language_he: String { return self._s[1353]! } public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1345]!, self._r[1345]!, [_0]) + return formatWithArgumentRanges(self._s[1354]!, self._r[1354]!, [_0]) } - public var GroupPermission_Title: String { return self._s[1346]! } + public var GroupPermission_Title: String { return self._s[1355]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1347]!, self._r[1347]!, [_0]) + return formatWithArgumentRanges(self._s[1356]!, self._r[1356]!, [_0]) } - public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1348]! } - public var GroupPermission_NoChangeInfo: String { return self._s[1349]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1350]! } - public var Tour_Text1: String { return self._s[1351]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1352]! } - public var Month_ShortFebruary: String { return self._s[1353]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1354]! } + public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1357]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1358]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1359]! } + public var Tour_Text1: String { return self._s[1360]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1361]! } + public var Month_ShortFebruary: String { return self._s[1362]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1363]! } public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1355]!, self._r[1355]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1364]!, self._r[1364]!, [_1, _2, _3]) } - public var NotificationsSound_Glass: String { return self._s[1356]! } - public var Appearance_ThemeNightBlue: String { return self._s[1357]! } - public var CheckoutInfo_Pay: String { return self._s[1358]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1360]! } - public var Call_CallAgain: String { return self._s[1362]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1363]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1364]! } - public var Passport_InvalidPasswordError: String { return self._s[1365]! } - public var Watch_Message_Game: String { return self._s[1366]! } - public var Stickers_Install: String { return self._s[1367]! } - public var VoiceOver_Chat_Message: String { return self._s[1368]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1369]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1371]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1372]! } - public var AuthSessions_OtherSessions: String { return self._s[1373]! } - public var Channel_Username_Help: String { return self._s[1374]! } - public var Camera_Title: String { return self._s[1375]! } - public var IntentsSettings_Title: String { return self._s[1376]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1378]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1379]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1380]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1381]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1382]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1383]! } - public var ScheduledMessages_DeleteMany: String { return self._s[1384]! } - public var Conversation_RestrictedStickers: String { return self._s[1385]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1387]! } - public var UserInfo_TelegramCall: String { return self._s[1389]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1390]! } - public var CreatePoll_OptionsHeader: String { return self._s[1391]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1392]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1393]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1394]! } - public var Theme_Colors_Proceed: String { return self._s[1395]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1396]! } + public var NotificationsSound_Glass: String { return self._s[1365]! } + public var Appearance_ThemeNightBlue: String { return self._s[1366]! } + public var CheckoutInfo_Pay: String { return self._s[1367]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1369]! } + public var Call_CallAgain: String { return self._s[1371]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1372]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1373]! } + public var Passport_InvalidPasswordError: String { return self._s[1374]! } + public var Watch_Message_Game: String { return self._s[1375]! } + public var Stickers_Install: String { return self._s[1376]! } + public var VoiceOver_Chat_Message: String { return self._s[1377]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1378]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1380]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1381]! } + public var AuthSessions_OtherSessions: String { return self._s[1382]! } + public var Channel_Username_Help: String { return self._s[1383]! } + public var Camera_Title: String { return self._s[1384]! } + public var IntentsSettings_Title: String { return self._s[1385]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1387]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1388]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1389]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1390]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1391]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1392]! } + public var ScheduledMessages_DeleteMany: String { return self._s[1393]! } + public var Conversation_RestrictedStickers: String { return self._s[1394]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1396]! } + public var UserInfo_TelegramCall: String { return self._s[1398]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1399]! } + public var CreatePoll_OptionsHeader: String { return self._s[1400]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1401]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1402]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1403]! } + public var Theme_Colors_Proceed: String { return self._s[1404]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1405]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1397]!, self._r[1397]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1406]!, self._r[1406]!, [_1, _2, _3]) } - public var Wallet_Month_GenAugust: String { return self._s[1398]! } - public var Settings_SaveEditedPhotos: String { return self._s[1399]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1400]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1401]! } - public var Conversation_MessageDialogRetry: String { return self._s[1402]! } - public var ChatList_Context_MarkAsUnread: String { return self._s[1403]! } - public var MessagePoll_SubmitVote: String { return self._s[1404]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1405]! } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1406]! } - public var Group_Setup_TypeHeader: String { return self._s[1407]! } - public var Paint_RecentStickers: String { return self._s[1408]! } - public var PhotoEditor_GrainTool: String { return self._s[1409]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1410]! } - public var EmptyGroupInfo_Line4: String { return self._s[1411]! } - public var Watch_AuthRequired: String { return self._s[1413]! } + public var Wallet_Month_GenAugust: String { return self._s[1407]! } + public var Settings_SaveEditedPhotos: String { return self._s[1408]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1409]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1410]! } + public var Conversation_MessageDialogRetry: String { return self._s[1411]! } + public var ChatList_Context_MarkAsUnread: String { return self._s[1412]! } + public var MessagePoll_SubmitVote: String { return self._s[1413]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1414]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1415]! } + public var Group_Setup_TypeHeader: String { return self._s[1416]! } + public var Paint_RecentStickers: String { return self._s[1417]! } + public var PhotoEditor_GrainTool: String { return self._s[1418]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1419]! } + public var EmptyGroupInfo_Line4: String { return self._s[1420]! } + public var Watch_AuthRequired: String { return self._s[1422]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1414]!, self._r[1414]!, [_0]) + return formatWithArgumentRanges(self._s[1423]!, self._r[1423]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1415]! } - public var ChannelIntro_Text: String { return self._s[1416]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1417]! } - public var GroupPermission_NoSendMedia: String { return self._s[1418]! } - public var Calls_AddTab: String { return self._s[1419]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1420]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1421]! } - public var Conversation_WalletRequiredSetup: String { return self._s[1422]! } - public var Notification_MessageLifetime1d: String { return self._s[1423]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1424]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1425]! } - public var Passport_Identity_GenderFemale: String { return self._s[1426]! } - public var BlockedUsers_BlockTitle: String { return self._s[1427]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1424]! } + public var ChannelIntro_Text: String { return self._s[1425]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1426]! } + public var GroupPermission_NoSendMedia: String { return self._s[1427]! } + public var Calls_AddTab: String { return self._s[1428]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1429]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1430]! } + public var Conversation_WalletRequiredSetup: String { return self._s[1431]! } + public var Notification_MessageLifetime1d: String { return self._s[1432]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1433]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1434]! } + public var Passport_Identity_GenderFemale: String { return self._s[1435]! } + public var BlockedUsers_BlockTitle: String { return self._s[1436]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1428]!, self._r[1428]!, [_1]) + return formatWithArgumentRanges(self._s[1437]!, self._r[1437]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1429]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1430]! } - public var Settings_Context_Logout: String { return self._s[1431]! } - public var Wallet_Info_UnknownTransaction: String { return self._s[1432]! } - public var ChatList_ArchiveAction: String { return self._s[1433]! } - public var AutoNightTheme_Scheduled: String { return self._s[1434]! } - public var TwoFactorSetup_Email_SkipAction: String { return self._s[1435]! } - public var Settings_Devices: String { return self._s[1436]! } - public var ContactInfo_Note: String { return self._s[1437]! } + public var Weekday_Yesterday: String { return self._s[1438]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1439]! } + public var Settings_Context_Logout: String { return self._s[1440]! } + public var Wallet_Info_UnknownTransaction: String { return self._s[1441]! } + public var ChatList_ArchiveAction: String { return self._s[1442]! } + public var AutoNightTheme_Scheduled: String { return self._s[1443]! } + public var TwoFactorSetup_Email_SkipAction: String { return self._s[1444]! } + public var Settings_Devices: String { return self._s[1445]! } + public var ContactInfo_Note: String { return self._s[1446]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1438]!, self._r[1438]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1447]!, self._r[1447]!, [_1, _2, _3, _4, _5, _6]) } - public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1439]! } - public var Wallet_Receive_CreateInvoice: String { return self._s[1440]! } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1441]! } - public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1442]! } + public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1448]! } + public var Wallet_Receive_CreateInvoice: String { return self._s[1449]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1450]! } + public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1451]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1443]!, self._r[1443]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1452]!, self._r[1452]!, [_1, _2]) } - public var CreatePoll_Create: String { return self._s[1444]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1445]! } + public var CreatePoll_Create: String { return self._s[1453]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1454]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1446]!, self._r[1446]!, [_1, _2]) - } - public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1447]! } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1448]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1450]! } - public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1451]!, self._r[1451]!, [_1]) - } - public var Preview_OpenInInstagram: String { return self._s[1452]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1453]! } - public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1454]!, self._r[1454]!, [_1, _2, _3]) - } - public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1455]!, self._r[1455]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1456]! } - public var ArchivedChats_IntroText3: String { return self._s[1457]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1458]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1459]! } - public var Wallet_Month_GenSeptember: String { return self._s[1460]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1461]! } + public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1456]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1457]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1459]! } + public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1460]!, self._r[1460]!, [_1]) + } + public var Preview_OpenInInstagram: String { return self._s[1461]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1462]! } + public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1463]!, self._r[1463]!, [_1, _2, _3]) + } + public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1464]!, self._r[1464]!, [_1, _2]) + } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1465]! } + public var ArchivedChats_IntroText3: String { return self._s[1466]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1467]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1468]! } + public var Wallet_Month_GenSeptember: String { return self._s[1469]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1470]! } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1462]!, self._r[1462]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1471]!, self._r[1471]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1464]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1465]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1466]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1467]! } - public var Gif_NoGifsFound: String { return self._s[1468]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1469]! } - public var VoiceOver_MessageContextDelete: String { return self._s[1470]! } - public var EditTheme_Preview: String { return self._s[1471]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1473]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1474]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1475]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1476]! } + public var Gif_NoGifsFound: String { return self._s[1477]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1478]! } + public var VoiceOver_MessageContextDelete: String { return self._s[1479]! } + public var EditTheme_Preview: String { return self._s[1480]! } public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1472]!, self._r[1472]!, [_0]) + return formatWithArgumentRanges(self._s[1481]!, self._r[1481]!, [_0]) } - public var GroupInfo_ActionPromote: String { return self._s[1473]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1474]! } - public var GroupInfo_Permissions_Title: String { return self._s[1475]! } - public var Permissions_ContactsText_v0: String { return self._s[1476]! } - public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1477]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1478]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1481]! } - public var Passport_FieldEmailHelp: String { return self._s[1482]! } + public var GroupInfo_ActionPromote: String { return self._s[1482]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1483]! } + public var GroupInfo_Permissions_Title: String { return self._s[1484]! } + public var Permissions_ContactsText_v0: String { return self._s[1485]! } + public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1486]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1487]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1490]! } + public var Passport_FieldEmailHelp: String { return self._s[1491]! } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1483]!, self._r[1483]!, [_0]) + return formatWithArgumentRanges(self._s[1492]!, self._r[1492]!, [_0]) } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1484]! } - public var Weekday_ShortSaturday: String { return self._s[1485]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1486]! } - public var Watch_Conversation_UserInfo: String { return self._s[1487]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1488]! } - public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1489]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1490]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1491]! } - public var PhotoEditor_VignetteTool: String { return self._s[1492]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1493]! } - public var Passport_Language_et: String { return self._s[1494]! } - public var AppUpgrade_Running: String { return self._s[1495]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1497]! } - public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1498]! } - public var Passport_Language_bg: String { return self._s[1499]! } - public var Stickers_NoStickersFound: String { return self._s[1501]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1493]! } + public var Weekday_ShortSaturday: String { return self._s[1494]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1495]! } + public var Watch_Conversation_UserInfo: String { return self._s[1496]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1497]! } + public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1498]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1499]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1500]! } + public var PhotoEditor_VignetteTool: String { return self._s[1501]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1502]! } + public var Passport_Language_et: String { return self._s[1503]! } + public var AppUpgrade_Running: String { return self._s[1504]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1506]! } + public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1507]! } + public var Passport_Language_bg: String { return self._s[1508]! } + public var Stickers_NoStickersFound: String { return self._s[1510]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1503]!, self._r[1503]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1512]!, self._r[1512]!, [_1, _2]) } public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1504]!, self._r[1504]!, [_0]) + return formatWithArgumentRanges(self._s[1513]!, self._r[1513]!, [_0]) } - public var Wallet_Month_GenJuly: String { return self._s[1505]! } - public var Wallet_Receive_AddressHeader: String { return self._s[1506]! } - public var Wallet_Send_AmountText: String { return self._s[1507]! } - public var Settings_About: String { return self._s[1508]! } + public var Wallet_Month_GenJuly: String { return self._s[1514]! } + public var Wallet_Receive_AddressHeader: String { return self._s[1515]! } + public var Wallet_Send_AmountText: String { return self._s[1516]! } + public var Settings_About: String { return self._s[1517]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1509]!, self._r[1509]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1518]!, self._r[1518]!, [_0, _1, _2]) } - public var ChatList_Context_MarkAsRead: String { return self._s[1511]! } - public var KeyCommand_NewMessage: String { return self._s[1512]! } - public var Group_ErrorAddBlocked: String { return self._s[1513]! } + public var ChatList_Context_MarkAsRead: String { return self._s[1520]! } + public var KeyCommand_NewMessage: String { return self._s[1521]! } + public var Group_ErrorAddBlocked: String { return self._s[1522]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1514]!, self._r[1514]!, [_0]) + return formatWithArgumentRanges(self._s[1523]!, self._r[1523]!, [_0]) } - public var Map_LocationTitle: String { return self._s[1515]! } - public var ReportGroupLocation_Title: String { return self._s[1516]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1517]! } - public var Cache_ClearProgress: String { return self._s[1518]! } + public var Map_LocationTitle: String { return self._s[1524]! } + public var ReportGroupLocation_Title: String { return self._s[1525]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1526]! } + public var Cache_ClearProgress: String { return self._s[1527]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1519]!, self._r[1519]!, [_0]) + return formatWithArgumentRanges(self._s[1528]!, self._r[1528]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1520]! } - public var Passport_UpdateRequiredError: String { return self._s[1521]! } - public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1522]! } + public var GroupRemoved_AddToGroup: String { return self._s[1529]! } + public var Passport_UpdateRequiredError: String { return self._s[1530]! } + public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1531]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1523]!, self._r[1523]!, [_1]) + return formatWithArgumentRanges(self._s[1532]!, self._r[1532]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1525]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1526]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1527]! } - public var Passport_Language_ka: String { return self._s[1528]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1534]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1535]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1536]! } + public var Passport_Language_ka: String { return self._s[1537]! } public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1529]!, self._r[1529]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1538]!, self._r[1538]!, [_1, _2, _3]) } - public var Call_Decline: String { return self._s[1530]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1531]! } - public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1534]! } + public var Call_Decline: String { return self._s[1539]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1540]! } + public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1543]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1535]!, self._r[1535]!, [_0]) + return formatWithArgumentRanges(self._s[1544]!, self._r[1544]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1536]! } - public var EditTheme_EditTitle: String { return self._s[1537]! } + public var CallFeedback_Send: String { return self._s[1545]! } + public var EditTheme_EditTitle: String { return self._s[1546]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1538]!, self._r[1538]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1547]!, self._r[1547]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1539]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1548]! } public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1541]!, self._r[1541]!, [_0]) + return formatWithArgumentRanges(self._s[1550]!, self._r[1550]!, [_0]) } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1542]! } - public var Passport_DeletePassport: String { return self._s[1543]! } - public var Appearance_AppIconFilled: String { return self._s[1544]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1545]! } - public var Month_ShortDecember: String { return self._s[1546]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1548]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1551]! } + public var Passport_DeletePassport: String { return self._s[1552]! } + public var Appearance_AppIconFilled: String { return self._s[1553]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1554]! } + public var Month_ShortDecember: String { return self._s[1555]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1557]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1549]!, self._r[1549]!, [_0]) - } - public var Channel_Stickers_Searching: String { return self._s[1550]! } - public var Conversation_EncryptedDescription1: String { return self._s[1551]! } - public var Conversation_EncryptedDescription2: String { return self._s[1552]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1553]! } - public var Conversation_EncryptedDescription3: String { return self._s[1555]! } - public var PhotoEditor_SharpenTool: String { return self._s[1556]! } - public var Wallet_Configuration_Title: String { return self._s[1557]! } - public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1558]!, self._r[1558]!, [_0]) } - public var Conversation_EncryptedDescription4: String { return self._s[1560]! } - public var Channel_Members_AddMembers: String { return self._s[1561]! } - public var Wallpaper_Search: String { return self._s[1562]! } - public var Weekday_Friday: String { return self._s[1564]! } - public var Privacy_ContactsSync: String { return self._s[1565]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1566]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1567]! } + public var Channel_Stickers_Searching: String { return self._s[1559]! } + public var Conversation_EncryptedDescription1: String { return self._s[1560]! } + public var Conversation_EncryptedDescription2: String { return self._s[1561]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1562]! } + public var Conversation_EncryptedDescription3: String { return self._s[1564]! } + public var PhotoEditor_SharpenTool: String { return self._s[1565]! } + public var Wallet_Configuration_Title: String { return self._s[1566]! } + public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1567]!, self._r[1567]!, [_0]) + } + public var Conversation_EncryptedDescription4: String { return self._s[1569]! } + public var Channel_Members_AddMembers: String { return self._s[1570]! } + public var Wallpaper_Search: String { return self._s[1571]! } + public var Weekday_Friday: String { return self._s[1573]! } + public var Privacy_ContactsSync: String { return self._s[1574]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1575]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1576]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1568]!, self._r[1568]!, [_0]) + return formatWithArgumentRanges(self._s[1577]!, self._r[1577]!, [_0]) } - public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1569]! } - public var GroupInfo_Permissions_Removed: String { return self._s[1570]! } - public var ScheduledMessages_ScheduledOnline: String { return self._s[1571]! } - public var Passport_Identity_GenderMale: String { return self._s[1572]! } + public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1578]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1579]! } + public var ScheduledMessages_ScheduledOnline: String { return self._s[1580]! } + public var Passport_Identity_GenderMale: String { return self._s[1581]! } public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1573]!, self._r[1573]!, [_0]) + return formatWithArgumentRanges(self._s[1582]!, self._r[1582]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1574]! } - public var Conversation_JumpToDate: String { return self._s[1575]! } - public var Contacts_GlobalSearch: String { return self._s[1576]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1577]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1578]! } - public var Profile_MessageLifetime1d: String { return self._s[1579]! } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1583]! } + public var Conversation_JumpToDate: String { return self._s[1584]! } + public var Contacts_GlobalSearch: String { return self._s[1585]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1586]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1587]! } + public var Profile_MessageLifetime1d: String { return self._s[1588]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1580]!, self._r[1580]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1589]!, self._r[1589]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1583]! } + public var StickerPack_BuiltinPackName: String { return self._s[1592]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1584]!, self._r[1584]!, [_1, _2]) - } - public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1585]! } - public var Passport_InfoTitle: String { return self._s[1587]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1588]! } - public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1592]!, self._r[1592]!, [_0]) - } - public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1593]!, self._r[1593]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1594]! } - public var Profile_BotInfo: String { return self._s[1595]! } - public var Watch_Compose_CreateMessage: String { return self._s[1596]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1597]! } - public var Month_ShortNovember: String { return self._s[1598]! } - public var Conversation_ScamWarning: String { return self._s[1599]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1600]! } - public var Appearance_TextSize_Title: String { return self._s[1601]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1602]! } - public var NotificationsSound_Chime: String { return self._s[1603]! } - public var Passport_Language_ko: String { return self._s[1605]! } - public var InviteText_URL: String { return self._s[1606]! } - public var TextFormat_Monospace: String { return self._s[1607]! } - public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1608]!, self._r[1608]!, [_1, _2, _3]) + public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1594]! } + public var Passport_InfoTitle: String { return self._s[1596]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1597]! } + public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1601]!, self._r[1601]!, [_0]) } - public var EditTheme_Edit_BottomInfo: String { return self._s[1609]! } + public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1602]!, self._r[1602]!, [_1, _2]) + } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1603]! } + public var Profile_BotInfo: String { return self._s[1604]! } + public var Watch_Compose_CreateMessage: String { return self._s[1605]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1606]! } + public var Month_ShortNovember: String { return self._s[1607]! } + public var Conversation_ScamWarning: String { return self._s[1608]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1609]! } + public var Appearance_TextSize_Title: String { return self._s[1610]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1611]! } + public var NotificationsSound_Chime: String { return self._s[1612]! } + public var Passport_Language_ko: String { return self._s[1614]! } + public var InviteText_URL: String { return self._s[1615]! } + public var TextFormat_Monospace: String { return self._s[1616]! } + public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1617]!, self._r[1617]!, [_1, _2, _3]) + } + public var EditTheme_Edit_BottomInfo: String { return self._s[1618]! } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1610]!, self._r[1610]!, [_0]) + return formatWithArgumentRanges(self._s[1619]!, self._r[1619]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1611]!, self._r[1611]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1620]!, self._r[1620]!, [_1, _2]) } - public var Wallet_Words_Title: String { return self._s[1612]! } - public var Wallet_Month_ShortMay: String { return self._s[1613]! } - public var EditTheme_CreateTitle: String { return self._s[1615]! } - public var Passport_InfoLearnMore: String { return self._s[1616]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1617]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1618]! } - public var Your_card_has_expired: String { return self._s[1619]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1620]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1621]! } - public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1625]! } - public var Conversation_Report: String { return self._s[1627]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1628]! } - public var Notification_MessageLifetime1m: String { return self._s[1629]! } - public var Privacy_ContactsTitle: String { return self._s[1630]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1631]! } - public var Wallet_WordCheck_Title: String { return self._s[1632]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1633]! } - public var Channel_Members_Title: String { return self._s[1634]! } - public var Map_OpenInWaze: String { return self._s[1635]! } - public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1636]! } - public var Login_PhoneBannedError: String { return self._s[1637]! } + public var Wallet_Words_Title: String { return self._s[1621]! } + public var Wallet_Month_ShortMay: String { return self._s[1622]! } + public var EditTheme_CreateTitle: String { return self._s[1624]! } + public var Passport_InfoLearnMore: String { return self._s[1625]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1626]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1627]! } + public var Your_card_has_expired: String { return self._s[1628]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1629]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1630]! } + public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1634]! } + public var Conversation_Report: String { return self._s[1636]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1637]! } + public var Notification_MessageLifetime1m: String { return self._s[1638]! } + public var Privacy_ContactsTitle: String { return self._s[1639]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1640]! } + public var Wallet_WordCheck_Title: String { return self._s[1641]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1642]! } + public var Channel_Members_Title: String { return self._s[1643]! } + public var Map_OpenInWaze: String { return self._s[1644]! } + public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1645]! } + public var Login_PhoneBannedError: String { return self._s[1646]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_0]) + return formatWithArgumentRanges(self._s[1647]!, self._r[1647]!, [_0]) } - public var IntentsSettings_MainAccount: String { return self._s[1639]! } - public var Group_Management_AddModeratorHelp: String { return self._s[1640]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1641]! } - public var Common_OK: String { return self._s[1642]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1643]! } - public var Wallet_Words_NotDoneResponse: String { return self._s[1644]! } - public var Cache_Music: String { return self._s[1645]! } - public var Wallet_Configuration_SourceURL: String { return self._s[1646]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1647]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1649]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1650]! } + public var IntentsSettings_MainAccount: String { return self._s[1648]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1649]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1650]! } + public var Common_OK: String { return self._s[1651]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1652]! } + public var Wallet_Words_NotDoneResponse: String { return self._s[1653]! } + public var Cache_Music: String { return self._s[1654]! } + public var Wallet_Configuration_SourceURL: String { return self._s[1655]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1656]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1659]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1660]! } public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1651]!, self._r[1651]!, [_1]) + return formatWithArgumentRanges(self._s[1661]!, self._r[1661]!, [_1]) } public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1652]!, self._r[1652]!, [_0]) + return formatWithArgumentRanges(self._s[1662]!, self._r[1662]!, [_0]) } - public var TwoFactorSetup_Done_Action: String { return self._s[1653]! } + public var TwoFactorSetup_Done_Action: String { return self._s[1663]! } public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1654]!, self._r[1654]!, [_0]) + return formatWithArgumentRanges(self._s[1664]!, self._r[1664]!, [_0]) } - public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1655]! } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1657]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1658]! } - public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1660]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1661]! } - public var State_ConnectingToProxyInfo: String { return self._s[1662]! } - public var Conversation_SwipeToReplyHintTitle: String { return self._s[1663]! } - public var Message_VideoMessage: String { return self._s[1665]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1666]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1667]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1668]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1669]! } + public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1665]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1667]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1668]! } + public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1670]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1671]! } + public var State_ConnectingToProxyInfo: String { return self._s[1672]! } + public var Conversation_SwipeToReplyHintTitle: String { return self._s[1673]! } + public var Message_VideoMessage: String { return self._s[1675]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1676]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1677]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1678]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1679]! } public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1670]!, self._r[1670]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1680]!, self._r[1680]!, [_1, _2, _3]) } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1671]! } - public var Activity_RecordingAudio: String { return self._s[1672]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1673]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1674]! } - public var Wallet_Info_Address: String { return self._s[1675]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1681]! } + public var Activity_RecordingAudio: String { return self._s[1682]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1683]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1684]! } + public var Wallet_Info_Address: String { return self._s[1685]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1677]!, self._r[1677]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1687]!, self._r[1687]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1681]!, self._r[1681]!, [_0]) + return formatWithArgumentRanges(self._s[1691]!, self._r[1691]!, [_0]) } - public var Conversation_ApplyLocalization: String { return self._s[1682]! } - public var TwoFactorSetup_Intro_Action: String { return self._s[1683]! } - public var UserInfo_AddPhone: String { return self._s[1684]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1685]! } + public var Conversation_ApplyLocalization: String { return self._s[1692]! } + public var TwoFactorSetup_Intro_Action: String { return self._s[1693]! } + public var UserInfo_AddPhone: String { return self._s[1694]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1695]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1686]!, self._r[1686]!, [_0]) + return formatWithArgumentRanges(self._s[1696]!, self._r[1696]!, [_0]) } - public var Passport_Scans: String { return self._s[1688]! } - public var BlockedUsers_Unblock: String { return self._s[1689]! } + public var Passport_Scans: String { return self._s[1698]! } + public var BlockedUsers_Unblock: String { return self._s[1699]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1690]!, self._r[1690]!, [_1]) + return formatWithArgumentRanges(self._s[1700]!, self._r[1700]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1691]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[1692]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1693]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1694]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1695]! } + public var Channel_Management_LabelCreator: String { return self._s[1701]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[1702]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1703]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1704]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1705]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1696]!, self._r[1696]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1706]!, self._r[1706]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1697]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1698]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1699]! } - public var ChannelIntro_CreateChannel: String { return self._s[1700]! } - public var Conversation_UnreadMessages: String { return self._s[1701]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1702]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1703]! } - public var Theme_Context_Apply: String { return self._s[1704]! } - public var Notification_GroupActivated: String { return self._s[1705]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1706]! } - public var Wallet_Intro_CreateWallet: String { return self._s[1707]! } + public var Login_PhoneNumberHelp: String { return self._s[1707]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1708]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1709]! } + public var ChannelIntro_CreateChannel: String { return self._s[1710]! } + public var Conversation_UnreadMessages: String { return self._s[1711]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1712]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1713]! } + public var Theme_Context_Apply: String { return self._s[1714]! } + public var Notification_GroupActivated: String { return self._s[1715]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1716]! } + public var Wallet_Intro_CreateWallet: String { return self._s[1717]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1708]!, self._r[1708]!, [_0]) + return formatWithArgumentRanges(self._s[1718]!, self._r[1718]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1709]!, self._r[1709]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1719]!, self._r[1719]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1711]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1721]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1712]!, self._r[1712]!, [_0]) + return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_0]) } - public var Undo_DeletedChannel: String { return self._s[1713]! } - public var CallFeedback_AddComment: String { return self._s[1714]! } + public var Undo_DeletedChannel: String { return self._s[1723]! } + public var CallFeedback_AddComment: String { return self._s[1724]! } public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1715]!, self._r[1715]!, [_0]) + return formatWithArgumentRanges(self._s[1725]!, self._r[1725]!, [_0]) } - public var Document_TargetConfirmationFormat: String { return self._s[1716]! } + public var Document_TargetConfirmationFormat: String { return self._s[1726]! } public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1717]!, self._r[1717]!, [_0]) + return formatWithArgumentRanges(self._s[1727]!, self._r[1727]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1718]! } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1728]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1719]!, self._r[1719]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1729]!, self._r[1729]!, [_1, _2, _3, _4]) } - public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1720]! } - public var Theme_ErrorNotFound: String { return self._s[1721]! } - public var Contacts_SortByName: String { return self._s[1722]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1723]! } + public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1730]! } + public var Theme_ErrorNotFound: String { return self._s[1731]! } + public var Contacts_SortByName: String { return self._s[1732]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1733]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1725]!, self._r[1725]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1735]!, self._r[1735]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1726]! } - public var ScheduledMessages_EditTime: String { return self._s[1727]! } - public var Conversation_ClearSelfHistory: String { return self._s[1728]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1729]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1730]! } - public var Stickers_SuggestNone: String { return self._s[1731]! } - public var ChatSettings_Cache: String { return self._s[1732]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1733]! } - public var Media_ShareThisPhoto: String { return self._s[1734]! } - public var Chat_SlowmodeTooltipPending: String { return self._s[1735]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1736]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1737]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1738]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1739]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1740]! } - public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1741]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1736]! } + public var ScheduledMessages_EditTime: String { return self._s[1737]! } + public var Conversation_ClearSelfHistory: String { return self._s[1738]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1739]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1740]! } + public var Stickers_SuggestNone: String { return self._s[1741]! } + public var ChatSettings_Cache: String { return self._s[1742]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1743]! } + public var Media_ShareThisPhoto: String { return self._s[1744]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[1745]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1746]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1747]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1748]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1749]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1750]! } + public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1751]! } public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1742]!, self._r[1742]!, [_0]) - } - public var Permissions_CellularDataTitle_v0: String { return self._s[1743]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1745]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1746]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1747]! } - public var Map_OpenIn: String { return self._s[1748]! } - public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1751]!, self._r[1751]!, [_1]) - } - public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1752]!, self._r[1752]!, [_0]) } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1753]! } - public var MessagePoll_LabelClosed: String { return self._s[1754]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1756]! } - public var Wallet_Send_SendAnyway: String { return self._s[1757]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1758]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1759]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1760]! } - public var Map_SetThisPlace: String { return self._s[1761]! } - public var Login_SelectCountry_Title: String { return self._s[1762]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1763]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1753]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1755]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1756]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1757]! } + public var Map_OpenIn: String { return self._s[1758]! } + public var PeerInfo_ButtonCall: String { return self._s[1759]! } + public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1762]!, self._r[1762]!, [_1]) + } + public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1763]!, self._r[1763]!, [_0]) + } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1764]! } + public var MessagePoll_LabelClosed: String { return self._s[1765]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1767]! } + public var Wallet_Send_SendAnyway: String { return self._s[1768]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1769]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1770]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1771]! } + public var Map_SetThisPlace: String { return self._s[1772]! } + public var Login_SelectCountry_Title: String { return self._s[1773]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1774]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1764]!, self._r[1764]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1775]!, self._r[1775]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1765]! } - public var Watch_Suggestion_BRB: String { return self._s[1766]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1767]! } - public var Contacts_PermissionsTitle: String { return self._s[1768]! } - public var Conversation_RestrictedInline: String { return self._s[1769]! } - public var Appearance_RemoveThemeColor: String { return self._s[1771]! } - public var StickerPack_ViewPack: String { return self._s[1772]! } - public var Wallet_UnknownError: String { return self._s[1773]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1776]! } + public var Watch_Suggestion_BRB: String { return self._s[1777]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1778]! } + public var Contacts_PermissionsTitle: String { return self._s[1779]! } + public var Conversation_RestrictedInline: String { return self._s[1780]! } + public var Appearance_RemoveThemeColor: String { return self._s[1782]! } + public var StickerPack_ViewPack: String { return self._s[1783]! } + public var Wallet_UnknownError: String { return self._s[1784]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1774]!, self._r[1774]!, [_0]) + return formatWithArgumentRanges(self._s[1785]!, self._r[1785]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1776]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1779]! } - public var MessagePoll_LabelQuiz: String { return self._s[1781]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1782]! } - public var Channel_Info_Stickers: String { return self._s[1783]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1784]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1785]! } - public var Passport_DeletePersonalDetails: String { return self._s[1786]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1787]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1788]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1789]! } - public var Conversation_SearchNoResults: String { return self._s[1792]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1793]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1794]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1795]! } - public var Login_Code: String { return self._s[1796]! } - public var EditTheme_Create_BottomInfo: String { return self._s[1797]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1798]! } - public var Weekday_ShortThursday: String { return self._s[1799]! } - public var Resolve_ErrorNotFound: String { return self._s[1801]! } - public var LastSeen_Offline: String { return self._s[1802]! } - public var PeopleNearby_NoMembers: String { return self._s[1803]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1804]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1805]! } - public var GroupInfo_Title: String { return self._s[1807]! } - public var NotificationsSound_Note: String { return self._s[1808]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1809]! } - public var Watch_Message_Poll: String { return self._s[1810]! } - public var Privacy_Calls: String { return self._s[1811]! } + public var Compose_NewChannel: String { return self._s[1787]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1790]! } + public var MessagePoll_LabelQuiz: String { return self._s[1792]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1793]! } + public var Channel_Info_Stickers: String { return self._s[1794]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1795]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1796]! } + public var Passport_DeletePersonalDetails: String { return self._s[1797]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1798]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1799]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1800]! } + public var Conversation_SearchNoResults: String { return self._s[1803]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1804]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1805]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1806]! } + public var Login_Code: String { return self._s[1807]! } + public var EditTheme_Create_BottomInfo: String { return self._s[1808]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1809]! } + public var Weekday_ShortThursday: String { return self._s[1810]! } + public var Resolve_ErrorNotFound: String { return self._s[1812]! } + public var LastSeen_Offline: String { return self._s[1813]! } + public var PeopleNearby_NoMembers: String { return self._s[1814]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1815]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1816]! } + public var GroupInfo_Title: String { return self._s[1818]! } + public var NotificationsSound_Note: String { return self._s[1819]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1820]! } + public var Watch_Message_Poll: String { return self._s[1821]! } + public var Privacy_Calls: String { return self._s[1822]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1812]!, self._r[1812]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1823]!, self._r[1823]!, [_1, _2, _3]) } - public var Month_ShortAugust: String { return self._s[1813]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1814]! } - public var Notifications_Reset: String { return self._s[1815]! } - public var Conversation_Pin: String { return self._s[1816]! } - public var Passport_Language_lv: String { return self._s[1817]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1818]! } - public var BlockedUsers_Info: String { return self._s[1819]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1821]! } - public var Watch_Conversation_Unblock: String { return self._s[1823]! } + public var Month_ShortAugust: String { return self._s[1824]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1825]! } + public var Notifications_Reset: String { return self._s[1826]! } + public var Conversation_Pin: String { return self._s[1827]! } + public var Passport_Language_lv: String { return self._s[1828]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1829]! } + public var BlockedUsers_Info: String { return self._s[1830]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1832]! } + public var Watch_Conversation_Unblock: String { return self._s[1834]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1824]!, self._r[1824]!, [_0]) + return formatWithArgumentRanges(self._s[1835]!, self._r[1835]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1825]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1826]! } + public var CloudStorage_Title: String { return self._s[1836]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1837]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1827]!, self._r[1827]!, [_0]) + return formatWithArgumentRanges(self._s[1838]!, self._r[1838]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1828]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1829]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1830]! } - public var Passport_Address_EditBankStatement: String { return self._s[1831]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1839]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1840]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1841]! } + public var Passport_Address_EditBankStatement: String { return self._s[1842]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1832]!, self._r[1832]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1843]!, self._r[1843]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1833]! } - public var ShareMenu_Comment: String { return self._s[1834]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1835]! } - public var Notifications_PermissionsTitle: String { return self._s[1836]! } - public var GroupPermission_NoSendLinks: String { return self._s[1837]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1838]! } - public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1839]! } - public var Settings_Support: String { return self._s[1840]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1841]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1842]! } - public var Privacy_Forwards_Preview: String { return self._s[1843]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1844]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1845]! } - public var Common_Select: String { return self._s[1847]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1848]! } - public var WallpaperSearch_ColorGray: String { return self._s[1851]! } - public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1852]! } - public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1853]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1854]! } - public var PollResults_Title: String { return self._s[1855]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1856]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1857]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1858]! } - public var Widget_AuthRequired: String { return self._s[1859]! } - public var Camera_FlashOn: String { return self._s[1860]! } - public var Conversation_ContextMenuLookUp: String { return self._s[1861]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1862]! } - public var Watch_Suggestion_OK: String { return self._s[1863]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1844]! } + public var ShareMenu_Comment: String { return self._s[1845]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1846]! } + public var Notifications_PermissionsTitle: String { return self._s[1847]! } + public var GroupPermission_NoSendLinks: String { return self._s[1848]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1849]! } + public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1850]! } + public var Settings_Support: String { return self._s[1851]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1852]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1853]! } + public var Privacy_Forwards_Preview: String { return self._s[1854]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1855]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1856]! } + public var Common_Select: String { return self._s[1858]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1859]! } + public var WallpaperSearch_ColorGray: String { return self._s[1862]! } + public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1863]! } + public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1864]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1865]! } + public var PollResults_Title: String { return self._s[1866]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1867]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1868]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1869]! } + public var Widget_AuthRequired: String { return self._s[1870]! } + public var Camera_FlashOn: String { return self._s[1871]! } + public var Conversation_ContextMenuLookUp: String { return self._s[1872]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1873]! } + public var Watch_Suggestion_OK: String { return self._s[1874]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1865]!, self._r[1865]!, [_0]) + return formatWithArgumentRanges(self._s[1876]!, self._r[1876]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1867]!, self._r[1867]!, [_0]) + return formatWithArgumentRanges(self._s[1878]!, self._r[1878]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1868]! } - public var DialogList_AdLabel: String { return self._s[1869]! } - public var WatchRemote_NotificationText: String { return self._s[1870]! } - public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1871]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1872]! } - public var Conversation_ReportSpam: String { return self._s[1873]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1874]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1876]! } - public var PhoneLabel_Title: String { return self._s[1877]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1878]! } - public var Settings_ChangePhoneNumber: String { return self._s[1879]! } - public var Notifications_ExceptionsTitle: String { return self._s[1880]! } - public var Notifications_AlertTones: String { return self._s[1881]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1882]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1883]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1884]! } - public var VoiceOver_Chat_Photo: String { return self._s[1886]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1887]! } - public var ReportPeer_ReasonOther: String { return self._s[1888]! } - public var ChatList_Context_JoinChannel: String { return self._s[1889]! } - public var KeyCommand_ScrollDown: String { return self._s[1891]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[1892]! } + public var TextFormat_Strikethrough: String { return self._s[1879]! } + public var DialogList_AdLabel: String { return self._s[1880]! } + public var WatchRemote_NotificationText: String { return self._s[1881]! } + public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1882]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1883]! } + public var Conversation_ReportSpam: String { return self._s[1884]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1885]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1887]! } + public var PhoneLabel_Title: String { return self._s[1888]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1889]! } + public var Settings_ChangePhoneNumber: String { return self._s[1890]! } + public var Notifications_ExceptionsTitle: String { return self._s[1891]! } + public var Notifications_AlertTones: String { return self._s[1892]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1893]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1894]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1895]! } + public var VoiceOver_Chat_Photo: String { return self._s[1897]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1898]! } + public var ReportPeer_ReasonOther: String { return self._s[1899]! } + public var ChatList_Context_JoinChannel: String { return self._s[1900]! } + public var KeyCommand_ScrollDown: String { return self._s[1902]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[1903]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1893]!, self._r[1893]!, [_0]) + return formatWithArgumentRanges(self._s[1904]!, self._r[1904]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1894]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1895]! } - public var AuthSessions_LogOut: String { return self._s[1896]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1897]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1898]! } - public var Passport_Phone_Title: String { return self._s[1899]! } - public var ContactList_Context_StartSecretChat: String { return self._s[1900]! } - public var Settings_PhoneNumber: String { return self._s[1901]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1905]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1906]! } + public var AuthSessions_LogOut: String { return self._s[1907]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1908]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1909]! } + public var Passport_Phone_Title: String { return self._s[1910]! } + public var ContactList_Context_StartSecretChat: String { return self._s[1911]! } + public var Settings_PhoneNumber: String { return self._s[1912]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1902]!, self._r[1902]!, [_0]) + return formatWithArgumentRanges(self._s[1913]!, self._r[1913]!, [_0]) } - public var NotificationsSound_Alert: String { return self._s[1904]! } - public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1905]! } - public var WebSearch_SearchNoResults: String { return self._s[1906]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1908]! } - public var Wallet_Configuration_SourceInfo: String { return self._s[1909]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1910]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1911]! } - public var PhotoEditor_CurvesTool: String { return self._s[1912]! } - public var Checkout_PaymentMethod: String { return self._s[1914]! } + public var NotificationsSound_Alert: String { return self._s[1915]! } + public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1916]! } + public var WebSearch_SearchNoResults: String { return self._s[1917]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1919]! } + public var Wallet_Configuration_SourceInfo: String { return self._s[1920]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1921]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1922]! } + public var PhotoEditor_CurvesTool: String { return self._s[1923]! } + public var Checkout_PaymentMethod: String { return self._s[1925]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1915]!, self._r[1915]!, [_1, _2]) - } - public var Contacts_AccessDeniedError: String { return self._s[1916]! } - public var Camera_PhotoMode: String { return self._s[1919]! } - public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1920]! } - public var Appearance_TextSize_Apply: String { return self._s[1921]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1923]! } - public var CallSettings_OnMobile: String { return self._s[1924]! } - public var Tour_Text2: String { return self._s[1925]! } - public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1926]!, self._r[1926]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1928]! } - public var Permissions_Skip: String { return self._s[1929]! } - public var Wallet_Words_NotDoneOk: String { return self._s[1930]! } - public var SecretImage_Title: String { return self._s[1931]! } - public var Watch_MessageView_Title: String { return self._s[1932]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1933]! } - public var AttachmentMenu_Poll: String { return self._s[1934]! } + public var Contacts_AccessDeniedError: String { return self._s[1927]! } + public var Camera_PhotoMode: String { return self._s[1930]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1931]! } + public var Appearance_TextSize_Apply: String { return self._s[1932]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1934]! } + public var CallSettings_OnMobile: String { return self._s[1935]! } + public var Tour_Text2: String { return self._s[1936]! } + public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1937]!, self._r[1937]!, [_1, _2]) + } + public var DialogList_EncryptionProcessing: String { return self._s[1939]! } + public var Permissions_Skip: String { return self._s[1940]! } + public var Wallet_Words_NotDoneOk: String { return self._s[1941]! } + public var SecretImage_Title: String { return self._s[1942]! } + public var Watch_MessageView_Title: String { return self._s[1943]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1944]! } + public var AttachmentMenu_Poll: String { return self._s[1945]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1935]!, self._r[1935]!, [_0]) + return formatWithArgumentRanges(self._s[1946]!, self._r[1946]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1936]!, self._r[1936]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1947]!, self._r[1947]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1937]! } - public var WallpaperPreview_Title: String { return self._s[1938]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1939]! } - public var Settings_ProxyConnecting: String { return self._s[1940]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1942]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[1943]! } - public var Wallet_Intro_Title: String { return self._s[1944]! } - public var TwoFactorSetup_Password_Action: String { return self._s[1945]! } - public var Profile_MessageLifetime5s: String { return self._s[1946]! } - public var Username_InvalidCharacters: String { return self._s[1947]! } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1948]! } - public var ScheduledMessages_ClearAll: String { return self._s[1949]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1950]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1951]! } - public var Settings_AddAccount: String { return self._s[1952]! } - public var Notification_CreatedChannel: String { return self._s[1955]! } + public var Notification_CallCanceled: String { return self._s[1948]! } + public var WallpaperPreview_Title: String { return self._s[1949]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1950]! } + public var Settings_ProxyConnecting: String { return self._s[1951]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1953]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[1954]! } + public var Wallet_Intro_Title: String { return self._s[1955]! } + public var TwoFactorSetup_Password_Action: String { return self._s[1956]! } + public var Profile_MessageLifetime5s: String { return self._s[1957]! } + public var Username_InvalidCharacters: String { return self._s[1958]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1959]! } + public var ScheduledMessages_ClearAll: String { return self._s[1960]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1961]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1962]! } + public var Settings_AddAccount: String { return self._s[1963]! } + public var Notification_CreatedChannel: String { return self._s[1966]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1956]!, self._r[1956]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1967]!, self._r[1967]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1958]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1959]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[1960]! } - public var Contacts_TopSection: String { return self._s[1961]! } - public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1962]! } + public var Passcode_AppLockedAlert: String { return self._s[1969]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1970]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[1971]! } + public var Contacts_TopSection: String { return self._s[1972]! } + public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1973]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1963]!, self._r[1963]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1974]!, self._r[1974]!, [_0, _1]) } - public var Wallet_Info_Receive: String { return self._s[1964]! } - public var Wallet_Completed_ViewWallet: String { return self._s[1965]! } + public var Wallet_Info_Receive: String { return self._s[1975]! } + public var Wallet_Completed_ViewWallet: String { return self._s[1976]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1966]!, self._r[1966]!, [_0]) + return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1967]! } - public var UserInfo_TapToCall: String { return self._s[1968]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1970]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1971]! } - public var Common_Search: String { return self._s[1972]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1973]! } + public var ReportPeer_ReasonSpam: String { return self._s[1978]! } + public var UserInfo_TapToCall: String { return self._s[1979]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1981]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1982]! } + public var Common_Search: String { return self._s[1983]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1984]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1974]!, self._r[1974]!, [_0]) + return formatWithArgumentRanges(self._s[1985]!, self._r[1985]!, [_0]) } - public var Wallet_Month_ShortJuly: String { return self._s[1975]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1977]! } - public var Message_InvoiceLabel: String { return self._s[1978]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1979]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1980]! } + public var Wallet_Month_ShortJuly: String { return self._s[1986]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1988]! } + public var Message_InvoiceLabel: String { return self._s[1989]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1990]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1991]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1981]!, self._r[1981]!, [_0]) + return formatWithArgumentRanges(self._s[1992]!, self._r[1992]!, [_0]) } - public var IntentsSettings_Reset: String { return self._s[1982]! } - public var Conversation_Info: String { return self._s[1983]! } - public var Login_InfoDeletePhoto: String { return self._s[1984]! } - public var Passport_Language_vi: String { return self._s[1986]! } - public var UserInfo_ScamUserWarning: String { return self._s[1987]! } - public var Conversation_Search: String { return self._s[1988]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1990]! } - public var ReportPeer_ReasonPornography: String { return self._s[1991]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1992]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1993]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1994]! } - public var Channel_Setup_TypeHeader: String { return self._s[1995]! } - public var AuthSessions_LoggedIn: String { return self._s[1996]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1997]! } - public var Login_SmsRequestState3: String { return self._s[1998]! } - public var Passport_Address_EditUtilityBill: String { return self._s[1999]! } - public var Appearance_ReduceMotionInfo: String { return self._s[2000]! } - public var Join_ChannelsTooMuch: String { return self._s[2001]! } - public var Channel_Edit_LinkItem: String { return self._s[2002]! } - public var Privacy_Calls_P2PNever: String { return self._s[2003]! } - public var Conversation_AddToReadingList: String { return self._s[2005]! } - public var Share_MultipleMessagesDisabled: String { return self._s[2006]! } - public var Message_Animation: String { return self._s[2007]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[2008]! } - public var Map_Unknown: String { return self._s[2009]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[2010]! } + public var IntentsSettings_Reset: String { return self._s[1993]! } + public var Conversation_Info: String { return self._s[1994]! } + public var Login_InfoDeletePhoto: String { return self._s[1995]! } + public var Passport_Language_vi: String { return self._s[1997]! } + public var UserInfo_ScamUserWarning: String { return self._s[1998]! } + public var Conversation_Search: String { return self._s[1999]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[2001]! } + public var ReportPeer_ReasonPornography: String { return self._s[2002]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[2003]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[2004]! } + public var Map_LiveLocationGroupDescription: String { return self._s[2005]! } + public var Channel_Setup_TypeHeader: String { return self._s[2006]! } + public var AuthSessions_LoggedIn: String { return self._s[2007]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2008]! } + public var Login_SmsRequestState3: String { return self._s[2009]! } + public var Passport_Address_EditUtilityBill: String { return self._s[2010]! } + public var Appearance_ReduceMotionInfo: String { return self._s[2011]! } + public var Join_ChannelsTooMuch: String { return self._s[2012]! } + public var Channel_Edit_LinkItem: String { return self._s[2013]! } + public var Privacy_Calls_P2PNever: String { return self._s[2014]! } + public var Conversation_AddToReadingList: String { return self._s[2016]! } + public var Share_MultipleMessagesDisabled: String { return self._s[2017]! } + public var Message_Animation: String { return self._s[2018]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[2019]! } + public var Map_Unknown: String { return self._s[2020]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[2021]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2011]!, self._r[2011]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2022]!, self._r[2022]!, [_1, _2]) } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2012]!, self._r[2012]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2023]!, self._r[2023]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[2013]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[2014]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2015]! } + public var Call_StatusRequesting: String { return self._s[2024]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[2025]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2026]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2016]!, self._r[2016]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2027]!, self._r[2027]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2017]!, self._r[2017]!, [_0]) + return formatWithArgumentRanges(self._s[2028]!, self._r[2028]!, [_0]) } - public var Update_Skip: String { return self._s[2018]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2019]! } - public var BlockedUsers_Title: String { return self._s[2020]! } - public var Weekday_Monday: String { return self._s[2021]! } + public var Update_Skip: String { return self._s[2029]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2030]! } + public var BlockedUsers_Title: String { return self._s[2031]! } + public var Weekday_Monday: String { return self._s[2032]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2022]!, self._r[2022]!, [_1]) + return formatWithArgumentRanges(self._s[2033]!, self._r[2033]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[2023]! } - public var NotificationsSound_Bell: String { return self._s[2024]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[2025]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2026]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2027]! } - public var ChatSettings_Groups: String { return self._s[2028]! } - public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2029]! } + public var Username_CheckingUsername: String { return self._s[2034]! } + public var NotificationsSound_Bell: String { return self._s[2035]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[2036]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2037]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2038]! } + public var ChatSettings_Groups: String { return self._s[2039]! } + public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2040]! } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2030]!, self._r[2030]!, [_0]) + return formatWithArgumentRanges(self._s[2041]!, self._r[2041]!, [_0]) } - public var Your_card_was_declined: String { return self._s[2031]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2033]! } - public var Wallet_Month_ShortApril: String { return self._s[2034]! } - public var ChatList_Unmute: String { return self._s[2035]! } - public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2036]! } - public var PhotoEditor_CurvesAll: String { return self._s[2037]! } - public var Weekday_ShortTuesday: String { return self._s[2038]! } - public var DialogList_Read: String { return self._s[2039]! } - public var Appearance_AppIconClassic: String { return self._s[2040]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2041]! } - public var Passport_Identity_Gender: String { return self._s[2042]! } + public var Your_card_was_declined: String { return self._s[2042]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2044]! } + public var Wallet_Month_ShortApril: String { return self._s[2045]! } + public var ChatList_Unmute: String { return self._s[2046]! } + public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2047]! } + public var PhotoEditor_CurvesAll: String { return self._s[2048]! } + public var Weekday_ShortTuesday: String { return self._s[2049]! } + public var DialogList_Read: String { return self._s[2050]! } + public var Appearance_AppIconClassic: String { return self._s[2051]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2052]! } + public var Passport_Identity_Gender: String { return self._s[2053]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2043]!, self._r[2043]!, [_0]) + return formatWithArgumentRanges(self._s[2054]!, self._r[2054]!, [_0]) } - public var Target_SelectGroup: String { return self._s[2044]! } - public var Map_HomeAndWorkInfo: String { return self._s[2046]! } + public var Target_SelectGroup: String { return self._s[2055]! } + public var Map_HomeAndWorkInfo: String { return self._s[2057]! } public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, [_0]) + return formatWithArgumentRanges(self._s[2058]!, self._r[2058]!, [_0]) } - public var Passport_Language_en: String { return self._s[2048]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2049]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2050]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[2051]! } - public var ScheduledMessages_SendNow: String { return self._s[2052]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[2054]! } - public var Login_InfoHelp: String { return self._s[2055]! } - public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2056]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2057]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2058]! } + public var Passport_Language_en: String { return self._s[2059]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2060]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2061]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[2062]! } + public var ScheduledMessages_SendNow: String { return self._s[2063]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[2065]! } + public var Login_InfoHelp: String { return self._s[2066]! } + public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2067]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2068]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2069]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2059]!, self._r[2059]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2070]!, self._r[2070]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[2062]! } - public var CreatePoll_Title: String { return self._s[2063]! } - public var MessagePoll_QuizNoUsers: String { return self._s[2064]! } - public var Conversation_ViewTheme: String { return self._s[2065]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2066]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2067]! } - public var TwoFactorSetup_Intro_Text: String { return self._s[2068]! } - public var UserInfo_GroupsInCommon: String { return self._s[2069]! } - public var TelegramWallet_Intro_TermsUrl: String { return self._s[2070]! } - public var Call_AudioRouteHide: String { return self._s[2071]! } + public var SocksProxySetup_AddProxy: String { return self._s[2073]! } + public var CreatePoll_Title: String { return self._s[2074]! } + public var MessagePoll_QuizNoUsers: String { return self._s[2075]! } + public var Conversation_ViewTheme: String { return self._s[2076]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2077]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2078]! } + public var TwoFactorSetup_Intro_Text: String { return self._s[2079]! } + public var UserInfo_GroupsInCommon: String { return self._s[2080]! } + public var TelegramWallet_Intro_TermsUrl: String { return self._s[2081]! } + public var Call_AudioRouteHide: String { return self._s[2082]! } public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2073]!, self._r[2073]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2084]!, self._r[2084]!, [_1, _2]) } - public var ContactInfo_PhoneLabelMobile: String { return self._s[2074]! } - public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2075]! } - public var CreatePoll_QuizOptionsHeader: String { return self._s[2076]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[2085]! } + public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2086]! } + public var CreatePoll_QuizOptionsHeader: String { return self._s[2087]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2077]!, self._r[2077]!, [_0]) + return formatWithArgumentRanges(self._s[2088]!, self._r[2088]!, [_0]) } - public var TextFormat_Bold: String { return self._s[2078]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[2079]! } - public var StickerPackActionInfo_AddedTitle: String { return self._s[2080]! } - public var Notifications_Title: String { return self._s[2081]! } - public var Group_Username_InvalidTooShort: String { return self._s[2082]! } - public var Channel_ErrorAddTooMuch: String { return self._s[2083]! } + public var TextFormat_Bold: String { return self._s[2089]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[2090]! } + public var StickerPackActionInfo_AddedTitle: String { return self._s[2091]! } + public var Notifications_Title: String { return self._s[2092]! } + public var Group_Username_InvalidTooShort: String { return self._s[2093]! } + public var Channel_ErrorAddTooMuch: String { return self._s[2094]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2084]!, self._r[2084]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2095]!, self._r[2095]!, ["\(_0)"]) } - public var VoiceOver_DiscardPreparedContent: String { return self._s[2086]! } - public var Stickers_SuggestAdded: String { return self._s[2087]! } - public var Login_CountryCode: String { return self._s[2088]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[2089]! } - public var Map_GetDirections: String { return self._s[2090]! } - public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2091]! } - public var Login_PhoneFloodError: String { return self._s[2092]! } + public var VoiceOver_DiscardPreparedContent: String { return self._s[2097]! } + public var Stickers_SuggestAdded: String { return self._s[2098]! } + public var Login_CountryCode: String { return self._s[2099]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[2100]! } + public var Map_GetDirections: String { return self._s[2101]! } + public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2102]! } + public var Login_PhoneFloodError: String { return self._s[2103]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2093]!, self._r[2093]!, [_0]) + return formatWithArgumentRanges(self._s[2104]!, self._r[2104]!, [_0]) } public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2094]!, self._r[2094]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2105]!, self._r[2105]!, [_1, _2, _3]) } - public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2095]! } - public var Settings_SetUsername: String { return self._s[2097]! } - public var Group_Location_ChangeLocation: String { return self._s[2098]! } - public var Notification_GroupInviterSelf: String { return self._s[2099]! } - public var InstantPage_TapToOpenLink: String { return self._s[2100]! } + public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2106]! } + public var Settings_SetUsername: String { return self._s[2108]! } + public var Group_Location_ChangeLocation: String { return self._s[2109]! } + public var Notification_GroupInviterSelf: String { return self._s[2110]! } + public var InstantPage_TapToOpenLink: String { return self._s[2111]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2101]!, self._r[2101]!, [_0]) + return formatWithArgumentRanges(self._s[2112]!, self._r[2112]!, [_0]) } - public var Watch_Suggestion_TalkLater: String { return self._s[2102]! } - public var SecretChat_Title: String { return self._s[2103]! } - public var Group_UpgradeNoticeText1: String { return self._s[2104]! } - public var AuthSessions_Title: String { return self._s[2105]! } + public var Watch_Suggestion_TalkLater: String { return self._s[2113]! } + public var SecretChat_Title: String { return self._s[2114]! } + public var Group_UpgradeNoticeText1: String { return self._s[2115]! } + public var AuthSessions_Title: String { return self._s[2116]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2106]!, self._r[2106]!, [_0]) + return formatWithArgumentRanges(self._s[2117]!, self._r[2117]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[2107]! } - public var Channel_About_Title: String { return self._s[2108]! } - public var Theme_ThemeChanged: String { return self._s[2109]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[2110]! } + public var PhotoEditor_CropAuto: String { return self._s[2118]! } + public var Channel_About_Title: String { return self._s[2119]! } + public var Theme_ThemeChanged: String { return self._s[2120]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[2121]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2112]!, self._r[2112]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2123]!, self._r[2123]!, ["\(_0)"]) } - public var VoiceOver_MessageContextReport: String { return self._s[2113]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2115]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[2116]! } + public var VoiceOver_MessageContextReport: String { return self._s[2124]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2126]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[2127]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2117]!, self._r[2117]!, [_1]) + return formatWithArgumentRanges(self._s[2128]!, self._r[2128]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2119]!, self._r[2119]!, [_0]) + return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_0]) } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_0]) + return formatWithArgumentRanges(self._s[2131]!, self._r[2131]!, [_0]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[2121]! } - public var Presence_online: String { return self._s[2124]! } - public var PasscodeSettings_Title: String { return self._s[2125]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2126]! } - public var Web_OpenExternal: String { return self._s[2127]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[2129]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2130]! } - public var LocalGroup_Title: String { return self._s[2131]! } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[2132]! } + public var PeopleNearby_DiscoverDescription: String { return self._s[2134]! } + public var Presence_online: String { return self._s[2136]! } + public var PasscodeSettings_Title: String { return self._s[2137]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2138]! } + public var Web_OpenExternal: String { return self._s[2139]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[2141]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2142]! } + public var LocalGroup_Title: String { return self._s[2143]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2132]!, self._r[2132]!, [_0]) + return formatWithArgumentRanges(self._s[2144]!, self._r[2144]!, [_0]) } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2133]! } - public var Conversation_StopQuizConfirmation: String { return self._s[2134]! } - public var Map_YouAreHere: String { return self._s[2135]! } + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2145]! } + public var Conversation_StopQuizConfirmation: String { return self._s[2146]! } + public var Map_YouAreHere: String { return self._s[2147]! } public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_0]) + return formatWithArgumentRanges(self._s[2148]!, self._r[2148]!, [_0]) } public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_0]) + return formatWithArgumentRanges(self._s[2149]!, self._r[2149]!, [_0]) } - public var Theme_Context_ChangeColors: String { return self._s[2138]! } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2139]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2140]! } + public var Theme_Context_ChangeColors: String { return self._s[2150]! } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2151]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2152]! } public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2141]!, self._r[2141]!, [_0]) + return formatWithArgumentRanges(self._s[2153]!, self._r[2153]!, [_0]) } public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2142]!, self._r[2142]!, [_0]) + return formatWithArgumentRanges(self._s[2154]!, self._r[2154]!, [_0]) } - public var SocksProxySetup_Username: String { return self._s[2143]! } - public var Bot_Start: String { return self._s[2144]! } + public var SocksProxySetup_Username: String { return self._s[2155]! } + public var Bot_Start: String { return self._s[2156]! } public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2145]!, self._r[2145]!, [_0]) + return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_0]) } public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2146]!, self._r[2146]!, [_0]) + return formatWithArgumentRanges(self._s[2158]!, self._r[2158]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[2147]! } - public var AccentColor_Title: String { return self._s[2149]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2150]! } + public var Contacts_SortByPresence: String { return self._s[2159]! } + public var AccentColor_Title: String { return self._s[2161]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2162]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2163]!, self._r[2163]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2152]!, self._r[2152]!, [_0]) + return formatWithArgumentRanges(self._s[2164]!, self._r[2164]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2153]!, self._r[2153]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2165]!, self._r[2165]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[2154]! } - public var Login_InfoAvatarPhoto: String { return self._s[2155]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2156]! } - public var Tour_Title4: String { return self._s[2157]! } - public var Passport_Identity_Translation: String { return self._s[2158]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2159]! } - public var Login_TermsOfServiceLabel: String { return self._s[2161]! } - public var Passport_Language_it: String { return self._s[2162]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2163]! } - public var Passport_Identity_SelfieHelp: String { return self._s[2164]! } - public var Conversation_ClearAll: String { return self._s[2166]! } - public var Wallet_Send_UninitializedText: String { return self._s[2168]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[2169]! } - public var TwoStepAuth_FloodError: String { return self._s[2170]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[2166]! } + public var Login_InfoAvatarPhoto: String { return self._s[2167]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2168]! } + public var Tour_Title4: String { return self._s[2169]! } + public var Passport_Identity_Translation: String { return self._s[2170]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2171]! } + public var Login_TermsOfServiceLabel: String { return self._s[2173]! } + public var Passport_Language_it: String { return self._s[2174]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2175]! } + public var Passport_Identity_SelfieHelp: String { return self._s[2176]! } + public var Conversation_ClearAll: String { return self._s[2178]! } + public var Wallet_Send_UninitializedText: String { return self._s[2180]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[2181]! } + public var TwoStepAuth_FloodError: String { return self._s[2182]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2171]!, self._r[2171]!, [_1]) + return formatWithArgumentRanges(self._s[2183]!, self._r[2183]!, [_1]) } - public var Paint_Delete: String { return self._s[2172]! } + public var Paint_Delete: String { return self._s[2184]! } public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2173]!, self._r[2173]!, [_0]) + return formatWithArgumentRanges(self._s[2185]!, self._r[2185]!, [_0]) } - public var Privacy_AddNewPeer: String { return self._s[2174]! } + public var Privacy_AddNewPeer: String { return self._s[2186]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2175]!, self._r[2175]!, [_1]) + return formatWithArgumentRanges(self._s[2187]!, self._r[2187]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[2176]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[2188]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2189]!, self._r[2189]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[2178]! } + public var Message_PinnedAudioMessage: String { return self._s[2190]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2179]!, self._r[2179]!, [_0]) + return formatWithArgumentRanges(self._s[2191]!, self._r[2191]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[2180]! } - public var Notifications_GroupNotificationsSound: String { return self._s[2181]! } - public var Wallet_Month_GenNovember: String { return self._s[2182]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[2183]! } - public var Conversation_MessageEditedLabel: String { return self._s[2184]! } + public var Notification_Mute1hMin: String { return self._s[2192]! } + public var Notifications_GroupNotificationsSound: String { return self._s[2193]! } + public var Wallet_Month_GenNovember: String { return self._s[2194]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[2195]! } + public var Conversation_MessageEditedLabel: String { return self._s[2196]! } public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2185]!, self._r[2185]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_0, _1]) } - public var Notification_Exceptions_AlwaysOff: String { return self._s[2186]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2187]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[2198]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2199]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2188]!, self._r[2188]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[2200]!, self._r[2200]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[2189]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[2201]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2190]!, self._r[2190]!, [_1]) + return formatWithArgumentRanges(self._s[2202]!, self._r[2202]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[2191]! } - public var Month_GenOctober: String { return self._s[2192]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2193]! } - public var EnterPasscode_EnterPasscode: String { return self._s[2194]! } - public var MediaPicker_TimerTooltip: String { return self._s[2196]! } - public var SharedMedia_TitleAll: String { return self._s[2197]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2200]! } - public var Conversation_RestrictedMedia: String { return self._s[2201]! } - public var AccessDenied_PhotosRestricted: String { return self._s[2202]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2204]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2205]! } + public var AccessDenied_LocationTracking: String { return self._s[2203]! } + public var Month_GenOctober: String { return self._s[2204]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2205]! } + public var EnterPasscode_EnterPasscode: String { return self._s[2206]! } + public var MediaPicker_TimerTooltip: String { return self._s[2208]! } + public var SharedMedia_TitleAll: String { return self._s[2209]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2212]! } + public var Conversation_RestrictedMedia: String { return self._s[2213]! } + public var AccessDenied_PhotosRestricted: String { return self._s[2214]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2216]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2217]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2206]!, self._r[2206]!, [_0]) + return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[2209]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[2211]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2212]! } + public var Conversation_SavedMessages: String { return self._s[2221]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[2223]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2224]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2214]!, self._r[2214]!, [_0]) + return formatWithArgumentRanges(self._s[2226]!, self._r[2226]!, [_0]) } - public var VoiceOver_Chat_YourMessage: String { return self._s[2215]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2227]! } public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2216]!, self._r[2216]!, [_0]) + return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[2217]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2218]! } + public var ReportPeer_AlertSuccess: String { return self._s[2229]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2230]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2219]!, self._r[2219]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2231]!, self._r[2231]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[2220]! } - public var PhotoEditor_FadeTool: String { return self._s[2221]! } - public var Privacy_ContactsReset: String { return self._s[2222]! } + public var Checkout_PasswordEntry_Title: String { return self._s[2232]! } + public var PhotoEditor_FadeTool: String { return self._s[2233]! } + public var Privacy_ContactsReset: String { return self._s[2234]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2224]!, self._r[2224]!, [_0]) + return formatWithArgumentRanges(self._s[2236]!, self._r[2236]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[2225]! } - public var ChatList_Mute: String { return self._s[2226]! } + public var Message_PinnedVideoMessage: String { return self._s[2237]! } + public var ChatList_Mute: String { return self._s[2238]! } public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2227]!, self._r[2227]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2239]!, self._r[2239]!, [_1, _2, _3]) } - public var Permissions_CellularDataText_v0: String { return self._s[2228]! } - public var Conversation_PinnedQuiz: String { return self._s[2230]! } - public var ShareMenu_SelectChats: String { return self._s[2232]! } - public var ChatList_Context_Unarchive: String { return self._s[2233]! } - public var MusicPlayer_VoiceNote: String { return self._s[2234]! } - public var Conversation_RestrictedText: String { return self._s[2235]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2236]! } - public var Wallet_Month_GenApril: String { return self._s[2237]! } - public var Wallet_Month_ShortMarch: String { return self._s[2238]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[2239]! } - public var Cache_Videos: String { return self._s[2240]! } - public var PrivacySettings_PhoneNumber: String { return self._s[2241]! } - public var Wallet_Month_GenFebruary: String { return self._s[2242]! } - public var FeatureDisabled_Oops: String { return self._s[2244]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[2245]! } + public var Permissions_CellularDataText_v0: String { return self._s[2240]! } + public var Conversation_PinnedQuiz: String { return self._s[2242]! } + public var ShareMenu_SelectChats: String { return self._s[2244]! } + public var ChatList_Context_Unarchive: String { return self._s[2245]! } + public var MusicPlayer_VoiceNote: String { return self._s[2246]! } + public var Conversation_RestrictedText: String { return self._s[2247]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2248]! } + public var Wallet_Month_GenApril: String { return self._s[2249]! } + public var Wallet_Month_ShortMarch: String { return self._s[2250]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[2251]! } + public var Cache_Videos: String { return self._s[2252]! } + public var PrivacySettings_PhoneNumber: String { return self._s[2253]! } + public var Wallet_Month_GenFebruary: String { return self._s[2254]! } + public var FeatureDisabled_Oops: String { return self._s[2256]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[2257]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2246]!, self._r[2246]!, [_0]) + return formatWithArgumentRanges(self._s[2258]!, self._r[2258]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[2247]! } - public var GroupPermission_NoSendPolls: String { return self._s[2248]! } - public var Wallet_Qr_ScanCode: String { return self._s[2249]! } - public var Message_VideoExpired: String { return self._s[2251]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[2252]! } - public var Notifications_Badge: String { return self._s[2253]! } - public var Wallet_Receive_AddressCopied: String { return self._s[2254]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[2255]! } - public var Username_InvalidTooShort: String { return self._s[2256]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2257]! } - public var Channel_AdminLog_PinMessages: String { return self._s[2258]! } - public var ArchivedChats_IntroTitle3: String { return self._s[2259]! } + public var Stickers_GroupStickersHelp: String { return self._s[2260]! } + public var GroupPermission_NoSendPolls: String { return self._s[2261]! } + public var Wallet_Qr_ScanCode: String { return self._s[2262]! } + public var Message_VideoExpired: String { return self._s[2264]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2265]! } + public var Notifications_Badge: String { return self._s[2266]! } + public var Wallet_Receive_AddressCopied: String { return self._s[2267]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2268]! } + public var Username_InvalidTooShort: String { return self._s[2269]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2270]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2271]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2272]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2260]!, self._r[2260]!, [_1]) + return formatWithArgumentRanges(self._s[2273]!, self._r[2273]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[2261]! } - public var Conversation_DefaultRestrictedText: String { return self._s[2262]! } - public var SharedMedia_CategoryDocs: String { return self._s[2265]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2274]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2275]! } + public var SharedMedia_CategoryDocs: String { return self._s[2278]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2266]!, self._r[2266]!, [_1]) + return formatWithArgumentRanges(self._s[2279]!, self._r[2279]!, [_1]) } - public var Wallet_Send_UninitializedTitle: String { return self._s[2267]! } - public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2268]! } - public var Privacy_Forwards_NeverLink: String { return self._s[2270]! } + public var Wallet_Send_UninitializedTitle: String { return self._s[2280]! } + public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2281]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2283]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2271]!, self._r[2271]!, [_1]) + return formatWithArgumentRanges(self._s[2284]!, self._r[2284]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2272]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2285]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2273]!, self._r[2273]!, [_0]) + return formatWithArgumentRanges(self._s[2286]!, self._r[2286]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2274]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2275]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2276]! } - public var Channel_UpdatePhotoItem: String { return self._s[2277]! } - public var GroupInfo_LeftStatus: String { return self._s[2278]! } - public var Watch_MessageView_Forward: String { return self._s[2280]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2281]! } - public var Cache_ClearEmpty: String { return self._s[2283]! } - public var Localization_LanguageName: String { return self._s[2284]! } - public var Wallet_AccessDenied_Title: String { return self._s[2285]! } - public var WebSearch_GIFs: String { return self._s[2286]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2287]! } - public var Wallet_AccessDenied_Settings: String { return self._s[2288]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2289]! } - public var Common_Back: String { return self._s[2290]! } - public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2291]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2292]! } - public var Wallet_Send_Send: String { return self._s[2293]! } + public var ChatSettings_PrivateChats: String { return self._s[2287]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2288]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2289]! } + public var Channel_UpdatePhotoItem: String { return self._s[2290]! } + public var GroupInfo_LeftStatus: String { return self._s[2291]! } + public var Watch_MessageView_Forward: String { return self._s[2293]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2294]! } + public var Cache_ClearEmpty: String { return self._s[2296]! } + public var Localization_LanguageName: String { return self._s[2297]! } + public var Wallet_AccessDenied_Title: String { return self._s[2298]! } + public var WebSearch_GIFs: String { return self._s[2299]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2300]! } + public var Wallet_AccessDenied_Settings: String { return self._s[2301]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2302]! } + public var Common_Back: String { return self._s[2303]! } + public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2304]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2305]! } + public var Wallet_Send_Send: String { return self._s[2306]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2295]!, self._r[2295]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2308]!, self._r[2308]!, [_1, _2]) } - public var Wallet_Info_RefreshErrorTitle: String { return self._s[2296]! } - public var Wallet_Month_GenJune: String { return self._s[2297]! } - public var Passport_Email_Help: String { return self._s[2298]! } - public var Watch_Conversation_Reply: String { return self._s[2300]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2303]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2304]! } - public var Channel_BanUser_Unban: String { return self._s[2306]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2307]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2308]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2310]! } - public var Wallet_Send_AddressHeader: String { return self._s[2311]! } - public var Passport_Identity_Name: String { return self._s[2312]! } + public var Wallet_Info_RefreshErrorTitle: String { return self._s[2309]! } + public var Wallet_Month_GenJune: String { return self._s[2310]! } + public var Passport_Email_Help: String { return self._s[2311]! } + public var Watch_Conversation_Reply: String { return self._s[2313]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2316]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2317]! } + public var Channel_BanUser_Unban: String { return self._s[2319]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2320]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2321]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2323]! } + public var Wallet_Send_AddressHeader: String { return self._s[2324]! } + public var Passport_Identity_Name: String { return self._s[2325]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2313]!, self._r[2313]!, [_0]) + return formatWithArgumentRanges(self._s[2326]!, self._r[2326]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2314]! } - public var Conversation_BlockUser: String { return self._s[2315]! } - public var Month_GenJanuary: String { return self._s[2316]! } - public var ChatSettings_TextSize: String { return self._s[2317]! } - public var Notification_PassportValuePhone: String { return self._s[2318]! } - public var MediaPlayer_UnknownArtist: String { return self._s[2319]! } - public var Passport_Language_ne: String { return self._s[2320]! } - public var Notification_CallBack: String { return self._s[2321]! } - public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2322]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2323]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2327]! } + public var Conversation_BlockUser: String { return self._s[2328]! } + public var Month_GenJanuary: String { return self._s[2329]! } + public var ChatSettings_TextSize: String { return self._s[2330]! } + public var Notification_PassportValuePhone: String { return self._s[2331]! } + public var MediaPlayer_UnknownArtist: String { return self._s[2332]! } + public var Passport_Language_ne: String { return self._s[2333]! } + public var Notification_CallBack: String { return self._s[2334]! } + public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2335]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2336]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2324]!, self._r[2324]!, [_0]) + return formatWithArgumentRanges(self._s[2337]!, self._r[2337]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2325]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2326]! } - public var Stickers_FrequentlyUsed: String { return self._s[2327]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2328]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2330]! } + public var Channel_Info_Management: String { return self._s[2338]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2339]! } + public var Stickers_FrequentlyUsed: String { return self._s[2340]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2341]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2343]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2331]!, self._r[2331]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2344]!, self._r[2344]!, [_1, "\(_2)"]) } - public var TwoFactorSetup_Password_Title: String { return self._s[2332]! } - public var Passport_Address_EditResidentialAddress: String { return self._s[2333]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2334]! } - public var CreatePoll_TextHeader: String { return self._s[2335]! } + public var TwoFactorSetup_Password_Title: String { return self._s[2345]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2346]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2347]! } + public var CreatePoll_TextHeader: String { return self._s[2348]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2336]!, self._r[2336]!, [_0]) + return formatWithArgumentRanges(self._s[2349]!, self._r[2349]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2337]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2338]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2340]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2341]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2342]! } + public var PhotoEditor_QualityMedium: String { return self._s[2350]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2351]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2353]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2354]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2355]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2343]!, self._r[2343]!, [_0]) + return formatWithArgumentRanges(self._s[2356]!, self._r[2356]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2344]!, self._r[2344]!, [_1]) + return formatWithArgumentRanges(self._s[2357]!, self._r[2357]!, [_1]) } - public var LogoutOptions_LogOutWalletInfo: String { return self._s[2345]! } - public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2346]! } - public var Conversation_LinkDialogOpen: String { return self._s[2348]! } - public var TwoFactorSetup_Hint_Title: String { return self._s[2349]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2350]! } - public var Settings_Username: String { return self._s[2352]! } - public var Conversation_Block: String { return self._s[2354]! } - public var Wallpaper_Wallpaper: String { return self._s[2355]! } - public var SocksProxySetup_UseProxy: String { return self._s[2357]! } - public var Wallet_Send_Confirmation: String { return self._s[2358]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2359]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2360]! } - public var MessageTimer_Forever: String { return self._s[2361]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2362]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2363]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2364]! } - public var Passport_Language_da: String { return self._s[2365]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2366]! } + public var LogoutOptions_LogOutWalletInfo: String { return self._s[2358]! } + public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2359]! } + public var Conversation_LinkDialogOpen: String { return self._s[2361]! } + public var TwoFactorSetup_Hint_Title: String { return self._s[2362]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2363]! } + public var Settings_Username: String { return self._s[2365]! } + public var Conversation_Block: String { return self._s[2367]! } + public var Wallpaper_Wallpaper: String { return self._s[2368]! } + public var SocksProxySetup_UseProxy: String { return self._s[2370]! } + public var Wallet_Send_Confirmation: String { return self._s[2371]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2372]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2373]! } + public var MessageTimer_Forever: String { return self._s[2374]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2375]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2376]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2377]! } + public var Passport_Language_da: String { return self._s[2378]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2379]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2367]!, self._r[2367]!, [_0]) + return formatWithArgumentRanges(self._s[2380]!, self._r[2380]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[2368]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2381]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2370]!, self._r[2370]!, [_0]) - } - public var Settings_AddDevice: String { return self._s[2371]! } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2373]! } - public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2374]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2375]! } - public var Conversation_PinnedPoll: String { return self._s[2376]! } - public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2377]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2378]! } - public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2379]! } - public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2380]!, self._r[2380]!, [_1]) - } - public var WallpaperSearch_ColorPurple: String { return self._s[2381]! } - public var Cache_ByPeerHeader: String { return self._s[2382]! } - public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2383]!, self._r[2383]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2384]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2387]! } - public var Wallet_Completed_Title: String { return self._s[2388]! } - public var Notification_PinnedMessage: String { return self._s[2389]! } - public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2390]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2392]! } - public var Contacts_SortBy: String { return self._s[2393]! } + public var Settings_AddDevice: String { return self._s[2384]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2386]! } + public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2387]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2388]! } + public var Conversation_PinnedPoll: String { return self._s[2389]! } + public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2390]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2391]! } + public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2392]! } + public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2393]!, self._r[2393]!, [_1]) + } + public var WallpaperSearch_ColorPurple: String { return self._s[2394]! } + public var Cache_ByPeerHeader: String { return self._s[2395]! } + public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2396]!, self._r[2396]!, [_0]) + } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2397]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2400]! } + public var Wallet_Completed_Title: String { return self._s[2401]! } + public var Notification_PinnedMessage: String { return self._s[2402]! } + public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2403]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2405]! } + public var Contacts_SortBy: String { return self._s[2406]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2394]!, self._r[2394]!, [_1]) + return formatWithArgumentRanges(self._s[2407]!, self._r[2407]!, [_1]) } - public var Appearance_ColorThemeNight: String { return self._s[2396]! } + public var Appearance_ColorThemeNight: String { return self._s[2409]! } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2397]!, self._r[2397]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2410]!, self._r[2410]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2398]! } - public var Watch_UserInfo_Service: String { return self._s[2399]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2401]! } - public var Conversation_Unpin: String { return self._s[2403]! } - public var CancelResetAccount_Title: String { return self._s[2404]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2405]! } + public var Call_EncryptionKey_Title: String { return self._s[2411]! } + public var Watch_UserInfo_Service: String { return self._s[2412]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2414]! } + public var Conversation_Unpin: String { return self._s[2416]! } + public var CancelResetAccount_Title: String { return self._s[2417]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2418]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2407]!, self._r[2407]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2420]!, self._r[2420]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2408]! } - public var Appearance_BubbleCorners_Title: String { return self._s[2409]! } - public var CallSettings_Title: String { return self._s[2410]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2411]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2413]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2414]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2421]! } + public var Appearance_BubbleCorners_Title: String { return self._s[2422]! } + public var CallSettings_Title: String { return self._s[2423]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2424]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2426]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2427]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2415]!, self._r[2415]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2428]!, self._r[2428]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2416]! } - public var LoginPassword_PasswordHelp: String { return self._s[2417]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2418]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2419]! } - public var ChatContextMenu_TextSelectionTip: String { return self._s[2420]! } - public var Checkout_TotalPaidAmount: String { return self._s[2421]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2429]! } + public var LoginPassword_PasswordHelp: String { return self._s[2430]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2431]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2432]! } + public var ChatContextMenu_TextSelectionTip: String { return self._s[2433]! } + public var Checkout_TotalPaidAmount: String { return self._s[2434]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2422]!, self._r[2422]!, [_0]) + return formatWithArgumentRanges(self._s[2435]!, self._r[2435]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2423]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2425]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2426]! } + public var ChatState_Updating: String { return self._s[2436]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2437]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2439]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2440]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2427]!, self._r[2427]!, [_1]) + return formatWithArgumentRanges(self._s[2441]!, self._r[2441]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2428]! } - public var Contacts_InviteFriends: String { return self._s[2430]! } - public var Map_ChooseLocationTitle: String { return self._s[2431]! } - public var Conversation_StopPoll: String { return self._s[2433]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2442]! } + public var Contacts_InviteFriends: String { return self._s[2444]! } + public var Map_ChooseLocationTitle: String { return self._s[2445]! } + public var Conversation_StopPoll: String { return self._s[2447]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2434]!, self._r[2434]!, [_0]) + return formatWithArgumentRanges(self._s[2448]!, self._r[2448]!, [_0]) } - public var Call_Camera: String { return self._s[2435]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2436]! } - public var AppWallet_Intro_Text: String { return self._s[2437]! } - public var Appearance_BubbleCornersSetting: String { return self._s[2438]! } - public var Calls_RatingFeedback: String { return self._s[2439]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2441]! } - public var Wallet_Alert_OK: String { return self._s[2442]! } - public var NotificationsSound_Pulse: String { return self._s[2443]! } - public var Watch_LastSeen_Lately: String { return self._s[2444]! } - public var ReportGroupLocation_Report: String { return self._s[2447]! } - public var Widget_NoUsers: String { return self._s[2448]! } - public var Conversation_UnvotePoll: String { return self._s[2449]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2451]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2452]! } - public var NotificationsSound_Circles: String { return self._s[2453]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2456]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2457]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2458]! } - public var Proxy_TooltipUnavailable: String { return self._s[2459]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2461]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2463]! } - public var Conversation_FileDropbox: String { return self._s[2464]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2465]! } - public var Tour_Text3: String { return self._s[2467]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2469]! } - public var GroupPermission_NoSendMessages: String { return self._s[2470]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2471]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2472]! } + public var Call_Camera: String { return self._s[2449]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2450]! } + public var AppWallet_Intro_Text: String { return self._s[2451]! } + public var Appearance_BubbleCornersSetting: String { return self._s[2452]! } + public var Calls_RatingFeedback: String { return self._s[2453]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2455]! } + public var Wallet_Alert_OK: String { return self._s[2456]! } + public var NotificationsSound_Pulse: String { return self._s[2457]! } + public var Watch_LastSeen_Lately: String { return self._s[2458]! } + public var ReportGroupLocation_Report: String { return self._s[2461]! } + public var Widget_NoUsers: String { return self._s[2462]! } + public var Conversation_UnvotePoll: String { return self._s[2463]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2465]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2466]! } + public var NotificationsSound_Circles: String { return self._s[2467]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2470]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2471]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2472]! } + public var Proxy_TooltipUnavailable: String { return self._s[2473]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2475]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2477]! } + public var Conversation_FileDropbox: String { return self._s[2478]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2479]! } + public var Tour_Text3: String { return self._s[2481]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2483]! } + public var GroupPermission_NoSendMessages: String { return self._s[2484]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2485]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2486]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2474]!, self._r[2474]!, [_0]) + return formatWithArgumentRanges(self._s[2488]!, self._r[2488]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2475]! } - public var Checkout_ShippingOption_Title: String { return self._s[2476]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2477]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2489]! } + public var Checkout_ShippingOption_Title: String { return self._s[2490]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2491]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2478]!, self._r[2478]!, [_0]) + return formatWithArgumentRanges(self._s[2492]!, self._r[2492]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2479]!, self._r[2479]!, [_0]) + return formatWithArgumentRanges(self._s[2493]!, self._r[2493]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2480]! } - public var EditTheme_FileReadError: String { return self._s[2481]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2482]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2483]! } - public var AutoDownloadSettings_Photos: String { return self._s[2485]! } - public var Appearance_PreviewIncomingText: String { return self._s[2486]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2487]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2488]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2489]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2490]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2491]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2492]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2493]! } - public var Notification_SecretChatScreenshot: String { return self._s[2494]! } - public var AccessDenied_Wallpapers: String { return self._s[2495]! } - public var ChatList_Context_Mute: String { return self._s[2497]! } - public var Passport_Address_City: String { return self._s[2498]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2499]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2500]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2501]! } - public var AccessDenied_LocationDisabled: String { return self._s[2502]! } - public var Group_Location_Title: String { return self._s[2503]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2505]! } - public var GroupInfo_Sound: String { return self._s[2506]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2507]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2508]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2509]! } - public var Contacts_Title: String { return self._s[2510]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2511]! } - public var Passport_Language_fr: String { return self._s[2512]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2513]! } - public var Notifications_ResetAllNotifications: String { return self._s[2514]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2516]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2518]! } - public var Checkout_NewCard_Title: String { return self._s[2519]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2520]! } - public var Conversation_ForwardChats: String { return self._s[2521]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2523]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2524]! } - public var Settings_FAQ: String { return self._s[2526]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2527]! } - public var Conversation_ContextMenuForward: String { return self._s[2528]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2531]! } - public var PrivacyPolicy_Title: String { return self._s[2534]! } - public var Notifications_TextTone: String { return self._s[2535]! } - public var Profile_CreateNewContact: String { return self._s[2536]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2537]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2539]! } - public var Call_Speaker: String { return self._s[2540]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2541]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2543]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2544]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2494]! } + public var EditTheme_FileReadError: String { return self._s[2495]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2496]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2497]! } + public var AutoDownloadSettings_Photos: String { return self._s[2499]! } + public var Appearance_PreviewIncomingText: String { return self._s[2500]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2501]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2502]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2503]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2504]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2505]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2506]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2507]! } + public var Notification_SecretChatScreenshot: String { return self._s[2508]! } + public var AccessDenied_Wallpapers: String { return self._s[2509]! } + public var ChatList_Context_Mute: String { return self._s[2511]! } + public var Passport_Address_City: String { return self._s[2512]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2513]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2514]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2515]! } + public var AccessDenied_LocationDisabled: String { return self._s[2516]! } + public var Group_Location_Title: String { return self._s[2517]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2519]! } + public var GroupInfo_Sound: String { return self._s[2520]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2521]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2522]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2523]! } + public var Contacts_Title: String { return self._s[2524]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2525]! } + public var Passport_Language_fr: String { return self._s[2526]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2527]! } + public var Notifications_ResetAllNotifications: String { return self._s[2528]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2530]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2532]! } + public var Checkout_NewCard_Title: String { return self._s[2533]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2534]! } + public var Conversation_ForwardChats: String { return self._s[2535]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2537]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2538]! } + public var Settings_FAQ: String { return self._s[2540]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2541]! } + public var Conversation_ContextMenuForward: String { return self._s[2542]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2545]! } + public var PrivacyPolicy_Title: String { return self._s[2548]! } + public var Notifications_TextTone: String { return self._s[2549]! } + public var Profile_CreateNewContact: String { return self._s[2550]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2551]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2553]! } + public var Call_Speaker: String { return self._s[2554]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2555]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2557]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2558]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2545]!, self._r[2545]!, [_0]) + return formatWithArgumentRanges(self._s[2559]!, self._r[2559]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2546]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2547]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2548]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2549]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2550]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2551]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2552]! } - public var Bot_Unblock: String { return self._s[2553]! } - public var TextFormat_Italic: String { return self._s[2554]! } - public var WallpaperSearch_ColorPink: String { return self._s[2555]! } - public var Settings_About_Help: String { return self._s[2557]! } - public var SearchImages_Title: String { return self._s[2558]! } - public var Weekday_Wednesday: String { return self._s[2559]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2560]! } - public var ExplicitContent_AlertTitle: String { return self._s[2561]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2560]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2561]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2562]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2563]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2564]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2565]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2566]! } + public var Bot_Unblock: String { return self._s[2567]! } + public var TextFormat_Italic: String { return self._s[2568]! } + public var WallpaperSearch_ColorPink: String { return self._s[2569]! } + public var Settings_About_Help: String { return self._s[2571]! } + public var SearchImages_Title: String { return self._s[2572]! } + public var Weekday_Wednesday: String { return self._s[2573]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2574]! } + public var ExplicitContent_AlertTitle: String { return self._s[2575]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2562]!, self._r[2562]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2576]!, self._r[2576]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2563]! } - public var Weekday_Thursday: String { return self._s[2564]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2565]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2566]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2577]! } + public var Weekday_Thursday: String { return self._s[2578]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2579]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2580]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2567]!, self._r[2567]!, [_0]) + return formatWithArgumentRanges(self._s[2581]!, self._r[2581]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2568]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2569]! } - public var Passport_RequestedInformation: String { return self._s[2570]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2571]! } - public var Conversation_EncryptionProcessing: String { return self._s[2573]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2574]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2576]! } - public var Channel_Setup_Title: String { return self._s[2577]! } - public var Conversation_SearchPlaceholder: String { return self._s[2578]! } - public var OldChannels_GroupEmptyFormat: String { return self._s[2579]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2580]! } - public var Checkout_ErrorGeneric: String { return self._s[2581]! } - public var Passport_Language_hu: String { return self._s[2582]! } - public var GroupPermission_EditingDisabled: String { return self._s[2583]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2585]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2582]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2583]! } + public var Passport_RequestedInformation: String { return self._s[2584]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2585]! } + public var Conversation_EncryptionProcessing: String { return self._s[2587]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2588]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2590]! } + public var Channel_Setup_Title: String { return self._s[2591]! } + public var Conversation_SearchPlaceholder: String { return self._s[2592]! } + public var OldChannels_GroupEmptyFormat: String { return self._s[2593]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2594]! } + public var Checkout_ErrorGeneric: String { return self._s[2595]! } + public var Passport_Language_hu: String { return self._s[2596]! } + public var GroupPermission_EditingDisabled: String { return self._s[2597]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2599]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2586]!, self._r[2586]!, [_0]) + return formatWithArgumentRanges(self._s[2600]!, self._r[2600]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2589]!, self._r[2589]!, [_1]) + return formatWithArgumentRanges(self._s[2603]!, self._r[2603]!, [_1]) } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2590]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2604]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2591]!, self._r[2591]!, [_0]) + return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2592]! } - public var Group_Location_Info: String { return self._s[2593]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2594]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2595]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2606]! } + public var Group_Location_Info: String { return self._s[2607]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2608]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2609]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2596]!, self._r[2596]!, [_0]) + return formatWithArgumentRanges(self._s[2610]!, self._r[2610]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2597]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2598]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2599]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2600]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2611]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2612]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2613]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2614]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2601]!, self._r[2601]!, [_0]) + return formatWithArgumentRanges(self._s[2615]!, self._r[2615]!, [_0]) } public func Notification_PinnedQuizMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2602]!, self._r[2602]!, [_0]) - } - public var Passport_Language_cs: String { return self._s[2603]! } - public var Message_PinnedAnimationMessage: String { return self._s[2605]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2607]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2608]! } - public var Wallet_Info_TransactionTo: String { return self._s[2610]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2611]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2612]! } - public var Embed_PlayingInPIP: String { return self._s[2613]! } - public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2614]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2615]! } - public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2617]! } - public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2618]!, self._r[2618]!, [_1]) + public var Passport_Language_cs: String { return self._s[2617]! } + public var Message_PinnedAnimationMessage: String { return self._s[2619]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2621]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2622]! } + public var Wallet_Info_TransactionTo: String { return self._s[2624]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2625]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2626]! } + public var Embed_PlayingInPIP: String { return self._s[2627]! } + public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2628]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2629]! } + public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2630]!, self._r[2630]!, [_0]) } - public var Notification_PaymentSent: String { return self._s[2619]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2620]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2621]! } - public var AutoNightTheme_System: String { return self._s[2622]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2623]! } - public var CreatePoll_QuizTitle: String { return self._s[2624]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2625]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2626]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2631]! } + public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_1]) + } + public var Notification_PaymentSent: String { return self._s[2633]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2634]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2635]! } + public var AutoNightTheme_System: String { return self._s[2636]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2637]! } + public var CreatePoll_QuizTitle: String { return self._s[2638]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2639]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2640]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_1]) + return formatWithArgumentRanges(self._s[2643]!, self._r[2643]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2630]!, self._r[2630]!, [_1]) + return formatWithArgumentRanges(self._s[2644]!, self._r[2644]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_1]) + return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2633]! } - public var PasscodeSettings_HelpTop: String { return self._s[2634]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2635]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2636]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2637]! } - public var EditTheme_ShortLink: String { return self._s[2638]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2639]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2640]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2641]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2642]! } - public var Call_Accept: String { return self._s[2644]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2645]! } - public var Month_GenMarch: String { return self._s[2647]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2648]! } - public var LoginPassword_Title: String { return self._s[2649]! } - public var Call_End: String { return self._s[2650]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2651]! } - public var VoiceOver_Chat_Contact: String { return self._s[2652]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2653]! } - public var CallSettings_Always: String { return self._s[2654]! } - public var CallFeedback_Success: String { return self._s[2655]! } - public var TwoStepAuth_SetupHint: String { return self._s[2656]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2647]! } + public var PasscodeSettings_HelpTop: String { return self._s[2648]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2649]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2650]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2651]! } + public var EditTheme_ShortLink: String { return self._s[2652]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2653]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2654]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2655]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2656]! } + public var Call_Accept: String { return self._s[2658]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2659]! } + public var Month_GenMarch: String { return self._s[2661]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2662]! } + public var LoginPassword_Title: String { return self._s[2663]! } + public var Call_End: String { return self._s[2664]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2665]! } + public var VoiceOver_Chat_Contact: String { return self._s[2666]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2667]! } + public var CallSettings_Always: String { return self._s[2668]! } + public var CallFeedback_Success: String { return self._s[2669]! } + public var TwoStepAuth_SetupHint: String { return self._s[2670]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2657]!, self._r[2657]!, [_1]) + return formatWithArgumentRanges(self._s[2671]!, self._r[2671]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2658]! } - public var Login_PhoneTitle: String { return self._s[2659]! } - public var Passport_FieldPhoneHelp: String { return self._s[2660]! } - public var Weekday_ShortSunday: String { return self._s[2661]! } - public var Passport_InfoFAQ_URL: String { return self._s[2662]! } - public var ContactInfo_Job: String { return self._s[2664]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2665]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2666]! } - public var CreatePoll_QuizTip: String { return self._s[2667]! } - public var TwoFactorSetup_Email_Text: String { return self._s[2668]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2669]! } - public var Invite_ChannelsTooMuch: String { return self._s[2670]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2671]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2672]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2673]! } - public var Wallet_Receive_AmountText: String { return self._s[2674]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2675]! } - public var CallFeedback_ReasonNoise: String { return self._s[2676]! } - public var Appearance_AppIconDefault: String { return self._s[2678]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2679]! } - public var MediaPicker_AddCaption: String { return self._s[2680]! } - public var CallSettings_TabIconDescription: String { return self._s[2681]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2672]! } + public var PeerInfo_ButtonAddMember: String { return self._s[2673]! } + public var Login_PhoneTitle: String { return self._s[2674]! } + public var Passport_FieldPhoneHelp: String { return self._s[2675]! } + public var Weekday_ShortSunday: String { return self._s[2676]! } + public var Passport_InfoFAQ_URL: String { return self._s[2677]! } + public var ContactInfo_Job: String { return self._s[2679]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2680]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2681]! } + public var CreatePoll_QuizTip: String { return self._s[2682]! } + public var TwoFactorSetup_Email_Text: String { return self._s[2683]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2684]! } + public var Invite_ChannelsTooMuch: String { return self._s[2685]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2686]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2687]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2688]! } + public var Wallet_Receive_AmountText: String { return self._s[2689]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2690]! } + public var CallFeedback_ReasonNoise: String { return self._s[2691]! } + public var Appearance_AppIconDefault: String { return self._s[2693]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2694]! } + public var MediaPicker_AddCaption: String { return self._s[2695]! } + public var CallSettings_TabIconDescription: String { return self._s[2696]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2682]!, self._r[2682]!, [_0]) + return formatWithArgumentRanges(self._s[2697]!, self._r[2697]!, [_0]) } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2683]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2698]! } public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2684]!, self._r[2684]!, [_0]) - } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2685]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2686]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2687]! } - public var DialogList_SearchSectionRecent: String { return self._s[2688]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2689]! } - public var CreatePoll_Anonymous: String { return self._s[2690]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2693]! } - public var LastSeen_WithinAWeek: String { return self._s[2694]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2695]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2697]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2698]! } - public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2699]!, self._r[2699]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2700]! } - public var Conversation_StatusLeftGroup: String { return self._s[2701]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2702]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2704]! } - public var GroupPermission_AddSuccess: String { return self._s[2705]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2707]! } - public var Conversation_ContextMenuCopy: String { return self._s[2708]! } - public var AccessDenied_CallMicrophone: String { return self._s[2709]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2700]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2701]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2702]! } + public var DialogList_SearchSectionRecent: String { return self._s[2703]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2704]! } + public var CreatePoll_Anonymous: String { return self._s[2705]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2708]! } + public var LastSeen_WithinAWeek: String { return self._s[2709]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2710]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2712]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2713]! } + public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2714]!, self._r[2714]!, [_0]) + } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2715]! } + public var Conversation_StatusLeftGroup: String { return self._s[2716]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2717]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2719]! } + public var GroupPermission_AddSuccess: String { return self._s[2720]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2722]! } + public var Conversation_ContextMenuCopy: String { return self._s[2723]! } + public var AccessDenied_CallMicrophone: String { return self._s[2724]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2710]!, self._r[2710]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2725]!, self._r[2725]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2711]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2712]! } - public var Checkout_PaymentMethod_New: String { return self._s[2713]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2714]! } - public var PhotoEditor_QualityTool: String { return self._s[2715]! } - public var Login_SendCodeViaSms: String { return self._s[2716]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2717]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2718]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2719]! } - public var Login_EmailNotConfiguredError: String { return self._s[2720]! } - public var SocksProxySetup_Status: String { return self._s[2721]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2722]! } - public var PrivacyPolicy_Accept: String { return self._s[2723]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2724]! } - public var Appearance_AppIconClassicX: String { return self._s[2725]! } + public var Login_InvalidFirstNameError: String { return self._s[2726]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2727]! } + public var Checkout_PaymentMethod_New: String { return self._s[2728]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2729]! } + public var PhotoEditor_QualityTool: String { return self._s[2730]! } + public var Login_SendCodeViaSms: String { return self._s[2731]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2732]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2733]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2734]! } + public var Login_EmailNotConfiguredError: String { return self._s[2735]! } + public var SocksProxySetup_Status: String { return self._s[2736]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2737]! } + public var PrivacyPolicy_Accept: String { return self._s[2738]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2739]! } + public var Appearance_AppIconClassicX: String { return self._s[2740]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2726]!, self._r[2726]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2741]!, self._r[2741]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2727]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2729]! } - public var AutoNightTheme_Automatic: String { return self._s[2730]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2731]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2732]! } - public var Cache_Help: String { return self._s[2733]! } - public var Group_ErrorAccessDenied: String { return self._s[2734]! } - public var Passport_Language_fa: String { return self._s[2735]! } - public var Wallet_Intro_Text: String { return self._s[2736]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2737]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2738]! } - public var PrivacySettings_LastSeen: String { return self._s[2739]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2742]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2744]! } + public var AutoNightTheme_Automatic: String { return self._s[2745]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2746]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2747]! } + public var Cache_Help: String { return self._s[2748]! } + public var Group_ErrorAccessDenied: String { return self._s[2749]! } + public var Passport_Language_fa: String { return self._s[2750]! } + public var Wallet_Intro_Text: String { return self._s[2751]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2752]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2753]! } + public var PrivacySettings_LastSeen: String { return self._s[2754]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2740]!, self._r[2740]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2755]!, self._r[2755]!, [_0, _1]) } - public var Wallet_Configuration_Apply: String { return self._s[2744]! } - public var Preview_SaveGif: String { return self._s[2745]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2746]! } - public var Profile_About: String { return self._s[2747]! } - public var Channel_About_Placeholder: String { return self._s[2748]! } - public var Login_InfoTitle: String { return self._s[2749]! } + public var Wallet_Configuration_Apply: String { return self._s[2759]! } + public var Preview_SaveGif: String { return self._s[2760]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2761]! } + public var Profile_About: String { return self._s[2762]! } + public var Channel_About_Placeholder: String { return self._s[2763]! } + public var Login_InfoTitle: String { return self._s[2764]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2750]!, self._r[2750]!, [_0]) + return formatWithArgumentRanges(self._s[2765]!, self._r[2765]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2751]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2753]! } - public var ContactInfo_Title: String { return self._s[2754]! } - public var Media_ShareThisVideo: String { return self._s[2755]! } - public var Weekday_ShortFriday: String { return self._s[2756]! } - public var AccessDenied_Contacts: String { return self._s[2758]! } - public var Notification_CallIncomingShort: String { return self._s[2759]! } - public var Group_Setup_TypePublic: String { return self._s[2760]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2761]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2762]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2765]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2766]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2767]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2768]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2769]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2766]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2768]! } + public var ContactInfo_Title: String { return self._s[2769]! } + public var Media_ShareThisVideo: String { return self._s[2770]! } + public var Weekday_ShortFriday: String { return self._s[2771]! } + public var AccessDenied_Contacts: String { return self._s[2773]! } + public var Notification_CallIncomingShort: String { return self._s[2774]! } + public var Group_Setup_TypePublic: String { return self._s[2775]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2776]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2777]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2780]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2781]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2782]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2783]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2784]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2770]!, self._r[2770]!, [_0]) + return formatWithArgumentRanges(self._s[2785]!, self._r[2785]!, [_0]) } - public var DialogList_Typing: String { return self._s[2771]! } - public var CallFeedback_IncludeLogs: String { return self._s[2773]! } - public var Checkout_Phone: String { return self._s[2775]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2778]! } - public var Privacy_Calls_Integration: String { return self._s[2779]! } - public var Notifications_PermissionsAllow: String { return self._s[2780]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2784]! } - public var Settings_ChatSettings: String { return self._s[2785]! } - public var Conversation_SendingOptionsTooltip: String { return self._s[2786]! } + public var DialogList_Typing: String { return self._s[2786]! } + public var CallFeedback_IncludeLogs: String { return self._s[2788]! } + public var Checkout_Phone: String { return self._s[2790]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2793]! } + public var Privacy_Calls_Integration: String { return self._s[2794]! } + public var Notifications_PermissionsAllow: String { return self._s[2795]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2800]! } + public var Settings_ChatSettings: String { return self._s[2801]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[2802]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2788]!, self._r[2788]!, [_0]) + return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_0]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2789]!, self._r[2789]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2805]!, self._r[2805]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2791]! } + public var GroupRemoved_DeleteUser: String { return self._s[2807]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2792]!, self._r[2792]!, [_0]) + return formatWithArgumentRanges(self._s[2808]!, self._r[2808]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2793]!, self._r[2793]!, [_1]) + return formatWithArgumentRanges(self._s[2809]!, self._r[2809]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2794]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2795]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2797]! } - public var Conversation_Unblock: String { return self._s[2798]! } - public var PrivacySettings_DataSettings: String { return self._s[2799]! } - public var WallpaperPreview_PatternPaternApply: String { return self._s[2800]! } - public var Group_PublicLink_Info: String { return self._s[2801]! } + public var Login_ContinueWithLocalization: String { return self._s[2810]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2811]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2813]! } + public var Conversation_Unblock: String { return self._s[2814]! } + public var PrivacySettings_DataSettings: String { return self._s[2815]! } + public var WallpaperPreview_PatternPaternApply: String { return self._s[2816]! } + public var Group_PublicLink_Info: String { return self._s[2817]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2802]!, self._r[2802]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2818]!, self._r[2818]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2803]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2819]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2820]!, self._r[2820]!, [_0, _1]) } - public var OldChannels_ChannelsHeader: String { return self._s[2806]! } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2807]! } - public var PrivacySettings_Passcode: String { return self._s[2809]! } - public var Call_Mute: String { return self._s[2810]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2811]! } - public var Passport_Language_dz: String { return self._s[2812]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2813]! } - public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2814]! } - public var Passport_Language_tk: String { return self._s[2815]! } + public var OldChannels_ChannelsHeader: String { return self._s[2822]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2823]! } + public var PrivacySettings_Passcode: String { return self._s[2825]! } + public var Call_Mute: String { return self._s[2826]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2827]! } + public var Passport_Language_dz: String { return self._s[2828]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2829]! } + public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2830]! } + public var Passport_Language_tk: String { return self._s[2831]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2816]!, self._r[2816]!, [_0]) + return formatWithArgumentRanges(self._s[2832]!, self._r[2832]!, [_0]) } - public var Settings_Search: String { return self._s[2817]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2818]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2819]! } - public var Wallet_Configuration_SourceJSON: String { return self._s[2820]! } - public var Conversation_ContextMenuReply: String { return self._s[2821]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2822]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2823]! } - public var Tour_Title1: String { return self._s[2824]! } - public var Wallet_Alert_Cancel: String { return self._s[2825]! } - public var Conversation_ClearGroupHistory: String { return self._s[2827]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2828]! } - public var WallpaperPreview_Motion: String { return self._s[2829]! } + public var Settings_Search: String { return self._s[2833]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2834]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2835]! } + public var Wallet_Configuration_SourceJSON: String { return self._s[2836]! } + public var Conversation_ContextMenuReply: String { return self._s[2837]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2838]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2839]! } + public var Tour_Title1: String { return self._s[2840]! } + public var Wallet_Alert_Cancel: String { return self._s[2841]! } + public var Conversation_ClearGroupHistory: String { return self._s[2843]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2844]! } + public var WallpaperPreview_Motion: String { return self._s[2845]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2830]!, self._r[2830]!, [_0]) + return formatWithArgumentRanges(self._s[2846]!, self._r[2846]!, [_0]) } - public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2831]! } - public var Call_RateCall: String { return self._s[2832]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2833]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2834]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2835]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2837]! } + public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2847]! } + public var Call_RateCall: String { return self._s[2848]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2849]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2850]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2851]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2853]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2839]!, self._r[2839]!, [_0]) + return formatWithArgumentRanges(self._s[2855]!, self._r[2855]!, [_0]) } - public var Compose_Create: String { return self._s[2840]! } - public var Contacts_InviteToTelegram: String { return self._s[2841]! } - public var GroupInfo_Notifications: String { return self._s[2842]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2844]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2845]! } - public var Month_GenApril: String { return self._s[2846]! } - public var Appearance_AutoNightTheme: String { return self._s[2847]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2849]! } - public var Login_CodeSentSms: String { return self._s[2851]! } + public var Compose_Create: String { return self._s[2856]! } + public var Contacts_InviteToTelegram: String { return self._s[2857]! } + public var GroupInfo_Notifications: String { return self._s[2858]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2860]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2861]! } + public var Month_GenApril: String { return self._s[2862]! } + public var Appearance_AutoNightTheme: String { return self._s[2863]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2865]! } + public var Login_CodeSentSms: String { return self._s[2867]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2852]!, self._r[2852]!, [_0]) + return formatWithArgumentRanges(self._s[2868]!, self._r[2868]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2853]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2854]! } - public var Passport_Language_hr: String { return self._s[2855]! } - public var Common_ActionNotAllowedError: String { return self._s[2856]! } + public var EmptyGroupInfo_Line3: String { return self._s[2869]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2870]! } + public var Passport_Language_hr: String { return self._s[2871]! } + public var Common_ActionNotAllowedError: String { return self._s[2872]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2857]!, self._r[2857]!, [_0]) + return formatWithArgumentRanges(self._s[2873]!, self._r[2873]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2858]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2859]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2860]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2861]! } - public var Privacy_SecretChatsTitle: String { return self._s[2862]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2864]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2865]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2866]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2867]! } - public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2868]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2869]! } - public var Preview_DeleteGif: String { return self._s[2870]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2871]! } - public var Group_ErrorNotMutualContact: String { return self._s[2872]! } - public var Notification_MessageLifetime5s: String { return self._s[2873]! } - public var Wallet_Send_OwnAddressAlertText: String { return self._s[2874]! } - public var OldChannels_ChannelFormat: String { return self._s[2875]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2874]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2875]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2876]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2877]! } + public var Privacy_SecretChatsTitle: String { return self._s[2878]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2880]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2881]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2882]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2883]! } + public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2884]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2885]! } + public var Preview_DeleteGif: String { return self._s[2886]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2887]! } + public var Group_ErrorNotMutualContact: String { return self._s[2888]! } + public var Notification_MessageLifetime5s: String { return self._s[2889]! } + public var Wallet_Send_OwnAddressAlertText: String { return self._s[2890]! } + public var OldChannels_ChannelFormat: String { return self._s[2891]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2876]!, self._r[2876]!, [_0]) + return formatWithArgumentRanges(self._s[2892]!, self._r[2892]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2877]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2879]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2880]! } - public var Passport_Address_AddBankStatement: String { return self._s[2881]! } - public var Notification_CallIncoming: String { return self._s[2882]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2883]! } - public var Compose_NewGroupTitle: String { return self._s[2884]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2886]! } - public var Passport_Address_Postcode: String { return self._s[2888]! } + public var VoiceOver_Chat_Video: String { return self._s[2893]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2895]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2896]! } + public var Passport_Address_AddBankStatement: String { return self._s[2897]! } + public var Notification_CallIncoming: String { return self._s[2898]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2899]! } + public var Compose_NewGroupTitle: String { return self._s[2900]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2902]! } + public var Passport_Address_Postcode: String { return self._s[2904]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2889]!, self._r[2889]!, [_0]) + return formatWithArgumentRanges(self._s[2905]!, self._r[2905]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2890]! } - public var Wallet_Month_ShortOctober: String { return self._s[2891]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2892]! } - public var WallpaperColors_Title: String { return self._s[2893]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2894]! } - public var VoiceOver_MessageContextForward: String { return self._s[2895]! } - public var GroupPermission_Duration: String { return self._s[2896]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2906]! } + public var Wallet_Month_ShortOctober: String { return self._s[2907]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2908]! } + public var WallpaperColors_Title: String { return self._s[2909]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2910]! } + public var VoiceOver_MessageContextForward: String { return self._s[2911]! } + public var GroupPermission_Duration: String { return self._s[2912]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2897]!, self._r[2897]!, [_0]) + return formatWithArgumentRanges(self._s[2913]!, self._r[2913]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2898]! } - public var Username_Placeholder: String { return self._s[2899]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2900]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2901]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2902]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2914]! } + public var Username_Placeholder: String { return self._s[2915]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2916]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2917]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2918]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2904]!, self._r[2904]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2920]!, self._r[2920]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2905]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2906]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2907]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2908]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2909]! } - public var Conversation_ContextMenuMore: String { return self._s[2910]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2911]! } - public var CallSettings_TabIcon: String { return self._s[2912]! } - public var KeyCommand_Find: String { return self._s[2913]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2914]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2915]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2916]! } - public var Message_PinnedGame: String { return self._s[2917]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2918]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2920]! } - public var Login_CallRequestState2: String { return self._s[2922]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2924]! } + public var Passport_PasswordDescription: String { return self._s[2921]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2922]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2923]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2924]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2925]! } + public var Conversation_ContextMenuMore: String { return self._s[2926]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2927]! } + public var CallSettings_TabIcon: String { return self._s[2928]! } + public var KeyCommand_Find: String { return self._s[2929]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2930]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2931]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2932]! } + public var Message_PinnedGame: String { return self._s[2933]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2934]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2936]! } + public var Login_CallRequestState2: String { return self._s[2938]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2940]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2925]!, self._r[2925]!, [_0]) + return formatWithArgumentRanges(self._s[2941]!, self._r[2941]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2927]!, self._r[2927]!, [_0]) + return formatWithArgumentRanges(self._s[2943]!, self._r[2943]!, [_0]) } - public var AuthSessions_AddDevice: String { return self._s[2928]! } - public var WallpaperPreview_Blurred: String { return self._s[2929]! } - public var Conversation_InstantPagePreview: String { return self._s[2930]! } + public var AuthSessions_AddDevice: String { return self._s[2944]! } + public var WallpaperPreview_Blurred: String { return self._s[2945]! } + public var Conversation_InstantPagePreview: String { return self._s[2946]! } + public var PeerInfo_ButtonUnmute: String { return self._s[2947]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2931]!, self._r[2931]!, [_0]) + return formatWithArgumentRanges(self._s[2948]!, self._r[2948]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2934]! } - public var WallpaperSearch_ColorRed: String { return self._s[2935]! } - public var GroupPermission_NoPinMessages: String { return self._s[2936]! } - public var Passport_Language_es: String { return self._s[2937]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2939]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2940]! } + public var SecretTimer_VideoDescription: String { return self._s[2951]! } + public var WallpaperSearch_ColorRed: String { return self._s[2952]! } + public var GroupPermission_NoPinMessages: String { return self._s[2953]! } + public var Passport_Language_es: String { return self._s[2954]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2956]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2957]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2941]!, self._r[2941]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2958]!, self._r[2958]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2942]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2943]! } - public var Watch_UserInfo_Unmute: String { return self._s[2944]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2945]! } - public var AccessDenied_CameraRestricted: String { return self._s[2947]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2959]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2960]! } + public var Watch_UserInfo_Unmute: String { return self._s[2961]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2962]! } + public var AccessDenied_CameraRestricted: String { return self._s[2964]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2948]!, self._r[2948]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2965]!, self._r[2965]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2950]! } - public var Settings_CopyUsername: String { return self._s[2951]! } - public var Contacts_SearchLabel: String { return self._s[2952]! } - public var Map_OpenInYandexNavigator: String { return self._s[2954]! } - public var PasscodeSettings_EncryptData: String { return self._s[2955]! } - public var Settings_Wallet: String { return self._s[2956]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2957]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2958]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2959]! } - public var DialogList_AdNoticeAlert: String { return self._s[2960]! } - public var Wallet_Month_GenMay: String { return self._s[2962]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2963]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2964]! } - public var Localization_LanguageCustom: String { return self._s[2965]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2966]! } - public var CallFeedback_Title: String { return self._s[2967]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2970]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2971]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[2972]! } - public var Conversation_InfoGroup: String { return self._s[2973]! } - public var Compose_NewMessage: String { return self._s[2974]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2975]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2976]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2977]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2978]! } + public var ChatList_ReadAll: String { return self._s[2967]! } + public var Settings_CopyUsername: String { return self._s[2968]! } + public var Contacts_SearchLabel: String { return self._s[2969]! } + public var Map_OpenInYandexNavigator: String { return self._s[2971]! } + public var PasscodeSettings_EncryptData: String { return self._s[2972]! } + public var Settings_Wallet: String { return self._s[2973]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2974]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2975]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2976]! } + public var DialogList_AdNoticeAlert: String { return self._s[2977]! } + public var Wallet_Month_GenMay: String { return self._s[2979]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2980]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2981]! } + public var Localization_LanguageCustom: String { return self._s[2982]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2983]! } + public var CallFeedback_Title: String { return self._s[2984]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2987]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2988]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[2989]! } + public var Conversation_InfoGroup: String { return self._s[2990]! } + public var Compose_NewMessage: String { return self._s[2991]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2992]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2993]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2994]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2995]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2979]!, self._r[2979]!, [_0]) + return formatWithArgumentRanges(self._s[2996]!, self._r[2996]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2980]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2981]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2982]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2983]! } - public var Channel_BlackList_Title: String { return self._s[2984]! } - public var UserInfo_PhoneCall: String { return self._s[2985]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2987]! } - public var Wallet_Month_ShortJanuary: String { return self._s[2988]! } - public var State_connecting: String { return self._s[2989]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2990]! } - public var Wallet_Month_GenMarch: String { return self._s[2991]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2992]! } - public var AuthSessions_AddedDeviceTerminate: String { return self._s[2993]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2997]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2998]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2999]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[3000]! } + public var Channel_BlackList_Title: String { return self._s[3001]! } + public var UserInfo_PhoneCall: String { return self._s[3002]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3004]! } + public var Wallet_Month_ShortJanuary: String { return self._s[3005]! } + public var State_connecting: String { return self._s[3006]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[3007]! } + public var Wallet_Month_GenMarch: String { return self._s[3008]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[3009]! } + public var AuthSessions_AddedDeviceTerminate: String { return self._s[3010]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2994]!, self._r[2994]!, [_0]) + return formatWithArgumentRanges(self._s[3011]!, self._r[3011]!, [_0]) } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2995]!, self._r[2995]!, [_0]) + return formatWithArgumentRanges(self._s[3012]!, self._r[3012]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2996]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2997]! } - public var Passport_Identity_EditPassport: String { return self._s[2998]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[3000]! } - public var Localization_EnglishLanguageName: String { return self._s[3001]! } - public var Share_AuthDescription: String { return self._s[3002]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3003]! } - public var Passport_Identity_Surname: String { return self._s[3004]! } - public var Compose_TokenListPlaceholder: String { return self._s[3005]! } - public var Wallet_AccessDenied_Camera: String { return self._s[3006]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[3007]! } - public var Settings_AboutEmpty: String { return self._s[3008]! } - public var Conversation_Unmute: String { return self._s[3009]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[3011]! } - public var Wallet_Sending_Text: String { return self._s[3012]! } + public var Notifications_GroupNotifications: String { return self._s[3013]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3014]! } + public var Passport_Identity_EditPassport: String { return self._s[3015]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[3017]! } + public var Localization_EnglishLanguageName: String { return self._s[3018]! } + public var Share_AuthDescription: String { return self._s[3019]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3020]! } + public var Passport_Identity_Surname: String { return self._s[3021]! } + public var Compose_TokenListPlaceholder: String { return self._s[3022]! } + public var Wallet_AccessDenied_Camera: String { return self._s[3023]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[3024]! } + public var Settings_AboutEmpty: String { return self._s[3025]! } + public var Conversation_Unmute: String { return self._s[3026]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[3028]! } + public var Wallet_Sending_Text: String { return self._s[3029]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3013]!, self._r[3013]!, [_1]) + return formatWithArgumentRanges(self._s[3030]!, self._r[3030]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[3014]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3016]! } - public var ChatSettings_Appearance: String { return self._s[3017]! } - public var ClearCache_StorageUsage: String { return self._s[3018]! } - public var Appearance_PickAccentColor: String { return self._s[3019]! } + public var Login_CodeSentCall: String { return self._s[3031]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3033]! } + public var ChatSettings_Appearance: String { return self._s[3034]! } + public var ClearCache_StorageUsage: String { return self._s[3035]! } + public var Appearance_PickAccentColor: String { return self._s[3036]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3020]!, self._r[3020]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3037]!, self._r[3037]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3021]!, self._r[3021]!, [_1]) - } - public var Notification_CallMissed: String { return self._s[3022]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3023]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3024]! } - public var Wallet_Month_GenOctober: String { return self._s[3026]! } - public var ChatAdmins_AdminLabel: String { return self._s[3027]! } - public var KeyCommand_JumpToNextChat: String { return self._s[3028]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[3030]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3031]! } - public var Month_GenJune: String { return self._s[3032]! } - public var IntentsSettings_MainAccountInfo: String { return self._s[3033]! } - public var Watch_Location_Current: String { return self._s[3034]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3035]! } - public var Conversation_TitleMute: String { return self._s[3036]! } - public var Map_PlacesInThisArea: String { return self._s[3037]! } - public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3038]!, self._r[3038]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[3039]! } + public var Notification_CallMissed: String { return self._s[3039]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3040]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3041]! } + public var Wallet_Month_GenOctober: String { return self._s[3043]! } + public var ChatAdmins_AdminLabel: String { return self._s[3044]! } + public var KeyCommand_JumpToNextChat: String { return self._s[3045]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[3047]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3048]! } + public var Month_GenJune: String { return self._s[3049]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[3050]! } + public var Watch_Location_Current: String { return self._s[3051]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3052]! } + public var Conversation_TitleMute: String { return self._s[3053]! } + public var Map_PlacesInThisArea: String { return self._s[3054]! } + public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3055]!, self._r[3055]!, [_1]) + } + public var GroupInfo_DeleteAndExit: String { return self._s[3056]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3040]!, self._r[3040]!, [_0]) + return formatWithArgumentRanges(self._s[3057]!, self._r[3057]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[3041]! } - public var Chat_SlowmodeSendError: String { return self._s[3042]! } - public var MaskStickerSettings_Info: String { return self._s[3043]! } - public var EditTheme_Expand_TopInfo: String { return self._s[3044]! } + public var Call_ReportPlaceholder: String { return self._s[3058]! } + public var Chat_SlowmodeSendError: String { return self._s[3059]! } + public var MaskStickerSettings_Info: String { return self._s[3060]! } + public var EditTheme_Expand_TopInfo: String { return self._s[3061]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_0]) + return formatWithArgumentRanges(self._s[3062]!, self._r[3062]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[3046]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[3048]! } - public var Contacts_ShareTelegram: String { return self._s[3049]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3050]! } - public var Map_AddressOnMap: String { return self._s[3051]! } - public var Channel_ErrorAccessDenied: String { return self._s[3052]! } - public var UserInfo_ScamBotWarning: String { return self._s[3054]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[3055]! } - public var Call_ConnectionErrorTitle: String { return self._s[3056]! } - public var UserInfo_NotificationsEnable: String { return self._s[3057]! } - public var ArchivedChats_IntroText1: String { return self._s[3058]! } - public var Tour_Text4: String { return self._s[3061]! } - public var WallpaperSearch_Recent: String { return self._s[3062]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[3063]! } - public var Profile_MessageLifetime2s: String { return self._s[3065]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3066]! } - public var Notification_MessageLifetime2s: String { return self._s[3067]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[3063]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[3065]! } + public var Contacts_ShareTelegram: String { return self._s[3066]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3067]! } + public var Map_AddressOnMap: String { return self._s[3068]! } + public var Channel_ErrorAccessDenied: String { return self._s[3069]! } + public var UserInfo_ScamBotWarning: String { return self._s[3071]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[3072]! } + public var Call_ConnectionErrorTitle: String { return self._s[3073]! } + public var UserInfo_NotificationsEnable: String { return self._s[3074]! } + public var ArchivedChats_IntroText1: String { return self._s[3075]! } + public var Tour_Text4: String { return self._s[3078]! } + public var WallpaperSearch_Recent: String { return self._s[3079]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[3080]! } + public var PeopleNearby_MakeVisibleTitle: String { return self._s[3081]! } + public var Profile_MessageLifetime2s: String { return self._s[3083]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3084]! } + public var Notification_MessageLifetime2s: String { return self._s[3085]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3068]!, self._r[3068]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3086]!, self._r[3086]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[3069]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[3070]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3071]! } + public var Cache_ClearCache: String { return self._s[3087]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[3088]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3089]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3075]!, self._r[3075]!, [_0]) + return formatWithArgumentRanges(self._s[3093]!, self._r[3093]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3077]!, self._r[3077]!, [_0]) + return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_0]) } - public var LocalGroup_Text: String { return self._s[3078]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3079]! } - public var SocksProxySetup_TypeSocks: String { return self._s[3080]! } - public var ChatList_UnarchiveAction: String { return self._s[3081]! } - public var AutoNightTheme_Title: String { return self._s[3082]! } - public var InstantPage_FeedbackButton: String { return self._s[3083]! } - public var Passport_FieldAddress: String { return self._s[3084]! } + public var LocalGroup_Text: String { return self._s[3096]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3097]! } + public var SocksProxySetup_TypeSocks: String { return self._s[3098]! } + public var ChatList_UnarchiveAction: String { return self._s[3099]! } + public var AutoNightTheme_Title: String { return self._s[3100]! } + public var InstantPage_FeedbackButton: String { return self._s[3101]! } + public var Passport_FieldAddress: String { return self._s[3102]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3085]!, self._r[3085]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3103]!, self._r[3103]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[3086]! } + public var Month_ShortMarch: String { return self._s[3104]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3087]!, self._r[3087]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3105]!, self._r[3105]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3088]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3089]! } - public var Passport_FloodError: String { return self._s[3090]! } - public var SecretGif_Title: String { return self._s[3091]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3092]! } - public var ChatList_Context_UnhideArchive: String { return self._s[3093]! } - public var Passport_Language_th: String { return self._s[3095]! } - public var Passport_Address_Address: String { return self._s[3096]! } - public var Login_InvalidLastNameError: String { return self._s[3097]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3098]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[3099]! } - public var ChatList_Context_Archive: String { return self._s[3100]! } - public var SettingsSearch_FAQ: String { return self._s[3101]! } - public var ShareMenu_Send: String { return self._s[3102]! } - public var WallpaperSearch_ColorYellow: String { return self._s[3104]! } - public var Month_GenNovember: String { return self._s[3106]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3108]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3106]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3107]! } + public var Passport_FloodError: String { return self._s[3108]! } + public var SecretGif_Title: String { return self._s[3109]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3110]! } + public var ChatList_Context_UnhideArchive: String { return self._s[3111]! } + public var Passport_Language_th: String { return self._s[3113]! } + public var Passport_Address_Address: String { return self._s[3114]! } + public var Login_InvalidLastNameError: String { return self._s[3115]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3116]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[3117]! } + public var ChatList_Context_Archive: String { return self._s[3118]! } + public var SettingsSearch_FAQ: String { return self._s[3119]! } + public var ShareMenu_Send: String { return self._s[3120]! } + public var ChatState_Connecting: String { return self._s[3121]! } + public var WallpaperSearch_ColorYellow: String { return self._s[3123]! } + public var Month_GenNovember: String { return self._s[3125]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3127]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3109]!, self._r[3109]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3128]!, self._r[3128]!, [_1, _2]) } - public var Conversation_SwipeToReplyHintText: String { return self._s[3110]! } - public var Checkout_Email: String { return self._s[3111]! } - public var NotificationsSound_Tritone: String { return self._s[3112]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[3114]! } - public var Wallet_ContextMenuCopy: String { return self._s[3116]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3129]! } + public var Checkout_Email: String { return self._s[3130]! } + public var NotificationsSound_Tritone: String { return self._s[3131]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[3133]! } + public var Wallet_ContextMenuCopy: String { return self._s[3135]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3118]!, self._r[3118]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_1, _2, _3]) } - public var Appearance_TextSize_Automatic: String { return self._s[3119]! } + public var Appearance_TextSize_Automatic: String { return self._s[3138]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3120]!, self._r[3120]!, [_1]) + return formatWithArgumentRanges(self._s[3139]!, self._r[3139]!, [_1]) } public func StickerPackActionInfo_AddedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_0]) + return formatWithArgumentRanges(self._s[3140]!, self._r[3140]!, [_0]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[3122]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[3141]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3123]!, self._r[3123]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[3142]!, self._r[3142]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[3124]! } - public var Notification_Exceptions_Add: String { return self._s[3125]! } - public var DialogList_You: String { return self._s[3126]! } - public var MediaPicker_Send: String { return self._s[3129]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3130]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3131]! } - public var Call_AudioRouteSpeaker: String { return self._s[3132]! } - public var Watch_UserInfo_Title: String { return self._s[3133]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[3134]! } - public var Appearance_AccentColor: String { return self._s[3136]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3143]! } + public var Notification_Exceptions_Add: String { return self._s[3144]! } + public var DialogList_You: String { return self._s[3145]! } + public var MediaPicker_Send: String { return self._s[3148]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3149]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3150]! } + public var Call_AudioRouteSpeaker: String { return self._s[3151]! } + public var Watch_UserInfo_Title: String { return self._s[3152]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[3153]! } + public var Appearance_AccentColor: String { return self._s[3155]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_0]) + return formatWithArgumentRanges(self._s[3156]!, self._r[3156]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3138]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3157]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3139]!, self._r[3139]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[3140]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3141]! } - public var Notification_CallOutgoing: String { return self._s[3142]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3143]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3144]! } - public var Call_RecordingDisabledMessage: String { return self._s[3145]! } - public var Message_Game: String { return self._s[3146]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[3147]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3148]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3149]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3150]! } - public var Date_DialogDateFormat: String { return self._s[3152]! } - public var WallpaperColors_SetCustomColor: String { return self._s[3153]! } - public var Notifications_InAppNotifications: String { return self._s[3154]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[3159]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3160]! } + public var Notification_CallOutgoing: String { return self._s[3161]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3162]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3163]! } + public var Call_RecordingDisabledMessage: String { return self._s[3164]! } + public var Message_Game: String { return self._s[3165]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[3166]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3167]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3168]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3169]! } + public var Date_DialogDateFormat: String { return self._s[3171]! } + public var WallpaperColors_SetCustomColor: String { return self._s[3172]! } + public var Notifications_InAppNotifications: String { return self._s[3173]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3155]!, self._r[3155]!, [_0]) + return formatWithArgumentRanges(self._s[3174]!, self._r[3174]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3156]!, self._r[3156]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3175]!, self._r[3175]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[3157]! } + public var NewContact_Title: String { return self._s[3176]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_0]) + return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[3159]! } + public var Conversation_ViewContactDetails: String { return self._s[3178]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3161]!, self._r[3161]!, [_1]) + return formatWithArgumentRanges(self._s[3180]!, self._r[3180]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3162]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3163]! } - public var PrivacySettings_Title: String { return self._s[3164]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3167]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[3168]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[3169]! } - public var Contacts_PhoneNumber: String { return self._s[3170]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3172]! } - public var Map_ShowPlaces: String { return self._s[3173]! } - public var ChatAdmins_Title: String { return self._s[3174]! } - public var InstantPage_Reference: String { return self._s[3176]! } - public var Wallet_Info_Updating: String { return self._s[3177]! } - public var ReportGroupLocation_Text: String { return self._s[3178]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3181]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3182]! } + public var PrivacySettings_Title: String { return self._s[3183]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3186]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[3187]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[3188]! } + public var Contacts_PhoneNumber: String { return self._s[3189]! } + public var PeerInfo_ButtonMute: String { return self._s[3190]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3192]! } + public var Map_ShowPlaces: String { return self._s[3193]! } + public var ChatAdmins_Title: String { return self._s[3194]! } + public var InstantPage_Reference: String { return self._s[3196]! } + public var Wallet_Info_Updating: String { return self._s[3197]! } + public var ReportGroupLocation_Text: String { return self._s[3198]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3179]!, self._r[3179]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3199]!, self._r[3199]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[3180]! } - public var Watch_UserInfo_Block: String { return self._s[3181]! } - public var ChatSettings_Stickers: String { return self._s[3182]! } - public var ChatSettings_DownloadInBackground: String { return self._s[3183]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3184]! } + public var Camera_FlashOff: String { return self._s[3200]! } + public var Watch_UserInfo_Block: String { return self._s[3201]! } + public var ChatSettings_Stickers: String { return self._s[3202]! } + public var ChatSettings_DownloadInBackground: String { return self._s[3203]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3204]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3185]!, self._r[3185]!, [_0]) - } - public var Settings_ViewPhoto: String { return self._s[3186]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3187]! } - public var AutoDownloadSettings_Cellular: String { return self._s[3188]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[3189]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3190]! } - public var VoiceOver_MessageContextShare: String { return self._s[3191]! } - public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_0]) - } - public var Privacy_DeleteDrafts: String { return self._s[3194]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3195]! } - public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3196]!, self._r[3196]!, [_0]) - } - public var DialogList_SavedMessagesHelp: String { return self._s[3197]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3198]! } - public var DialogList_SavedMessages: String { return self._s[3199]! } - public var GroupInfo_UpgradeButton: String { return self._s[3200]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3202]! } - public var DialogList_Pin: String { return self._s[3203]! } - public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3204]!, self._r[3204]!, [_0, _1]) - } - public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3205]!, self._r[3205]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3206]! } - public var UserInfo_NotificationsDisable: String { return self._s[3207]! } - public var Conversation_ContextMenuCancelEditing: String { return self._s[3208]! } - public var Paint_Outlined: String { return self._s[3209]! } - public var Activity_PlayingGame: String { return self._s[3210]! } - public var SearchImages_NoImagesFound: String { return self._s[3211]! } - public var SocksProxySetup_ProxyType: String { return self._s[3212]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3214]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3215]! } - public var Settings_AppLanguage: String { return self._s[3216]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3217]! } - public var Common_ChoosePhoto: String { return self._s[3218]! } - public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3219]! } - public var CallFeedback_ReasonEcho: String { return self._s[3220]! } + public var Settings_ViewPhoto: String { return self._s[3206]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3207]! } + public var AutoDownloadSettings_Cellular: String { return self._s[3208]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[3209]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3210]! } + public var VoiceOver_MessageContextShare: String { return self._s[3211]! } + public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3213]!, self._r[3213]!, [_0]) + } + public var Privacy_DeleteDrafts: String { return self._s[3214]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3215]! } + public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3216]!, self._r[3216]!, [_0]) + } + public var DialogList_SavedMessagesHelp: String { return self._s[3217]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3218]! } + public var DialogList_SavedMessages: String { return self._s[3219]! } + public var GroupInfo_UpgradeButton: String { return self._s[3220]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3222]! } + public var DialogList_Pin: String { return self._s[3223]! } + public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3224]!, self._r[3224]!, [_0, _1]) + } + public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3225]!, self._r[3225]!, [_0]) + } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3226]! } + public var UserInfo_NotificationsDisable: String { return self._s[3227]! } + public var Conversation_ContextMenuCancelEditing: String { return self._s[3228]! } + public var Paint_Outlined: String { return self._s[3229]! } + public var Activity_PlayingGame: String { return self._s[3230]! } + public var SearchImages_NoImagesFound: String { return self._s[3231]! } + public var SocksProxySetup_ProxyType: String { return self._s[3232]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3234]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3235]! } + public var Settings_AppLanguage: String { return self._s[3236]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3237]! } + public var Common_ChoosePhoto: String { return self._s[3238]! } + public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3239]! } + public var CallFeedback_ReasonEcho: String { return self._s[3240]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3221]!, self._r[3221]!, [_1]) + return formatWithArgumentRanges(self._s[3241]!, self._r[3241]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3222]! } - public var PollResults_Collapse: String { return self._s[3223]! } - public var Activity_UploadingVideo: String { return self._s[3224]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3225]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3226]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3227]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3228]! } - public var PUSH_SENDER_YOU: String { return self._s[3229]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3230]! } - public var Checkout_PayWithTouchId: String { return self._s[3231]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3232]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3242]! } + public var PollResults_Collapse: String { return self._s[3243]! } + public var Activity_UploadingVideo: String { return self._s[3244]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3245]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3246]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3247]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3248]! } + public var PUSH_SENDER_YOU: String { return self._s[3249]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3250]! } + public var Checkout_PayWithTouchId: String { return self._s[3251]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3252]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3234]!, self._r[3234]!, [_1]) + return formatWithArgumentRanges(self._s[3254]!, self._r[3254]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[3235]! } + public var Notifications_ExceptionsNone: String { return self._s[3255]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3236]!, self._r[3236]!, [_0]) + return formatWithArgumentRanges(self._s[3256]!, self._r[3256]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3237]!, self._r[3237]!, [_1]) + return formatWithArgumentRanges(self._s[3257]!, self._r[3257]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3239]! } - public var Passport_Address_Region: String { return self._s[3242]! } - public var ChatList_DeleteChat: String { return self._s[3243]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3244]! } - public var PhotoEditor_TiltShift: String { return self._s[3245]! } - public var Settings_FAQ_URL: String { return self._s[3246]! } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3247]! } - public var Passport_Language_sl: String { return self._s[3248]! } - public var Settings_PrivacySettings: String { return self._s[3250]! } - public var SharedMedia_TitleLink: String { return self._s[3251]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3252]! } - public var Settings_SetProfilePhoto: String { return self._s[3253]! } - public var Channel_About_Help: String { return self._s[3254]! } - public var Contacts_PermissionsEnable: String { return self._s[3255]! } - public var Wallet_Sending_Title: String { return self._s[3256]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3257]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3258]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3260]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3261]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3262]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3263]! } - public var OldChannels_Title: String { return self._s[3264]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3265]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3267]! } - public var Map_OpenInYandexMaps: String { return self._s[3269]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3270]! } - public var VoiceOver_MessageContextReply: String { return self._s[3271]! } - public var PhotoEditor_SaturationTool: String { return self._s[3273]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[3259]! } + public var Passport_Address_Region: String { return self._s[3262]! } + public var ChatList_DeleteChat: String { return self._s[3263]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3264]! } + public var PhotoEditor_TiltShift: String { return self._s[3265]! } + public var Settings_FAQ_URL: String { return self._s[3266]! } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3267]! } + public var Passport_Language_sl: String { return self._s[3268]! } + public var Settings_PrivacySettings: String { return self._s[3270]! } + public var SharedMedia_TitleLink: String { return self._s[3271]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3272]! } + public var Settings_SetProfilePhoto: String { return self._s[3273]! } + public var Channel_About_Help: String { return self._s[3274]! } + public var Contacts_PermissionsEnable: String { return self._s[3275]! } + public var Wallet_Sending_Title: String { return self._s[3276]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3277]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3278]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3280]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3281]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3282]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3283]! } + public var OldChannels_Title: String { return self._s[3284]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3285]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3287]! } + public var Map_OpenInYandexMaps: String { return self._s[3289]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3290]! } + public var VoiceOver_MessageContextReply: String { return self._s[3291]! } + public var PhotoEditor_SaturationTool: String { return self._s[3293]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3274]!, self._r[3274]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3294]!, self._r[3294]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3275]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3276]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3277]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3295]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3296]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3297]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3278]!, self._r[3278]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3298]!, self._r[3298]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3279]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3281]! } - public var SettingsSearch_Synonyms_Wallet: String { return self._s[3282]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3299]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3301]! } + public var SettingsSearch_Synonyms_Wallet: String { return self._s[3302]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3283]!, self._r[3283]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3303]!, self._r[3303]!, [_1, _2]) } - public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3284]! } + public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3304]! } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3285]!, self._r[3285]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3305]!, self._r[3305]!, [_1, _2, _3]) } - public var WallpaperPreview_PatternTitle: String { return self._s[3286]! } - public var GroupInfo_PublicLinkAdd: String { return self._s[3287]! } - public var Passport_PassportInformation: String { return self._s[3290]! } - public var Theme_Unsupported: String { return self._s[3291]! } - public var WatchRemote_AlertTitle: String { return self._s[3292]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3293]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3295]! } + public var WallpaperPreview_PatternTitle: String { return self._s[3306]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3307]! } + public var Passport_PassportInformation: String { return self._s[3310]! } + public var Theme_Unsupported: String { return self._s[3311]! } + public var WatchRemote_AlertTitle: String { return self._s[3312]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3313]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3315]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3296]!, self._r[3296]!, [_0]) + return formatWithArgumentRanges(self._s[3316]!, self._r[3316]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3297]!, self._r[3297]!, [_1]) + return formatWithArgumentRanges(self._s[3317]!, self._r[3317]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3298]! } - public var Wallet_Navigation_Done: String { return self._s[3300]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3301]! } - public var AccessDenied_CameraDisabled: String { return self._s[3302]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3318]! } + public var Wallet_Navigation_Done: String { return self._s[3320]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3321]! } + public var AccessDenied_CameraDisabled: String { return self._s[3322]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3303]!, self._r[3303]!, [_0]) + return formatWithArgumentRanges(self._s[3323]!, self._r[3323]!, [_0]) } - public var ClearCache_Forever: String { return self._s[3304]! } - public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3305]! } - public var CreatePoll_Quiz: String { return self._s[3306]! } - public var PhotoEditor_ContrastTool: String { return self._s[3309]! } + public var ClearCache_Forever: String { return self._s[3324]! } + public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3325]! } + public var CreatePoll_Quiz: String { return self._s[3326]! } + public var PhotoEditor_ContrastTool: String { return self._s[3329]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3310]!, self._r[3310]!, [_1]) + return formatWithArgumentRanges(self._s[3330]!, self._r[3330]!, [_1]) } - public var DialogList_Draft: String { return self._s[3311]! } - public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3312]! } - public var Privacy_TopPeersDelete: String { return self._s[3314]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3315]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3316]! } - public var WebSearch_RecentSectionClear: String { return self._s[3317]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3318]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3320]! } - public var Common_Done: String { return self._s[3322]! } - public var Shortcut_SwitchAccount: String { return self._s[3323]! } - public var AuthSessions_EmptyText: String { return self._s[3324]! } - public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3325]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3326]! } - public var Tour_Title5: String { return self._s[3327]! } - public var Wallet_Settings_Title: String { return self._s[3328]! } + public var DialogList_Draft: String { return self._s[3331]! } + public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3332]! } + public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3333]!, self._r[3333]!, [_0]) + } + public var Privacy_TopPeersDelete: String { return self._s[3335]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3336]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3337]! } + public var WebSearch_RecentSectionClear: String { return self._s[3338]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3339]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3341]! } + public var PeerInfo_ButtonMore: String { return self._s[3343]! } + public var Common_Done: String { return self._s[3344]! } + public var Shortcut_SwitchAccount: String { return self._s[3345]! } + public var AuthSessions_EmptyText: String { return self._s[3346]! } + public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3347]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3348]! } + public var Tour_Title5: String { return self._s[3349]! } + public var Wallet_Settings_Title: String { return self._s[3350]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3329]!, self._r[3329]!, [_0]) + return formatWithArgumentRanges(self._s[3351]!, self._r[3351]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3330]! } - public var Conversation_LinkDialogSave: String { return self._s[3331]! } - public var GroupInfo_ActionRestrict: String { return self._s[3332]! } - public var Checkout_Title: String { return self._s[3333]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3335]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3337]! } - public var Notification_RenamedGroup: String { return self._s[3338]! } - public var PeopleNearby_Groups: String { return self._s[3339]! } - public var Checkout_PayWithFaceId: String { return self._s[3340]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3341]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3343]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3344]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3345]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3352]! } + public var Conversation_LinkDialogSave: String { return self._s[3353]! } + public var GroupInfo_ActionRestrict: String { return self._s[3354]! } + public var Checkout_Title: String { return self._s[3355]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3357]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3359]! } + public var Notification_RenamedGroup: String { return self._s[3360]! } + public var PeopleNearby_Groups: String { return self._s[3361]! } + public var Checkout_PayWithFaceId: String { return self._s[3362]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3363]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3365]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3366]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3367]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3346]!, self._r[3346]!, [_0]) + return formatWithArgumentRanges(self._s[3368]!, self._r[3368]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3348]! } + public var Profile_AddToExisting: String { return self._s[3370]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3349]!, self._r[3349]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3351]! } - public var Permissions_PrivacyPolicy: String { return self._s[3352]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3353]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3354]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3356]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3358]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3359]! } + public var Cache_Files: String { return self._s[3373]! } + public var Permissions_PrivacyPolicy: String { return self._s[3374]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3375]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3376]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3378]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3380]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3381]! } public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3360]!, self._r[3360]!, [_0]) + return formatWithArgumentRanges(self._s[3382]!, self._r[3382]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3361]! } - public var VoiceOver_AttachMedia: String { return self._s[3364]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3365]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3383]! } + public var VoiceOver_AttachMedia: String { return self._s[3386]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3387]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3366]!, self._r[3366]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3388]!, self._r[3388]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3367]! } - public var Conversation_SetReminder_Title: String { return self._s[3368]! } - public var Passport_FieldAddressHelp: String { return self._s[3369]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3370]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3371]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3389]! } + public var Conversation_SetReminder_Title: String { return self._s[3390]! } + public var Passport_FieldAddressHelp: String { return self._s[3391]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3392]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3393]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3372]!, self._r[3372]!, [_0]) + return formatWithArgumentRanges(self._s[3394]!, self._r[3394]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3373]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3374]! } - public var Login_UnknownError: String { return self._s[3375]! } - public var Group_UpgradeNoticeText2: String { return self._s[3378]! } - public var Watch_Compose_AddContact: String { return self._s[3379]! } - public var ClearCache_StorageServiceFiles: String { return self._s[3380]! } - public var Web_Error: String { return self._s[3381]! } - public var Gif_Search: String { return self._s[3382]! } - public var Profile_MessageLifetime1h: String { return self._s[3383]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3384]! } - public var Channel_Username_CheckingUsername: String { return self._s[3385]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3386]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3387]! } - public var Channel_AboutItem: String { return self._s[3388]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3390]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3391]! } - public var GroupInfo_SharedMedia: String { return self._s[3392]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3395]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3396]! } + public var Login_UnknownError: String { return self._s[3397]! } + public var Group_UpgradeNoticeText2: String { return self._s[3400]! } + public var Watch_Compose_AddContact: String { return self._s[3401]! } + public var ClearCache_StorageServiceFiles: String { return self._s[3402]! } + public var Web_Error: String { return self._s[3403]! } + public var Gif_Search: String { return self._s[3404]! } + public var Profile_MessageLifetime1h: String { return self._s[3405]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3406]! } + public var Channel_Username_CheckingUsername: String { return self._s[3407]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3408]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3409]! } + public var Channel_AboutItem: String { return self._s[3410]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3412]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3413]! } + public var GroupInfo_SharedMedia: String { return self._s[3414]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3393]!, self._r[3393]!, [_1]) + return formatWithArgumentRanges(self._s[3415]!, self._r[3415]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3394]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3416]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3395]!, self._r[3395]!, [_1]) + return formatWithArgumentRanges(self._s[3417]!, self._r[3417]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3396]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3397]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3398]! } - public var CreatePoll_AddOption: String { return self._s[3399]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3400]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3401]! } - public var Channel_Management_AddModerator: String { return self._s[3402]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3403]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3404]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3405]! } - public var Theme_Colors_Background: String { return self._s[3406]! } - public var NotificationsSound_Hello: String { return self._s[3408]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3409]! } - public var Channel_Stickers_Placeholder: String { return self._s[3411]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3418]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3419]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3420]! } + public var CreatePoll_AddOption: String { return self._s[3421]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3422]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3423]! } + public var Channel_Management_AddModerator: String { return self._s[3424]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3425]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3426]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3427]! } + public var Theme_Colors_Background: String { return self._s[3428]! } + public var NotificationsSound_Hello: String { return self._s[3430]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3431]! } + public var Channel_Stickers_Placeholder: String { return self._s[3433]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3412]!, self._r[3412]!, [_0]) + return formatWithArgumentRanges(self._s[3434]!, self._r[3434]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3413]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3414]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3415]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3416]! } - public var AutoDownloadSettings_Channels: String { return self._s[3417]! } - public var Passport_Language_mn: String { return self._s[3418]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3421]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3422]! } - public var Passport_Language_ja: String { return self._s[3424]! } - public var Settings_About_Title: String { return self._s[3425]! } - public var Settings_NotificationsAndSounds: String { return self._s[3426]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3427]! } - public var Settings_BlockedUsers: String { return self._s[3428]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3435]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3436]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3437]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3438]! } + public var AutoDownloadSettings_Channels: String { return self._s[3439]! } + public var Passport_Language_mn: String { return self._s[3440]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3443]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3444]! } + public var Passport_Language_ja: String { return self._s[3446]! } + public var Settings_About_Title: String { return self._s[3447]! } + public var Settings_NotificationsAndSounds: String { return self._s[3448]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3449]! } + public var Settings_BlockedUsers: String { return self._s[3450]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3429]!, self._r[3429]!, [_0]) + return formatWithArgumentRanges(self._s[3451]!, self._r[3451]!, [_0]) } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3430]! } - public var Wallet_Weekday_Today: String { return self._s[3431]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3432]! } - public var Widget_ApplicationLocked: String { return self._s[3433]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3434]! } - public var Channel_Username_Title: String { return self._s[3435]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3452]! } + public var Wallet_Weekday_Today: String { return self._s[3453]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3454]! } + public var Widget_ApplicationLocked: String { return self._s[3455]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3456]! } + public var Channel_Username_Title: String { return self._s[3457]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3436]!, self._r[3436]!, [_0]) + return formatWithArgumentRanges(self._s[3458]!, self._r[3458]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3438]! } - public var AppleWatch_Title: String { return self._s[3439]! } - public var Activity_RecordingVideoMessage: String { return self._s[3440]! } + public var AttachmentMenu_File: String { return self._s[3460]! } + public var AppleWatch_Title: String { return self._s[3461]! } + public var Activity_RecordingVideoMessage: String { return self._s[3462]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3441]!, self._r[3441]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3463]!, self._r[3463]!, [_1, _2]) } - public var Theme_Colors_Messages: String { return self._s[3442]! } - public var Weekday_Saturday: String { return self._s[3443]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3444]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3445]! } - public var Common_Next: String { return self._s[3447]! } - public var Channel_Stickers_YourStickers: String { return self._s[3449]! } - public var Message_Theme: String { return self._s[3450]! } - public var Call_AudioRouteHeadphones: String { return self._s[3451]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3453]! } - public var Watch_Contacts_NoResults: String { return self._s[3455]! } - public var PhotoEditor_TintTool: String { return self._s[3458]! } - public var LoginPassword_ResetAccount: String { return self._s[3460]! } - public var Settings_SavedMessages: String { return self._s[3461]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3462]! } - public var Bot_GenericSupportStatus: String { return self._s[3463]! } - public var StickerPack_Add: String { return self._s[3464]! } - public var Checkout_TotalAmount: String { return self._s[3465]! } - public var Your_cards_number_is_invalid: String { return self._s[3466]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3467]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3468]! } + public var Theme_Colors_Messages: String { return self._s[3464]! } + public var Weekday_Saturday: String { return self._s[3465]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3466]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3467]! } + public var Common_Next: String { return self._s[3469]! } + public var Channel_Stickers_YourStickers: String { return self._s[3471]! } + public var Message_Theme: String { return self._s[3472]! } + public var Call_AudioRouteHeadphones: String { return self._s[3473]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3475]! } + public var Watch_Contacts_NoResults: String { return self._s[3477]! } + public var PhotoEditor_TintTool: String { return self._s[3480]! } + public var LoginPassword_ResetAccount: String { return self._s[3482]! } + public var Settings_SavedMessages: String { return self._s[3483]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3484]! } + public var Bot_GenericSupportStatus: String { return self._s[3485]! } + public var StickerPack_Add: String { return self._s[3486]! } + public var Checkout_TotalAmount: String { return self._s[3487]! } + public var Your_cards_number_is_invalid: String { return self._s[3488]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3489]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3490]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3469]!, self._r[3469]!, [_0]) + return formatWithArgumentRanges(self._s[3491]!, self._r[3491]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3470]!, self._r[3470]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3492]!, self._r[3492]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3471]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3493]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3473]!, self._r[3473]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3495]!, self._r[3495]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_0]) + return formatWithArgumentRanges(self._s[3496]!, self._r[3496]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3475]! } - public var StickerPack_Share: String { return self._s[3476]! } - public var Passport_DeleteAddress: String { return self._s[3477]! } - public var Settings_Passport: String { return self._s[3478]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3479]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3480]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3481]! } - public var Contacts_PermissionsText: String { return self._s[3482]! } - public var Group_Setup_HistoryVisible: String { return self._s[3483]! } - public var Wallet_Month_ShortDecember: String { return self._s[3485]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3486]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3487]! } - public var SocksProxySetup_Title: String { return self._s[3488]! } - public var Notification_Mute1h: String { return self._s[3489]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3497]! } + public var StickerPack_Share: String { return self._s[3498]! } + public var Passport_DeleteAddress: String { return self._s[3499]! } + public var Settings_Passport: String { return self._s[3500]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3501]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3502]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3503]! } + public var Contacts_PermissionsText: String { return self._s[3504]! } + public var Group_Setup_HistoryVisible: String { return self._s[3505]! } + public var Wallet_Month_ShortDecember: String { return self._s[3507]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3508]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3509]! } + public var SocksProxySetup_Title: String { return self._s[3510]! } + public var Notification_Mute1h: String { return self._s[3511]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3490]!, self._r[3490]!, [_0]) + return formatWithArgumentRanges(self._s[3512]!, self._r[3512]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3491]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3513]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3492]!, self._r[3492]!, [_1]) + return formatWithArgumentRanges(self._s[3514]!, self._r[3514]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3493]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3496]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3498]! } - public var DialogList_NoMessagesText: String { return self._s[3499]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3500]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3501]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3503]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3504]! } - public var Common_TakePhotoOrVideo: String { return self._s[3505]! } - public var Wallet_Words_Text: String { return self._s[3506]! } - public var Call_StatusBusy: String { return self._s[3507]! } - public var Conversation_PinnedMessage: String { return self._s[3508]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3509]! } - public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3510]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3511]! } - public var Undo_ChatCleared: String { return self._s[3512]! } - public var AppleWatch_ReplyPresets: String { return self._s[3513]! } - public var Passport_DiscardMessageDescription: String { return self._s[3515]! } - public var Login_NetworkError: String { return self._s[3516]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3515]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3518]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3520]! } + public var DialogList_NoMessagesText: String { return self._s[3521]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3522]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3523]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3525]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3526]! } + public var Common_TakePhotoOrVideo: String { return self._s[3527]! } + public var Wallet_Words_Text: String { return self._s[3528]! } + public var Call_StatusBusy: String { return self._s[3529]! } + public var Conversation_PinnedMessage: String { return self._s[3530]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3531]! } + public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3532]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3533]! } + public var Undo_ChatCleared: String { return self._s[3534]! } + public var AppleWatch_ReplyPresets: String { return self._s[3535]! } + public var Passport_DiscardMessageDescription: String { return self._s[3537]! } + public var Login_NetworkError: String { return self._s[3538]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3517]!, self._r[3517]!, [_0]) - } - public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3518]!, self._r[3518]!, [_0]) - } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3519]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3521]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3522]! } - public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3524]!, self._r[3524]!, [_0]) - } - public var Call_ConnectionErrorMessage: String { return self._s[3525]! } - public var VoiceOver_Chat_Music: String { return self._s[3526]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3527]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3529]! } - public var ConversationMedia_Title: String { return self._s[3530]! } - public var EncryptionKey_Title: String { return self._s[3532]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3533]! } - public var Notification_Exceptions_AddException: String { return self._s[3534]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3535]! } - public var Profile_MessageLifetime1m: String { return self._s[3536]! } - public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3537]!, self._r[3537]!, [_1]) - } - public var Month_GenMay: String { return self._s[3538]! } - public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3540]! } - public var Wallet_Send_AddressInfo: String { return self._s[3541]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3542]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3543]! } + public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3540]!, self._r[3540]!, [_0]) + } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3541]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3543]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3544]! } + public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3546]!, self._r[3546]!, [_0]) + } + public var Call_ConnectionErrorMessage: String { return self._s[3547]! } + public var VoiceOver_Chat_Music: String { return self._s[3548]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3549]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3551]! } + public var ConversationMedia_Title: String { return self._s[3552]! } + public var EncryptionKey_Title: String { return self._s[3554]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3555]! } + public var Notification_Exceptions_AddException: String { return self._s[3556]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3557]! } + public var Profile_MessageLifetime1m: String { return self._s[3558]! } + public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3559]!, self._r[3559]!, [_1]) + } + public var Month_GenMay: String { return self._s[3560]! } + public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3561]!, self._r[3561]!, [_0]) + } + public var PeopleNearby_Users: String { return self._s[3562]! } + public var Wallet_Send_AddressInfo: String { return self._s[3563]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3564]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3565]! } public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3545]!, self._r[3545]!, [_0]) + return formatWithArgumentRanges(self._s[3567]!, self._r[3567]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3546]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3547]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3548]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3549]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3550]! } - public var Channel_JoinChannel: String { return self._s[3552]! } - public var Appearance_Animations: String { return self._s[3555]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3568]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3569]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3570]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3571]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3572]! } + public var Channel_JoinChannel: String { return self._s[3574]! } + public var Appearance_Animations: String { return self._s[3577]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3556]!, self._r[3556]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3578]!, self._r[3578]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3558]! } - public var Appearance_ShareTheme: String { return self._s[3559]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3560]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3562]! } - public var StickerPackActionInfo_RemovedTitle: String { return self._s[3563]! } - public var Passport_Address_Street: String { return self._s[3564]! } - public var Conversation_AddContact: String { return self._s[3565]! } - public var Login_PhonePlaceholder: String { return self._s[3566]! } - public var Channel_Members_InviteLink: String { return self._s[3568]! } - public var Bot_Stop: String { return self._s[3569]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3571]! } - public var Notification_PassportValueAddress: String { return self._s[3572]! } - public var Month_ShortJuly: String { return self._s[3573]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3574]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3575]! } - public var Passport_Identity_ReverseSide: String { return self._s[3576]! } - public var Watch_Stickers_Recents: String { return self._s[3579]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3581]! } - public var Map_SendThisLocation: String { return self._s[3582]! } + public var Stickers_GroupStickers: String { return self._s[3580]! } + public var Appearance_ShareTheme: String { return self._s[3581]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3582]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3584]! } + public var StickerPackActionInfo_RemovedTitle: String { return self._s[3585]! } + public var Passport_Address_Street: String { return self._s[3586]! } + public var Conversation_AddContact: String { return self._s[3587]! } + public var Login_PhonePlaceholder: String { return self._s[3588]! } + public var Channel_Members_InviteLink: String { return self._s[3590]! } + public var Bot_Stop: String { return self._s[3591]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3593]! } + public var Notification_PassportValueAddress: String { return self._s[3594]! } + public var Month_ShortJuly: String { return self._s[3595]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3596]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3597]! } + public var Passport_Identity_ReverseSide: String { return self._s[3598]! } + public var Watch_Stickers_Recents: String { return self._s[3601]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3603]! } + public var Map_SendThisLocation: String { return self._s[3604]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3583]!, self._r[3583]!, [_0]) + return formatWithArgumentRanges(self._s[3605]!, self._r[3605]!, [_0]) } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3584]!, self._r[3584]!, [_0]) + return formatWithArgumentRanges(self._s[3606]!, self._r[3606]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[3585]! } - public var Wallet_Intro_NotNow: String { return self._s[3586]! } + public var ConvertToSupergroup_Note: String { return self._s[3607]! } + public var Wallet_Intro_NotNow: String { return self._s[3608]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3587]!, self._r[3587]!, [_0]) + return formatWithArgumentRanges(self._s[3609]!, self._r[3609]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3588]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3610]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3589]!, self._r[3589]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3611]!, self._r[3611]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3591]! } - public var Wallpaper_SearchShort: String { return self._s[3592]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3594]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3595]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3596]! } + public var Login_CallRequestState3: String { return self._s[3613]! } + public var Wallpaper_SearchShort: String { return self._s[3614]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3616]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3617]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3618]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3597]!, self._r[3597]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3619]!, self._r[3619]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3598]! } - public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3600]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3603]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3620]! } + public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3622]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3625]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3604]!, self._r[3604]!, [_0]) - } - public var Passport_CorrectErrors: String { return self._s[3605]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3606]! } - public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3607]!, self._r[3607]!, [_0]) - } - public var Map_SendMyCurrentLocation: String { return self._s[3608]! } - public var Channel_DiscussionGroup: String { return self._s[3609]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3610]! } - public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3611]!, self._r[3611]!, [_1, _2]) - } - public var SharedMedia_SearchNoResults: String { return self._s[3612]! } - public var Permissions_NotificationsText_v0: String { return self._s[3613]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3614]! } - public var Appearance_AppIcon: String { return self._s[3615]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3616]! } - public var LoginPassword_FloodError: String { return self._s[3617]! } - public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3619]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3620]! } - public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3621]!, self._r[3621]!, [_0]) - } - public var Passport_Language_bn: String { return self._s[3622]! } - public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3623]!, self._r[3623]!, [_0]) - } - public var ChatList_Context_Pin: String { return self._s[3624]! } - public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3625]!, self._r[3625]!, [_0]) - } - public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3626]!, self._r[3626]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3627]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3631]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3633]! } - public var Wallet_Month_GenDecember: String { return self._s[3634]! } - public var Contacts_PermissionsAllow: String { return self._s[3635]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3636]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3637]! } - public var WallpaperPreview_Pattern: String { return self._s[3638]! } - public var Paint_Duplicate: String { return self._s[3639]! } - public var Passport_Address_Country: String { return self._s[3640]! } - public var Notification_RenamedChannel: String { return self._s[3642]! } - public var ChatList_Context_Unmute: String { return self._s[3643]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3644]! } - public var Group_MessagePhotoUpdated: String { return self._s[3645]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3646]! } - public var Conversation_ContextMenuBan: String { return self._s[3647]! } - public var TwoStepAuth_EmailSent: String { return self._s[3648]! } - public var MessagePoll_NoVotes: String { return self._s[3649]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3650]! } - public var Passport_Language_is: String { return self._s[3652]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3654]! } - public var Tour_Text5: String { return self._s[3655]! } + public var Passport_CorrectErrors: String { return self._s[3627]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3628]! } + public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3629]!, self._r[3629]!, [_0]) + } + public var Map_SendMyCurrentLocation: String { return self._s[3630]! } + public var Channel_DiscussionGroup: String { return self._s[3631]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3632]! } + public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3633]!, self._r[3633]!, [_1, _2]) + } + public var SharedMedia_SearchNoResults: String { return self._s[3634]! } + public var Permissions_NotificationsText_v0: String { return self._s[3635]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3636]! } + public var Appearance_AppIcon: String { return self._s[3637]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3638]! } + public var LoginPassword_FloodError: String { return self._s[3639]! } + public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3641]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3642]! } + public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3643]!, self._r[3643]!, [_0]) + } + public var Passport_Language_bn: String { return self._s[3644]! } + public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3645]!, self._r[3645]!, [_0]) + } + public var ChatList_Context_Pin: String { return self._s[3646]! } + public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3647]!, self._r[3647]!, [_0]) + } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3648]!, self._r[3648]!, [_0]) + } + public var Wallet_Navigation_Close: String { return self._s[3649]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3653]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3655]! } + public var Wallet_Month_GenDecember: String { return self._s[3656]! } + public var Contacts_PermissionsAllow: String { return self._s[3657]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3658]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3659]! } + public var WallpaperPreview_Pattern: String { return self._s[3660]! } + public var Paint_Duplicate: String { return self._s[3661]! } + public var Passport_Address_Country: String { return self._s[3662]! } + public var Notification_RenamedChannel: String { return self._s[3664]! } + public var ChatList_Context_Unmute: String { return self._s[3665]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3666]! } + public var Group_MessagePhotoUpdated: String { return self._s[3667]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3668]! } + public var Conversation_ContextMenuBan: String { return self._s[3669]! } + public var TwoStepAuth_EmailSent: String { return self._s[3670]! } + public var MessagePoll_NoVotes: String { return self._s[3671]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3672]! } + public var Passport_Language_is: String { return self._s[3674]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3676]! } + public var Tour_Text5: String { return self._s[3677]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3658]!, self._r[3658]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3680]!, self._r[3680]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3659]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3660]! } + public var Undo_SecretChatDeleted: String { return self._s[3681]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3682]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3661]!, self._r[3661]!, [_0]) + return formatWithArgumentRanges(self._s[3683]!, self._r[3683]!, [_0]) } - public var Forward_ErrorDisabledForChat: String { return self._s[3662]! } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3663]! } - public var Paint_Edit: String { return self._s[3665]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3667]! } - public var Undo_DeletedGroup: String { return self._s[3669]! } - public var LoginPassword_ForgotPassword: String { return self._s[3670]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3671]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3672]! } + public var Forward_ErrorDisabledForChat: String { return self._s[3684]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3685]! } + public var Paint_Edit: String { return self._s[3687]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3689]! } + public var Undo_DeletedGroup: String { return self._s[3691]! } + public var LoginPassword_ForgotPassword: String { return self._s[3692]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3693]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3694]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3673]!, self._r[3673]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3695]!, self._r[3695]!, [_0, _1]) } - public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3674]! } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3675]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3676]! } - public var Passport_Language_uz: String { return self._s[3677]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3678]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3679]! } - public var Map_StopLiveLocation: String { return self._s[3681]! } - public var VoiceOver_MessageContextSend: String { return self._s[3683]! } - public var PasscodeSettings_Help: String { return self._s[3684]! } - public var NotificationsSound_Input: String { return self._s[3685]! } - public var Share_Title: String { return self._s[3688]! } - public var LogoutOptions_Title: String { return self._s[3689]! } - public var Wallet_Send_AddressText: String { return self._s[3690]! } - public var Login_TermsOfServiceAgree: String { return self._s[3691]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3692]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3693]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3694]! } - public var EnterPasscode_EnterTitle: String { return self._s[3695]! } + public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3696]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3697]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3698]! } + public var Passport_Language_uz: String { return self._s[3699]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3700]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3701]! } + public var Map_StopLiveLocation: String { return self._s[3703]! } + public var VoiceOver_MessageContextSend: String { return self._s[3705]! } + public var PasscodeSettings_Help: String { return self._s[3706]! } + public var NotificationsSound_Input: String { return self._s[3707]! } + public var Share_Title: String { return self._s[3710]! } + public var LogoutOptions_Title: String { return self._s[3711]! } + public var Wallet_Send_AddressText: String { return self._s[3712]! } + public var Login_TermsOfServiceAgree: String { return self._s[3713]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3714]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3715]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3716]! } + public var EnterPasscode_EnterTitle: String { return self._s[3717]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3696]!, self._r[3696]!, [_0]) + return formatWithArgumentRanges(self._s[3718]!, self._r[3718]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3697]! } - public var Conversation_AddToContacts: String { return self._s[3698]! } + public var Settings_CopyPhoneNumber: String { return self._s[3719]! } + public var Conversation_AddToContacts: String { return self._s[3720]! } public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3699]!, self._r[3699]!, [_0]) + return formatWithArgumentRanges(self._s[3721]!, self._r[3721]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[3700]! } + public var NotificationsSound_Keys: String { return self._s[3722]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3701]!, self._r[3701]!, [_0]) + return formatWithArgumentRanges(self._s[3723]!, self._r[3723]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3702]! } - public var Message_Video: String { return self._s[3703]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3704]! } + public var Notification_MessageLifetime1w: String { return self._s[3724]! } + public var Message_Video: String { return self._s[3725]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3726]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3705]!, self._r[3705]!, [_1]) + return formatWithArgumentRanges(self._s[3727]!, self._r[3727]!, [_1]) } - public var Wallet_Receive_AmountInfo: String { return self._s[3708]! } + public var Wallet_Receive_AmountInfo: String { return self._s[3730]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3709]!, self._r[3709]!, [_0]) + return formatWithArgumentRanges(self._s[3731]!, self._r[3731]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3710]!, self._r[3710]!, [_0]) + return formatWithArgumentRanges(self._s[3732]!, self._r[3732]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3711]! } + public var Passport_Language_mk: String { return self._s[3733]! } public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3712]!, self._r[3712]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3734]!, self._r[3734]!, [_1, _2, _3]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3713]! } - public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3714]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3716]! } - public var PrivacyPolicy_Decline: String { return self._s[3717]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3718]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3719]! } - public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3720]! } - public var Permissions_SiriAllow_v0: String { return self._s[3722]! } - public var Wallet_Month_ShortAugust: String { return self._s[3723]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3724]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3735]! } + public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3736]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3738]! } + public var PrivacyPolicy_Decline: String { return self._s[3739]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3740]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3741]! } + public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3742]! } + public var Permissions_SiriAllow_v0: String { return self._s[3744]! } + public var Wallet_Month_ShortAugust: String { return self._s[3745]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3746]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3725]!, self._r[3725]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3747]!, self._r[3747]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3726]!, self._r[3726]!, [_0]) + return formatWithArgumentRanges(self._s[3748]!, self._r[3748]!, [_0]) } - public var Paint_Regular: String { return self._s[3727]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3728]! } - public var SocksProxySetup_ShareLink: String { return self._s[3729]! } - public var Wallet_Qr_Title: String { return self._s[3730]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3731]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3733]! } - public var Wallet_Settings_Configuration: String { return self._s[3734]! } - public var GroupInfo_InviteByLink: String { return self._s[3735]! } - public var MessageTimer_Custom: String { return self._s[3736]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3737]! } - public var Conversation_StopQuizConfirmationTitle: String { return self._s[3738]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3740]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3741]! } - public var VoiceOver_Chat_Selected: String { return self._s[3742]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3743]! } - public var Channel_Username_InvalidTaken: String { return self._s[3744]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3745]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3746]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3747]! } - public var Settings_ChatBackground: String { return self._s[3748]! } - public var Channel_Subscribers_Title: String { return self._s[3749]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3750]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3751]! } - public var Watch_ConnectionDescription: String { return self._s[3752]! } - public var OldChannels_NoticeText: String { return self._s[3755]! } - public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3756]! } - public var IntentsSettings_SuggestBy: String { return self._s[3758]! } - public var Theme_ThemeChangedText: String { return self._s[3759]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3760]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3761]! } - public var Wallet_Send_TransactionInProgress: String { return self._s[3762]! } - public var EditProfile_Title: String { return self._s[3763]! } - public var NotificationsSound_Bamboo: String { return self._s[3765]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3767]! } - public var Login_SmsRequestState2: String { return self._s[3768]! } - public var Passport_Language_ar: String { return self._s[3769]! } + public var Paint_Regular: String { return self._s[3749]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3750]! } + public var SocksProxySetup_ShareLink: String { return self._s[3751]! } + public var Wallet_Qr_Title: String { return self._s[3752]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3753]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3755]! } + public var Wallet_Settings_Configuration: String { return self._s[3756]! } + public var GroupInfo_InviteByLink: String { return self._s[3757]! } + public var MessageTimer_Custom: String { return self._s[3758]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3759]! } + public var Conversation_StopQuizConfirmationTitle: String { return self._s[3760]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3762]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3763]! } + public var VoiceOver_Chat_Selected: String { return self._s[3764]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3765]! } + public var Channel_Username_InvalidTaken: String { return self._s[3766]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3767]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3768]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3769]! } + public var Settings_ChatBackground: String { return self._s[3770]! } + public var Channel_Subscribers_Title: String { return self._s[3771]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3772]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3773]! } + public var Watch_ConnectionDescription: String { return self._s[3774]! } + public var OldChannels_NoticeText: String { return self._s[3777]! } + public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3778]! } + public var IntentsSettings_SuggestBy: String { return self._s[3780]! } + public var Theme_ThemeChangedText: String { return self._s[3781]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3782]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3783]! } + public var Wallet_Send_TransactionInProgress: String { return self._s[3784]! } + public var EditProfile_Title: String { return self._s[3785]! } + public var NotificationsSound_Bamboo: String { return self._s[3787]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3789]! } + public var Login_SmsRequestState2: String { return self._s[3790]! } + public var Passport_Language_ar: String { return self._s[3791]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3770]!, self._r[3770]!, [_0]) - } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3771]! } - public var Wallet_Created_Text: String { return self._s[3772]! } - public var Conversation_MessageDialogEdit: String { return self._s[3774]! } - public var Wallet_Created_Proceed: String { return self._s[3775]! } - public var Wallet_Words_Done: String { return self._s[3776]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3777]! } - public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3778]!, self._r[3778]!, [_1]) - } - public var Common_Close: String { return self._s[3779]! } - public var GroupInfo_PublicLink: String { return self._s[3780]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3781]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3782]! } - public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3786]!, self._r[3786]!, [_0]) - } - public var UserInfo_About_Placeholder: String { return self._s[3787]! } - public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3788]!, self._r[3788]!, [_0]) - } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3789]! } - public var Channel_Info_Banned: String { return self._s[3791]! } - public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3792]!, self._r[3792]!, [_0]) } - public var Appearance_Other: String { return self._s[3793]! } - public var Passport_Language_my: String { return self._s[3794]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3795]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3793]! } + public var Wallet_Created_Text: String { return self._s[3794]! } + public var Conversation_MessageDialogEdit: String { return self._s[3796]! } + public var Wallet_Created_Proceed: String { return self._s[3797]! } + public var Wallet_Words_Done: String { return self._s[3798]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3799]! } + public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3800]!, self._r[3800]!, [_1]) + } + public var Common_Close: String { return self._s[3801]! } + public var GroupInfo_PublicLink: String { return self._s[3802]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3803]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3804]! } + public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3808]!, self._r[3808]!, [_0]) + } + public var UserInfo_About_Placeholder: String { return self._s[3809]! } + public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3810]!, self._r[3810]!, [_0]) + } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3811]! } + public var Channel_Info_Banned: String { return self._s[3813]! } + public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3814]!, self._r[3814]!, [_0]) + } + public var Appearance_Other: String { return self._s[3815]! } + public var Passport_Language_my: String { return self._s[3816]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3817]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3796]!, self._r[3796]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3818]!, self._r[3818]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3797]! } - public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3798]! } - public var Preview_CopyAddress: String { return self._s[3799]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3819]! } + public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3820]! } + public var Preview_CopyAddress: String { return self._s[3821]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3800]!, self._r[3800]!, [_0]) + return formatWithArgumentRanges(self._s[3822]!, self._r[3822]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3801]! } - public var UserInfo_BotSettings: String { return self._s[3802]! } - public var LiveLocation_MenuStopAll: String { return self._s[3804]! } - public var Passport_PasswordCreate: String { return self._s[3805]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3806]! } - public var Message_PinnedLocationMessage: String { return self._s[3807]! } - public var Map_Satellite: String { return self._s[3808]! } - public var Watch_Message_Unsupported: String { return self._s[3809]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3810]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3811]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3823]! } + public var UserInfo_BotSettings: String { return self._s[3824]! } + public var LiveLocation_MenuStopAll: String { return self._s[3826]! } + public var Passport_PasswordCreate: String { return self._s[3827]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3828]! } + public var Message_PinnedLocationMessage: String { return self._s[3829]! } + public var Map_Satellite: String { return self._s[3830]! } + public var Watch_Message_Unsupported: String { return self._s[3831]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3832]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3833]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3812]!, self._r[3812]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3813]!, self._r[3813]!, [_0]) - } - public var Wallet_WordImport_Continue: String { return self._s[3814]! } - public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3815]!, self._r[3815]!, [_0]) - } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3816]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3817]! } - public var NotificationsSound_None: String { return self._s[3818]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3819]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3821]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3822]! } - public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3823]!, self._r[3823]!, [_1]) - } - public var Cache_Indexing: String { return self._s[3824]! } - public var DialogList_RecentTitlePeople: String { return self._s[3826]! } - public var DialogList_EncryptionRejected: String { return self._s[3827]! } - public var GroupInfo_Administrators: String { return self._s[3828]! } - public var Passport_ScanPassportHelp: String { return self._s[3829]! } - public var Application_Name: String { return self._s[3830]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3831]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3833]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3834]! } - public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3835]!, self._r[3835]!, [_0]) } - public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3836]!, self._r[3836]!, [_0]) - } - public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Wallet_WordImport_Continue: String { return self._s[3836]! } + public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3837]!, self._r[3837]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3838]! } - public var Privacy_ChatsTitle: String { return self._s[3839]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3840]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3841]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3842]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3843]! } - public var WebBrowser_Title: String { return self._s[3844]! } - public var Group_LinkedChannel: String { return self._s[3845]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3846]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3847]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3848]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3849]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3850]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3852]! } - public var Channel_Setup_TypePublic: String { return self._s[3854]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3838]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3839]! } + public var NotificationsSound_None: String { return self._s[3840]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3841]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3843]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3844]! } + public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3845]!, self._r[3845]!, [_1]) + } + public var Cache_Indexing: String { return self._s[3846]! } + public var DialogList_RecentTitlePeople: String { return self._s[3848]! } + public var DialogList_EncryptionRejected: String { return self._s[3849]! } + public var GroupInfo_Administrators: String { return self._s[3850]! } + public var Passport_ScanPassportHelp: String { return self._s[3851]! } + public var Application_Name: String { return self._s[3852]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3853]! } + public var PeopleNearby_MakeVisible: String { return self._s[3855]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3856]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3857]! } + public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3858]!, self._r[3858]!, [_0]) + } + public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3859]!, self._r[3859]!, [_0]) + } + public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3860]!, self._r[3860]!, [_0]) + } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3861]! } + public var Privacy_ChatsTitle: String { return self._s[3862]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3863]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3864]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3865]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3866]! } + public var WebBrowser_Title: String { return self._s[3867]! } + public var Group_LinkedChannel: String { return self._s[3868]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3869]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3870]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3871]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3872]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3873]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3875]! } + public var Channel_Setup_TypePublic: String { return self._s[3877]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3855]!, self._r[3855]!, [_0]) + return formatWithArgumentRanges(self._s[3878]!, self._r[3878]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3857]! } - public var MessagePoll_ViewResults: String { return self._s[3858]! } - public var Map_OpenInMaps: String { return self._s[3860]! } + public var Channel_TypeSetup_Title: String { return self._s[3880]! } + public var MessagePoll_ViewResults: String { return self._s[3881]! } + public var Map_OpenInMaps: String { return self._s[3883]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3861]!, self._r[3861]!, [_1]) + return formatWithArgumentRanges(self._s[3884]!, self._r[3884]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3863]! } + public var NotificationsSound_Tremolo: String { return self._s[3886]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3864]!, self._r[3864]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3887]!, self._r[3887]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3865]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3866]! } - public var Passport_PasswordHelp: String { return self._s[3867]! } - public var Login_CodeExpiredError: String { return self._s[3868]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3869]! } - public var Conversation_TitleUnmute: String { return self._s[3870]! } - public var Passport_Identity_ScansHelp: String { return self._s[3871]! } - public var Passport_Language_lo: String { return self._s[3872]! } - public var Camera_FlashAuto: String { return self._s[3873]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3874]! } - public var Common_Cancel: String { return self._s[3875]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3876]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3877]! } - public var Appearance_TintAllColors: String { return self._s[3878]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3888]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3889]! } + public var Passport_PasswordHelp: String { return self._s[3890]! } + public var Login_CodeExpiredError: String { return self._s[3891]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3892]! } + public var Conversation_TitleUnmute: String { return self._s[3893]! } + public var Passport_Identity_ScansHelp: String { return self._s[3894]! } + public var Passport_Language_lo: String { return self._s[3895]! } + public var Camera_FlashAuto: String { return self._s[3896]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3897]! } + public var Common_Cancel: String { return self._s[3898]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3899]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3900]! } + public var Appearance_TintAllColors: String { return self._s[3901]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_1]) + return formatWithArgumentRanges(self._s[3902]!, self._r[3902]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3880]! } - public var ChatSettings_Title: String { return self._s[3882]! } - public var Passport_PasswordReset: String { return self._s[3883]! } - public var SocksProxySetup_TypeNone: String { return self._s[3884]! } - public var EditTheme_Title: String { return self._s[3887]! } - public var PhoneNumberHelp_Help: String { return self._s[3888]! } - public var Checkout_EnterPassword: String { return self._s[3889]! } - public var Activity_UploadingDocument: String { return self._s[3891]! } - public var Share_AuthTitle: String { return self._s[3892]! } - public var State_Connecting: String { return self._s[3893]! } - public var Profile_MessageLifetime1w: String { return self._s[3894]! } - public var Conversation_ContextMenuReport: String { return self._s[3895]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3896]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3897]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3903]! } + public var ChatSettings_Title: String { return self._s[3905]! } + public var Passport_PasswordReset: String { return self._s[3906]! } + public var SocksProxySetup_TypeNone: String { return self._s[3907]! } + public var EditTheme_Title: String { return self._s[3910]! } + public var PhoneNumberHelp_Help: String { return self._s[3911]! } + public var Checkout_EnterPassword: String { return self._s[3912]! } + public var Activity_UploadingDocument: String { return self._s[3914]! } + public var Share_AuthTitle: String { return self._s[3915]! } + public var State_Connecting: String { return self._s[3916]! } + public var Profile_MessageLifetime1w: String { return self._s[3917]! } + public var Conversation_ContextMenuReport: String { return self._s[3918]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3919]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3920]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3898]!, self._r[3898]!, [_0]) + return formatWithArgumentRanges(self._s[3921]!, self._r[3921]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3899]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3900]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3902]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3903]! } - public var PhotoEditor_Set: String { return self._s[3904]! } - public var EmptyGroupInfo_Title: String { return self._s[3905]! } - public var Login_PadPhoneHelp: String { return self._s[3906]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3908]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3910]! } - public var NotificationsSound_Complete: String { return self._s[3911]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3912]! } - public var Group_Info_AdminLog: String { return self._s[3913]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3914]! } + public var AuthSessions_Terminate: String { return self._s[3922]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3923]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3925]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3926]! } + public var PhotoEditor_Set: String { return self._s[3927]! } + public var EmptyGroupInfo_Title: String { return self._s[3928]! } + public var Login_PadPhoneHelp: String { return self._s[3929]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3931]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3933]! } + public var NotificationsSound_Complete: String { return self._s[3934]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3935]! } + public var Group_Info_AdminLog: String { return self._s[3936]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3937]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3915]!, self._r[3915]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3938]!, self._r[3938]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3916]! } - public var Group_Location_CreateInThisPlace: String { return self._s[3918]! } - public var Conversation_Admin: String { return self._s[3919]! } - public var Conversation_GifTooltip: String { return self._s[3920]! } - public var Passport_NotLoggedInMessage: String { return self._s[3921]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3939]! } + public var Group_Location_CreateInThisPlace: String { return self._s[3941]! } + public var Conversation_Admin: String { return self._s[3942]! } + public var Conversation_GifTooltip: String { return self._s[3943]! } + public var Passport_NotLoggedInMessage: String { return self._s[3944]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3923]!, self._r[3923]!, [_0]) + return formatWithArgumentRanges(self._s[3946]!, self._r[3946]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3924]! } - public var SharedMedia_EmptyTitle: String { return self._s[3926]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3928]! } - public var Username_Help: String { return self._s[3929]! } - public var DialogList_LanguageTooltip: String { return self._s[3931]! } - public var Map_LoadError: String { return self._s[3932]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3933]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3934]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3935]! } - public var Notification_Exceptions_NewException: String { return self._s[3936]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3937]! } - public var WatchRemote_AlertText: String { return self._s[3938]! } + public var Profile_MessageLifetimeForever: String { return self._s[3947]! } + public var SharedMedia_EmptyTitle: String { return self._s[3949]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3951]! } + public var Username_Help: String { return self._s[3952]! } + public var DialogList_LanguageTooltip: String { return self._s[3954]! } + public var Map_LoadError: String { return self._s[3955]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3956]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3957]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3958]! } + public var Notification_Exceptions_NewException: String { return self._s[3959]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3960]! } + public var WatchRemote_AlertText: String { return self._s[3961]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3939]!, self._r[3939]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3962]!, self._r[3962]!, [_1, _2, _3]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3943]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3966]! } public func PUSH_PINNED_QUIZ(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3944]!, self._r[3944]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3967]!, self._r[3967]!, [_1, _2]) } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3945]!, self._r[3945]!, [_0]) + return formatWithArgumentRanges(self._s[3968]!, self._r[3968]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3946]! } - public var WebBrowser_DefaultBrowser: String { return self._s[3947]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3948]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3969]! } + public var WebBrowser_DefaultBrowser: String { return self._s[3970]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3971]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3949]!, self._r[3949]!, [_0]) + return formatWithArgumentRanges(self._s[3972]!, self._r[3972]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3950]!, self._r[3950]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3973]!, self._r[3973]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3951]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3952]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3954]! } - public var Wallet_Created_ExportErrorText: String { return self._s[3955]! } - public var ChatList_UndoArchiveText1: String { return self._s[3956]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3957]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3958]! } - public var Cache_ClearNone: String { return self._s[3959]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3960]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3961]! } + public var Group_AdminLog_EmptyText: String { return self._s[3974]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3975]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3977]! } + public var Wallet_Created_ExportErrorText: String { return self._s[3978]! } + public var ChatList_UndoArchiveText1: String { return self._s[3979]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3980]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3981]! } + public var Cache_ClearNone: String { return self._s[3982]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3983]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3984]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3962]!, self._r[3962]!, [_0]) - } - public var Passport_Identity_Country: String { return self._s[3963]! } - public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3964]!, self._r[3964]!, [_0]) - } - public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3965]!, self._r[3965]!, [_0]) - } - public var Exceptions_AddToExceptions: String { return self._s[3966]! } - public var AccessDenied_Settings: String { return self._s[3967]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3968]! } - public var Month_ShortMay: String { return self._s[3969]! } - public var Compose_NewGroup: String { return self._s[3971]! } - public var Group_Setup_TypePrivate: String { return self._s[3973]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3975]! } - public var Appearance_ThemeDayClassic: String { return self._s[3976]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3977]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3978]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3979]! } - public var Conversation_typing: String { return self._s[3981]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3982]! } - public var Paint_Masks: String { return self._s[3983]! } - public var Contacts_DeselectAll: String { return self._s[3984]! } - public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3985]!, self._r[3985]!, [_0]) } - public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[3986]! } - public var Username_InvalidTaken: String { return self._s[3987]! } - public var Call_StatusNoAnswer: String { return self._s[3988]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3989]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3990]! } - public var Passport_Identity_Selfie: String { return self._s[3991]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3992]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3993]! } - public var Conversation_ClearSecretHistory: String { return self._s[3994]! } - public var PeopleNearby_Description: String { return self._s[3996]! } - public var NetworkUsageSettings_Title: String { return self._s[3997]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3999]! } + public var Passport_Identity_Country: String { return self._s[3986]! } + public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3987]!, self._r[3987]!, [_0]) + } + public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3988]!, self._r[3988]!, [_0]) + } + public var Exceptions_AddToExceptions: String { return self._s[3989]! } + public var AccessDenied_Settings: String { return self._s[3990]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3991]! } + public var Month_ShortMay: String { return self._s[3992]! } + public var Compose_NewGroup: String { return self._s[3994]! } + public var Group_Setup_TypePrivate: String { return self._s[3996]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3998]! } + public var Appearance_ThemeDayClassic: String { return self._s[3999]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[4000]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[4001]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[4002]! } + public var Conversation_typing: String { return self._s[4004]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[4005]! } + public var Paint_Masks: String { return self._s[4006]! } + public var Contacts_DeselectAll: String { return self._s[4007]! } + public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4008]!, self._r[4008]!, [_0]) + } + public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[4009]! } + public var Username_InvalidTaken: String { return self._s[4010]! } + public var Call_StatusNoAnswer: String { return self._s[4011]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[4012]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4013]! } + public var Passport_Identity_Selfie: String { return self._s[4014]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[4015]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[4016]! } + public var Conversation_ClearSecretHistory: String { return self._s[4017]! } + public var PeopleNearby_Description: String { return self._s[4019]! } + public var NetworkUsageSettings_Title: String { return self._s[4020]! } + public var Your_cards_security_code_is_invalid: String { return self._s[4022]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4001]!, self._r[4001]!, [_0]) + return formatWithArgumentRanges(self._s[4024]!, self._r[4024]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4002]!, self._r[4002]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4025]!, self._r[4025]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[4004]! } - public var VoiceOver_Navigation_Search: String { return self._s[4005]! } - public var Map_LiveLocationTitle: String { return self._s[4006]! } - public var Login_InfoAvatarAdd: String { return self._s[4007]! } - public var Passport_Identity_FilesView: String { return self._s[4008]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[4009]! } - public var Privacy_Calls_NeverAllow: String { return self._s[4010]! } - public var VoiceOver_Chat_File: String { return self._s[4011]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4012]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[4027]! } + public var VoiceOver_Navigation_Search: String { return self._s[4028]! } + public var Map_LiveLocationTitle: String { return self._s[4029]! } + public var Login_InfoAvatarAdd: String { return self._s[4030]! } + public var Passport_Identity_FilesView: String { return self._s[4031]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[4032]! } + public var Privacy_Calls_NeverAllow: String { return self._s[4033]! } + public var VoiceOver_Chat_File: String { return self._s[4034]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4035]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_0]) + return formatWithArgumentRanges(self._s[4036]!, self._r[4036]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[4014]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[4015]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4016]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[4037]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[4038]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4039]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4017]!, self._r[4017]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4040]!, self._r[4040]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4018]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[4019]! } - public var Tour_Title2: String { return self._s[4020]! } - public var Wallet_Sent_ViewWallet: String { return self._s[4021]! } - public var Conversation_FileOpenIn: String { return self._s[4022]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4023]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4024]! } - public var Wallpaper_Set: String { return self._s[4025]! } - public var Passport_Identity_Translations: String { return self._s[4027]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4041]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[4042]! } + public var Tour_Title2: String { return self._s[4043]! } + public var Wallet_Sent_ViewWallet: String { return self._s[4044]! } + public var Conversation_FileOpenIn: String { return self._s[4045]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4046]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4047]! } + public var Wallpaper_Set: String { return self._s[4048]! } + public var Passport_Identity_Translations: String { return self._s[4050]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4028]!, self._r[4028]!, [_0]) + return formatWithArgumentRanges(self._s[4051]!, self._r[4051]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[4029]! } + public var Channel_LeaveChannel: String { return self._s[4052]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4030]!, self._r[4030]!, [_1]) + return formatWithArgumentRanges(self._s[4053]!, self._r[4053]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4032]! } - public var PhotoEditor_HighlightsTint: String { return self._s[4033]! } - public var MessagePoll_LabelPoll: String { return self._s[4034]! } - public var Passport_Email_Delete: String { return self._s[4035]! } - public var Conversation_Mute: String { return self._s[4037]! } - public var Channel_AddBotAsAdmin: String { return self._s[4038]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[4040]! } - public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4041]! } - public var ChatSettings_IntentsSettings: String { return self._s[4043]! } - public var Channel_Management_LabelOwner: String { return self._s[4044]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4055]! } + public var PhotoEditor_HighlightsTint: String { return self._s[4056]! } + public var MessagePoll_LabelPoll: String { return self._s[4057]! } + public var Passport_Email_Delete: String { return self._s[4058]! } + public var Conversation_Mute: String { return self._s[4060]! } + public var Channel_AddBotAsAdmin: String { return self._s[4061]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[4063]! } + public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4064]! } + public var ChatSettings_IntentsSettings: String { return self._s[4066]! } + public var Channel_Management_LabelOwner: String { return self._s[4067]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4045]!, self._r[4045]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4068]!, self._r[4068]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[4046]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[4047]! } - public var Common_No: String { return self._s[4048]! } - public var Weekday_Sunday: String { return self._s[4049]! } - public var Notification_Reply: String { return self._s[4050]! } - public var Conversation_ViewMessage: String { return self._s[4051]! } + public var Calls_CallTabDescription: String { return self._s[4069]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[4070]! } + public var Common_No: String { return self._s[4071]! } + public var Weekday_Sunday: String { return self._s[4072]! } + public var Notification_Reply: String { return self._s[4073]! } + public var Conversation_ViewMessage: String { return self._s[4074]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4052]!, self._r[4052]!, [_0]) + return formatWithArgumentRanges(self._s[4075]!, self._r[4075]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4053]!, self._r[4053]!, [_0]) + return formatWithArgumentRanges(self._s[4076]!, self._r[4076]!, [_0]) } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4054]!, self._r[4054]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4077]!, self._r[4077]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4055]! } - public var Wallet_Send_Title: String { return self._s[4056]! } - public var Message_PinnedDocumentMessage: String { return self._s[4057]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[4058]! } - public var DialogList_TabTitle: String { return self._s[4060]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[4061]! } - public var Passport_FieldEmail: String { return self._s[4062]! } - public var Conversation_UnpinMessageAlert: String { return self._s[4063]! } - public var Passport_Address_TypeBankStatement: String { return self._s[4064]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[4065]! } - public var Passport_Identity_ExpiryDate: String { return self._s[4066]! } - public var Privacy_Calls_P2P: String { return self._s[4067]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4078]! } + public var Wallet_Send_Title: String { return self._s[4079]! } + public var Message_PinnedDocumentMessage: String { return self._s[4080]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[4081]! } + public var DialogList_TabTitle: String { return self._s[4083]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[4084]! } + public var Passport_FieldEmail: String { return self._s[4085]! } + public var Conversation_UnpinMessageAlert: String { return self._s[4086]! } + public var Passport_Address_TypeBankStatement: String { return self._s[4087]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[4088]! } + public var Passport_Identity_ExpiryDate: String { return self._s[4089]! } + public var Privacy_Calls_P2P: String { return self._s[4090]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4069]!, self._r[4069]!, [_0]) - } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[4070]! } - public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4071]!, self._r[4071]!, [_1, _2]) - } - public var Stickers_ClearRecent: String { return self._s[4072]! } - public var EnterPasscode_ChangeTitle: String { return self._s[4073]! } - public var TwoFactorSetup_Email_Title: String { return self._s[4074]! } - public var Passport_InfoText: String { return self._s[4075]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4076]! } - public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4077]!, self._r[4077]!, [_0]) - } - public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_1, _2, _3]) - } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4079]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[4080]! } - public var VoiceOver_Navigation_Compose: String { return self._s[4081]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[4082]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[4084]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4085]! } - public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4086]!, self._r[4086]!, [_1, _2]) - } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4088]! } - public var ChatSettings_OpenLinksIn: String { return self._s[4089]! } - public var Map_HomeAndWorkTitle: String { return self._s[4090]! } - public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4092]!, self._r[4092]!, [_0]) } - public var DialogList_Unread: String { return self._s[4093]! } - public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + public var SocksProxySetup_UseForCallsHelp: String { return self._s[4093]! } + public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4094]!, self._r[4094]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[4095]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4096]! } - public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4097]!, self._r[4097]!, [_0]) + public var Stickers_ClearRecent: String { return self._s[4095]! } + public var EnterPasscode_ChangeTitle: String { return self._s[4096]! } + public var TwoFactorSetup_Email_Title: String { return self._s[4097]! } + public var Passport_InfoText: String { return self._s[4098]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4099]! } + public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4100]!, self._r[4100]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[4098]! } - public var SharedMedia_CategoryMedia: String { return self._s[4099]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4100]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4101]! } - public var Watch_ChatList_Compose: String { return self._s[4102]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4103]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[4104]! } - public var Watch_Microphone_Access: String { return self._s[4105]! } - public var Group_Setup_HistoryHeader: String { return self._s[4106]! } - public var Map_SetThisLocation: String { return self._s[4107]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4108]! } - public var Activity_UploadingPhoto: String { return self._s[4109]! } - public var Conversation_Edit: String { return self._s[4111]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[4112]! } - public var Login_TermsOfServiceDecline: String { return self._s[4113]! } - public var Message_PinnedContactMessage: String { return self._s[4114]! } + public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4101]!, self._r[4101]!, [_1, _2, _3]) + } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4102]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[4103]! } + public var VoiceOver_Navigation_Compose: String { return self._s[4104]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[4105]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[4107]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4108]! } + public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4109]!, self._r[4109]!, [_1, _2]) + } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4112]! } + public var ChatSettings_OpenLinksIn: String { return self._s[4113]! } + public var Map_HomeAndWorkTitle: String { return self._s[4114]! } + public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4116]!, self._r[4116]!, [_0]) + } + public var DialogList_Unread: String { return self._s[4117]! } + public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4118]!, self._r[4118]!, [_1, _2]) + } + public var User_DeletedAccount: String { return self._s[4119]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4120]! } + public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4121]!, self._r[4121]!, [_0]) + } + public var UserInfo_NotificationsDefault: String { return self._s[4122]! } + public var SharedMedia_CategoryMedia: String { return self._s[4123]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4124]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4125]! } + public var Watch_ChatList_Compose: String { return self._s[4126]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4127]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[4128]! } + public var Watch_Microphone_Access: String { return self._s[4129]! } + public var Group_Setup_HistoryHeader: String { return self._s[4130]! } + public var Map_SetThisLocation: String { return self._s[4131]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4132]! } + public var Activity_UploadingPhoto: String { return self._s[4133]! } + public var Conversation_Edit: String { return self._s[4135]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[4136]! } + public var Login_TermsOfServiceDecline: String { return self._s[4137]! } + public var Message_PinnedContactMessage: String { return self._s[4138]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4115]!, self._r[4115]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4139]!, self._r[4139]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4116]!, self._r[4116]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[4140]!, self._r[4140]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[4117]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4119]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4120]! } + public var Appearance_LargeEmoji: String { return self._s[4141]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4143]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4144]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4121]!, self._r[4121]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4145]!, self._r[4145]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[4122]! } - public var Message_PinnedPhotoMessage: String { return self._s[4123]! } - public var Passport_FieldPhone: String { return self._s[4124]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4125]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[4126]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[4128]! } - public var Conversation_Call: String { return self._s[4129]! } - public var Common_TakePhoto: String { return self._s[4131]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4132]! } - public var Wallet_Receive_CommentHeader: String { return self._s[4133]! } - public var Channel_NotificationLoading: String { return self._s[4134]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[4146]! } + public var Message_PinnedPhotoMessage: String { return self._s[4147]! } + public var Passport_FieldPhone: String { return self._s[4148]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4149]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[4150]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[4152]! } + public var Conversation_Call: String { return self._s[4153]! } + public var Common_TakePhoto: String { return self._s[4155]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4156]! } + public var Wallet_Receive_CommentHeader: String { return self._s[4157]! } + public var Channel_NotificationLoading: String { return self._s[4158]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4135]!, self._r[4135]!, [_0]) + return formatWithArgumentRanges(self._s[4159]!, self._r[4159]!, [_0]) } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4136]!, self._r[4136]!, [_0]) - } - public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4137]!, self._r[4137]!, [_1]) - } - public var Permissions_SiriTitle_v0: String { return self._s[4138]! } - public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4139]!, self._r[4139]!, [_0]) - } - public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4140]!, self._r[4140]!, [_0]) - } - public var Channel_MessagePhotoRemoved: String { return self._s[4141]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[4142]! } - public var ClearCache_FreeSpace: String { return self._s[4143]! } - public var Appearance_BubbleCorners_Apply: String { return self._s[4144]! } - public var Common_edit: String { return self._s[4145]! } - public var PrivacySettings_AuthSessions: String { return self._s[4146]! } - public var Month_ShortJune: String { return self._s[4147]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4148]! } - public var Call_ReportSend: String { return self._s[4149]! } - public var Watch_LastSeen_JustNow: String { return self._s[4150]! } - public var Notifications_MessageNotifications: String { return self._s[4151]! } - public var WallpaperSearch_ColorGreen: String { return self._s[4152]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4154]! } - public var Group_Status: String { return self._s[4155]! } - public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4156]!, self._r[4156]!, [_0, _1]) - } - public var TextFormat_AddLinkTitle: String { return self._s[4157]! } - public var ShareMenu_ShareTo: String { return self._s[4158]! } - public var Conversation_Moderate_Ban: String { return self._s[4159]! } - public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4160]!, self._r[4160]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[4161]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4162]! } + public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4161]!, self._r[4161]!, [_1]) + } + public var Permissions_SiriTitle_v0: String { return self._s[4162]! } + public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4163]!, self._r[4163]!, [_0]) + } + public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4164]!, self._r[4164]!, [_0]) + } + public var Channel_MessagePhotoRemoved: String { return self._s[4165]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[4166]! } + public var ClearCache_FreeSpace: String { return self._s[4167]! } + public var Appearance_BubbleCorners_Apply: String { return self._s[4168]! } + public var Common_edit: String { return self._s[4169]! } + public var PrivacySettings_AuthSessions: String { return self._s[4170]! } + public var Month_ShortJune: String { return self._s[4171]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4172]! } + public var Call_ReportSend: String { return self._s[4173]! } + public var Watch_LastSeen_JustNow: String { return self._s[4174]! } + public var Notifications_MessageNotifications: String { return self._s[4175]! } + public var WallpaperSearch_ColorGreen: String { return self._s[4176]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4178]! } + public var Group_Status: String { return self._s[4179]! } + public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4180]!, self._r[4180]!, [_0, _1]) + } + public var TextFormat_AddLinkTitle: String { return self._s[4181]! } + public var ShareMenu_ShareTo: String { return self._s[4182]! } + public var Conversation_Moderate_Ban: String { return self._s[4183]! } + public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4184]!, self._r[4184]!, [_0]) + } + public var SharedMedia_ViewInChat: String { return self._s[4185]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4186]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4163]!, self._r[4163]!, [_1]) + return formatWithArgumentRanges(self._s[4187]!, self._r[4187]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4164]!, self._r[4164]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4188]!, self._r[4188]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4166]!, self._r[4166]!, [_0]) + return formatWithArgumentRanges(self._s[4190]!, self._r[4190]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[4167]! } - public var Appearance_ReduceMotion: String { return self._s[4168]! } + public var Map_OpenInHereMaps: String { return self._s[4191]! } + public var Appearance_ReduceMotion: String { return self._s[4192]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4169]!, self._r[4169]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4193]!, self._r[4193]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[4170]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[4171]! } - public var PhotoEditor_Skip: String { return self._s[4172]! } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[4194]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[4195]! } + public var PhotoEditor_Skip: String { return self._s[4196]! } + public func MessageTimer_Days(_ 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 LastSeen_MinutesAgo(_ 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[1 * 6 + Int(form.rawValue)]!, stringValue) } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + public func Map_ETAMinutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedLocations(_ value: Int32) -> String { + public func LastSeen_HoursAgo(_ 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 MessageTimer_Weeks(_ value: Int32) -> String { + public func DialogList_LiveLocationChatsCount(_ 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 AttachmentMenu_SendVideo(_ value: Int32) -> String { + public func Conversation_SelectedMessages(_ 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 SharedMedia_Photo(_ value: Int32) -> String { + public func MessageTimer_Months(_ 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 PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Notification_GameScoreExtended(_ value: Int32) -> String { + public func SharedMedia_Video(_ 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 MuteFor_Days(_ value: Int32) -> String { + public func ForwardedContacts(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) } - public func Wallpaper_DeleteConfirmation(_ 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 Conversation_LiveLocationMembersCount(_ 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 ForwardedVideoMessages(_ 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 Contacts_ImportersCount(_ 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 ForwardedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + 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[15 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func AttachmentMenu_SendItem(_ 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 ServiceMessage_GameScoreSelfExtended(_ 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 Forward_ConfirmMultipleFiles(_ 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 PollResults_ShowMore(_ 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 DialogList_LiveLocationChatsCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_SelectedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_InactiveWeek(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MuteFor_Hours(_ 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 OldChannels_GroupFormat(_ 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 UserCount(_ 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 Notification_GameScoreSelfExtended(_ 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 Watch_UserInfo_Mute(_ 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_SendGif(_ 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 MuteExpires_Days(_ 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 InviteText_ContactsCountText(_ 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 StickerPack_StickerCount(_ 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 PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedGifs(_ 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) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, _2, _1, _3) } public func Map_ETAHours(_ 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) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) } - public func ChatList_SelectedChats(_ value: Int32) -> String { + public func Chat_DeleteMessagesConfirmation(_ 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) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_ShortMinutes(_ value: Int32) -> String { + public func Call_Minutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } - public func Media_ShareItem(_ value: Int32) -> String { + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) } - public func Media_ShareVideo(_ value: Int32) -> String { + public func Notification_GameScoreSelfExtended(_ 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) + return String(format: self._ps[15 * 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[42 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) } - public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { + public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[17 * 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[18 * 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[19 * 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[20 * 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[21 * 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[22 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func PeopleNearby_ShowMorePeople(_ 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 QuickSend_Photos(_ 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 PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[26 * 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[27 * 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[28 * 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[29 * 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[30 * 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[31 * 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[32 * 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[33 * 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[34 * 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[35 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[36 * 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[37 * 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[38 * 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[39 * 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[40 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 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[42 * 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[43 * 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[44 * 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[45 * 6 + Int(form.rawValue)]!, _1, _2) + 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 PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, _2, _1, _3) + 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[46 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + public func MessageTimer_ShortWeeks(_ 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 ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + public func CreatePoll_AddMoreOptions(_ 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_Generic(_ value: Int32) -> String { + public func InviteText_ContactsCountText(_ 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 MessageTimer_Days(_ 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 PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func Conversation_StatusMembers(_ value: Int32) -> String { + public func MessageTimer_ShortHours(_ 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_ShortMinutes(_ value: Int32) -> String { + public func SharedMedia_File(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Seconds(_ value: Int32) -> String { + public func Conversation_StatusMembers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) } - public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String { + public func Contacts_InviteContacts(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSimple(_ value: Int32) -> String { + public func ChatList_DeletedChats(_ 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) @@ -4986,341 +5006,348 @@ public final class PresentationStrings: Equatable { let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - 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[58 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessagePoll_QuizCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_Link(_ 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 StickerPack_RemoveMaskCount(_ 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 Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Theme_UsersCount(_ 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 ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) - } - public func QuickSend_Photos(_ 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 MessageTimer_ShortDays(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortWeeks(_ 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 Watch_LastSeen_HoursAgo(_ 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 Chat_DeleteMessagesConfirmation(_ 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) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, _1, _2) } public func PasscodeSettings_FailedAttempts(_ 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) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_Seconds(_ value: Int32) -> String { + public func LastSeen_MinutesAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[74 * 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[75 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Contacts_InviteContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[76 * 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[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Notifications_ExceptionMuteExpires_Days(_ 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 Wallet_Updated_HoursAgo(_ 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 StickerPack_AddStickerCount(_ 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 ForwardedContacts(_ 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 ForwardedAudios(_ 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 Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfSimple(_ 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 PrivacyLastSeenSettings_AddUsers(_ 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 VoiceOver_Chat_PollVotes(_ 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 ForwardedStickers(_ 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) + return String(format: self._ps[59 * 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[90 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) } - public func AttachmentMenu_SendPhoto(_ value: 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[91 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortHours(_ value: Int32) -> String { + public func StickerPack_RemoveMaskCount(_ 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) + return String(format: self._ps[62 * 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[63 * 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[64 * 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[65 * 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[66 * 6 + Int(form.rawValue)]!, stringValue) } public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[93 * 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[94 * 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[95 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_InactiveMonth(_ 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 ForwardedVideos(_ 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 SharedMedia_Video(_ 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 StickerPack_AddMaskCount(_ 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 Map_ETAMinutes(_ 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 SharedMedia_File(_ 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_Minutes(_ 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 Invitation_Members(_ 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 StickerPack_RemoveStickerCount(_ 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 ChatList_DeletedChats(_ 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 PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[108 * 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[109 * 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[110 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[67 * 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[111 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Passport_Scans(_ value: Int32) -> String { + public func SharedMedia_Link(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MessageTimer_Months(_ value: Int32) -> String { + public func MessageTimer_Seconds(_ 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[71 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + 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[72 * 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[115 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MuteExpires_Minutes(_ 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[116 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) } - public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + public func MessageTimer_Years(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notifications_Exceptions(_ value: Int32) -> String { + public func AttachmentMenu_SendGif(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[76 * 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[77 * 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[119 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + public func ForwardedStickers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[120 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[79 * 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[121 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[80 * 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[122 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Conversation_StatusOnline(_ value: Int32) -> String { + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[81 * 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[82 * 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[83 * 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[84 * 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[85 * 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[86 * 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[87 * 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[88 * 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[89 * 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[90 * 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[91 * 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[92 * 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[93 * 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[94 * 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[95 * 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[96 * 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[97 * 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[98 * 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[99 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[100 * 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[101 * 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[102 * 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[103 * 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[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Minutes(_ 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 Forward_ConfirmMultipleFiles(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func SharedMedia_Generic(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[110 * 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[111 * 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[112 * 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[113 * 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[114 * 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[115 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func MessageTimer_ShortDays(_ 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 ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ 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_Days(_ 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 ChatList_DeleteConfirmation(_ 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 Media_ShareItem(_ 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 ForwardedVideoMessages(_ 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 MuteExpires_Hours(_ 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 Call_ShortMinutes(_ 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 Wallet_Updated_MinutesAgo(_ 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 Theme_UsersCount(_ 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) + } public init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) { self.primaryComponent = primaryComponent diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift index 0c11f4342c..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 @@ -48,6 +49,8 @@ public enum PresentationResourceKey: Int32 { case itemListVerifiedPeerIcon case itemListCloudFetchIcon case itemListCloseIconImage + case itemListMakeVisibleIcon + case itemListMakeInvisibleIcon case itemListCornersTop case itemListCornersBottom case itemListCornersBoth diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift index 53b0efb48f..8a3e6fc808 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift @@ -152,6 +152,18 @@ public struct PresentationResourcesItemList { }) } + public static func makeVisibleIcon(_ theme: PresentationTheme) -> UIImage? { + return theme.image(PresentationResourceKey.itemListMakeVisibleIcon.rawValue, { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Contact List/MakeVisibleIcon"), color: theme.list.itemAccentColor) + }) + } + + public static func makeInvisibleIcon(_ theme: PresentationTheme) -> UIImage? { + return theme.image(PresentationResourceKey.itemListMakeInvisibleIcon.rawValue, { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Contact List/MakeInvisibleIcon"), color: theme.list.itemDestructiveColor) + }) + } + public static func cornersImage(_ theme: PresentationTheme, top: Bool, bottom: Bool) -> UIImage? { if !top && !bottom { return nil 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/PresenceStrings.swift b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift index b7bdd08a48..31893c0e27 100644 --- a/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift +++ b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift @@ -109,12 +109,13 @@ public func stringForMonth(strings: PresentationStrings, month: Int32, ofYear ye public enum RelativeTimestampFormatDay { case today case yesterday + case tomorrow } public func stringForUserPresence(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32) -> String { let dayString: String switch day { - case .today: + case .today, .tomorrow: dayString = strings.LastSeen_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 case .yesterday: dayString = strings.LastSeen_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 @@ -125,10 +126,13 @@ public func stringForUserPresence(strings: PresentationStrings, day: RelativeTim private func humanReadableStringForTimestamp(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32) -> String { let dayString: String switch day { - case .today: - dayString = strings.Time_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 - case .yesterday: - dayString = strings.Time_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 + case .today: + dayString = strings.Time_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 + case .yesterday: + dayString = strings.Time_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 + case .tomorrow: + dayString = strings.Time_TomorrowAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 + } return dayString } @@ -148,12 +152,14 @@ public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTi } let dayDifference = timeinfo.tm_yday - timeinfoNow.tm_yday - if dayDifference == 0 || dayDifference == -1 { + if dayDifference == 0 || dayDifference == -1 || dayDifference == 1 { let day: RelativeTimestampFormatDay if dayDifference == 0 { day = .today - } else { + } else if dayDifference == -1 { day = .yesterday + } else { + day = .tomorrow } return humanReadableStringForTimestamp(strings: strings, day: day, dateTimeFormat: dateTimeFormat, hours: timeinfo.tm_hour, minutes: timeinfo.tm_min) } else { 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/Chart/Contents.json b/submodules/TelegramUI/Images.xcassets/Chart/Contents.json new file mode 100644 index 0000000000..38f0c81fc2 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chart/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "provides-namespace" : true + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/Contents.json new file mode 100644 index 0000000000..78b05b5e2a --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "arrow_left.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/arrow_left.pdf b/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/arrow_left.pdf new file mode 100644 index 0000000000..7b20434672 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/arrow_left.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Chart/arrow_right.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chart/arrow_right.imageset/Contents.json new file mode 100644 index 0000000000..147027fa6d --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chart/arrow_right.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "arrow_right.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chart/arrow_right.imageset/arrow_right.pdf b/submodules/TelegramUI/Images.xcassets/Chart/arrow_right.imageset/arrow_right.pdf new file mode 100644 index 0000000000..baf05c2435 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chart/arrow_right.imageset/arrow_right.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_dark.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_dark.imageset/Contents.json new file mode 100644 index 0000000000..65481db2a7 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_dark.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "selection_frame_dark.pdf", + "resizing" : { + "mode" : "3-part-horizontal", + "center" : { + "mode" : "stretch", + "width" : 1 + }, + "cap-insets" : { + "right" : 11, + "left" : 11 + } + } + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_dark.imageset/selection_frame_dark.pdf b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_dark.imageset/selection_frame_dark.pdf new file mode 100644 index 0000000000..ae27128091 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_dark.imageset/selection_frame_dark.pdf @@ -0,0 +1,61 @@ +%PDF-1.4 +% +1 0 obj +<> +endobj +2 0 obj +<> stream +xMN1 9H .,8bD{ 'vBZ$&(zv9#@[OG@$mޞy er:kptiک >) ԩS J) zKHf7.< U l5(ez;n[fscwN5&oW\~ɷtm`v{ *CK=N' |T[Rb35LdvuMU D-=1XׁTa'ۀzqncM="X+& -yKS +endstream +endobj +3 0 obj +<> +endobj +4 0 obj +<> +endobj +5 0 obj +<>>> +/MediaBox [0 0 114 42] +/Contents 2 0 R +/Parent 4 0 R>> +endobj +6 0 obj +<> +endobj +7 0 obj +<> +endobj +xref +0 8 +0000000000 65535 f +0000000015 00000 n +0000000089 00000 n +0000000482 00000 n +0000000529 00000 n +0000000584 00000 n +0000000765 00000 n +0000000802 00000 n +trailer +<> +startxref +880 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_light.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_light.imageset/Contents.json new file mode 100644 index 0000000000..8cc38ca79c --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_light.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "selection_frame_light.pdf", + "resizing" : { + "mode" : "3-part-horizontal", + "center" : { + "mode" : "stretch", + "width" : 1 + }, + "cap-insets" : { + "right" : 11, + "left" : 11 + } + } + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_light.imageset/selection_frame_light.pdf b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_light.imageset/selection_frame_light.pdf new file mode 100644 index 0000000000..c426c5d695 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chart/selection_frame_light.imageset/selection_frame_light.pdf @@ -0,0 +1,62 @@ +%PDF-1.4 +% +1 0 obj +<> +endobj +2 0 obj +<> stream +xN0 ~ +'yp*NY6$5uH&M3!U;ur:(`PĒ8 weT-)s+w0ofn2zrkM~q=[  V{ ]]b5^8U '䖄&?ȽƋ1NdBuQZmP2{Q DʠՆ8-,l lx} E>nr_1io|BV +endstream +endobj +3 0 obj +<> +endobj +4 0 obj +<> +endobj +5 0 obj +<>>> +/MediaBox [0 0 114 42] +/Contents 2 0 R +/Parent 4 0 R>> +endobj +6 0 obj +<> +endobj +7 0 obj +<> +endobj +xref +0 8 +0000000000 65535 f +0000000015 00000 n +0000000089 00000 n +0000000482 00000 n +0000000529 00000 n +0000000584 00000 n +0000000765 00000 n +0000000802 00000 n +trailer +<> +startxref +880 +%%EOF \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/Contents.json new file mode 100644 index 0000000000..38f0c81fc2 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "provides-namespace" : true + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Contents.json new file mode 100644 index 0000000000..9afc9c4e5d --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_calls.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/ic_calls.pdf b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/ic_calls.pdf new file mode 100644 index 0000000000..f42e5fe81b Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/ic_calls.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Contents.json new file mode 100644 index 0000000000..3637003f27 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_messages.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/ic_messages.pdf b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/ic_messages.pdf new file mode 100644 index 0000000000..64aba1907d Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/ic_messages.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contents.json new file mode 100644 index 0000000000..006f82fb71 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_contacts.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/ic_contacts.pdf b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/ic_contacts.pdf new file mode 100644 index 0000000000..41f48e4e2d Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/ic_contacts.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Contents.json new file mode 100644 index 0000000000..261d9ff3a9 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_settings.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/ic_settings.pdf b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/ic_settings.pdf new file mode 100644 index 0000000000..0f3b0dc083 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/ic_settings.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Contact List/MakeInvisibleIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Contact List/MakeInvisibleIcon.imageset/Contents.json new file mode 100644 index 0000000000..7abcd976aa --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Contact List/MakeInvisibleIcon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_stopshowme.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Contact List/MakeInvisibleIcon.imageset/ic_stopshowme.pdf b/submodules/TelegramUI/Images.xcassets/Contact List/MakeInvisibleIcon.imageset/ic_stopshowme.pdf new file mode 100644 index 0000000000..9cc4c3d65a Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Contact List/MakeInvisibleIcon.imageset/ic_stopshowme.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Contact List/MakeVisibleIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Contact List/MakeVisibleIcon.imageset/Contents.json new file mode 100644 index 0000000000..97cc9be019 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Contact List/MakeVisibleIcon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_showme.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Contact List/MakeVisibleIcon.imageset/ic_showme.pdf b/submodules/TelegramUI/Images.xcassets/Contact List/MakeVisibleIcon.imageset/ic_showme.pdf new file mode 100644 index 0000000000..0c5a6e2133 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Contact List/MakeVisibleIcon.imageset/ic_showme.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/Contents.json new file mode 100644 index 0000000000..d2ce704e18 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "soundoff (2).pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/soundoff (2).pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/soundoff (2).pdf new file mode 100644 index 0000000000..8051a2a4e0 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/soundoff (2).pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/Contents.json new file mode 100644 index 0000000000..1d93d33a26 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "soundon (2).pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/soundon (2).pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/soundon (2).pdf new file mode 100644 index 0000000000..20236a226b Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/soundon (2).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/Images.xcassets/Peer Info/VerifiedIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Peer Info/VerifiedIcon.imageset/Contents.json new file mode 100644 index 0000000000..55305eb8ca --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Peer Info/VerifiedIcon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_verify_big.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Peer Info/VerifiedIcon.imageset/ic_verify_big.pdf b/submodules/TelegramUI/Images.xcassets/Peer Info/VerifiedIcon.imageset/ic_verify_big.pdf new file mode 100644 index 0000000000..e368606b86 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Peer Info/VerifiedIcon.imageset/ic_verify_big.pdf differ diff --git a/submodules/TelegramUI/TelegramUI/AppDelegate.swift b/submodules/TelegramUI/TelegramUI/AppDelegate.swift index 34183420de..6b6d402bb3 100644 --- a/submodules/TelegramUI/TelegramUI/AppDelegate.swift +++ b/submodules/TelegramUI/TelegramUI/AppDelegate.swift @@ -5,7 +5,6 @@ import TelegramCore import SyncCore import UserNotifications import Intents -//import HockeySDK import Postbox import PushKit import AsyncDisplayKit @@ -161,12 +160,13 @@ final class SharedApplicationContext { } } -@objc(AppDelegate) class AppDelegate: UIResponder, UIApplicationDelegate, PKPushRegistryDelegate/*, BITHockeyManagerDelegate*/, UNUserNotificationCenterDelegate, UIAlertViewDelegate { +@objc(AppDelegate) class AppDelegate: UIResponder, UIApplicationDelegate, PKPushRegistryDelegate, UNUserNotificationCenterDelegate, UIAlertViewDelegate { @objc var window: UIWindow? var nativeWindow: (UIWindow & WindowHost)? var mainWindow: Window1! private var dataImportSplash: LegacyDataImportSplash? + private var buildConfig: BuildConfig? let episodeId = arc4random() private let isInForegroundPromise = ValuePromise(false, ignoreRepeated: true) @@ -373,6 +373,7 @@ final class SharedApplicationContext { let maybeAppGroupUrl = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupName) let buildConfig = BuildConfig(baseAppBundleId: baseAppBundleId) + self.buildConfig = buildConfig let signatureDict = BuildConfigExtra.signatureDict() let apiId: Int32 = buildConfig.apiId @@ -1346,46 +1347,6 @@ final class SharedApplicationContext { self.isActivePromise.set(true) } - /*BITHockeyBaseManager.setPresentAlert({ [weak self] alert in - if let strongSelf = self, let alert = alert { - var actions: [TextAlertAction] = [] - for action in alert.actions { - let isDefault = action.style == .default - actions.append(TextAlertAction(type: isDefault ? .defaultAction : .genericAction, title: action.title ?? "", action: { - if let action = action as? BITAlertAction { - action.invokeAction() - } - })) - } - if let sharedContext = strongSelf.contextValue?.context.sharedContext { - let presentationData = sharedContext.currentPresentationData.with { $0 } - strongSelf.mainWindow.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: alert.title, text: alert.message ?? "", actions: actions), on: .root) - } - } - }) - - BITHockeyBaseManager.setPresentView({ [weak self] controller in - if let strongSelf = self, let controller = controller { - let parent = LegacyController(presentation: .modal(animateIn: true), theme: nil) - let navigationController = UINavigationController(rootViewController: controller) - controller.navigation_setDismiss({ [weak parent] in - parent?.dismiss() - }, rootController: nil) - parent.bind(controller: navigationController) - strongSelf.mainWindow.present(parent, on: .root) - } - }) - - if let hockeyAppId = buildConfig.hockeyAppId, !hockeyAppId.isEmpty { - BITHockeyManager.shared().configure(withIdentifier: hockeyAppId, delegate: self) - BITHockeyManager.shared().crashManager.crashManagerStatus = .alwaysAsk - BITHockeyManager.shared().start() - #if targetEnvironment(simulator) - #else - BITHockeyManager.shared().authenticator.authenticateInstallation() - #endif - }*/ - if UIApplication.shared.isStatusBarHidden { UIApplication.shared.setStatusBarHidden(false, with: .none) } @@ -1411,6 +1372,8 @@ final class SharedApplicationContext { }) }*/ + self.maybeCheckForUpdates() + return true } @@ -1494,6 +1457,8 @@ final class SharedApplicationContext { self.isInForegroundPromise.set(true) self.isActiveValue = true self.isActivePromise.set(true) + + self.maybeCheckForUpdates() } func applicationWillTerminate(_ application: UIApplication) { @@ -2215,6 +2180,60 @@ final class SharedApplicationContext { completionHandler() } + private var lastCheckForUpdatesTimestamp: Double? + private let currentCheckForUpdatesDisposable = MetaDisposable() + + private func maybeCheckForUpdates() { + #if targetEnvironment(simulator) + return; + #endif + + guard let buildConfig = self.buildConfig, !buildConfig.isAppStoreBuild, let appCenterId = buildConfig.appCenterId, !appCenterId.isEmpty else { + return + } + let timestamp = CFAbsoluteTimeGetCurrent() + if self.lastCheckForUpdatesTimestamp == nil || self.lastCheckForUpdatesTimestamp! < timestamp - 10.0 * 60.0 { + self.lastCheckForUpdatesTimestamp = timestamp + + if let url = URL(string: "https://api.appcenter.ms/v0.1/public/sdk/apps/\(appCenterId)/releases/latest") { + self.currentCheckForUpdatesDisposable.set((downloadHTTPData(url: url) + |> deliverOnMainQueue).start(next: { [weak self] data in + guard let strongSelf = self else { + return + } + guard let json = try? JSONSerialization.jsonObject(with: data, options: []) else { + return + } + guard let dict = json as? [String: Any] else { + return + } + guard let versionString = dict["version"] as? String, let version = Int(versionString) else { + return + } + guard let releaseNotesUrl = dict["release_notes_url"] as? String else { + return + } + guard let currentVersionString = Bundle.main.infoDictionary?["CFBundleVersion"] as? String, let currentVersion = Int(currentVersionString) else { + return + } + if currentVersion < version { + let _ = (strongSelf.sharedContextPromise.get() + |> take(1) + |> deliverOnMainQueue).start(next: { sharedContext in + let presentationData = sharedContext.sharedContext.currentPresentationData.with { $0 } + sharedContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: "A new build is available", actions: [ + TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), + TextAlertAction(type: .defaultAction, title: "Show", action: { + sharedContext.sharedContext.applicationBindings.openUrl(releaseNotesUrl) + }) + ]), on: .root, blockInteraction: false, completion: {}) + }) + } + })) + } + } + } + override var next: UIResponder? { if let context = self.contextValue, let controller = context.context.keyShortcutsController { return controller @@ -2356,3 +2375,29 @@ private func messageIdFromNotification(peerId: PeerId, notification: UNNotificat } return nil } + +private enum DownloadFileError { + case network +} + +private func downloadHTTPData(url: URL) -> Signal { + return Signal { subscriber in + let completed = Atomic(value: false) + let downloadTask = URLSession.shared.downloadTask(with: url, completionHandler: { location, _, error in + let _ = completed.swap(true) + if let location = location, let data = try? Data(contentsOf: location) { + subscriber.putNext(data) + subscriber.putCompletion() + } else { + subscriber.putError(.network) + } + }) + downloadTask.resume() + + return ActionDisposable { + if !completed.with({ $0 }) { + downloadTask.cancel() + } + } + } +} 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/ChatBotInfoItem.swift b/submodules/TelegramUI/TelegramUI/ChatBotInfoItem.swift index be5f243176..7e6470fbf2 100644 --- a/submodules/TelegramUI/TelegramUI/ChatBotInfoItem.swift +++ b/submodules/TelegramUI/TelegramUI/ChatBotInfoItem.swift @@ -117,7 +117,7 @@ final class ChatBotInfoItemNode: ListViewItemNode { break case .ignore: return .fail - case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .wallpaper, .theme, .call, .openMessage, .timecode, .tooltip: + case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .wallpaper, .theme, .call, .openMessage, .timecode, .bankCard, .tooltip: return .waitForSingleTap } } diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index e19a44ca6e..5b48c84791 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -309,6 +309,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G private var updateSlowmodeStatusTimerValue: Int32? private var isDismissed = false + + private var focusOnSearchAfterAppearance: Bool = false + + private let keepPeerInfoScreenDataHotDisposable = MetaDisposable() public override var customData: Any? { return self.chatLocation @@ -365,13 +369,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) @@ -1360,6 +1357,38 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G ])]) strongSelf.chatDisplayNode.dismissInput() strongSelf.present(actionSheet, in: .window(.root)) + case let .bankCard(number): + guard let message = message else { + return + } + + let _ = (getBankCardInfo(account: strongSelf.context.account, cardNumber: number) + |> deliverOnMainQueue).start(next: { [weak self] info in + if let strongSelf = self, let info = info { + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) + var items: [ActionSheetItem] = [] + items.append(ActionSheetTextItem(title: info.title)) + for url in info.urls { + items.append(ActionSheetButtonItem(title: url.title, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.controllerInteraction?.openUrl(url.url, false, false, message) + } + })) + } + items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + UIPasteboard.general.string = number + })) + 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.present(actionSheet, in: .window(.root)) + } + }) + strongSelf.chatDisplayNode.dismissInput() } } }, openCheckoutOrReceipt: { [weak self] messageId in @@ -1873,6 +1902,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 @@ -1920,20 +1953,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 { @@ -2012,7 +2048,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 } @@ -2505,6 +2549,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.reportIrrelvantGeoDisposable?.dispose() self.reminderActivity?.invalidate() self.updateSlowmodeStatusDisposable.dispose() + self.keepPeerInfoScreenDataHotDisposable.dispose() } public func updatePresentationMode(_ mode: ChatControllerPresentationMode) { @@ -3547,7 +3592,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() @@ -4461,6 +4506,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) @@ -4717,6 +4768,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: { })]), in: .window(.root)) })) + + if case let .peer(peerId) = self.chatLocation { + self.keepPeerInfoScreenDataHotDisposable.set(keepPeerInfoScreenDataHot(context: self.context, peerId: peerId).start()) + } + } + + if self.focusOnSearchAfterAppearance { + self.focusOnSearchAfterAppearance = false + if let searchNode = self.navigationBar?.contentNode as? ChatSearchNavigationContentNode { + searchNode.activate() + } } } @@ -5321,18 +5383,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, fromChat: true) { strongSelf.effectiveNavigationController?.pushViewController(infoController) } } - })) + } + })) } case .search: self.interfaceInteraction?.beginMessageSearch(.everything, "") @@ -5540,6 +5610,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() + } + } + }) } } @@ -7027,11 +7118,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, { @@ -7063,7 +7154,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, fromChat: true) { strongSelf.effectiveNavigationController?.pushViewController(infoController) } } @@ -7480,7 +7571,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, fromChat: false) { strongSelf.effectiveNavigationController?.pushViewController(infoController) } } @@ -8447,6 +8538,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/ChatControllerInteraction.swift b/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift index fdae414c0a..e9b15f43af 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift @@ -42,6 +42,7 @@ public enum ChatControllerInteractionLongTapAction { case command(String) case hashtag(String) case timecode(Double, String) + case bankCard(String) } struct ChatInterfacePollActionState: Equatable { @@ -119,6 +120,7 @@ public final class ChatControllerInteraction { var stickerSettings: ChatInterfaceStickerSettings var searchTextHighightState: (String, [MessageIndex])? var seenOneTimeAnimatedMedia = Set() + var seenDicePointsValue = [MessageId: Int]() init(openMessage: @escaping (Message, ChatControllerInteractionOpenMessageMode) -> Bool, openPeer: @escaping (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void, openPeerMention: @escaping (String) -> Void, openMessageContextMenu: @escaping (Message, Bool, ASDisplayNode, CGRect, TapLongTapOrDoubleTapGestureRecognizer?) -> Void, openMessageContextActions: @escaping (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void, navigateToMessage: @escaping (MessageId, MessageId) -> Void, tapMessage: ((Message) -> Void)?, clickThroughMessage: @escaping () -> Void, toggleMessagesSelection: @escaping ([MessageId], Bool) -> Void, sendCurrentMessage: @escaping (Bool) -> Void, sendMessage: @escaping (String) -> Void, sendSticker: @escaping (FileMediaReference, Bool, ASDisplayNode, CGRect) -> Bool, sendGif: @escaping (FileMediaReference, ASDisplayNode, CGRect) -> Bool, requestMessageActionCallback: @escaping (MessageId, MemoryBuffer?, Bool) -> Void, requestMessageActionUrlAuth: @escaping (String, MessageId, Int32) -> Void, activateSwitchInline: @escaping (PeerId?, String) -> Void, openUrl: @escaping (String, Bool, Bool?, Message?) -> Void, shareCurrentLocation: @escaping () -> Void, shareAccountContact: @escaping () -> Void, sendBotCommand: @escaping (MessageId?, String) -> Void, openInstantPage: @escaping (Message, ChatMessageItemAssociatedData?) -> Void, openWallpaper: @escaping (Message) -> Void, openTheme: @escaping (Message) -> Void, openHashtag: @escaping (String?, String) -> Void, updateInputState: @escaping ((ChatTextInputState) -> ChatTextInputState) -> Void, updateInputMode: @escaping ((ChatInputMode) -> ChatInputMode) -> Void, openMessageShareMenu: @escaping (MessageId) -> Void, presentController: @escaping (ViewController, Any?) -> Void, navigationController: @escaping () -> NavigationController?, chatControllerNode: @escaping () -> ASDisplayNode?, reactionContainerNode: @escaping () -> ReactionSelectionParentNode?, presentGlobalOverlayController: @escaping (ViewController, Any?) -> Void, callPeer: @escaping (PeerId) -> Void, longTap: @escaping (ChatControllerInteractionLongTapAction, Message?) -> Void, openCheckoutOrReceipt: @escaping (MessageId) -> Void, openSearch: @escaping () -> Void, setupReply: @escaping (MessageId) -> Void, canSetupReply: @escaping (Message) -> Bool, navigateToFirstDateMessage: @escaping(Int32) ->Void, requestRedeliveryOfFailedMessages: @escaping (MessageId) -> Void, addContact: @escaping (String) -> Void, rateCall: @escaping (Message, CallId) -> Void, requestSelectMessagePollOptions: @escaping (MessageId, [Data]) -> Void, requestOpenMessagePollResults: @escaping (MessageId, MediaId) -> Void, openAppStorePage: @escaping () -> Void, displayMessageTooltip: @escaping (MessageId, String, ASDisplayNode?, CGRect?) -> Void, seekToTimecode: @escaping (Message, Double, Bool) -> Void, scheduleCurrentMessage: @escaping () -> Void, sendScheduledMessagesNow: @escaping ([MessageId]) -> Void, editScheduledMessagesTime: @escaping ([MessageId]) -> Void, performTextSelectionAction: @escaping (UInt32, String, TextSelectionAction) -> Void, updateMessageReaction: @escaping (MessageId, String?) -> Void, openMessageReactions: @escaping (MessageId) -> Void, displaySwipeToReplyHint: @escaping () -> Void, dismissReplyMarkupMessage: @escaping (Message) -> Void, openMessagePollResults: @escaping (MessageId, Data) -> Void, openPollCreation: @escaping (Bool?) -> Void, requestMessageUpdate: @escaping (MessageId) -> Void, cancelInteractiveKeyboardGestures: @escaping () -> Void, automaticMediaDownloadSettings: MediaAutoDownloadSettings, pollActionState: ChatInterfacePollActionState, stickerSettings: ChatInterfaceStickerSettings) { self.openMessage = openMessage diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index 9e562d29e0..f8fd60a4f5 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -13,6 +13,7 @@ import AccountContext import TemporaryCachedPeerDataManager import ChatListSearchItemNode import Emoji +import AppBundle private class ChatHistoryListSelectionRecognizer: UIPanGestureRecognizer { private let selectionGestureActivationThreshold: CGFloat = 5.0 @@ -308,7 +309,7 @@ private final class ChatHistoryTransactionOpaqueState { } } -private func extractAssociatedData(chatLocation: ChatLocation, view: MessageHistoryView, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, animatedEmojiStickers: [String: StickerPackItem], isScheduledMessages: Bool) -> ChatMessageItemAssociatedData { +private func extractAssociatedData(chatLocation: ChatLocation, view: MessageHistoryView, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, animatedEmojiStickers: [String: [StickerPackItem]], isScheduledMessages: Bool) -> ChatMessageItemAssociatedData { var automaticMediaDownloadPeerType: MediaAutoDownloadPeerType = .channel var contactsPeerIds: Set = Set() if case let .peer(peerId) = chatLocation { @@ -605,19 +606,31 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { |> distinctUntilChanged let animatedEmojiStickers = loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .animatedEmoji, forceActualized: false) - |> map { result -> [String: StickerPackItem] in + |> map { result -> [String: [StickerPackItem]] in switch result { case let .result(_, items, _): - var animatedEmojiStickers: [String: StickerPackItem] = [:] + var animatedEmojiStickers: [String: [StickerPackItem]] = [:] for case let item as StickerPackItem in items { if let emoji = item.getStringRepresentationsOfIndexKeys().first { - animatedEmojiStickers[emoji.basicEmoji.0] = item + animatedEmojiStickers[emoji.basicEmoji.0] = [item] let strippedEmoji = emoji.basicEmoji.0.strippedEmoji if animatedEmojiStickers[strippedEmoji] == nil { - animatedEmojiStickers[strippedEmoji] = item + animatedEmojiStickers[strippedEmoji] = [item] } } } + + if let path = getAppBundle().path(forResource: "Dice_1", ofType: "tgs") { + var dices: [StickerPackItem] = [] + for i in 1...6 { + let path = path.replacingOccurrences(of: "_1", with: "_\(i)") + let id = arc4random64() + let resource = LocalFileReferenceMediaResource(localFilePath: path, randomId: id) + dices.append(StickerPackItem(index: ItemCollectionItemIndex(index: Int32(i), id: Int64(i)), file: TelegramMediaFile(fileId: MediaId(namespace: 10, id: Int64(i)), partialReference: nil, resource: resource, previewRepresentations: [], immediateThumbnailData: nil, mimeType: "application/x-tgsticker", size: nil, attributes: []), indexKeys: [])) + } + animatedEmojiStickers["🎲".strippedEmoji] = dices + } + return animatedEmojiStickers default: return [:] 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/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index da8d51b1c8..a6ac25c1ff 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -255,9 +255,24 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { let (emoji, fitz) = item.message.text.basicEmoji if self.telegramFile == nil { - var emojiFile = item.associatedData.animatedEmojiStickers[emoji]?.file - if emojiFile == nil { - emojiFile = item.associatedData.animatedEmojiStickers[emoji.strippedEmoji]?.file + var emojiFile: TelegramMediaFile? + + if emoji == "🎲" { + var pointsValue: Int + if let value = item.controllerInteraction.seenDicePointsValue[item.message.id] { + pointsValue = value + } else { + pointsValue = Int(arc4random_uniform(6)) + item.controllerInteraction.seenDicePointsValue[item.message.id] = pointsValue + } + if let diceEmojis = item.associatedData.animatedEmojiStickers[emoji] { + emojiFile = diceEmojis[pointsValue].file + } + } else { + emojiFile = item.associatedData.animatedEmojiStickers[emoji]?.first?.file + if emojiFile == nil { + emojiFile = item.associatedData.animatedEmojiStickers[emoji.strippedEmoji]?.first?.file + } } if self.emojiFile?.id != emojiFile?.id { @@ -293,8 +308,12 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { } self.animationNode.visibility = isPlaying && !alreadySeen + if self.didSetUpAnimationNode && alreadySeen { - self.animationNode.seekToStart() + if let emojiFile = self.emojiFile, emojiFile.resource is LocalFileReferenceMediaResource { + } else { + self.animationNode.seekTo(.start) + } } if self.isPlaying && !self.didSetUpAnimationNode { @@ -313,7 +332,11 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { } else if let emojiFile = self.emojiFile { isEmoji = true file = emojiFile - playbackMode = .once + if alreadySeen && emojiFile.resource is LocalFileReferenceMediaResource { + playbackMode = .still(.end) + } else { + playbackMode = .once + } let (_, fitz) = item.message.text.basicEmoji if let fitz = fitz { fitzModifier = EmojiFitzModifier(emoji: fitz) @@ -323,7 +346,13 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { if let file = file { let dimensions = file.dimensions ?? PixelDimensions(width: 512, height: 512) let fittedSize = isEmoji ? dimensions.cgSize.aspectFilled(CGSize(width: 384.0, height: 384.0)) : dimensions.cgSize.aspectFitted(CGSize(width: 384.0, height: 384.0)) - self.animationNode.setup(source: AnimatedStickerResourceSource(account: item.context.account, resource: file.resource, fitzModifier: fitzModifier), width: Int(fittedSize.width), height: Int(fittedSize.height), playbackMode: playbackMode, mode: .cached) + let mode: AnimatedStickerMode + if file.resource is LocalFileReferenceMediaResource { + mode = .direct + } else { + mode = .cached + } + self.animationNode.setup(source: AnimatedStickerResourceSource(account: item.context.account, resource: file.resource, fitzModifier: fitzModifier), width: Int(fittedSize.width), height: Int(fittedSize.height), playbackMode: playbackMode, mode: mode) } } } @@ -870,34 +899,59 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { if self.telegramFile != nil { let _ = item.controllerInteraction.openMessage(item.message, .default) } else if let _ = self.emojiFile { - var startTime: Signal - if self.animationNode.playIfNeeded() { - startTime = .single(0.0) + let (emoji, fitz) = item.message.text.basicEmoji + if emoji == "🎲" { + if !self.animationNode.isPlaying { + var pointsValue = Int(arc4random_uniform(6)) + item.controllerInteraction.seenDicePointsValue[item.message.id] = pointsValue + item.controllerInteraction.seenOneTimeAnimatedMedia.remove(item.message.id) + + var emojiFile: TelegramMediaFile? + if let diceEmojis = item.associatedData.animatedEmojiStickers[emoji] { + emojiFile = diceEmojis[pointsValue].file + } + + self.emojiFile = emojiFile + if let emojiFile = emojiFile { + let dimensions = emojiFile.dimensions ?? PixelDimensions(width: 512, height: 512) + self.imageNode.setSignal(chatMessageAnimatedSticker(postbox: item.context.account.postbox, file: emojiFile, small: false, size: dimensions.cgSize.aspectFilled(CGSize(width: 384.0, height: 384.0)), fitzModifier: nil, thumbnail: false)) + self.disposable.set(freeMediaFileInteractiveFetched(account: item.context.account, fileReference: .standalone(media: emojiFile)).start()) + } + self.isPlaying = false + self.didSetUpAnimationNode = false + self.updateVisibility() + self.animationNode.playIfNeeded() + } } else { - startTime = self.animationNode.status + var startTime: Signal + if self.animationNode.playIfNeeded() { + startTime = .single(0.0) + } else { + startTime = self.animationNode.status |> map { $0.timestamp } |> take(1) |> deliverOnMainQueue - } - - if let text = self.item?.message.text, let firstScalar = text.unicodeScalars.first, firstScalar.value == 0x2764 { - let _ = startTime.start(next: { [weak self] time in - guard let strongSelf = self else { - return - } - - let heartbeatHaptic: ChatMessageHeartbeatHaptic - if let current = strongSelf.heartbeatHaptic { - heartbeatHaptic = current - } else { - heartbeatHaptic = ChatMessageHeartbeatHaptic() - heartbeatHaptic.enabled = true - strongSelf.heartbeatHaptic = heartbeatHaptic - } - if !heartbeatHaptic.active { - heartbeatHaptic.start(time: time) - } - }) + } + + if let text = self.item?.message.text, let firstScalar = text.unicodeScalars.first, firstScalar.value == 0x2764 { + let _ = startTime.start(next: { [weak self] time in + guard let strongSelf = self else { + return + } + + let heartbeatHaptic: ChatMessageHeartbeatHaptic + if let current = strongSelf.heartbeatHaptic { + heartbeatHaptic = current + } else { + heartbeatHaptic = ChatMessageHeartbeatHaptic() + heartbeatHaptic.enabled = true + strongSelf.heartbeatHaptic = heartbeatHaptic + } + if !heartbeatHaptic.active { + heartbeatHaptic.start(time: time) + } + }) + } } } return true diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift index 0e565d40fb..bfb409db6b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift @@ -1019,7 +1019,8 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { TelegramTextAttributes.PeerMention, TelegramTextAttributes.PeerTextMention, TelegramTextAttributes.BotCommand, - TelegramTextAttributes.Hashtag + TelegramTextAttributes.Hashtag, + TelegramTextAttributes.BankCard ] for name in possibleNames { if let _ = attributes[NSAttributedString.Key(rawValue: name)] { diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift index 621473f04c..a06144dee7 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift @@ -82,6 +82,7 @@ enum ChatMessageBubbleContentTapAction { case openMessage case timecode(Double, String) case tooltip(String, ASDisplayNode?, CGRect?) + case bankCard(String) case ignore } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift index 7768affa08..d9b6abe090 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift @@ -369,7 +369,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode break case .ignore: return .fail - case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .wallpaper, .theme, .call, .openMessage, .timecode, .tooltip: + case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .wallpaper, .theme, .call, .openMessage, .timecode, .bankCard, .tooltip: return .waitForSingleTap } } @@ -2441,6 +2441,11 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode item.controllerInteraction.seekToTimecode(mediaMessage, timecode, forceOpen) } break loop + case let .bankCard(number): + foundTapAction = true + if let item = self.item { + item.controllerInteraction.longTap(.bankCard(number), item.message) + } case let .tooltip(text, node, rect): foundTapAction = true if let item = self.item { @@ -2507,6 +2512,9 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode item.controllerInteraction.longTap(.timecode(timecode, text), mediaMessage) } break loop + case let .bankCard(number): + foundTapAction = true + item.controllerInteraction.longTap(.bankCard(number), message) case .tooltip: break } 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/ChatMessageItem.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift index 26af9b2098..fe50b15654 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift @@ -226,10 +226,10 @@ public final class ChatMessageItemAssociatedData: Equatable { let isRecentActions: Bool let isScheduledMessages: Bool let contactsPeerIds: Set - let animatedEmojiStickers: [String: StickerPackItem] + let animatedEmojiStickers: [String: [StickerPackItem]] let forcedResourceStatus: FileMediaResourceStatus? - init(automaticDownloadPeerType: MediaAutoDownloadPeerType, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, isRecentActions: Bool = false, isScheduledMessages: Bool = false, contactsPeerIds: Set = Set(), animatedEmojiStickers: [String: StickerPackItem] = [:], forcedResourceStatus: FileMediaResourceStatus? = nil) { + init(automaticDownloadPeerType: MediaAutoDownloadPeerType, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, isRecentActions: Bool = false, isScheduledMessages: Bool = false, contactsPeerIds: Set = Set(), animatedEmojiStickers: [String: [StickerPackItem]] = [:], forcedResourceStatus: FileMediaResourceStatus? = nil) { self.automaticDownloadPeerType = automaticDownloadPeerType self.automaticDownloadNetworkType = automaticDownloadNetworkType self.isRecentActions = isRecentActions diff --git a/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift index c1ba412885..8a812fe3e0 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift @@ -1628,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/ChatMessageTextBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageTextBubbleContentNode.swift index 31b1d33df8..5df3808ac2 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageTextBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageTextBubbleContentNode.swift @@ -428,6 +428,8 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode { return .hashtag(hashtag.peerName, hashtag.hashtag) } else if let timecode = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.Timecode)] as? TelegramTimecode { return .timecode(timecode.time, timecode.text) + } else if let bankCard = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.BankCard)] as? String { + return .bankCard(bankCard) } else { return .none } @@ -451,7 +453,8 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode { TelegramTextAttributes.PeerTextMention, TelegramTextAttributes.BotCommand, TelegramTextAttributes.Hashtag, - TelegramTextAttributes.Timecode + TelegramTextAttributes.Timecode, + TelegramTextAttributes.BankCard ] for name in possibleNames { if let _ = attributes[NSAttributedString.Key(rawValue: name)] { diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift index 4f299bb032..e484f7412e 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift @@ -392,6 +392,8 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { }) ])]) strongSelf.presentController(actionSheet, nil) + case .bankCard: + break } } }, openCheckoutOrReceipt: { _ in @@ -659,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, fromChat: false) { strongSelf.pushController(infoController) } } @@ -681,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, fromChat: false) { strongSelf.pushController(infoController) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift index 4b77d486aa..e69a824772 100644 --- a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift @@ -352,7 +352,7 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel transition.updateFrame(node: self.doneButton, frame: CGRect(x: buttonInset, y: contentHeight - buttonHeight - insets.bottom - 10.0 - buttonOffset, width: contentFrame.width, height: buttonHeight)) let onlineSize = self.onlineButton.measure(CGSize(width: width, height: titleHeight)) - let onlineFrame = CGRect(origin: CGPoint(x: ceil((layout.size.width - onlineSize.width) / 2.0), y: contentHeight - 45.0 - insets.bottom), size: onlineSize) + let onlineFrame = CGRect(origin: CGPoint(x: ceil((contentFrame.width - onlineSize.width) / 2.0), y: contentHeight - 45.0 - insets.bottom), size: onlineSize) transition.updateFrame(node: self.onlineButton, frame: onlineFrame) self.pickerView?.frame = CGRect(origin: CGPoint(x: 0.0, y: 54.0), size: CGSize(width: contentFrame.width, height: pickerHeight)) 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/DeclareEncodables.swift b/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift index 01c3ef9546..8de131f329 100644 --- a/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift +++ b/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift @@ -54,7 +54,6 @@ private var telegramUIDeclaredEncodables: Void = { declareEncodable(WebBrowserSettings.self, f: { WebBrowserSettings(decoder: $0) }) declareEncodable(IntentsSettings.self, f: { IntentsSettings(decoder: $0) }) declareEncodable(CachedGeocode.self, f: { CachedGeocode(decoder: $0) }) - declareEncodable(ChatListFilterSettings.self, f: { ChatListFilterSettings(decoder: $0) }) return }() 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/GifPaneSearchContentNode.swift b/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift index 48c50b6f43..606f2431d9 100644 --- a/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift @@ -28,7 +28,7 @@ func paneGifSearchForQuery(account: Account, query: String, updateActivity: ((Bo } |> mapToSignal { peer -> Signal<(ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?, NoError> in if let user = peer as? TelegramUser, let botInfo = user.botInfo, let _ = botInfo.inlinePlaceholder { - let results = requestContextResults(account: account, botId: user.id, query: query, peerId: account.peerId, limit: 64) + let results = requestContextResults(account: account, botId: user.id, query: query, peerId: account.peerId, limit: 15) |> map { results -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in return { _ in return .contextRequestResult(user, results) diff --git a/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift b/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift index 5a3d511455..0e6f49d611 100644 --- a/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift +++ b/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift @@ -105,4 +105,3 @@ final class ListMessageDateHeaderNode: ListViewItemHeaderNode { self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size) } } - 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..8a82226ae8 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/MultiScaleTextNode.swift @@ -0,0 +1,88 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display + +private final class MultiScaleTextStateNode: ASDisplayNode { + let textNode: ImmediateTextNode + + var currentLayout: MultiScaleTextLayout? + + override init() { + self.textNode = ImmediateTextNode() + self.textNode.displaysAsynchronously = false + + 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], mainState: AnyHashable) -> [AnyHashable: MultiScaleTextLayout] { + assert(Set(states.keys) == Set(self.stateNodes.keys)) + assert(states[mainState] != nil) + + var result: [AnyHashable: MultiScaleTextLayout] = [:] + var mainLayout: 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) + if key == mainState { + mainLayout = nodeLayout + } + node.currentLayout = nodeLayout + result[key] = nodeLayout + } + } + if let mainLayout = mainLayout { + let mainBounds = CGRect(origin: CGPoint(x: -mainLayout.size.width / 2.0, y: -mainLayout.size.height / 2.0), size: mainLayout.size) + for (key, _) in states { + if let node = self.stateNodes[key], let nodeLayout = result[key] { + node.textNode.frame = CGRect(origin: CGPoint(x: mainBounds.minX, y: mainBounds.minY + floor((mainBounds.height - nodeLayout.size.height) / 2.0)), size: nodeLayout.size) + } + } + } + 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..dec7f34047 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, fromChat: false) { pushController(infoController) } } else { diff --git a/submodules/TelegramUI/TelegramUI/OpenUrl.swift b/submodules/TelegramUI/TelegramUI/OpenUrl.swift index 8257e50929..36d0b974bc 100644 --- a/submodules/TelegramUI/TelegramUI/OpenUrl.swift +++ b/submodules/TelegramUI/TelegramUI/OpenUrl.swift @@ -213,7 +213,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, fromChat: false) { context.sharedContext.applicationBindings.dismissNativeController() navigationController?.pushViewController(infoController) } @@ -495,7 +495,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, fromChat: 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..33a0ebfdac --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift @@ -0,0 +1,275 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData +import AccountContext +import TextFormat + +enum PeerInfoScreenLabeledValueTextColor { + case primary + case accent +} + +enum PeerInfoScreenLabeledValueTextBehavior: Equatable { + case singleLine + case multiLine(maxLines: Int, enabledEntities: EnabledEntityTypes) +} + +final class PeerInfoScreenLabeledValueItem: PeerInfoScreenItem { + let id: AnyHashable + let label: String + let text: String + let textColor: PeerInfoScreenLabeledValueTextColor + let textBehavior: PeerInfoScreenLabeledValueTextBehavior + let action: (() -> Void)? + let longTapAction: ((ASDisplayNode) -> Void)? + let linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? + + init( + id: AnyHashable, + label: String, + text: String, + textColor: PeerInfoScreenLabeledValueTextColor = .primary, + textBehavior: PeerInfoScreenLabeledValueTextBehavior = .singleLine, + action: (() -> Void)?, + longTapAction: ((ASDisplayNode) -> Void)? = nil, + linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil + ) { + self.id = id + self.label = label + self.text = text + self.textColor = textColor + self.textBehavior = textBehavior + self.action = action + self.longTapAction = longTapAction + self.linkItemAction = linkItemAction + } + + 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 linkHighlightingNode: LinkHighlightingNode? + + private var item: PeerInfoScreenLabeledValueItem? + private var theme: PresentationTheme? + + override init() { + var bringToFrontForHighlightImpl: (() -> Void)? + self.selectionNode = PeerInfoScreenSelectableBackgroundNode(bringToFrontForHighlight: { bringToFrontForHighlightImpl?() }) + self.selectionNode.isUserInteractionEnabled = false + + 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 didLoad() { + super.didLoad() + + let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:))) + recognizer.tapActionAtPoint = { [weak self] point in + guard let strongSelf = self, let item = strongSelf.item else { + return .keepWithSingleTap + } + if let _ = strongSelf.linkItemAtPoint(point) { + return .waitForSingleTap + } + if item.longTapAction != nil { + return .waitForSingleTap + } + if item.action != nil { + return .keepWithSingleTap + } + return .fail + } + recognizer.highlight = { [weak self] point in + guard let strongSelf = self else { + return + } + strongSelf.updateTouchesAtPoint(point) + } + self.view.addGestureRecognizer(recognizer) + } + + @objc private func tapLongTapOrDoubleTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { + switch recognizer.state { + case .ended: + if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { + switch gesture { + case .tap, .longTap: + if let item = self.item { + if let linkItem = self.linkItemAtPoint(location) { + item.linkItemAction?(gesture == .tap ? .tap : .longTap, linkItem) + } else if case .longTap = gesture { + item.longTapAction?(self) + } else if case .tap = gesture { + item.action?() + } + } + default: + break + } + } + default: + break + } + } + + 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.theme = presentationData.theme + + 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 + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(17.0), textColor: textColorValue) + case let .multiLine(maxLines, enabledEntities): + self.textNode.maximumNumberOfLines = maxLines + if enabledEntities.isEmpty { + self.textNode.attributedText = NSAttributedString(string: item.text, font: Font.regular(17.0), textColor: textColorValue) + } else { + let fontSize: CGFloat = 17.0 + + var baseFont = Font.regular(fontSize) + var linkFont = baseFont + var boldFont = Font.medium(fontSize) + var italicFont = Font.italic(fontSize) + var boldItalicFont = Font.semiboldItalic(fontSize) + let titleFixedFont = Font.monospace(fontSize) + + let entities = generateTextEntities(item.text, enabledTypes: enabledEntities) + self.textNode.attributedText = stringWithAppliedEntities(item.text, entities: entities, baseColor: textColorValue, linkColor: presentationData.theme.list.itemAccentColor, baseFont: baseFont, linkFont: linkFont, boldFont: boldFont, italicFont: italicFont, boldItalicFont: boldItalicFont, fixedFont: titleFixedFont, blockQuoteFont: baseFont) + } + } + + 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 + } + + private func linkItemAtPoint(_ point: CGPoint) -> TextLinkItem? { + let textNodeFrame = self.textNode.frame + if let (_, attributes) = self.textNode.attributesAtPoint(CGPoint(x: point.x - textNodeFrame.minX, y: point.y - textNodeFrame.minY)) { + if let url = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.URL)] as? String { + return .url(url) + } else if let peerName = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.PeerTextMention)] as? String { + return .mention(peerName) + } else if let hashtag = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.Hashtag)] as? TelegramHashtag { + return .hashtag(hashtag.peerName, hashtag.hashtag) + } else { + return nil + } + } + return nil + } + + private func updateTouchesAtPoint(_ point: CGPoint?) { + guard let item = self.item, let theme = self.theme else { + return + } + var rects: [CGRect]? + if let point = point { + let textNodeFrame = self.textNode.frame + if let (index, attributes) = self.textNode.attributesAtPoint(CGPoint(x: point.x - textNodeFrame.minX, y: point.y - textNodeFrame.minY)) { + let possibleNames: [String] = [ + TelegramTextAttributes.URL, + TelegramTextAttributes.PeerMention, + TelegramTextAttributes.PeerTextMention, + TelegramTextAttributes.BotCommand, + TelegramTextAttributes.Hashtag + ] + for name in possibleNames { + if let _ = attributes[NSAttributedString.Key(rawValue: name)] { + rects = self.textNode.attributeRects(name: name, at: index) + break + } + } + } + } + + if let rects = rects { + let linkHighlightingNode: LinkHighlightingNode + if let current = self.linkHighlightingNode { + linkHighlightingNode = current + } else { + linkHighlightingNode = LinkHighlightingNode(color: theme.list.itemAccentColor.withAlphaComponent(0.5)) + self.linkHighlightingNode = linkHighlightingNode + self.insertSubnode(linkHighlightingNode, belowSubnode: self.textNode) + } + linkHighlightingNode.frame = self.textNode.frame + linkHighlightingNode.updateRects(rects) + } else if let linkHighlightingNode = self.linkHighlightingNode { + self.linkHighlightingNode = nil + linkHighlightingNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.18, removeOnCompletion: false, completion: { [weak linkHighlightingNode] _ in + linkHighlightingNode?.removeFromSupernode() + }) + } + + if point != nil && rects == nil && item.action != nil { + self.selectionNode.updateIsHighlighted(true) + } else { + self.selectionNode.updateIsHighlighted(false) + } + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift new file mode 100644 index 0000000000..e593df1e4e --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift @@ -0,0 +1,213 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import TelegramPresentationData +import ItemListPeerItem +import SwiftSignalKit +import AccountContext +import Postbox +import SyncCore +import TelegramCore +import ItemListUI + +enum PeerInfoScreenMemberItemAction { + case open + case promote + case restrict + case remove +} + +final class PeerInfoScreenMemberItem: PeerInfoScreenItem { + let id: AnyHashable + let context: AccountContext + let enclosingPeer: Peer + let member: PeerInfoMember + let action: ((PeerInfoScreenMemberItemAction) -> Void)? + + init( + id: AnyHashable, + context: AccountContext, + enclosingPeer: Peer, + member: PeerInfoMember, + action: ((PeerInfoScreenMemberItemAction) -> Void)? + ) { + self.id = id + self.context = context + self.enclosingPeer = enclosingPeer + self.member = member + 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.selectionNode.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) + } + + override func didLoad() { + super.didLoad() + + let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:))) + recognizer.tapActionAtPoint = { [weak self] point in + return .keepWithSingleTap + } + recognizer.highlight = { [weak self] point in + guard let strongSelf = self else { + return + } + strongSelf.updateTouchesAtPoint(point) + } + self.view.addGestureRecognizer(recognizer) + } + + @objc private func tapLongTapOrDoubleTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { + switch recognizer.state { + case .ended: + if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { + switch gesture { + case .tap: + if let item = self.item { + item.action?(.open) + } + default: + break + } + } + default: + break + } + } + + 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.flatMap { action in + return { + action(.open) + } + } + + let sideInset: CGFloat = 16.0 + + self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + let label: String? + if let rank = item.member.rank { + label = rank + } else { + switch item.member.role { + case .creator: + label = presentationData.strings.GroupInfo_LabelOwner + case .admin: + label = presentationData.strings.GroupInfo_LabelAdmin + case .member: + label = nil + } + } + + let actions = availableActionsForMemberOfPeer(accountPeerId: item.context.account.peerId, peer: item.enclosingPeer, member: item.member) + + var options: [ItemListPeerItemRevealOption] = [] + if actions.contains(.promote) && item.enclosingPeer is TelegramChannel { + options.append(ItemListPeerItemRevealOption(type: .neutral, title: presentationData.strings.GroupInfo_ActionPromote, action: { + item.action?(.promote) + })) + } + if actions.contains(.restrict) { + if item.enclosingPeer is TelegramChannel { + options.append(ItemListPeerItemRevealOption(type: .warning, title: presentationData.strings.GroupInfo_ActionRestrict, action: { + item.action?(.restrict) + })) + } + options.append(ItemListPeerItemRevealOption(type: .destructive, title: presentationData.strings.Common_Delete, action: { + item.action?(.remove) + })) + } + + let peerItem = ItemListPeerItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: item.context, peer: item.member.peer, height: .peerList, presence: item.member.presence, text: .presence, label: label == nil ? .none : .text(label!, .standard), editing: ItemListPeerItemEditing(editable: !options.isEmpty, editing: false, revealed: nil), revealOptions: ItemListPeerItemRevealOptions(options: options), 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 + 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 + } + + private func updateTouchesAtPoint(_ point: CGPoint?) { + guard let item = self.item else { + return + } + if point != nil && item.context.account.peerId != item.member.id { + self.selectionNode.updateIsHighlighted(true) + } else { + self.selectionNode.updateIsHighlighted(false) + } + } +} diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift new file mode 100644 index 0000000000..a630c37287 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift @@ -0,0 +1,62 @@ +import AsyncDisplayKit +import Display +import TelegramPresentationData + +final class PeerInfoScreenSelectableBackgroundNode: ASDisplayNode { + private let backgroundNode: ASDisplayNode + private let buttonNode: HighlightTrackingButtonNode + + let bringToFrontForHighlight: () -> Void + + private var isHighlighted: Bool = false + + 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 + self?.updateIsHighlighted(highlighted) + } + } + + @objc private func buttonPressed() { + self.pressed?() + } + + func updateIsHighlighted(_ isHighlighted: Bool) { + if self.isHighlighted != isHighlighted { + self.isHighlighted = isHighlighted + if isHighlighted { + self.bringToFrontForHighlight() + self.backgroundNode.layer.removeAnimation(forKey: "opacity") + self.backgroundNode.alpha = 1.0 + } else { + self.backgroundNode.alpha = 0.0 + self.backgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25) + } + } + } + + 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..e655f28ab3 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift @@ -0,0 +1,206 @@ +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 groupsInCommonContext: GroupsInCommonContext + + private let listNode: ListView + private var state: GroupsInCommonState? + 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() + } + + private var disposable: Disposable? + + init(context: AccountContext, peerId: PeerId, chatControllerInteraction: ChatControllerInteraction, openPeerContextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void, groupsInCommonContext: GroupsInCommonContext) { + self.context = context + self.peerId = peerId + self.chatControllerInteraction = chatControllerInteraction + self.openPeerContextAction = openPeerContextAction + self.groupsInCommonContext = groupsInCommonContext + + self.listNode = ListView() + + super.init() + + self.listNode.preloadPages = true + self.addSubnode(self.listNode) + + self.disposable = (groupsInCommonContext.state + |> deliverOnMainQueue).start(next: { [weak self] state in + guard let strongSelf = self else { + return + } + strongSelf.state = state + if let (_, _, presentationData) = strongSelf.currentParams { + strongSelf.updatePeers(state: state, presentationData: presentationData) + } + }) + + self.listNode.visibleBottomContentOffsetChanged = { [weak self] offset in + guard let strongSelf = self, let state = strongSelf.state, case .ready(true) = state.dataState else { + return + } + if case let .known(value) = offset, value < 100.0, case .ready(true) = state.dataState { + strongSelf.groupsInCommonContext.loadMore() + } + } + } + + deinit { + self.disposable?.dispose() + } + + 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.state { + self.updatePeers(state: state, presentationData: presentationData) + } + } + + private func updatePeers(state: GroupsInCommonState, presentationData: PresentationData) { + var entries: [GroupsInCommonListEntry] = [] + for peer in state.peers { + if let peer = peer.peer { + 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..f22ca30ca6 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoMembersPane.swift @@ -0,0 +1,250 @@ +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] + let animated: Bool +} + +enum PeerMembersListAction { + case open + case promote + case restrict + case remove +} + +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, enclosingPeer: Peer, action: @escaping (PeerInfoMember, PeerMembersListAction) -> Void) -> ListViewItem { + let member = self.member + let label: String? + if let rank = member.rank { + label = rank + } else { + switch member.role { + case .creator: + label = presentationData.strings.GroupInfo_LabelOwner + case .admin: + label = presentationData.strings.GroupInfo_LabelAdmin + case .member: + label = nil + } + } + + let actions = availableActionsForMemberOfPeer(accountPeerId: context.account.peerId, peer: enclosingPeer, member: member) + + var options: [ItemListPeerItemRevealOption] = [] + if actions.contains(.promote) && enclosingPeer is TelegramChannel{ + options.append(ItemListPeerItemRevealOption(type: .neutral, title: presentationData.strings.GroupInfo_ActionPromote, action: { + action(member, .promote) + })) + } + if actions.contains(.restrict) { + if enclosingPeer is TelegramChannel { + options.append(ItemListPeerItemRevealOption(type: .warning, title: presentationData.strings.GroupInfo_ActionRestrict, action: { + action(member, .restrict) + })) + } + options.append(ItemListPeerItemRevealOption(type: .destructive, title: presentationData.strings.Common_Delete, action: { + action(member, .remove) + })) + } + + return ItemListPeerItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: context, peer: member.peer, presence: member.presence, text: .presence, label: label == nil ? .none : .text(label!, .standard), editing: ItemListPeerItemEditing(editable: !options.isEmpty, editing: false, revealed: false), revealOptions: ItemListPeerItemRevealOptions(options: options), switchValue: nil, enabled: true, selectable: member.id != context.account.peerId, sectionId: 0, action: { + action(member, .open) + }, 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, enclosingPeer: Peer, action: @escaping (PeerInfoMember, PeerMembersListAction) -> 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, enclosingPeer: enclosingPeer, action: action), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, enclosingPeer: enclosingPeer, action: action), directionHint: nil) } + + return PeerMembersListTransaction(deletions: deletions, insertions: insertions, updates: updates, animated: toEntries.count < fromEntries.count) +} + +final class PeerInfoMembersPaneNode: ASDisplayNode, PeerInfoPaneNode { + private let context: AccountContext + private let membersContext: PeerInfoMembersContext + private let action: (PeerInfoMember, PeerMembersListAction) -> Void + + private let listNode: ListView + private var currentEntries: [PeerMembersListEntry] = [] + private var enclosingPeer: Peer? + 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, peerId: PeerId, membersContext: PeerInfoMembersContext, action: @escaping (PeerInfoMember, PeerMembersListAction) -> Void) { + self.context = context + self.membersContext = membersContext + self.action = action + + self.listNode = ListView() + + super.init() + + self.listNode.preloadPages = true + self.addSubnode(self.listNode) + + self.disposable = (combineLatest(queue: .mainQueue(), + membersContext.state, + context.account.postbox.combinedView(keys: [.basicPeer(peerId)]) + ) + |> deliverOnMainQueue).start(next: { [weak self] state, combinedView in + guard let strongSelf = self, let basicPeerView = combinedView.views[.basicPeer(peerId)] as? BasicPeerView, let enclosingPeer = basicPeerView.peer else { + return + } + + strongSelf.enclosingPeer = enclosingPeer + strongSelf.currentState = state + if let (_, _, presentationData) = strongSelf.currentParams { + strongSelf.updateState(enclosingPeer: enclosingPeer, 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 enclosingPeer = self.enclosingPeer, let state = self.currentState { + self.updateState(enclosingPeer: enclosingPeer, state: state, presentationData: presentationData) + } + } + + private func updateState(enclosingPeer: Peer, 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, enclosingPeer: enclosingPeer, action: { [weak self] member, action in + self?.action(member, action) + }) + self.enclosingPeer = enclosingPeer + 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() + if transaction.animated { + options.insert(.AnimateInsertion) + } else { + 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..8f901e2cd8 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift @@ -0,0 +1,647 @@ +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() + + let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))) + recognizer.tapActionAtPoint = { _ in + return .waitForSingleTap + } + self.imageNode.view.addGestureRecognizer(recognizer) + } + + @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 { + self.containerNode.isGestureEnabled = self.interaction.selectedMessageIds == nil + + 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.canCancelContentTouches = true + 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..04bb02018e --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift @@ -0,0 +1,699 @@ +import Foundation +import UIKit +import Postbox +import SyncCore +import TelegramCore +import SwiftSignalKit +import AccountContext +import PeerPresenceStatusManager +import TelegramStringFormatting +import TelegramPresentationData +import PeerAvatarGalleryUI + +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: GroupsInCommonContext? + let linkedDiscussionPeer: Peer? + let members: PeerInfoMembersData? + + init( + peer: Peer?, + cachedData: CachedPeerData?, + status: PeerInfoStatusData?, + notificationSettings: TelegramPeerNotificationSettings?, + globalNotificationSettings: GlobalNotificationSettings?, + isContact: Bool, + availablePanes: [PeerInfoPaneKey], + groupsInCommon: GroupsInCommonContext?, + 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 + } +} + +private enum PeerInfoScreenInputUserKind { + case user + case bot + case support +} + +private enum PeerInfoScreenInputData: Equatable { + case none + case user(userId: PeerId, secretChatId: PeerId?, kind: PeerInfoScreenInputUserKind) + case channel + case group(groupId: PeerId) +} + +private func peerInfoAvailableMediaPanes(context: AccountContext, peerId: PeerId) -> Signal<[PeerInfoPaneKey]?, NoError> { + let tags: [(MessageTags, PeerInfoPaneKey)] = [ + (.photoOrVideo, .media), + (.file, .files), + (.music, .music), + //(.voiceOrInstantVideo, .voice), + (.webPage, .links) + ] + enum PaneState { + case loading + case empty + case present + } + let loadedOnce = Atomic(value: false) + return combineLatest(queue: .mainQueue(), tags.map { tagAndKey -> Signal<(PeerInfoPaneKey, PaneState), NoError> 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, PaneState) in + if view.entries.isEmpty { + if view.isLoading { + return (key, .loading) + } else { + return (key, .empty) + } + } else { + return (key, .present) + } + } + }) + |> map { keysAndStates -> [PeerInfoPaneKey]? in + let loadedOnceValue = loadedOnce.with { $0 } + var result: [PeerInfoPaneKey] = [] + var hasNonLoaded = false + for (key, state) in keysAndStates { + switch state { + case .present: + result.append(key) + case .empty: + break + case .loading: + hasNonLoaded = true + } + } + if !hasNonLoaded || loadedOnceValue { + if !loadedOnceValue { + let _ = loadedOnce.swap(true) + } + return result + } else { + return nil + } + } + |> distinctUntilChanged +} + +struct PeerInfoStatusData: Equatable { + var text: String + var isActivity: Bool +} + +enum PeerInfoMembersData: Equatable { + case shortList(membersContext: PeerInfoMembersContext, members: [PeerInfoMember]) + case longList(PeerInfoMembersContext) + + var membersContext: PeerInfoMembersContext { + switch self { + case let .shortList(shortList): + return shortList.membersContext + case let .longList(membersContext): + return membersContext + } + } +} + +private func peerInfoScreenInputData(context: AccountContext, peerId: PeerId) -> 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(groupId: channel.id) + } else { + return .channel + } + } else if let group = peer as? TelegramGroup { + return .group(groupId: group.id) + } else { + return .none + } + } + |> distinctUntilChanged +} + +private func peerInfoProfilePhotos(context: AccountContext, peerId: PeerId) -> Signal { + return context.account.postbox.combinedView(keys: [.basicPeer(peerId)]) + |> map { view -> AvatarGalleryEntry? in + guard let peer = (view.views[.basicPeer(peerId)] as? BasicPeerView)?.peer else { + return nil + } + return initialAvatarGalleryEntries(peer: peer).first + } + |> distinctUntilChanged + |> mapToSignal { firstEntry -> Signal<[AvatarGalleryEntry], NoError> in + if let firstEntry = firstEntry { + return context.account.postbox.loadedPeerWithId(peerId) + |> mapToSignal { peer -> Signal<[AvatarGalleryEntry], NoError>in + return fetchedAvatarGalleryEntries(account: context.account, peer: peer, firstEntry: firstEntry) + } + } else { + return .single([]) + } + } + |> map { items -> Any in + return items + } +} + +func peerInfoProfilePhotosWithCache(context: AccountContext, peerId: PeerId) -> Signal<[AvatarGalleryEntry], NoError> { + return context.peerChannelMemberCategoriesContextsManager.profilePhotos(postbox: context.account.postbox, network: context.account.network, peerId: peerId, fetch: peerInfoProfilePhotos(context: context, peerId: peerId)) + |> map { items -> [AvatarGalleryEntry] in + return items as? [AvatarGalleryEntry] ?? [] + } +} + +func keepPeerInfoScreenDataHot(context: AccountContext, peerId: PeerId) -> Signal { + return peerInfoScreenInputData(context: context, peerId: peerId) + |> mapToSignal { inputData -> Signal in + switch inputData { + case .none: + return .complete() + case .user, .channel, .group: + return combineLatest( + context.peerChannelMemberCategoriesContextsManager.profileData(postbox: context.account.postbox, network: context.account.network, peerId: peerId, customData: peerInfoAvailableMediaPanes(context: context, peerId: peerId) |> ignoreValues), + context.peerChannelMemberCategoriesContextsManager.profilePhotos(postbox: context.account.postbox, network: context.account.network, peerId: peerId, fetch: peerInfoProfilePhotos(context: context, peerId: peerId)) |> ignoreValues + ) + |> ignoreValues + } + } +} + +func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat) -> Signal { + return peerInfoScreenInputData(context: context, peerId: peerId) + |> 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 groupsInCommon: GroupsInCommonContext? + if case .user = kind { + groupsInCommon = GroupsInCommonContext(account: context.account, peerId: peerId) + } else { + groupsInCommon = nil + } + + 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 + ) + |> 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 availablePanes = availablePanes + if availablePanes != nil, groupsInCommon != nil, 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: nil, + linkedDiscussionPeer: discussionPeer, + members: nil + ) + } + case let .group(groupId): + let status = context.account.viewTracker.peerView(groupId, updateData: false) + |> map { peerView -> PeerInfoStatusData? in + guard let channel = peerView.peers[groupId] as? TelegramChannel else { + return PeerInfoStatusData(text: strings.Group_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 membersContext = PeerInfoMembersContext(context: context, peerId: groupId) + + let membersData: Signal = membersContext.state + |> map { state -> PeerInfoMembersData? in + if state.members.count > 5 { + return .longList(membersContext) + } else { + return .shortList(membersContext: membersContext, members: state.members) + } + } + |> distinctUntilChanged + + let globalNotificationsKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.globalNotifications])) + var combinedKeys: [PostboxViewKey] = [] + combinedKeys.append(globalNotificationsKey) + return combineLatest(queue: .mainQueue(), + context.account.viewTracker.peerView(groupId, updateData: true), + peerInfoAvailableMediaPanes(context: context, peerId: groupId), + 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 { + if availablePanes != nil { + availablePanes?.insert(.members, at: 0) + } else { + availablePanes = [.members] + } + } + + return PeerInfoScreenData( + peer: peerView.peers[groupId], + cachedData: peerView.cachedData, + status: status, + notificationSettings: peerView.notificationSettings as? TelegramPeerNotificationSettings, + globalNotificationSettings: globalNotificationSettings, + isContact: peerView.peerIsContact, + availablePanes: availablePanes ?? [], + groupsInCommon: nil, + 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 +} + +struct PeerInfoMemberActions: OptionSet { + var rawValue: Int32 + + init(rawValue: Int32) { + self.rawValue = rawValue + } + + static let restrict = PeerInfoMemberActions(rawValue: 1 << 0) + static let promote = PeerInfoMemberActions(rawValue: 1 << 1) +} + +func availableActionsForMemberOfPeer(accountPeerId: PeerId, peer: Peer, member: PeerInfoMember) -> PeerInfoMemberActions { + var result: PeerInfoMemberActions = [] + + if member.id != accountPeerId { + if let channel = peer as? TelegramChannel { + if channel.flags.contains(.isCreator) { + result.insert(.restrict) + result.insert(.promote) + } else { + switch member { + case let .channelMember(channelMember): + switch channelMember.participant { + case .creator: + break + case let .member(member): + if let adminInfo = member.adminInfo { + if adminInfo.promotedBy == accountPeerId { + result.insert(.restrict) + if channel.hasPermission(.addAdmins) { + result.insert(.promote) + } + } + } else { + if channel.hasPermission(.banMembers) { + result.insert(.restrict) + } + } + } + case .legacyGroupMember: + break + } + } + } else if let group = peer as? TelegramGroup { + switch group.role { + case .creator: + result.insert(.restrict) + result.insert(.promote) + case .admin: + switch member { + case let .legacyGroupMember(legacyGroupMember): + if legacyGroupMember.invitedBy == accountPeerId { + result.insert(.restrict) + result.insert(.promote) + } + case .channelMember: + break + } + case .member: + switch member { + case let .legacyGroupMember(legacyGroupMember): + if legacyGroupMember.invitedBy == accountPeerId { + result.insert(.restrict) + } + case .channelMember: + break + } + } + } + } + + return result +} + +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) { + if let cachedUserData = cachedData as? CachedUserData { + callsAvailable = cachedUserData.callsAvailable + } + callsAvailable = true + } + 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..16620fe3b8 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoHeaderNode.swift @@ -0,0 +1,2013 @@ +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.imageNode.contentAnimations = .subsequentUpdates + 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 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, synchronous: true) + } + } else { + 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((peerInfoProfilePhotosWithCache(context: self.context, peerId: peer.id) + |> 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 = 8.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 + 1.0, 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 + } + let alphaFactor: CGFloat = spec.isForExpandedView ? expandFraction : (1.0 - expandFraction) + if wasAdded { + buttonNode.frame = buttonFrame + buttonNode.alpha = 0.0 + transition.updateAlpha(node: buttonNode, alpha: alphaFactor * alphaFactor) + } else { + transition.updateFrameAdditiveToCenter(node: buttonNode, frame: buttonFrame) + 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, ASEditableTextNodeDelegate { + private let textNode: EditableTextNode + private let textNodeContainer: ASDisplayNode + private let measureTextNode: ImmediateTextNode + private let topSeparator: ASDisplayNode + + private let requestUpdateHeight: () -> Void + + private var theme: PresentationTheme? + private var currentParams: (width: CGFloat, safeInset: CGFloat)? + private var currentMeasuredHeight: CGFloat? + + var text: String { + return self.textNode.attributedText?.string ?? "" + } + + init(requestUpdateHeight: @escaping () -> Void) { + self.requestUpdateHeight = requestUpdateHeight + + self.textNode = EditableTextNode() + self.textNodeContainer = ASDisplayNode() + self.measureTextNode = ImmediateTextNode() + self.measureTextNode.maximumNumberOfLines = 0 + self.topSeparator = ASDisplayNode() + + super.init() + + self.textNodeContainer.addSubnode(self.textNode) + self.addSubnode(self.textNodeContainer) + self.addSubnode(self.topSeparator) + } + + func update(width: CGFloat, safeInset: CGFloat, hasPrevious: Bool, placeholder: String, isEnabled: Bool, presentationData: PresentationData, updateText: String?) -> CGFloat { + self.currentParams = (width, safeInset) + + if self.theme !== presentationData.theme { + self.theme = presentationData.theme + let textColor = presentationData.theme.list.itemPrimaryTextColor + self.textNode.typingAttributes = [NSAttributedString.Key.font.rawValue: Font.regular(17.0), NSAttributedString.Key.foregroundColor.rawValue: textColor] + + self.textNode.clipsToBounds = true + self.textNode.delegate = self + self.textNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0) + } + + 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 attributedPlaceholderText = NSAttributedString(string: placeholder, font: Font.regular(17.0), textColor: presentationData.theme.list.itemPlaceholderTextColor) + if self.textNode.attributedPlaceholderText == nil || !self.textNode.attributedPlaceholderText!.isEqual(to: attributedPlaceholderText) { + self.textNode.attributedPlaceholderText = attributedPlaceholderText + } + + if let updateText = updateText { + let attributedText = NSAttributedString(string: updateText, font: Font.regular(17.0), textColor: presentationData.theme.list.itemPrimaryTextColor) + self.textNode.attributedText = attributedText + } + + var measureText = self.textNode.attributedText?.string ?? "" + if measureText.hasSuffix("\n") || measureText.isEmpty { + measureText += "|" + } + let attributedMeasureText = NSAttributedString(string: measureText, font: Font.regular(17.0), textColor: .black) + self.measureTextNode.attributedText = attributedMeasureText + let measureTextSize = self.measureTextNode.updateLayout(CGSize(width: width - safeInset * 2.0 - 16 * 2.0, height: .greatestFiniteMagnitude)) + self.currentMeasuredHeight = measureTextSize.height + + let height = measureTextSize.height + 22.0 + + let textNodeFrame = CGRect(origin: CGPoint(x: safeInset + 16.0, y: 10.0), size: CGSize(width: width - safeInset * 2.0 - 16.0 * 2.0, height: max(height, 1000.0))) + self.textNodeContainer.frame = textNodeFrame + self.textNode.frame = CGRect(origin: CGPoint(), size: textNodeFrame.size) + + return height + } + + func editableTextNode(_ editableTextNode: ASEditableTextNode, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { + guard let theme = self.theme else { + return true + } + let updatedText = (editableTextNode.textView.text as NSString).replacingCharacters(in: range, with: text) + if updatedText.count > 255 { + let attributedText = NSAttributedString(string: String(updatedText[updatedText.startIndex.. 0.1 { + self.requestUpdateHeight() + } + } + } + + func editableTextNodeShouldPaste(_ editableTextNode: ASEditableTextNode) -> Bool { + let text: String? = UIPasteboard.general.string + if let _ = text { + return true + } else { + return false + } + } +} + +final class PeerInfoHeaderEditingContentNode: ASDisplayNode { + private let context: AccountContext + private let requestUpdateLayout: () -> Void + + let avatarNode: PeerInfoEditingAvatarNode + + var itemNodes: [PeerInfoHeaderTextFieldNodeKey: PeerInfoHeaderTextFieldNode] = [:] + + init(context: AccountContext, requestUpdateLayout: @escaping () -> Void) { + self.context = context + self.requestUpdateLayout = requestUpdateLayout + + 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 { + var isMultiline = false + switch key { + case .firstName: + updateText = (peer as? TelegramUser)?.firstName ?? "" + case .lastName: + updateText = (peer as? TelegramUser)?.lastName ?? "" + case .title: + updateText = peer?.debugDisplayTitle ?? "" + case .description: + isMultiline = true + if let cachedData = cachedData as? CachedChannelData { + updateText = cachedData.about ?? "" + } else if let cachedData = cachedData as? CachedGroupData { + updateText = cachedData.about ?? "" + } else { + updateText = "" + } + } + if isMultiline { + itemNode = PeerInfoHeaderMultiLineTextFieldNode(requestUpdateHeight: { [weak self] in + self?.requestUpdateLayout() + }) + } else { + itemNode = PeerInfoHeaderSingleLineTextFieldNode() + } + self.itemNodes[key] = itemNode + self.addSubnode(itemNode) + } + let placeholder: String + var isEnabled = true + switch key { + case .firstName: + placeholder = presentationData.strings.UserInfo_FirstNamePlaceholder + isEnabled = isContact + case .lastName: + placeholder = presentationData.strings.UserInfo_LastNamePlaceholder + isEnabled = isContact + case .title: + if let channel = peer as? TelegramChannel, case .broadcast = channel.info { + placeholder = presentationData.strings.GroupInfo_ChannelListNamePlaceholder + } else { + placeholder = presentationData.strings.GroupInfo_GroupNamePlaceholder + } + isEnabled = canEditPeerInfo(peer: peer) + case .description: + placeholder = presentationData.strings.Channel_Edit_AboutItem + 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 + } +} + +private let TitleNodeStateRegular = 0 +private let TitleNodeStateExpanded = 1 + +final class PeerInfoHeaderNode: ASDisplayNode { + private var context: AccountContext + private var presentationData: PresentationData? + + private let keepExpandedButtons: PeerInfoScreenKeepExpandedButtons + + private(set) var isAvatarExpanded: Bool + + let avatarListNode: PeerInfoAvatarListNode + + let regularContentNode: PeerInfoHeaderRegularContentNode + let editingContentNode: PeerInfoHeaderEditingContentNode + let titleNodeContainer: ASDisplayNode + let titleNodeRawContainer: ASDisplayNode + let titleNode: MultiScaleTextNode + let titleCredibilityIconNode: ASImageNode + let subtitleNodeContainer: ASDisplayNode + let subtitleNodeRawContainer: ASDisplayNode + let subtitleNode: MultiScaleTextNode + 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 requestUpdateLayout: (() -> Void)? + + var navigationTransition: PeerInfoHeaderNavigationTransition? + + init(context: AccountContext, avatarInitiallyExpanded: Bool, keepExpandedButtons: PeerInfoScreenKeepExpandedButtons) { + self.context = context + self.isAvatarExpanded = avatarInitiallyExpanded + self.keepExpandedButtons = keepExpandedButtons + + self.avatarListNode = PeerInfoAvatarListNode(context: context, readyWhenGalleryLoads: avatarInitiallyExpanded) + + self.titleNodeContainer = ASDisplayNode() + self.titleNodeRawContainer = ASDisplayNode() + self.titleNode = MultiScaleTextNode(stateKeys: [TitleNodeStateRegular, TitleNodeStateExpanded]) + 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 = MultiScaleTextNode(stateKeys: [TitleNodeStateRegular, TitleNodeStateExpanded]) + self.subtitleNode.displaysAsynchronously = false + + self.regularContentNode = PeerInfoHeaderRegularContentNode() + var requestUpdateLayoutImpl: (() -> Void)? + self.editingContentNode = PeerInfoHeaderEditingContentNode(context: context, requestUpdateLayout: { + requestUpdateLayoutImpl?() + }) + 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() + + requestUpdateLayoutImpl = { [weak self] in + self?.requestUpdateLayout?() + } + + 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 { + if let sourceImage = UIImage(bundleImageName: "Peer Info/VerifiedIcon") { + self.titleCredibilityIconNode.image = generateImage(sourceImage.size, contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setFillColor(presentationData.theme.list.itemCheckColors.foregroundColor.cgColor) + context.fillEllipse(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: 7.0, dy: 7.0)) + context.setFillColor(presentationData.theme.list.itemCheckColors.fillColor.cgColor) + context.clip(to: CGRect(origin: CGPoint(), size: size), mask: sourceImage.cgImage!) + context.fill(CGRect(origin: CGPoint(), size: size)) + }) + //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 expandedAvatarControlsHeight: CGFloat = 61.0 + let expandedAvatarListHeight = min(width, containerHeight - expandedAvatarControlsHeight) + let expandedAvatarListSize = CGSize(width: width, height: expandedAvatarListHeight) + + let buttonKeys: [PeerInfoHeaderButtonKey] = peerInfoHeaderButtons(peer: peer, cachedData: cachedData) + + var isVerified = false + let titleString: NSAttributedString + let subtitleString: NSAttributedString + if let peer = peer, peer.isVerified { + isVerified = true + } + + if let peer = peer { + titleString = NSAttributedString(string: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), font: Font.medium(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor) + + 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 = NSAttributedString(string: " ", font: Font.regular(15.0), textColor: presentationData.theme.list.itemSecondaryTextColor) + } + } else { + titleString = NSAttributedString(string: " ", font: Font.medium(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor) + subtitleString = NSAttributedString(string: " ", font: Font.regular(15.0), textColor: presentationData.theme.list.itemSecondaryTextColor) + } + + let textSideInset: CGFloat = 44.0 + let expandedAvatarHeight: CGFloat = expandedAvatarListSize.height + expandedAvatarControlsHeight + + let titleConstrainedSize = CGSize(width: width - textSideInset * 2.0 - (isVerified ? 16.0 : 0.0), height: .greatestFiniteMagnitude) + + let titleNodeLayout = self.titleNode.updateLayout(states: [ + TitleNodeStateRegular: MultiScaleTextState(attributedText: titleString, constrainedSize: titleConstrainedSize), + TitleNodeStateExpanded: MultiScaleTextState(attributedText: titleString, constrainedSize: CGSize(width: titleConstrainedSize.width, height: titleConstrainedSize.height)) + ], mainState: TitleNodeStateRegular) + + let subtitleNodeLayout = self.subtitleNode.updateLayout(states: [ + TitleNodeStateRegular: MultiScaleTextState(attributedText: subtitleString, constrainedSize: titleConstrainedSize), + TitleNodeStateExpanded: MultiScaleTextState(attributedText: subtitleString, constrainedSize: CGSize(width: titleConstrainedSize.width - 82.0, height: titleConstrainedSize.height)) + ], mainState: TitleNodeStateRegular) + + self.titleNode.update(stateFractions: [ + TitleNodeStateRegular: self.isAvatarExpanded ? 0.0 : 1.0, + TitleNodeStateExpanded: self.isAvatarExpanded ? 1.0 : 0.0 + ], transition: transition) + + self.subtitleNode.update(stateFractions: [ + TitleNodeStateRegular: self.isAvatarExpanded ? 0.0 : 1.0, + TitleNodeStateExpanded: self.isAvatarExpanded ? 1.0 : 0.0 + ], transition: transition) + + 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) + + let titleSize = titleNodeLayout[TitleNodeStateRegular]!.size + let subtitleSize = subtitleNodeLayout[TitleNodeStateRegular]!.size + + 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 { + let minTitleSize = CGSize(width: titleSize.width * 0.7, height: titleSize.height * 0.7) + let minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - expandedAvatarControlsHeight + 9.0 + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize) + titleFrame = CGRect(origin: CGPoint(x: minTitleFrame.midX - titleSize.width / 2.0, y: minTitleFrame.midY - titleSize.height / 2.0), size: titleSize) + subtitleFrame = CGRect(origin: CGPoint(x: 16.0, y: minTitleFrame.maxY + 4.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 < 25.0 ? (statusBarHeight + 2.0) : (statusBarHeight - 3.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 * neutralTitleScale / 2.0, y: titleCenter.y - titleFrame.size.height * neutralTitleScale / 2.0), size: CGSize(width: titleFrame.size.width * neutralTitleScale, height: titleFrame.size.height * neutralTitleScale)) + 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(), size: CGSize())) + 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: CGRect(origin: rawSubtitleFrame.center, size: CGSize())) + transition.updateFrame(node: self.subtitleNode, frame: CGRect(origin: CGPoint(), size: CGSize())) + 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: CGSize())) + let rawSubtitleFrame = subtitleFrame + self.subtitleNodeRawContainer.frame = rawSubtitleFrame + if self.isAvatarExpanded { + transition.updateFrameAdditive(node: self.titleNodeContainer, frame: CGRect(origin: rawTitleFrame.center, size: CGSize()).offsetBy(dx: 0.0, dy: titleOffset + apparentTitleLockOffset)) + transition.updateFrameAdditive(node: self.subtitleNodeContainer, frame: CGRect(origin: rawSubtitleFrame.center, size: CGSize()).offsetBy(dx: 0.0, dy: titleOffset)) + } else { + transition.updateFrameAdditiveToCenter(node: self.titleNodeContainer, frame: CGRect(origin: rawTitleFrame.center, size: CGSize()).offsetBy(dx: 0.0, dy: titleOffset + apparentTitleLockOffset)) + transition.updateFrameAdditiveToCenter(node: self.subtitleNodeContainer, frame: CGRect(origin: rawSubtitleFrame.center, size: CGSize()).offsetBy(dx: 0.0, dy: titleOffset)) + } + transition.updateFrame(node: self.subtitleNode, frame: CGRect(origin: CGPoint(), size: CGSize())) + 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 + + var buttonsAlphaTransition = transition + + if self.navigationTransition != nil { + if case let .animated(duration, curve) = transition, transitionFraction >= 1.0 - CGFloat.ulpOfOne { + buttonsAlphaTransition = .animated(duration: duration * 0.6, curve: curve) + } + + 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 = presentationData.strings.PeerInfo_ButtonMessage + buttonIcon = .message + case .discussion: + buttonText = presentationData.strings.PeerInfo_ButtonDiscuss + buttonIcon = .message + case .call: + buttonText = presentationData.strings.PeerInfo_ButtonCall + buttonIcon = .call + case .mute: + if let notificationSettings = notificationSettings, case .muted = notificationSettings.muteState { + buttonText = presentationData.strings.PeerInfo_ButtonUnmute + buttonIcon = .unmute + } else { + buttonText = presentationData.strings.PeerInfo_ButtonMute + buttonIcon = .mute + } + case .more: + buttonText = presentationData.strings.PeerInfo_ButtonMore + buttonIcon = .more + case .addMember: + buttonText = presentationData.strings.PeerInfo_ButtonAddMember + buttonIcon = .addMember + } + buttonNode.update(size: buttonFrame.size, text: buttonText, icon: buttonIcon, isExpanded: self.isAvatarExpanded, presentationData: presentationData, transition: buttonTransition) + transition.updateSublayerTransformScaleAdditive(node: buttonNode, scale: buttonsScale) + + if wasAdded { + buttonNode.alpha = 0.0 + } + buttonsAlphaTransition.updateAlpha(node: buttonNode, alpha: buttonsAlpha) + + let hiddenWhileExpanded: Bool + switch self.keepExpandedButtons { + case .message: + switch buttonKey { + case .mute: + hiddenWhileExpanded = true + default: + hiddenWhileExpanded = false + } + case .mute: + switch buttonKey { + case .message: + 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..cbfd8230b7 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoMembers.swift @@ -0,0 +1,289 @@ +import Foundation +import SwiftSignalKit +import Postbox +import SyncCore +import TelegramCore +import AccountContext +import TemporaryCachedPeerDataManager + +enum PeerInfoMemberRole { + case creator + case admin + case member +} + +enum PeerInfoMember: Equatable { + case channelMember(RenderedChannelParticipant) + case legacyGroupMember(peer: RenderedPeer, role: PeerInfoMemberRole, invitedBy: PeerId?, presence: TelegramUserPresence?) + + var id: PeerId { + switch self { + case let .channelMember(channelMember): + return channelMember.peer.id + case let .legacyGroupMember(legacyGroupMember): + return legacyGroupMember.peer.peerId + } + } + + var peer: Peer { + switch self { + case let .channelMember(channelMember): + return channelMember.peer + case let .legacyGroupMember(legacyGroupMember): + return legacyGroupMember.peer.peers[legacyGroupMember.peer.peerId]! + } + } + + var presence: TelegramUserPresence? { + switch self { + case let .channelMember(channelMember): + return channelMember.presences[channelMember.peer.id] as? TelegramUserPresence + case let .legacyGroupMember(legacyGroupMember): + return legacyGroupMember.presence + } + } + + var role: PeerInfoMemberRole { + switch self { + case let .channelMember(channelMember): + switch channelMember.participant { + case .creator: + return .creator + case let .member(member): + if member.adminInfo != nil { + return .admin + } else { + return .member + } + } + case let .legacyGroupMember(legacyGroupMember): + return legacyGroupMember.role + } + } + + var rank: String? { + switch self { + case let .channelMember(channelMember): + switch channelMember.participant { + case let .creator(creator): + return creator.rank + case let .member(member): + return member.rank + } + case .legacyGroupMember: + return nil + } + } +} + +enum PeerInfoMembersDataState: Equatable { + case loading(isInitial: Bool) + case ready(canLoadMore: Bool) +} + +struct PeerInfoMembersState: Equatable { + var members: [PeerInfoMember] + var dataState: PeerInfoMembersDataState +} + +private func membersSortedByPresence(_ members: [PeerInfoMember], accountPeerId: PeerId) -> [PeerInfoMember] { + return members.sorted(by: { lhs, rhs in + if lhs.id == accountPeerId { + return true + } else if rhs.id == accountPeerId { + return false + } + + let lhsPresence = lhs.presence + let rhsPresence = rhs.presence + if let lhsPresence = lhsPresence, let rhsPresence = rhsPresence { + if lhsPresence.status < rhsPresence.status { + return false + } else if lhsPresence.status > rhsPresence.status { + return true + } + } else if let _ = lhsPresence { + return true + } else if let _ = rhsPresence { + return false + } + return lhs.id < rhs.id + }) +} + +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 var removingMemberIds: [PeerId: Disposable] = [:] + + 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 + } + let unsortedMembers = state.list.map(PeerInfoMember.channelMember) + let members: [PeerInfoMember] + if unsortedMembers.count <= 50 { + members = membersSortedByPresence(unsortedMembers, accountPeerId: strongSelf.context.account.peerId) + } else { + members = unsortedMembers + } + strongSelf.members = members + 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 unsortedMembers: [PeerInfoMember] = [] + for participant in participantsData.participants { + if let peer = view.peers[participant.peerId] { + let role: PeerInfoMemberRole + let invitedBy: PeerId? + switch participant { + case .creator: + role = .creator + invitedBy = nil + case let .admin(admin): + role = .admin + invitedBy = admin.invitedBy + case let .member(member): + role = .member + invitedBy = member.invitedBy + } + unsortedMembers.append(.legacyGroupMember(peer: RenderedPeer(peer: peer), role: role, invitedBy: invitedBy, presence: view.peerPresences[participant.peerId] as? TelegramUserPresence)) + } + } + strongSelf.members = membersSortedByPresence(unsortedMembers, accountPeerId: strongSelf.context.account.peerId) + strongSelf.dataState = .ready(canLoadMore: false) + strongSelf.pushState() + })) + } else { + self.dataState = .ready(canLoadMore: false) + self.pushState() + } + } + + deinit { + self.disposable.dispose() + } + + private func pushState() { + if self.removingMemberIds.isEmpty { + self.stateValue.set(.single(PeerInfoMembersState(members: self.members, dataState: self.dataState))) + } else { + self.stateValue.set(.single(PeerInfoMembersState(members: self.members.filter { member in + return self.removingMemberIds[member.id] == nil + }, dataState: self.dataState))) + } + } + + func loadMore() { + if case .ready(true) = self.dataState, let channelMembersControl = self.channelMembersControl { + self.context.peerChannelMemberCategoriesContextsManager.loadMore(peerId: self.peerId, control: channelMembersControl) + } + } + + func removeMember(memberId: PeerId) { + if removingMemberIds[memberId] == nil { + let signal: Signal + if self.peerId.namespace == Namespaces.Peer.CloudChannel { + signal = context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: self.context.account, peerId: self.peerId, memberId: memberId, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max)) + |> ignoreValues + } else { + signal = removePeerMember(account: self.context.account, peerId: self.peerId, memberId: memberId) + |> ignoreValues + } + let completed: () -> Void = { [weak self] in + guard let strongSelf = self else { + return + } + if let _ = strongSelf.removingMemberIds.removeValue(forKey: memberId) { + strongSelf.pushState() + } + } + let disposable = MetaDisposable() + self.removingMemberIds[memberId] = disposable + + self.pushState() + + disposable.set((signal + |> deliverOn(self.queue)).start(error: { _ in + completed() + }, completed: { + completed() + })) + } + } +} + +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() + } + } + + func removeMember(memberId: PeerId) { + self.impl.with { impl in + impl.removeMember(memberId: memberId) + } + } + + 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..c13323bca0 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoPaneContainerNode.swift @@ -0,0 +1,606 @@ +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 + + private var isSelected: Bool = false + + 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.isSelected { + 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.isSelected = isSelected + 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 + } + 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, Bool)] = [] + var totalRawTabSize: CGFloat = 0.0 + + var selectedFrame: CGRect? + for specifier in paneList { + guard let paneNode = self.paneNodes[specifier.key] else { + continue + } + let wasAdded = paneNode.supernode == nil + if wasAdded { + self.scrollNode.addSubnode(paneNode) + } + let paneNodeWidth = paneNode.updateLayout(height: size.height) + let paneNodeSize = CGSize(width: paneNodeWidth, height: size.height) + tabSizes.append((paneNodeSize, paneNode, wasAdded)) + totalRawTabSize += paneNodeSize.width + } + + let spacing: CGFloat = 32.0 + if tabSizes.count == 1 { + for i in 0 ..< tabSizes.count { + let (paneNodeSize, paneNode, wasAdded) = tabSizes[i] + let leftOffset: CGFloat = 16.0 + + let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize) + if wasAdded { + paneNode.frame = paneFrame + paneNode.alpha = 0.0 + transition.updateAlpha(node: paneNode, alpha: 1.0) + } else { + transition.updateFrameAdditiveToCenter(node: 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, wasAdded) = tabSizes[i] + + let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize) + if wasAdded { + paneNode.frame = paneFrame + paneNode.alpha = 0.0 + transition.updateAlpha(node: paneNode, alpha: 1.0) + } else { + transition.updateFrameAdditiveToCenter(node: 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, wasAdded) = tabSizes[i] + let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize) + if wasAdded { + paneNode.frame = paneFrame + paneNode.alpha = 0.0 + transition.updateAlpha(node: paneNode, alpha: 1.0) + } else { + transition.updateFrameAdditiveToCenter(node: 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 { + let wasAdded = self.selectedLineNode.isHidden + self.selectedLineNode.isHidden = false + let lineFrame = CGRect(origin: CGPoint(x: selectedFrame.minX, y: size.height - 4.0), size: CGSize(width: selectedFrame.width, height: 4.0)) + if wasAdded { + self.selectedLineNode.frame = lineFrame + self.selectedLineNode.alpha = 0.0 + transition.updateAlpha(node: self.selectedLineNode, alpha: 1.0) + } else { + transition.updateFrame(node: self.selectedLineNode, frame: lineFrame) + } + 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: max(0.0, 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 requestPerformPeerMemberAction: ((PeerInfoMember, PeerMembersListAction) -> Void)? + + var currentPaneUpdated: (() -> Void)? + var requestExpandTabs: (() -> Bool)? + + 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 { + if let requestExpandTabs = strongSelf.requestExpandTabs, requestExpandTabs() { + } else { + 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: self.peerId, chatControllerInteraction: self.chatControllerInteraction!, openPeerContextAction: self.openPeerContextAction!, groupsInCommonContext: data!.groupsInCommon!) + case .members: + if case let .longList(membersContext) = data?.members { + paneNode = PeerInfoMembersPaneNode(context: self.context, peerId: self.peerId, membersContext: membersContext, action: { [weak self] member, action in + self?.requestPerformPeerMemberAction?(member, action) + }) + } 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..e4af5f64a2 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift @@ -0,0 +1,4222 @@ +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 +import TextFormat + +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 let itemContainerNode: 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 + + self.itemContainerNode = ASDisplayNode() + self.itemContainerNode.clipsToBounds = true + + super.init() + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.itemContainerNode) + 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.itemContainerNode.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) { + itemNode.view.superview?.sendSubviewToBack(itemNode.view) + transition.updateAlpha(node: itemNode, alpha: 0.0, completion: { [weak itemNode] _ in + itemNode?.removeFromSupernode() + }) + } + } + + transition.updateFrame(node: self.itemContainerNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: width, height: contentHeight))) + 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 enum PeerInfoMemberAction { + case promote + case restrict + case remove +} + +private enum PeerInfoContextSubject { + case bio + case phone(String) + case link +} + +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 + let performMemberAction: (PeerInfoMember, PeerInfoMemberAction) -> Void + let openPeerInfoContextMenu: (PeerInfoContextSubject, ASDisplayNode) -> Void + let performBioLinkAction: (TextLinkItemActionType, TextLinkItem) -> 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, + performMemberAction: @escaping (PeerInfoMember, PeerInfoMemberAction) -> Void, + openPeerInfoContextMenu: @escaping (PeerInfoContextSubject, ASDisplayNode) -> Void, + performBioLinkAction: @escaping (TextLinkItemActionType, TextLinkItem) -> 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 + self.performMemberAction = performMemberAction + self.openPeerInfoContextMenu = openPeerInfoContextMenu + self.performBioLinkAction = performBioLinkAction + } +} + +private let enabledBioEntities: EnabledEntityTypes = [.url, .mention, .hashtag] + +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] = [] + } + + let bioContextAction: (ASDisplayNode) -> Void = { sourceNode in + interaction.openPeerInfoContextMenu(.bio, sourceNode) + } + let bioLinkAction: (TextLinkItemActionType, TextLinkItem) -> Void = { action, item in + interaction.performBioLinkAction(action, item) + } + + if let user = data.peer as? TelegramUser { + if let phone = user.phone { + let formattedPhone = formatPhoneNumber(phone) + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 2, label: presentationData.strings.ContactInfo_PhoneLabelMobile, text: formattedPhone, textColor: .accent, action: { + interaction.openPhone(phone) + }, longTapAction: { sourceNode in + interaction.openPeerInfoContextMenu(.phone(formattedPhone), sourceNode) + })) + } + if let username = user.username { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 1, label: presentationData.strings.Profile_Username, text: "@\(username)", textColor: .accent, action: { + interaction.openUsername(username) + }, longTapAction: { sourceNode in + interaction.openPeerInfoContextMenu(.link, sourceNode) + })) + } + if let cachedData = data.cachedData as? CachedUserData { + if user.isScam { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 0, label: user.botInfo == nil ? presentationData.strings.Profile_About : presentationData.strings.Channel_AboutItem, text: user.botInfo != nil ? presentationData.strings.UserInfo_ScamBotWarning : presentationData.strings.UserInfo_ScamUserWarning, textColor: .primary, textBehavior: .multiLine(maxLines: 100, enabledEntities: user.botInfo != nil ? enabledBioEntities : []), action: nil)) + } else if let about = cachedData.about, !about.isEmpty { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 0, label: user.botInfo == nil ? presentationData.strings.Profile_About : presentationData.strings.Channel_AboutItem, text: about, textColor: .primary, textBehavior: .multiLine(maxLines: 100, enabledEntities: enabledBioEntities), action: nil, longTapAction: bioContextAction, linkItemAction: bioLinkAction)) + } + } + if !data.isContact { + if user.botInfo == nil { + items[.peerInfo]!.append(PeerInfoScreenActionItem(id: 3, text: presentationData.strings.UserInfo_AddContact, action: { + interaction.openAddContact() + })) + } + } + if let cachedData = data.cachedData as? CachedUserData { + if cachedData.isBlocked { + items[.peerInfo]!.append(PeerInfoScreenActionItem(id: 4, text: user.botInfo != nil ? presentationData.strings.Bot_Unblock : presentationData.strings.Conversation_Unblock, action: { + interaction.updateBlocked(false) + })) + } else { + if user.flags.contains(.isSupport) || data.isContact { + } else { + items[.peerInfo]!.append(PeerInfoScreenActionItem(id: 4, text: user.botInfo != nil ? presentationData.strings.Bot_Stop : presentationData.strings.Conversation_BlockUser, 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) + }, longTapAction: { sourceNode in + interaction.openPeerInfoContextMenu(.link, sourceNode) + })) + } + if let cachedData = data.cachedData as? CachedChannelData { + if channel.isScam { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: ItemAbout, label: presentationData.strings.Channel_AboutItem, text: presentationData.strings.GroupInfo_ScamGroupWarning, textColor: .primary, textBehavior: .multiLine(maxLines: 100, enabledEntities: enabledBioEntities), action: nil)) + } else if let about = cachedData.about, !about.isEmpty { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: ItemAbout, label: presentationData.strings.Channel_AboutItem, text: about, textColor: .primary, textBehavior: .multiLine(maxLines: 100, enabledEntities: enabledBioEntities), action: nil, longTapAction: bioContextAction, linkItemAction: bioLinkAction)) + } + + 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.Channel_AboutItem, text: presentationData.strings.GroupInfo_ScamGroupWarning, textColor: .primary, textBehavior: .multiLine(maxLines: 100, enabledEntities: enabledBioEntities), action: nil)) + } else if let about = cachedData.about, !about.isEmpty { + items[.peerInfo]!.append(PeerInfoScreenLabeledValueItem(id: 0, label: presentationData.strings.Channel_AboutItem, text: about, textColor: .primary, textBehavior: .multiLine(maxLines: 100, enabledEntities: enabledBioEntities), action: nil, longTapAction: bioContextAction, linkItemAction: bioLinkAction)) + } + } + } + + if let peer = data.peer, let members = data.members, case let .shortList(_, memberList) = members { + for member in memberList { + var presence = member.presence + let isAccountPeer = member.id == context.account.peerId + if isAccountPeer { + presence = TelegramUserPresence(status: .present(until: Int32.max - 1), lastActivity: 0) + } + items[.peerMembers]!.append(PeerInfoScreenMemberItem(id: member.id, context: context, enclosingPeer: peer, member: member, action: isAccountPeer ? nil : { action in + switch action { + case .open: + interaction.openPeerInfo(member.peer) + case .promote: + interaction.performMemberAction(member, .promote) + case .restrict: + interaction.performMemberAction(member, .restrict) + case .remove: + interaction.performMemberAction(member, .remove) + } + })) + } + } + + 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: presentationData.strings.GroupInfo_Notifications, action: { + interaction.editingOpenNotificationSettings() + })) + items[.notifications]!.append(PeerInfoScreenDisclosureItem(id: 1, label: soundLabel, text: presentationData.strings.GroupInfo_Sound, action: { + interaction.editingOpenSoundSettings() + })) + items[.notifications]!.append(PeerInfoScreenSwitchItem(id: 2, text: presentationData.strings.Notification_Exceptions_PreviewAlwaysOn, 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 selectAddMemberDisposable = MetaDisposable() + private let addMemberDisposable = 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, keepExpandedButtons: PeerInfoScreenKeepExpandedButtons) { + 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, keepExpandedButtons: keepExpandedButtons) + 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) + }, + performMemberAction: { [weak self] member, action in + self?.performMemberAction(member: member, action: action) + }, + openPeerInfoContextMenu: { [weak self] subject, sourceNode in + self?.openPeerInfoContextMenu(subject: subject, sourceNode: sourceNode) + }, + performBioLinkAction: { [weak self] action, item in + self?.performBioLinkAction(action: action, item: item) + } + ) + + 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)) + } + })) + } + if strongSelf.searchDisplayController == nil { + items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_ContextMenuMore, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.chatInterfaceInteraction.toggleMessagesSelection([message.id], true) + strongSelf.expandTabs() + } + })) + } + 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 + }) + }))) + } + + items.append(.separator) + items.append(.action(ContextMenuActionItem(text: strings.Conversation_ContextMenuMore, icon: { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/More"), color: theme.actionSheet.primaryTextColor) + }, action: { _, f in + guard let strongSelf = self else { + return + } + strongSelf.chatInterfaceInteraction.toggleMessagesSelection([message.id], true) + strongSelf.expandTabs() + f(.default) + }))) + + 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.paneContainerNode.requestExpandTabs = { [weak self] in + guard let strongSelf = self, let (_, navigationHeight) = strongSelf.validLayout else { + return false + } + let contentOffset = strongSelf.scrollNode.view.contentOffset + let paneAreaExpansionFinalPoint: CGFloat = strongSelf.paneContainerNode.frame.minY - navigationHeight + if contentOffset.y < paneAreaExpansionFinalPoint - CGFloat.ulpOfOne { + strongSelf.scrollNode.view.setContentOffset(CGPoint(x: 0.0, y: paneAreaExpansionFinalPoint), animated: true) + return true + } else { + return false + } + } + + self.paneContainerNode.requestPerformPeerMemberAction = { [weak self] member, action in + guard let strongSelf = self else { + return + } + switch action { + case .open: + strongSelf.openPeerInfo(peer: member.peer) + case .promote: + strongSelf.performMemberAction(member: member, action: .promote) + case .restrict: + strongSelf.performMemberAction(member: member, action: .restrict) + case .remove: + strongSelf.performMemberAction(member: member, action: .remove) + } + } + + 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.requestUpdateLayout = { [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) + } + } + + 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) ?? "" + let description = strongSelf.headerNode.editingContentNode.editingTextForKey(.description) ?? "" + + var updateDataSignals: [Signal] = [] + + if title != group.title { + updateDataSignals.append( + updatePeerTitle(account: strongSelf.context.account, peerId: group.id, title: title) + |> ignoreValues + |> mapError { _ in return Void() } + ) + } + if description != (data.cachedData as? CachedGroupData)?.about { + updateDataSignals.append( + updatePeerDescription(account: strongSelf.context.account, peerId: group.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 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() + self.selectAddMemberDisposable.dispose() + self.addMemberDisposable.dispose() + } + + override func didLoad() { + super.didLoad() + } + + private func updateData(_ data: PeerInfoScreenData) { + var previousMemberCount: Int? + if let data = self.data { + if let members = data.members, case let .shortList(_, memberList) = members { + previousMemberCount = memberList.count + } + } + self.data = data + if let (layout, navigationHeight) = self.validLayout { + var updatedMemberCount: Int? + if let data = self.data { + if let members = data.members, case let .shortList(_, memberList) = members { + updatedMemberCount = memberList.count + } + } + + var membersUpdated = false + if let previousMemberCount = previousMemberCount, let updatedMemberCount = updatedMemberCount, previousMemberCount > updatedMemberCount { + membersUpdated = true + } + + self.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: self.didSetReady && membersUpdated ? .animated(duration: 0.3, curve: .spring) : .immediate) + } + } + + func scrollToTop() { + if !self.paneContainerNode.scrollToTop() { + self.scrollNode.view.setContentOffset(CGPoint(), animated: true) + } + } + + private func expandTabs() { + if let (layout, navigationHeight) = self.validLayout { + let contentOffset = self.scrollNode.view.contentOffset + let paneAreaExpansionFinalPoint: CGFloat = self.paneContainerNode.frame.minY - navigationHeight + if contentOffset.y < paneAreaExpansionFinalPoint - CGFloat.ulpOfOne { + self.scrollNode.view.setContentOffset(CGPoint(x: 0.0, y: paneAreaExpansionFinalPoint), 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, fromChat: 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 muteInterval: Int32? + if let notificationSettings = self.data?.notificationSettings, case .muted = notificationSettings.muteState { + muteInterval = nil + } else { + muteInterval = Int32.max + } + let _ = updatePeerMuteSetting(account: self.context.account, peerId: self.peerId, muteInterval: muteInterval).start() + 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: + self.openAddMember() + } + } + + 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: self.context, subject: .url("https://t.me/\(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() + }) + soundController.navigationPresentation = .modal + 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, fromChat: false) { + (self.controller?.navigationController as? NavigationController)?.pushViewController(infoController) + } + } + + private func performMemberAction(member: PeerInfoMember, action: PeerInfoMemberAction) { + guard let data = self.data, let peer = data.peer else { + return + } + switch action { + case .promote: + if case let .channelMember(channelMember) = member { + self.controller?.push(channelAdminController(context: self.context, peerId: peer.id, adminId: member.id, initialParticipant: channelMember.participant, updated: { _ in + }, upgradedToSupergroup: { _, f in f() }, transferedOwnership: { _ in })) + } + case .restrict: + if case let .channelMember(channelMember) = member { + self.controller?.push(channelBannedMemberController(context: self.context, peerId: peer.id, memberId: member.id, initialParticipant: channelMember.participant, updated: { _ in + }, upgradedToSupergroup: { _, f in f() })) + } + case .remove: + data.members?.membersContext.removeMember(memberId: member.id) + } + } + + private func openPeerInfoContextMenu(subject: PeerInfoContextSubject, sourceNode: ASDisplayNode) { + guard let data = self.data, let peer = data.peer, let controller = self.controller else { + return + } + switch subject { + case .bio: + var text: String? + if let cachedData = data.cachedData as? CachedUserData { + text = cachedData.about + } else if let cachedData = data.cachedData as? CachedGroupData { + text = cachedData.about + } else if let cachedData = data.cachedData as? CachedChannelData { + text = cachedData.about + } + if let text = text, !text.isEmpty { + let contextMenuController = ContextMenuController(actions: [ContextMenuAction(content: .text(title: self.presentationData.strings.Conversation_ContextMenuCopy, accessibilityLabel: self.presentationData.strings.Conversation_ContextMenuCopy), action: { + UIPasteboard.general.string = text + })]) + controller.present(contextMenuController, in: .window(.root), with: ContextMenuControllerPresentationArguments(sourceNodeAndRect: { [weak self, weak sourceNode] in + if let controller = self?.controller, let sourceNode = sourceNode { + return (sourceNode, sourceNode.bounds.insetBy(dx: 0.0, dy: -2.0), controller.displayNode, controller.view.bounds) + } else { + return nil + } + })) + } + case let .phone(phone): + let contextMenuController = ContextMenuController(actions: [ContextMenuAction(content: .text(title: self.presentationData.strings.Conversation_ContextMenuCopy, accessibilityLabel: self.presentationData.strings.Conversation_ContextMenuCopy), action: { + UIPasteboard.general.string = phone + })]) + controller.present(contextMenuController, in: .window(.root), with: ContextMenuControllerPresentationArguments(sourceNodeAndRect: { [weak self, weak sourceNode] in + if let controller = self?.controller, let sourceNode = sourceNode { + return (sourceNode, sourceNode.bounds.insetBy(dx: 0.0, dy: -2.0), controller.displayNode, controller.view.bounds) + } else { + return nil + } + })) + case .link: + if let addressName = peer.addressName { + let contextMenuController = ContextMenuController(actions: [ContextMenuAction(content: .text(title: self.presentationData.strings.Conversation_ContextMenuCopy, accessibilityLabel: self.presentationData.strings.Conversation_ContextMenuCopy), action: { + UIPasteboard.general.string = "@" + addressName + })]) + controller.present(contextMenuController, in: .window(.root), with: ContextMenuControllerPresentationArguments(sourceNodeAndRect: { [weak self, weak sourceNode] in + if let controller = self?.controller, let sourceNode = sourceNode { + return (sourceNode, sourceNode.bounds.insetBy(dx: 0.0, dy: -2.0), controller.displayNode, controller.view.bounds) + } else { + return nil + } + })) + } + } + } + + private func performBioLinkAction(action: TextLinkItemActionType, item: TextLinkItem) { + guard let data = self.data, let peer = data.peer, let controller = self.controller else { + return + } + self.context.sharedContext.handleTextLinkAction(context: self.context, peerId: peer.id, navigateDisposable: self.resolveUrlDisposable, controller: controller, action: action, itemLink: item) + } + + 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() + } + } + }) + } + + private func openAddMember() { + guard let data = self.data, let groupPeer = data.peer else { + return + } + + let members: Promise<[PeerId]> = Promise() + if groupPeer.id.namespace == Namespaces.Peer.CloudChannel { + /*var membersDisposable: Disposable? + let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerView.peerId, updated: { listState in + members.set(.single(listState.list.map {$0.peer.id})) + membersDisposable?.dispose() + }) + membersDisposable = disposable*/ + members.set(.single([])) + } else { + members.set(.single([])) + } + + let _ = (members.get() + |> take(1) + |> deliverOnMainQueue).start(next: { [weak self] recentIds in + guard let strongSelf = self else { + return + } + var createInviteLinkImpl: (() -> Void)? + var confirmationImpl: ((PeerId) -> Signal)? + var options: [ContactListAdditionalOption] = [] + let presentationData = strongSelf.presentationData + + var canCreateInviteLink = false + if let group = groupPeer as? TelegramGroup { + switch group.role { + case .creator, .admin: + canCreateInviteLink = true + default: + break + } + } else if let channel = groupPeer as? TelegramChannel { + if channel.hasPermission(.inviteMembers) { + if channel.flags.contains(.isCreator) || (channel.adminRights != nil && channel.username == nil) { + canCreateInviteLink = true + } + } + } + + if canCreateInviteLink { + options.append(ContactListAdditionalOption(title: presentationData.strings.GroupInfo_InviteByLink, icon: .generic(UIImage(bundleImageName: "Contact List/LinkActionIcon")!), action: { + createInviteLinkImpl?() + })) + } + + let contactsController: ViewController + if groupPeer.id.namespace == Namespaces.Peer.CloudGroup { + contactsController = strongSelf.context.sharedContext.makeContactSelectionController(ContactSelectionControllerParams(context: strongSelf.context, autoDismiss: false, title: { $0.GroupInfo_AddParticipantTitle }, options: options, confirmation: { peer in + if let confirmationImpl = confirmationImpl, case let .peer(peer, _, _) = peer { + return confirmationImpl(peer.id) + } else { + return .single(false) + } + })) + contactsController.navigationPresentation = .modal + } else { + contactsController = strongSelf.context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: strongSelf.context, mode: .peerSelection(searchChatList: false, searchGroups: false), options: options, filters: [.excludeSelf, .disable(recentIds)])) + contactsController.navigationPresentation = .modal + } + + let context = strongSelf.context + confirmationImpl = { [weak contactsController] peerId in + return context.account.postbox.loadedPeerWithId(peerId) + |> deliverOnMainQueue + |> mapToSignal { peer in + let result = ValuePromise() + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + if let contactsController = contactsController { + let alertController = textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddParticipantConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0, actions: [ + TextAlertAction(type: .genericAction, title: presentationData.strings.Common_No, action: { + result.set(false) + }), + TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Yes, action: { + result.set(true) + }) + ]) + contactsController.present(alertController, in: .window(.root)) + } + + return result.get() + } + } + + let addMember: (ContactListPeer) -> Signal = { memberPeer -> Signal in + if case let .peer(selectedPeer, _, _) = memberPeer { + let memberId = selectedPeer.id + if groupPeer.id.namespace == Namespaces.Peer.CloudChannel { + return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberId) + |> map { _ -> Void in + return Void() + } + |> `catch` { _ -> Signal in + return .complete() + } + } else { + return addGroupMember(account: context.account, peerId: groupPeer.id, memberId: memberId) + |> deliverOnMainQueue + |> `catch` { error -> Signal in + switch error { + case .generic: + return .complete() + case .privacy: + let _ = (context.account.postbox.loadedPeerWithId(memberId) + |> deliverOnMainQueue).start(next: { peer in + self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + }) + return .complete() + case .tooManyChannels: + let _ = (context.account.postbox.loadedPeerWithId(memberId) + |> deliverOnMainQueue).start(next: { peer in + self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + }) + return .complete() + case .groupFull: + let signal = convertGroupToSupergroup(account: context.account, peerId: groupPeer.id) + |> map(Optional.init) + |> `catch` { error -> Signal in + switch error { + case .tooManyChannels: + Queue.mainQueue().async { + self?.controller?.push(oldChannelsController(context: context, intent: .upgrade)) + } + default: + break + } + return .single(nil) + } + |> mapToSignal { upgradedPeerId -> Signal in + guard let upgradedPeerId = upgradedPeerId else { + return .single(nil) + } + return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: upgradedPeerId, memberId: memberId) + |> `catch` { _ -> Signal in + return .complete() + } + |> mapToSignal { _ -> Signal in + return .complete() + } + |> then(.single(upgradedPeerId)) + } + |> deliverOnMainQueue + |> mapToSignal { _ -> Signal in + return .complete() + } + return signal + } + } + } + } else { + return .complete() + } + } + + let addMembers: ([ContactListPeerId]) -> Signal = { members -> Signal in + let memberIds = members.compactMap { contact -> PeerId? in + switch contact { + case let .peer(peerId): + return peerId + default: + return nil + } + } + return context.account.postbox.multiplePeersView(memberIds) + |> take(1) + |> deliverOnMainQueue + |> mapError { _ in return .generic} + |> mapToSignal { view -> Signal in + if memberIds.count == 1 { + return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberIds[0]) + |> map { _ -> Void in + return Void() + } + } else { + return context.peerChannelMemberCategoriesContextsManager.addMembers(account: context.account, peerId: groupPeer.id, memberIds: memberIds) |> map { _ in + } + } + } + } + + createInviteLinkImpl = { [weak contactsController] in + guard let strongSelf = self else { + return + } + let mode: ChannelVisibilityControllerMode + if groupPeer.addressName != nil { + mode = .generic + } else { + mode = .privateLink + } + let visibilityController = channelVisibilityController(context: strongSelf.context, peerId: groupPeer.id, mode: mode, upgradedToSupergroup: { _, f in f() }, onDismissRemoveController: contactsController) + //visibilityController.navigationPresentation = .modal + + contactsController?.push(visibilityController) + + /*if let navigationController = strongSelf.controller?.navigationController as? NavigationController { + var controllers = navigationController.viewControllers + if let contactsController = contactsController { + controllers.removeAll(where: { $0 === contactsController }) + } + controllers.append(visibilityController) + navigationController.setViewControllers(controllers, animated: true) + }*/ + } + + strongSelf.controller?.push(contactsController) + let selectAddMemberDisposable = strongSelf.selectAddMemberDisposable + let addMemberDisposable = strongSelf.addMemberDisposable + if let contactsController = contactsController as? ContactSelectionController { + selectAddMemberDisposable.set((contactsController.result + |> deliverOnMainQueue).start(next: { [weak contactsController] memberPeer in + guard let memberPeer = memberPeer else { + return + } + + contactsController?.displayProgress = true + addMemberDisposable.set((addMember(memberPeer) + |> deliverOnMainQueue).start(completed: { + contactsController?.dismiss() + })) + })) + contactsController.dismissed = { + selectAddMemberDisposable.set(nil) + addMemberDisposable.set(nil) + } + } + if let contactsController = contactsController as? ContactMultiselectionController { + selectAddMemberDisposable.set((contactsController.result + |> deliverOnMainQueue).start(next: { [weak contactsController] peers in + contactsController?.displayProgress = true + addMemberDisposable.set((addMembers(peers) + |> deliverOnMainQueue).start(error: { error in + if peers.count == 1, case .restricted = error { + switch peers[0] { + case let .peer(peerId): + let _ = (context.account.postbox.loadedPeerWithId(peerId) + |> deliverOnMainQueue).start(next: { peer in + self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + }) + default: + break + } + } else if case .tooMuchJoined = error { + self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + } + + contactsController?.dismiss() + },completed: { + contactsController?.dismiss() + })) + })) + contactsController.dismissed = { + selectAddMemberDisposable.set(nil) + addMemberDisposable.set(nil) + } + } + }) + } + + private 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 + } + + if let currentPaneKey = self.paneContainerNode.currentPaneKey, case .members = currentPaneKey { + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Common_Search, contentNode: ChannelMembersSearchContainerNode(context: self.context, peerId: self.peerId, mode: .searchMembers, filters: [], searchContext: nil, openPeer: { [weak self] peer, participant in + self?.openPeer(peerId: peer.id, navigation: .info) + }, updateActivity: { _ in + }, pushController: { [weak self] c in + self?.controller?.push(c) + }), cancel: { [weak self] in + self?.deactivateSearch() + }) + } else { + 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) + + var wasAdded = false + let sectionNode: PeerInfoScreenItemSectionContainerNode + if let current = self.editingSections[sectionId] { + sectionNode = current + } else { + wasAdded = true + 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 wasAdded { + sectionNode.frame = sectionFrame + sectionNode.alpha = self.state.isEditing ? 1.0 : 0.0 + } else { + 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, .members: + navigationButtons.append(PeerInfoHeaderNavigationButtonSpec(key: .search, isForExpandedView: true)) + default: + break + } + switch currentPaneKey { + case .media, .files, .music, .links, .voice: + //navigationButtons.append(PeerInfoHeaderNavigationButtonSpec(key: .select, isForExpandedView: true)) + break + 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 enum PeerInfoScreenKeepExpandedButtons { + case message + case mute +} + +public final class PeerInfoScreen: ViewController { + private let context: AccountContext + private let peerId: PeerId + private let avatarInitiallyExpanded: Bool + private let keepExpandedButtons: PeerInfoScreenKeepExpandedButtons + + 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 + } + + private var validLayout: (layout: ContainerViewLayout, navigationHeight: CGFloat)? + + public init(context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool = false, keepExpandedButtons: PeerInfoScreenKeepExpandedButtons = .message) { + self.context = context + self.peerId = peerId + self.avatarInitiallyExpanded = avatarInitiallyExpanded + self.keepExpandedButtons = keepExpandedButtons + + 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, keepExpandedButtons: self.keepExpandedButtons) + + self._ready.set(self.controllerNode.ready.get()) + + super.displayNodeDidLoad() + } + + override public func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + if let (layout, navigationHeight) = self.validLayout { + self.controllerNode.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate) + } + } + + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.validLayout = (layout, navigationHeight) + + 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.titleNodeRawContainer.bounds.height) / previousTitleNode.bounds.height + let subtitleScale = max(0.01, min(10.0, (fraction * previousStatusNode.bounds.height + (1.0 - fraction) * self.headerNode.subtitleNodeRawContainer.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..d2ff44fa00 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, fromChat: false) { (strongSelf.navigationController as? NavigationController)?.pushViewController(infoController) } } diff --git a/submodules/TelegramUI/TelegramUI/PollResultsController.swift b/submodules/TelegramUI/TelegramUI/PollResultsController.swift index 177ca29828..4a7e627a71 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, fromChat: false) { pushControllerImpl?(controller) } } diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 7a9fbcb92d..16074d02e9 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 716a3d0b16..fc9ae8f7b9 100644 --- a/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift +++ b/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift @@ -1006,8 +1006,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, fromChat: Bool) -> ViewController? { + let controller = peerInfoControllerImpl(context: context, peer: peer, mode: mode, avatarInitiallyExpanded: avatarInitiallyExpanded, keepExpandedButtons: fromChat ? .mute : .message) controller?.navigationPresentation = .modalInLargeLayout return controller } @@ -1248,3 +1248,24 @@ public final class SharedAccountContextImpl: SharedAccountContext { } private let defaultChatControllerInteraction = ChatControllerInteraction.default + +private func peerInfoControllerImpl(context: AccountContext, peer: Peer, mode: PeerInfoControllerMode, avatarInitiallyExpanded: Bool, keepExpandedButtons: PeerInfoScreenKeepExpandedButtons = .message) -> ViewController? { + if let _ = peer as? TelegramGroup { + return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded, keepExpandedButtons: keepExpandedButtons) + + return groupInfoController(context: context, peerId: peer.id) + } else if let channel = peer as? TelegramChannel { + return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded, keepExpandedButtons: keepExpandedButtons) + + 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, keepExpandedButtons: keepExpandedButtons) + } 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 ed51dcace7..14401f2ffa 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, fromChat: false) { (controller.navigationController as? NavigationController)?.pushViewController(infoController) } } diff --git a/submodules/TelegramUIPreferences/Sources/ChatListFilterSettings.swift b/submodules/TelegramUIPreferences/Sources/ChatListFilterSettings.swift deleted file mode 100644 index 684bdbaa1a..0000000000 --- a/submodules/TelegramUIPreferences/Sources/ChatListFilterSettings.swift +++ /dev/null @@ -1,135 +0,0 @@ -import Foundation -import Postbox -import SwiftSignalKit -import SyncCore - -public struct ChatListIncludeCategoryFilter: OptionSet { - public var rawValue: Int32 - - public init(rawValue: Int32) { - self.rawValue = rawValue - } - - public static let muted = ChatListIncludeCategoryFilter(rawValue: 1 << 1) - public static let privateChats = ChatListIncludeCategoryFilter(rawValue: 1 << 2) - public static let secretChats = ChatListIncludeCategoryFilter(rawValue: 1 << 3) - public static let privateGroups = ChatListIncludeCategoryFilter(rawValue: 1 << 4) - public static let bots = ChatListIncludeCategoryFilter(rawValue: 1 << 5) - public static let publicGroups = ChatListIncludeCategoryFilter(rawValue: 1 << 6) - public static let channels = ChatListIncludeCategoryFilter(rawValue: 1 << 7) - public static let read = ChatListIncludeCategoryFilter(rawValue: 1 << 8) - - public static let all: ChatListIncludeCategoryFilter = [ - .muted, - .privateChats, - .secretChats, - .privateGroups, - .bots, - .publicGroups, - .channels, - .read - ] -} - -public enum ChatListFilterPresetName: Equatable, Hashable, PostboxCoding { - case unread - case custom(String) - - public init(decoder: PostboxDecoder) { - switch decoder.decodeInt32ForKey("_t", orElse: 0) { - case 0: - self = .unread - case 1: - self = .custom(decoder.decodeStringForKey("title", orElse: "Preset")) - default: - assertionFailure() - self = .custom("Preset") - } - } - - public func encode(_ encoder: PostboxEncoder) { - switch self { - case .unread: - encoder.encodeInt32(0, forKey: "_t") - case let .custom(title): - encoder.encodeInt32(1, forKey: "_t") - encoder.encodeString(title, forKey: "title") - } - } -} - -public struct ChatListFilterPreset: Equatable, PostboxCoding { - public var id: Int64 - public var name: ChatListFilterPresetName - public var includeCategories: ChatListIncludeCategoryFilter - public var additionallyIncludePeers: [PeerId] - - public init(id: Int64, name: ChatListFilterPresetName, includeCategories: ChatListIncludeCategoryFilter, additionallyIncludePeers: [PeerId]) { - self.id = id - self.name = name - self.includeCategories = includeCategories - self.additionallyIncludePeers = additionallyIncludePeers - } - - public init(decoder: PostboxDecoder) { - self.id = decoder.decodeInt64ForKey("id", orElse: 0) - self.name = decoder.decodeObjectForKey("name", decoder: { ChatListFilterPresetName(decoder: $0) }) as? ChatListFilterPresetName ?? ChatListFilterPresetName.custom("Preset") - self.includeCategories = ChatListIncludeCategoryFilter(rawValue: decoder.decodeInt32ForKey("includeCategories", orElse: 0)) - self.additionallyIncludePeers = decoder.decodeInt64ArrayForKey("additionallyIncludePeers").map(PeerId.init) - } - - public func encode(_ encoder: PostboxEncoder) { - encoder.encodeInt64(self.id, forKey: "id") - encoder.encodeObject(self.name, forKey: "name") - encoder.encodeInt32(self.includeCategories.rawValue, forKey: "includeCategories") - encoder.encodeInt64Array(self.additionallyIncludePeers.map { $0.toInt64() }, forKey: "additionallyIncludePeers") - } -} - -public struct ChatListFilterSettings: PreferencesEntry, Equatable { - public var presets: [ChatListFilterPreset] - - public static var `default`: ChatListFilterSettings { - return ChatListFilterSettings(presets: [ - ChatListFilterPreset( - id: Int64(arc4random()), - name: .unread, - includeCategories: ChatListIncludeCategoryFilter.all.subtracting(.read), - additionallyIncludePeers: [] - ) - ]) - } - - public init(presets: [ChatListFilterPreset]) { - self.presets = presets - } - - public init(decoder: PostboxDecoder) { - self.presets = decoder.decodeObjectArrayWithDecoderForKey("presets") - } - - public func encode(_ encoder: PostboxEncoder) { - encoder.encodeObjectArray(self.presets, forKey: "presets") - } - - public func isEqual(to: PreferencesEntry) -> Bool { - if let to = to as? ChatListFilterSettings { - return self == to - } else { - return false - } - } -} - -public func updateChatListFilterSettingsInteractively(postbox: Postbox, _ f: @escaping (ChatListFilterSettings) -> ChatListFilterSettings) -> Signal { - return postbox.transaction { transaction -> ChatListFilterSettings in - var result: ChatListFilterSettings? - transaction.updatePreferencesEntry(key: ApplicationSpecificPreferencesKeys.chatListFilterSettings, { entry in - var settings = entry as? ChatListFilterSettings ?? ChatListFilterSettings.default - let updated = f(settings) - result = updated - return updated - }) - return result ?? .default - } -} diff --git a/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift b/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift index a1e70f6726..b5e386a3a8 100644 --- a/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift +++ b/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift @@ -27,9 +27,34 @@ private final class PeerChannelMembersOnlineContext { } } +private final class ProfileDataPreloadContext { + let subscribers = Bag<() -> Void>() + + let disposable: Disposable + var emptyTimer: SwiftSignalKit.Timer? + + init(disposable: Disposable) { + self.disposable = disposable + } +} + +private final class ProfileDataPhotoPreloadContext { + let subscribers = Bag<(Any?) -> Void>() + + let disposable: Disposable + var value: Any? + var emptyTimer: SwiftSignalKit.Timer? + + init(disposable: Disposable) { + self.disposable = disposable + } +} + private final class PeerChannelMemberCategoriesContextsManagerImpl { fileprivate var contexts: [PeerId: PeerChannelMemberCategoriesContext] = [:] fileprivate var onlineContexts: [PeerId: PeerChannelMembersOnlineContext] = [:] + fileprivate var profileDataPreloadContexts: [PeerId: ProfileDataPreloadContext] = [:] + fileprivate var profileDataPhotoPreloadContexts: [PeerId: ProfileDataPhotoPreloadContext] = [:] func getContext(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, key: PeerChannelMemberContextKey, requestUpdate: Bool, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl) { if let current = self.contexts[peerId] { @@ -121,6 +146,121 @@ private final class PeerChannelMemberCategoriesContextsManagerImpl { context.loadMore(control) } } + + func profileData(postbox: Postbox, network: Network, peerId: PeerId, customData: Signal?) -> Disposable { + let context: ProfileDataPreloadContext + if let current = self.profileDataPreloadContexts[peerId] { + context = current + } else { + let disposable = DisposableSet() + context = ProfileDataPreloadContext(disposable: disposable) + self.profileDataPreloadContexts[peerId] = context + + if let customData = customData { + disposable.add(customData.start()) + } + + /*disposable.set(signal.start(next: { [weak context] value in + guard let context = context else { + return + } + context.value = value + for f in context.subscribers.copyItems() { + f(value) + } + }))*/ + } + + if let emptyTimer = context.emptyTimer { + emptyTimer.invalidate() + context.emptyTimer = nil + } + + let index = context.subscribers.add({ + }) + //updated(context.value ?? 0) + + return ActionDisposable { [weak self, weak context] in + Queue.mainQueue().async { + guard let strongSelf = self else { + return + } + if let current = strongSelf.profileDataPreloadContexts[peerId], let context = context, current === context { + current.subscribers.remove(index) + if current.subscribers.isEmpty { + if current.emptyTimer == nil { + let timer = SwiftSignalKit.Timer(timeout: 60.0, repeat: false, completion: { [weak context] in + if let current = strongSelf.profileDataPreloadContexts[peerId], let context = context, current === context { + if current.subscribers.isEmpty { + strongSelf.profileDataPreloadContexts.removeValue(forKey: peerId) + current.disposable.dispose() + } + } + }, queue: Queue.mainQueue()) + current.emptyTimer = timer + timer.start() + } + } + } + } + } + } + + func profilePhotos(postbox: Postbox, network: Network, peerId: PeerId, fetch: Signal, updated: @escaping (Any?) -> Void) -> Disposable { + let context: ProfileDataPhotoPreloadContext + if let current = self.profileDataPhotoPreloadContexts[peerId] { + context = current + } else { + let disposable = MetaDisposable() + context = ProfileDataPhotoPreloadContext(disposable: disposable) + self.profileDataPhotoPreloadContexts[peerId] = context + + disposable.set(fetch.start(next: { [weak context] value in + guard let context = context else { + return + } + context.value = value + for f in context.subscribers.copyItems() { + f(value) + } + })) + } + + if let emptyTimer = context.emptyTimer { + emptyTimer.invalidate() + context.emptyTimer = nil + } + + let index = context.subscribers.add({ next in + updated(next) + }) + updated(context.value) + + return ActionDisposable { [weak self, weak context] in + Queue.mainQueue().async { + guard let strongSelf = self else { + return + } + if let current = strongSelf.profileDataPhotoPreloadContexts[peerId], let context = context, current === context { + current.subscribers.remove(index) + if current.subscribers.isEmpty { + if current.emptyTimer == nil { + let timer = SwiftSignalKit.Timer(timeout: 60.0, repeat: false, completion: { [weak context] in + if let current = strongSelf.profileDataPhotoPreloadContexts[peerId], let context = context, current === context { + if current.subscribers.isEmpty { + strongSelf.profileDataPhotoPreloadContexts.removeValue(forKey: peerId) + current.disposable.dispose() + } + } + }, queue: Queue.mainQueue()) + current.emptyTimer = timer + timer.start() + } + } + } + } + } + } } public final class PeerChannelMemberCategoriesContextsManager { @@ -394,4 +534,35 @@ public final class PeerChannelMemberCategoriesContextsManager { } |> runOn(Queue.mainQueue()) } + + public func profileData(postbox: Postbox, network: Network, peerId: PeerId, customData: Signal?) -> Signal { + return Signal { [weak self] subscriber in + guard let strongSelf = self else { + subscriber.putCompletion() + return EmptyDisposable + } + let disposable = strongSelf.impl.syncWith({ impl -> Disposable in + return impl.profileData(postbox: postbox, network: network, peerId: peerId, customData: customData) + }) + return disposable ?? EmptyDisposable + } + |> runOn(Queue.mainQueue()) + } + + public func profilePhotos(postbox: Postbox, network: Network, peerId: PeerId, fetch: Signal) -> Signal { + return Signal { [weak self] subscriber in + guard let strongSelf = self else { + subscriber.putNext(0) + subscriber.putCompletion() + return EmptyDisposable + } + let disposable = strongSelf.impl.syncWith({ impl -> Disposable in + return impl.profilePhotos(postbox: postbox, network: network, peerId: peerId, fetch: fetch, updated: { value in + subscriber.putNext(value) + }) + }) + return disposable ?? EmptyDisposable + } + |> runOn(Queue.mainQueue()) + } } diff --git a/submodules/TextFormat/Sources/StringWithAppliedEntities.swift b/submodules/TextFormat/Sources/StringWithAppliedEntities.swift index 615d605e19..e3cad1726e 100644 --- a/submodules/TextFormat/Sources/StringWithAppliedEntities.swift +++ b/submodules/TextFormat/Sources/StringWithAppliedEntities.swift @@ -209,6 +209,15 @@ public func stringWithAppliedEntities(_ text: String, entities: [MessageTextEnti string.insert(NSAttributedString(string: paragraphBreak), at: paragraphRange.upperBound) rangeOffset += paragraphBreak.count + case .BankCard: + string.addAttribute(NSAttributedString.Key.foregroundColor, value: linkColor, range: range) + if underlineLinks && underlineAllLinks { + string.addAttribute(NSAttributedString.Key.underlineStyle, value: NSUnderlineStyle.single.rawValue as NSNumber, range: range) + } + if nsString == nil { + nsString = text as NSString + } + string.addAttribute(NSAttributedString.Key(rawValue: TelegramTextAttributes.BankCard), value: nsString!.substring(with: range), range: range) case let .Custom(type): if type == ApplicationSpecificEntityType.Timecode { string.addAttribute(NSAttributedString.Key.foregroundColor, value: linkColor, range: range) diff --git a/submodules/TextFormat/Sources/TelegramAttributes.swift b/submodules/TextFormat/Sources/TelegramAttributes.swift index b05f982d82..ab276a41e3 100644 --- a/submodules/TextFormat/Sources/TelegramAttributes.swift +++ b/submodules/TextFormat/Sources/TelegramAttributes.swift @@ -37,6 +37,7 @@ public struct TelegramTextAttributes { public static let PeerTextMention = "TelegramPeerTextMention" public static let BotCommand = "TelegramBotCommand" public static let Hashtag = "TelegramHashtag" + public static let BankCard = "TelegramBankCard" public static let Timecode = "TelegramTimecode" public static let BlockQuote = "TelegramBlockQuote" } diff --git a/submodules/UrlHandling/Sources/UrlHandling.swift b/submodules/UrlHandling/Sources/UrlHandling.swift index d55894f190..9c1fac2cfb 100644 --- a/submodules/UrlHandling/Sources/UrlHandling.swift +++ b/submodules/UrlHandling/Sources/UrlHandling.swift @@ -16,6 +16,8 @@ import AccountContext import WalletUrl #endif +private let baseTelegramMePaths = ["telegram.me", "t.me", "telegram.dog"] + public enum ParsedInternalPeerUrlParameter { case botStart(String) case groupBotStart(String) @@ -348,7 +350,6 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig public func isTelegramMeLink(_ url: String) -> Bool { let schemes = ["http://", "https://", ""] - let baseTelegramMePaths = ["telegram.me", "t.me"] for basePath in baseTelegramMePaths { for scheme in schemes { let basePrefix = scheme + basePath + "/" @@ -362,7 +363,6 @@ public func isTelegramMeLink(_ url: String) -> Bool { public func parseProxyUrl(_ url: String) -> (host: String, port: Int32, username: String?, password: String?, secret: Data?)? { let schemes = ["http://", "https://", ""] - let baseTelegramMePaths = ["telegram.me", "t.me"] for basePath in baseTelegramMePaths { for scheme in schemes { let basePrefix = scheme + basePath + "/" @@ -384,7 +384,6 @@ public func parseProxyUrl(_ url: String) -> (host: String, port: Int32, username public func parseStickerPackUrl(_ url: String) -> String? { let schemes = ["http://", "https://", ""] - let baseTelegramMePaths = ["telegram.me", "t.me"] for basePath in baseTelegramMePaths { for scheme in schemes { let basePrefix = scheme + basePath + "/" @@ -406,7 +405,6 @@ public func parseStickerPackUrl(_ url: String) -> String? { public func parseWallpaperUrl(_ url: String) -> WallpaperUrlParameter? { let schemes = ["http://", "https://", ""] - let baseTelegramMePaths = ["telegram.me", "t.me"] for basePath in baseTelegramMePaths { for scheme in schemes { let basePrefix = scheme + basePath + "/" @@ -435,7 +433,6 @@ public func resolveUrlImpl(account: Account, url: String) -> Signal() private let centralItemTitleView = Promise() private let centralItemNavigationStyle = Promise() - private let centralItemFooterContentNode = Promise() + private let centralItemFooterContentNode = Promise<(GalleryFooterContentNode?, GalleryOverlayContentNode?)>() private let centralItemAttributesDisposable = DisposableSet(); private let checkedDisposable = MetaDisposable() @@ -156,7 +156,7 @@ class WebSearchGalleryController: ViewController { self?.navigationItem.titleView = titleView })) - self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode in + self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode, _ in self?.galleryNode.updatePresentationState({ $0.withUpdatedFooterContentNode(footerContentNode) }, transition: .immediate) diff --git a/submodules/WebSearchUI/Sources/WebSearchVideoGalleryItem.swift b/submodules/WebSearchUI/Sources/WebSearchVideoGalleryItem.swift index 498a758306..1f69d4ec7a 100644 --- a/submodules/WebSearchUI/Sources/WebSearchVideoGalleryItem.swift +++ b/submodules/WebSearchUI/Sources/WebSearchVideoGalleryItem.swift @@ -534,7 +534,7 @@ final class WebSearchVideoGalleryItemNode: ZoomableContentGalleryItemNode { } } - override func footerContent() -> Signal { - return .single(self.footerContentNode) + override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> { + return .single((self.footerContentNode, nil)) } } diff --git a/submodules/ffmpeg/gas-preprocessor.pl b/submodules/ffmpeg/gas-preprocessor.pl new file mode 100755 index 0000000000..6da37c1f0d --- /dev/null +++ b/submodules/ffmpeg/gas-preprocessor.pl @@ -0,0 +1,1210 @@ +#!/usr/bin/env perl +# by David Conrad +# This code is licensed under GPLv2 or later; go to gnu.org to read it +# (not that it much matters for an asm preprocessor) +# usage: set your assembler to be something like "perl gas-preprocessor.pl gcc" +use strict; + +# Apple's gas is ancient and doesn't support modern preprocessing features like +# .rept and has ugly macro syntax, among other things. Thus, this script +# implements the subset of the gas preprocessor used by x264 and ffmpeg +# that isn't supported by Apple's gas. + +my %canonical_arch = ("aarch64" => "aarch64", "arm64" => "aarch64", + "arm" => "arm", + "powerpc" => "powerpc", "ppc" => "powerpc"); + +my %comments = ("aarch64" => '//', + "arm" => '@', + "powerpc" => '#'); + +my @gcc_cmd; +my @preprocess_c_cmd; + +my $comm; +my $arch; +my $as_type = "apple-gas"; + +my $fix_unreq = $^O eq "darwin"; +my $force_thumb = 0; +my $verbose = 0; + +my $arm_cond_codes = "eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo"; + +my $usage_str = " +$0\n +Gas-preprocessor.pl converts assembler files using modern GNU as syntax for +Apple's ancient gas version or clang's incompatible integrated assembler. The +conversion is regularly tested for Libav, x264 and vlc. Other projects might +use different features which are not correctly handled. + +Options for this program needs to be separated with ' -- ' from the assembler +command. Following options are currently supported: + + -help - this usage text + -arch - target architecture + -as-type - one value out of {{,apple-}{gas,clang},armasm} + -fix-unreq + -no-fix-unreq + -force-thumb - assemble as thumb regardless of the input source + (note, this is incomplete and only works for sources + it explicitly was tested with) + -verbose - print executed commands +"; + +sub usage() { + print $usage_str; +} + +while (@ARGV) { + my $opt = shift; + + if ($opt =~ /^-(no-)?fix-unreq$/) { + $fix_unreq = $1 ne "no-"; + } elsif ($opt eq "-force-thumb") { + $force_thumb = 1; + } elsif ($opt eq "-verbose") { + $verbose = 1; + } elsif ($opt eq "-arch") { + $arch = shift; + die "unknown arch: '$arch'\n" if not exists $canonical_arch{$arch}; + } elsif ($opt eq "-as-type") { + $as_type = shift; + die "unknown as type: '$as_type'\n" if $as_type !~ /^((apple-)?(gas|clang)|armasm)$/; + } elsif ($opt eq "-help") { + usage(); + exit 0; + } elsif ($opt eq "--" ) { + @gcc_cmd = @ARGV; + } elsif ($opt =~ /^-/) { + die "option '$opt' is not known. See '$0 -help' for usage information\n"; + } else { + push @gcc_cmd, $opt, @ARGV; + } + last if (@gcc_cmd); +} + +if (grep /\.c$/, @gcc_cmd) { + # C file (inline asm?) - compile + @preprocess_c_cmd = (@gcc_cmd, "-S"); +} elsif (grep /\.[sS]$/, @gcc_cmd) { + # asm file, just do C preprocessor + @preprocess_c_cmd = (@gcc_cmd, "-E"); +} elsif (grep /-(v|h|-version|dumpversion)/, @gcc_cmd) { + # pass -v/--version along, used during probing. Matching '-v' might have + # uninteded results but it doesn't matter much if gas-preprocessor or + # the compiler fails. + print STDERR join(" ", @gcc_cmd)."\n" if $verbose; + exec(@gcc_cmd); +} else { + die "Unrecognized input filetype"; +} +if ($as_type eq "armasm") { + + $preprocess_c_cmd[0] = "cpp"; + push(@preprocess_c_cmd, "-undef"); + # Normally a preprocessor for windows would predefine _WIN32, + # but we're using any generic system-agnostic preprocessor "cpp" + # with -undef (to avoid getting predefined variables from the host + # system in cross compilation cases), so manually define it here. + push(@preprocess_c_cmd, "-D_WIN32"); + + @preprocess_c_cmd = grep ! /^-nologo$/, @preprocess_c_cmd; + # Remove -ignore XX parameter pairs from preprocess_c_cmd + my $index = 1; + while ($index < $#preprocess_c_cmd) { + if ($preprocess_c_cmd[$index] eq "-ignore" and $index + 1 < $#preprocess_c_cmd) { + splice(@preprocess_c_cmd, $index, 2); + next; + } + $index++; + } + if (grep /^-MM$/, @preprocess_c_cmd) { + print STDERR join(" ", @preprocess_c_cmd)."\n" if $verbose; + system(@preprocess_c_cmd) == 0 or die "Error running preprocessor"; + exit 0; + } +} + +# if compiling, avoid creating an output file named '-.o' +if ((grep /^-c$/, @gcc_cmd) && !(grep /^-o/, @gcc_cmd)) { + foreach my $i (@gcc_cmd) { + if ($i =~ /\.[csS]$/) { + my $outputfile = $i; + $outputfile =~ s/\.[csS]$/.o/; + push(@gcc_cmd, "-o"); + push(@gcc_cmd, $outputfile); + last; + } + } +} +# replace only the '-o' argument with '-', avoids rewriting the make dependency +# target specified with -MT to '-' +my $index = 1; +while ($index < $#preprocess_c_cmd) { + if ($preprocess_c_cmd[$index] eq "-o") { + $index++; + $preprocess_c_cmd[$index] = "-"; + } + $index++; +} + +my $tempfile; +if ($as_type ne "armasm") { + @gcc_cmd = map { /\.[csS]$/ ? qw(-x assembler -) : $_ } @gcc_cmd; +} else { + @preprocess_c_cmd = grep ! /^-c$/, @preprocess_c_cmd; + @preprocess_c_cmd = grep ! /^-m/, @preprocess_c_cmd; + + @preprocess_c_cmd = grep ! /^-G/, @preprocess_c_cmd; + @preprocess_c_cmd = grep ! /^-W/, @preprocess_c_cmd; + @preprocess_c_cmd = grep ! /^-Z/, @preprocess_c_cmd; + @preprocess_c_cmd = grep ! /^-fp/, @preprocess_c_cmd; + @preprocess_c_cmd = grep ! /^-EHsc$/, @preprocess_c_cmd; + @preprocess_c_cmd = grep ! /^-O/, @preprocess_c_cmd; + + @gcc_cmd = grep ! /^-G/, @gcc_cmd; + @gcc_cmd = grep ! /^-W/, @gcc_cmd; + @gcc_cmd = grep ! /^-Z/, @gcc_cmd; + @gcc_cmd = grep ! /^-fp/, @gcc_cmd; + @gcc_cmd = grep ! /^-EHsc$/, @gcc_cmd; + @gcc_cmd = grep ! /^-O/, @gcc_cmd; + + my @outfiles = grep /\.(o|obj)$/, @gcc_cmd; + $tempfile = $outfiles[0].".asm"; + + # Remove most parameters from gcc_cmd, which actually is the armasm command, + # which doesn't support any of the common compiler/preprocessor options. + @gcc_cmd = grep ! /^-D/, @gcc_cmd; + @gcc_cmd = grep ! /^-U/, @gcc_cmd; + @gcc_cmd = grep ! /^-m/, @gcc_cmd; + @gcc_cmd = grep ! /^-M/, @gcc_cmd; + @gcc_cmd = grep ! /^-c$/, @gcc_cmd; + @gcc_cmd = grep ! /^-I/, @gcc_cmd; + @gcc_cmd = map { /\.S$/ ? $tempfile : $_ } @gcc_cmd; +} + +# detect architecture from gcc binary name +if (!$arch) { + if ($gcc_cmd[0] =~ /(arm64|aarch64|arm|powerpc|ppc)/) { + $arch = $1; + } else { + # look for -arch flag + foreach my $i (1 .. $#gcc_cmd-1) { + if ($gcc_cmd[$i] eq "-arch" and + $gcc_cmd[$i+1] =~ /(arm64|aarch64|arm|powerpc|ppc)/) { + $arch = $1; + } + } + } +} + +# assume we're not cross-compiling if no -arch or the binary doesn't have the arch name +$arch = qx/arch/ if (!$arch); + +die "Unknown target architecture '$arch'" if not exists $canonical_arch{$arch}; + +$arch = $canonical_arch{$arch}; +$comm = $comments{$arch}; +my $inputcomm = $comm; +$comm = ";" if $as_type =~ /armasm/; + +my %ppc_spr = (ctr => 9, + vrsave => 256); + +print STDERR join(" ", @preprocess_c_cmd)."\n" if $verbose; +open(INPUT, "-|", @preprocess_c_cmd) || die "Error running preprocessor"; + +if ($ENV{GASPP_DEBUG}) { + open(ASMFILE, ">&STDOUT"); +} else { + if ($as_type ne "armasm") { + print STDERR join(" ", @gcc_cmd)."\n" if $verbose; + open(ASMFILE, "|-", @gcc_cmd) or die "Error running assembler"; + } else { + open(ASMFILE, ">", $tempfile); + } +} + +my $current_macro = ''; +my $macro_level = 0; +my $rept_level = 0; +my %macro_lines; +my %macro_args; +my %macro_args_default; +my $macro_count = 0; +my $altmacro = 0; +my $in_irp = 0; + +my $num_repts; +my @rept_lines; + +my @irp_args; +my $irp_param; + +my @ifstack; + +my %symbols; + +my @sections; + +my %literal_labels; # for ldr , = +my $literal_num = 0; +my $literal_expr = ".word"; +$literal_expr = ".quad" if $arch eq "aarch64"; + +my $thumb = 0; + +my %thumb_labels; +my %call_targets; +my %import_symbols; + +my %neon_alias_reg; +my %neon_alias_type; + +my $temp_label_next = 0; +my %last_temp_labels; +my %next_temp_labels; + +my %labels_seen; + +my %aarch64_req_alias; + +if ($force_thumb) { + parse_line(".thumb\n"); +} + +# pass 1: parse .macro +# note that the handling of arguments is probably overly permissive vs. gas +# but it should be the same for valid cases +while () { + # remove lines starting with '#', preprocessing is done, '#' at start of + # the line indicates a comment for all supported archs (aarch64, arm, ppc + # and x86). Also strips line number comments but since they are off anyway + # it is no loss. + s/^\s*#.*$//; + # remove all comments (to avoid interfering with evaluating directives) + s/(? 0) { + $ifstack[-1] = -$ifstack[-1]; + } + return 1; + } elsif ($line =~ /\.else/) { + $ifstack[-1] = !$ifstack[-1]; + return 1; + } elsif (handle_if($line)) { + return 1; + } + } + + # discard lines in false .if blocks + foreach my $i (0 .. $#ifstack) { + if ($ifstack[$i] <= 0) { + return 1; + } + } + } + return 0; +} + +sub parse_line { + my $line = $_[0]; + + return if (parse_if_line($line)); + + if (scalar(@rept_lines) == 0) { + if ($line =~ /\.macro/) { + $macro_level++; + if ($macro_level > 1 && !$current_macro) { + die "nested macros but we don't have master macro"; + } + } elsif ($line =~ /\.endm/) { + $macro_level--; + if ($macro_level < 0) { + die "unmatched .endm"; + } elsif ($macro_level == 0) { + $current_macro = ''; + return; + } + } + } + + if ($macro_level == 0) { + if ($line =~ /\.(rept|irp)/) { + $rept_level++; + } elsif ($line =~ /.endr/) { + $rept_level--; + } + } + + if ($macro_level > 1) { + push(@{$macro_lines{$current_macro}}, $line); + } elsif (scalar(@rept_lines) and $rept_level >= 1) { + push(@rept_lines, $line); + } elsif ($macro_level == 0) { + expand_macros($line); + } else { + if ($line =~ /\.macro\s+([\d\w\.]+)\s*,?\s*(.*)/) { + $current_macro = $1; + + # commas in the argument list are optional, so only use whitespace as the separator + my $arglist = $2; + $arglist =~ s/,/ /g; + + my @args = split(/\s+/, $arglist); + foreach my $i (0 .. $#args) { + my @argpair = split(/=/, $args[$i]); + $macro_args{$current_macro}[$i] = $argpair[0]; + $argpair[0] =~ s/:vararg$//; + $macro_args_default{$current_macro}{$argpair[0]} = $argpair[1]; + } + # ensure %macro_lines has the macro name added as a key + $macro_lines{$current_macro} = []; + + } elsif ($current_macro) { + push(@{$macro_lines{$current_macro}}, $line); + } else { + die "macro level without a macro name"; + } + } +} + +sub handle_set { + my $line = $_[0]; + if ($line =~ /\.(?:set|equ)\s+(\S*)\s*,\s*(.*)/) { + $symbols{$1} = eval_expr($2); + return 1; + } + return 0; +} + +sub expand_macros { + my $line = $_[0]; + + # handle .if directives; apple's assembler doesn't support important non-basic ones + # evaluating them is also needed to handle recursive macros + if (handle_if($line)) { + return; + } + + if (/\.purgem\s+([\d\w\.]+)/) { + delete $macro_lines{$1}; + delete $macro_args{$1}; + delete $macro_args_default{$1}; + return; + } + + if ($line =~ /\.altmacro/) { + $altmacro = 1; + return; + } + + if ($line =~ /\.noaltmacro/) { + $altmacro = 0; + return; + } + + $line =~ s/\%([^,]*)/eval_expr($1)/eg if $altmacro; + + # Strip out the .set lines from the armasm output + return if (handle_set($line) and $as_type eq "armasm"); + + if ($line =~ /\.rept\s+(.*)/) { + $num_repts = $1; + @rept_lines = ("\n"); + + # handle the possibility of repeating another directive on the same line + # .endr on the same line is not valid, I don't know if a non-directive is + if ($num_repts =~ s/(\.\w+.*)//) { + push(@rept_lines, "$1\n"); + } + $num_repts = eval_expr($num_repts); + } elsif ($line =~ /\.irp\s+([\d\w\.]+)\s*(.*)/) { + $in_irp = 1; + $num_repts = 1; + @rept_lines = ("\n"); + $irp_param = $1; + + # only use whitespace as the separator + my $irp_arglist = $2; + $irp_arglist =~ s/,/ /g; + $irp_arglist =~ s/^\s+//; + @irp_args = split(/\s+/, $irp_arglist); + } elsif ($line =~ /\.irpc\s+([\d\w\.]+)\s*(.*)/) { + $in_irp = 1; + $num_repts = 1; + @rept_lines = ("\n"); + $irp_param = $1; + + my $irp_arglist = $2; + $irp_arglist =~ s/,/ /g; + $irp_arglist =~ s/^\s+//; + @irp_args = split(//, $irp_arglist); + } elsif ($line =~ /\.endr/) { + my @prev_rept_lines = @rept_lines; + my $prev_in_irp = $in_irp; + my @prev_irp_args = @irp_args; + my $prev_irp_param = $irp_param; + my $prev_num_repts = $num_repts; + @rept_lines = (); + $in_irp = 0; + @irp_args = ''; + + if ($prev_in_irp != 0) { + foreach my $i (@prev_irp_args) { + foreach my $origline (@prev_rept_lines) { + my $line = $origline; + $line =~ s/\\$prev_irp_param/$i/g; + $line =~ s/\\\(\)//g; # remove \() + parse_line($line); + } + } + } else { + for (1 .. $prev_num_repts) { + foreach my $origline (@prev_rept_lines) { + my $line = $origline; + parse_line($line); + } + } + } + } elsif ($line =~ /(\S+:|)\s*([\w\d\.]+)\s*(.*)/ && exists $macro_lines{$2}) { + handle_serialized_line($1); + my $macro = $2; + + # commas are optional here too, but are syntactically important because + # parameters can be blank + my @arglist = split(/,/, $3); + my @args; + my @args_seperator; + + my $comma_sep_required = 0; + foreach (@arglist) { + # allow arithmetic/shift operators in macro arguments + $_ =~ s/\s*(\+|-|\*|\/|<<|>>|<|>)\s*/$1/g; + + my @whitespace_split = split(/\s+/, $_); + if (!@whitespace_split) { + push(@args, ''); + push(@args_seperator, ''); + } else { + foreach (@whitespace_split) { + #print ("arglist = \"$_\"\n"); + if (length($_)) { + push(@args, $_); + my $sep = $comma_sep_required ? "," : " "; + push(@args_seperator, $sep); + #print ("sep = \"$sep\", arg = \"$_\"\n"); + $comma_sep_required = 0; + } + } + } + + $comma_sep_required = 1; + } + + my %replacements; + if ($macro_args_default{$macro}){ + %replacements = %{$macro_args_default{$macro}}; + } + + # construct hashtable of text to replace + foreach my $i (0 .. $#args) { + my $argname = $macro_args{$macro}[$i]; + my @macro_args = @{ $macro_args{$macro} }; + if ($args[$i] =~ m/=/) { + # arg=val references the argument name + # XXX: I'm not sure what the expected behaviour if a lot of + # these are mixed with unnamed args + my @named_arg = split(/=/, $args[$i]); + $replacements{$named_arg[0]} = $named_arg[1]; + } elsif ($i > $#{$macro_args{$macro}}) { + # more args given than the macro has named args + # XXX: is vararg allowed on arguments before the last? + $argname = $macro_args{$macro}[-1]; + if ($argname =~ s/:vararg$//) { + #print "macro = $macro, args[$i] = $args[$i], args_seperator=@args_seperator, argname = $argname, arglist[$i] = $arglist[$i], arglist = @arglist, args=@args, macro_args=@macro_args\n"; + #$replacements{$argname} .= ", $args[$i]"; + $replacements{$argname} .= "$args_seperator[$i] $args[$i]"; + } else { + die "Too many arguments to macro $macro"; + } + } else { + $argname =~ s/:vararg$//; + $replacements{$argname} = $args[$i]; + } + } + + my $count = $macro_count++; + + # apply replacements as regex + foreach (@{$macro_lines{$macro}}) { + my $macro_line = $_; + # do replacements by longest first, this avoids wrong replacement + # when argument names are subsets of each other + foreach (reverse sort {length $a <=> length $b} keys %replacements) { + $macro_line =~ s/\\$_/$replacements{$_}/g; + } + if ($altmacro) { + foreach (reverse sort {length $a <=> length $b} keys %replacements) { + $macro_line =~ s/\b$_\b/$replacements{$_}/g; + } + } + $macro_line =~ s/\\\@/$count/g; + $macro_line =~ s/\\\(\)//g; # remove \() + parse_line($macro_line); + } + } else { + handle_serialized_line($line); + } +} + +sub is_arm_register { + my $name = $_[0]; + if ($name eq "lr" or + $name eq "ip" or + $name =~ /^[rav]\d+$/) { + return 1; + } + return 0; +} + +sub is_aarch64_register { + my $name = $_[0]; + if ($name =~ /^[xw]\d+$/) { + return 1; + } + return 0; +} + +sub handle_local_label { + my $line = $_[0]; + my $num = $_[1]; + my $dir = $_[2]; + my $target = "$num$dir"; + if ($dir eq "b") { + $line =~ s/\b$target\b/$last_temp_labels{$num}/g; + } else { + my $name = "temp_label_$temp_label_next"; + $temp_label_next++; + push(@{$next_temp_labels{$num}}, $name); + $line =~ s/\b$target\b/$name/g; + } + return $line; +} + +sub handle_serialized_line { + my $line = $_[0]; + + # handle .previous (only with regard to .section not .subsection) + if ($line =~ /\.(section|text|const_data)/) { + push(@sections, $line); + } elsif ($line =~ /\.previous/) { + if (!$sections[-2]) { + die ".previous without a previous section"; + } + $line = $sections[-2]; + push(@sections, $line); + } + + $thumb = 1 if $line =~ /\.code\s+16|\.thumb/; + $thumb = 0 if $line =~ /\.code\s+32|\.arm/; + + # handle ldr , = + if ($line =~ /(.*)\s*ldr([\w\s\d]+)\s*,\s*=(.*)/ and $as_type ne "armasm") { + my $label = $literal_labels{$3}; + if (!$label) { + $label = "Literal_$literal_num"; + $literal_num++; + $literal_labels{$3} = $label; + } + $line = "$1 ldr$2, $label\n"; + } elsif ($line =~ /\.ltorg/ and $as_type ne "armasm") { + $line .= ".align 2\n"; + foreach my $literal (keys %literal_labels) { + $line .= "$literal_labels{$literal}:\n $literal_expr $literal\n"; + } + %literal_labels = (); + } + + # handle GNU as pc-relative relocations for adrp/add + if ($line =~ /(.*)\s*adrp([\w\s\d]+)\s*,\s*#?:pg_hi21:([^\s]+)/ and $as_type =~ /^apple-/) { + $line = "$1 adrp$2, ${3}\@PAGE\n"; + } elsif ($line =~ /(.*)\s*add([\w\s\d]+)\s*,([\w\s\d]+)\s*,\s*#?:lo12:([^\s]+)/ and $as_type =~ /^apple-/) { + $line = "$1 add$2, $3, ${4}\@PAGEOFF\n"; + } + + # thumb add with large immediate needs explicit add.w + if ($thumb and $line =~ /add\s+.*#([^@]+)/) { + $line =~ s/add/add.w/ if eval_expr($1) > 255; + } + + # mach-o local symbol names start with L (no dot) + $line =~ s/(? with ic as conditional code + if ($cond =~ /^(|$arm_cond_codes)$/) { + if (exists $thumb_labels{$label}) { + print ASMFILE ".thumb_func $label\n"; + } else { + $call_targets{$label}++; + } + } + } + + # @l -> lo16() @ha -> ha16() + $line =~ s/,\s+([^,]+)\@l\b/, lo16($1)/g; + $line =~ s/,\s+([^,]+)\@ha\b/, ha16($1)/g; + + # move to/from SPR + if ($line =~ /(\s+)(m[ft])([a-z]+)\s+(\w+)/ and exists $ppc_spr{$3}) { + if ($2 eq 'mt') { + $line = "$1${2}spr $ppc_spr{$3}, $4\n"; + } else { + $line = "$1${2}spr $4, $ppc_spr{$3}\n"; + } + } + + if ($line =~ /\.unreq\s+(.*)/) { + if (defined $neon_alias_reg{$1}) { + delete $neon_alias_reg{$1}; + delete $neon_alias_type{$1}; + return; + } elsif (defined $aarch64_req_alias{$1}) { + delete $aarch64_req_alias{$1}; + return; + } + } + # old gas versions store upper and lower case names on .req, + # but they remove only one on .unreq + if ($fix_unreq) { + if ($line =~ /\.unreq\s+(.*)/) { + $line = ".unreq " . lc($1) . "\n"; + $line .= ".unreq " . uc($1) . "\n"; + } + } + + if ($line =~ /(\w+)\s+\.(dn|qn)\s+(\w+)(?:\.(\w+))?(\[\d+\])?/) { + $neon_alias_reg{$1} = "$3$5"; + $neon_alias_type{$1} = $4; + return; + } + if (scalar keys %neon_alias_reg > 0 && $line =~ /^\s+v\w+/) { + # This line seems to possibly have a neon instruction + foreach (keys %neon_alias_reg) { + my $alias = $_; + # Require the register alias to match as an invididual word, not as a substring + # of a larger word-token. + if ($line =~ /\b$alias\b/) { + $line =~ s/\b$alias\b/$neon_alias_reg{$alias}/g; + # Add the type suffix. If multiple aliases match on the same line, + # only do this replacement the first time (a vfoo.bar string won't match v\w+). + $line =~ s/^(\s+)(v\w+)(\s+)/$1$2.$neon_alias_type{$alias}$3/; + } + } + } + + if ($arch eq "aarch64" or $as_type eq "armasm") { + # clang's integrated aarch64 assembler in Xcode 5 does not support .req/.unreq + if ($line =~ /\b(\w+)\s+\.req\s+(\w+)\b/) { + $aarch64_req_alias{$1} = $2; + return; + } + foreach (keys %aarch64_req_alias) { + my $alias = $_; + # recursively resolve aliases + my $resolved = $aarch64_req_alias{$alias}; + while (defined $aarch64_req_alias{$resolved}) { + $resolved = $aarch64_req_alias{$resolved}; + } + $line =~ s/\b$alias\b/$resolved/g; + } + } + if ($arch eq "aarch64") { + # fix missing aarch64 instructions in Xcode 5.1 (beta3) + # mov with vector arguments is not supported, use alias orr instead + if ($line =~ /^(\d+:)?\s*mov\s+(v\d[\.{}\[\]\w]+),\s*(v\d[\.{}\[\]\w]+)\b\s*$/) { + $line = "$1 orr $2, $3, $3\n"; + } + # movi 16, 32 bit shifted variant, shift is optional + if ($line =~ /^(\d+:)?\s*movi\s+(v[0-3]?\d\.(?:2|4|8)[hsHS])\s*,\s*(#\w+)\b\s*$/) { + $line = "$1 movi $2, $3, lsl #0\n"; + } + # Xcode 5 misses the alias uxtl. Replace it with the more general ushll. + # Clang 3.4 misses the alias sxtl too. Replace it with the more general sshll. + # armasm64 also misses these instructions. + if ($line =~ /^(\d+:)?\s*(s|u)xtl(2)?\s+(v[0-3]?\d\.[248][hsdHSD])\s*,\s*(v[0-3]?\d\.(?:2|4|8|16)[bhsBHS])\b\s*$/) { + $line = "$1 $2shll$3 $4, $5, #0\n"; + } + # clang 3.4 and armasm64 do not automatically use shifted immediates in add/sub + if (($as_type eq "clang" or $as_type eq "armasm") and + $line =~ /^(\d+:)?(\s*(?:add|sub)s?) ([^#l]+)#([\d\+\-\*\/ <>]+)\s*$/) { + my $imm = eval $4; + if ($imm > 4095 and not ($imm & 4095)) { + $line = "$1 $2 $3#" . ($imm >> 12) . ", lsl #12\n"; + } + } + if ($ENV{GASPP_FIX_XCODE5}) { + if ($line =~ /^\s*bsl\b/) { + $line =~ s/\b(bsl)(\s+v[0-3]?\d\.(\w+))\b/$1.$3$2/; + $line =~ s/\b(v[0-3]?\d)\.$3\b/$1/g; + } + if ($line =~ /^\s*saddl2?\b/) { + $line =~ s/\b(saddl2?)(\s+v[0-3]?\d\.(\w+))\b/$1.$3$2/; + $line =~ s/\b(v[0-3]?\d)\.\w+\b/$1/g; + } + if ($line =~ /^\s*dup\b.*\]$/) { + $line =~ s/\bdup(\s+v[0-3]?\d)\.(\w+)\b/dup.$2$1/g; + $line =~ s/\b(v[0-3]?\d)\.[bhsdBHSD](\[\d\])$/$1$2/g; + } + } + } + + if ($as_type eq "armasm") { + # Also replace variables set by .set + foreach (keys %symbols) { + my $sym = $_; + $line =~ s/\b$sym\b/$symbols{$sym}/g; + } + + # Handle function declarations and keep track of the declared labels + if ($line =~ s/^\s*\.func\s+(\w+)/$1 PROC/) { + $labels_seen{$1} = 1; + } + + if ($line =~ s/^\s*(\d+)://) { + # Convert local labels into unique labels. armasm (at least in + # RVCT) has something similar, but still different enough. + # By converting to unique labels we avoid any possible + # incompatibilities. + + my $num = $1; + foreach (@{$next_temp_labels{$num}}) { + $line = "$_\n" . $line; + } + @next_temp_labels{$num} = (); + my $name = "temp_label_$temp_label_next"; + $temp_label_next++; + # The matching regexp above removes the label from the start of + # the line (which might contain an instruction as well), readd + # it on a separate line above it. + $line = "$name:\n" . $line; + $last_temp_labels{$num} = $name; + } + + if ($line =~ s/^\s*(\w+):/$1/) { + # Skip labels that have already been declared with a PROC, + # labels must not be declared multiple times. + return if (defined $labels_seen{$1}); + $labels_seen{$1} = 1; + } elsif ($line !~ /(\w+) PROC/) { + # If not a label, make sure the line starts with whitespace, + # otherwise ms armasm interprets it incorrectly. + $line =~ s/^[\.\w]/\t$&/; + } + + + # Check branch instructions + if ($line =~ /(?:^|\n)\s*(\w+\s*:\s*)?(bl?x?\.?([^\s]{2})?(\.w)?)\s+(\w+)/) { + my $instr = $2; + my $cond = $3; + my $width = $4; + my $target = $5; + # Don't interpret e.g. bic as b with ic as conditional code + if ($cond !~ /^(|$arm_cond_codes)$/) { + # Not actually a branch + } elsif ($target =~ /^(\d+)([bf])$/) { + # The target is a local label + $line = handle_local_label($line, $1, $2); + $line =~ s/\b$instr\b/$&.w/ if $width eq "" and $arch eq "arm"; + } elsif (($arch eq "arm" and !is_arm_register($target)) or + ($arch eq "aarch64" and !is_aarch64_register($target))) { + $call_targets{$target}++; + } + } elsif ($line =~ /(?:^|\n)\s*(\w+\s*:\s*)?(cbn?z|adr|tbz)\s+(\w+)\s*,(\s*#\d+\s*,)?\s*(\w+)/) { + my $instr = $2; + my $reg = $3; + my $bit = $4; + my $target = $5; + if ($target =~ /^(\d+)([bf])$/) { + # The target is a local label + $line = handle_local_label($line, $1, $2); + } else { + $call_targets{$target}++; + } + # Convert tbz with a wX register into an xX register, + # due to armasm64 bugs/limitations. + if ($instr eq "tbz" and $reg =~ /w\d+/) { + my $xreg = $reg; + $xreg =~ s/w/x/; + $line =~ s/\b$reg\b/$xreg/; + } + } elsif ($line =~ /^\s*.h?word.*\b\d+[bf]\b/) { + while ($line =~ /\b(\d+)([bf])\b/g) { + $line = handle_local_label($line, $1, $2); + } + } + + # ALIGN in armasm syntax is the actual number of bytes + if ($line =~ /\.(?:p2)?align\s+(\d+)/) { + my $align = 1 << $1; + $line =~ s/\.(?:p2)?align\s+(\d+)/ALIGN $align/; + } + # Convert gas style [r0, :128] into armasm [r0@128] alignment specification + $line =~ s/\[([^\[,]+),?\s*:(\d+)\]/[$1\@$2]/g; + + # armasm treats logical values {TRUE} and {FALSE} separately from + # numeric values - logical operators and values can't be intermixed + # with numerical values. Evaluate ! and (a <> b) into numbers, + # let the assembler evaluate the rest of the expressions. This current + # only works for cases when ! and <> are used with actual constant numbers, + # we don't evaluate subexpressions here. + + # Evaluate ! + while ($line =~ /!\s*(\d+)/g) { + my $val = ($1 != 0) ? 0 : 1; + $line =~ s/!(\d+)/$val/; + } + # Evaluate (a > b) + while ($line =~ /\(\s*(\d+)\s*([<>])\s*(\d+)\s*\)/) { + my $val; + if ($2 eq "<") { + $val = ($1 < $3) ? 1 : 0; + } else { + $val = ($1 > $3) ? 1 : 0; + } + $line =~ s/\(\s*(\d+)\s*([<>])\s*(\d+)\s*\)/$val/; + } + + if ($arch eq "arm") { + # Change a movw... #:lower16: into a mov32 pseudoinstruction + $line =~ s/^(\s*)movw(\s+\w+\s*,\s*)\#:lower16:(.*)$/$1mov32$2$3/; + # and remove the following, matching movt completely + $line =~ s/^\s*movt\s+\w+\s*,\s*\#:upper16:.*$//; + + if ($line =~ /^\s*mov32\s+\w+,\s*([a-zA-Z]\w*)/) { + $import_symbols{$1}++; + } + + # Misc bugs/deficiencies: + # armasm seems unable to parse e.g. "vmov s0, s1" without a type + # qualifier, thus add .f32. + $line =~ s/^(\s+(?:vmov|vadd))(\s+s\d+\s*,\s*s\d+)/$1.f32$2/; + } elsif ($arch eq "aarch64") { + # Convert ext into ext8; armasm64 seems to require it named as ext8. + $line =~ s/^(\s+)ext(\s+)/$1ext8$2/; + + # Pick up targets from ldr x0, =sym+offset + if ($line =~ /^\s*ldr\s+(\w+)\s*,\s*=([a-zA-Z]\w*)(.*)$/) { + my $reg = $1; + my $sym = $2; + my $offset = eval_expr($3); + if ($offset < 0 and $ENV{GASPP_ARMASM64_SKIP_NEG_OFFSET}) { + # armasm64 in VS < 15.6 is buggy with ldr x0, =sym+offset where the + # offset is a negative value; it does write a negative + # offset into the literal pool as it should, but the + # negative offset only covers the lower 32 bit of the 64 + # bit literal/relocation. + # Thus remove the offset and apply it manually with a sub + # afterwards. + $offset = -$offset; + $line = "\tldr $reg, =$sym\n\tsub $reg, $reg, #$offset\n"; + } + $import_symbols{$sym}++; + } + + # armasm64 (currently) doesn't support offsets on adrp targets, + # even though the COFF format relocations (and the linker) + # supports it. Therefore strip out the offsets from adrp and + # add :lo12: (in case future armasm64 would start handling it) + # and add an extra explicit add instruction for the offset. + if ($line =~ s/(adrp\s+\w+\s*,\s*(\w+))([\d\+\-\*\/\(\) <>]+)?/\1/) { + $import_symbols{$2}++; + } + if ($line =~ s/(add\s+(\w+)\s*,\s*\w+\s*,\s*):lo12:(\w+)([\d\+\-\*\/\(\) <>]+)?/\1\3/) { + my $reg = $2; + my $sym = $3; + my $offset = eval_expr($4); + $line .= "\tadd $reg, $reg, #$offset\n" if $offset > 0; + $import_symbols{$sym}++; + } + + # Convert e.g. "add x0, x0, w0, uxtw" into "add x0, x0, w0, uxtw #0", + # or "ldr x0, [x0, w0, uxtw]" into "ldr x0, [x0, w0, uxtw #0]". + $line =~ s/(uxt[whb]|sxt[whb])(\s*\]?\s*)$/\1 #0\2/i; + + # Convert "mov x0, v0.d[0]" into "umov x0, v0.d[0]" + $line =~ s/\bmov\s+[xw]\d+\s*,\s*v\d+\.[ds]/u$&/i; + + # Convert "ccmp w0, #0, #0, ne" into "ccmpne w0, #0, #0", + # and "csel w0, w0, w0, ne" into "cselne w0, w0, w0". + $line =~ s/(ccmp|csel)\s+([xw]\w+)\s*,\s*([xw#]\w+)\s*,\s*([xw#]\w+)\s*,\s*($arm_cond_codes)/\1\5 \2, \3, \4/; + + # Convert "cinc w0, w0, ne" into "cincne w0, w0". + $line =~ s/(cinc)\s+([xw]\w+)\s*,\s*([xw]\w+)\s*,\s*($arm_cond_codes)/\1\4 \2, \3/; + + # Convert "cset w0, lo" into "csetlo w0" + $line =~ s/(cset)\s+([xw]\w+)\s*,\s*($arm_cond_codes)/\1\3 \2/; + + if ($ENV{GASPP_ARMASM64_SKIP_PRFUM}) { + # Strip out prfum; armasm64 (VS < 15.5) fails to assemble any + # variant/combination of prfum tested so far, but since it is + # a prefetch instruction it can be skipped without changing + # results. + $line =~ s/prfum.*\]//; + } + + # Convert "ldrb w0, [x0, #-1]" into "ldurb w0, [x0, #-1]". + # Don't do this for forms with writeback though. + if ($line =~ /(ld|st)(r[bh]?)\s+(\w+)\s*,\s*\[\s*(\w+)\s*,\s*#([^\]]+)\s*\][^!]/) { + my $instr = $1; + my $suffix = $2; + my $target = $3; + my $base = $4; + my $offset = eval_expr($5); + if ($offset < 0) { + $line =~ s/$instr$suffix/${instr}u$suffix/; + } + } + + if ($ENV{GASPP_ARMASM64_INVERT_SCALE}) { + # Instructions like fcvtzs and scvtf store the scale value + # inverted in the opcode (stored as 64 - scale), but armasm64 + # in VS < 15.5 stores it as-is. Thus convert from + # "fcvtzs w0, s0, #8" into "fcvtzs w0, s0, #56". + if ($line =~ /(?:fcvtzs|scvtf)\s+(\w+)\s*,\s*(\w+)\s*,\s*#(\d+)/) { + my $scale = $3; + my $inverted_scale = 64 - $3; + $line =~ s/#$scale/#$inverted_scale/; + } + } + + # Convert "ld1 {v0.4h-v3.4h}" into "ld1 {v0.4h,v1.4h,v2.4h,v3.4h}" + if ($line =~ /(?:ld|st)\d\s+({\s*v(\d+)\.(\d[bhsdBHSD])\s*-\s*v(\d+)\.(\d[bhsdBHSD])\s*})/) { + my $regspec = $1; + my $reg1 = $2; + my $layout1 = $3; + my $reg2 = $4; + my $layout2 = $5; + if ($layout1 eq $layout2) { + my $new_regspec = "{"; + foreach my $i ($reg1 .. $reg2) { + $new_regspec .= "," if ($i > $reg1); + $new_regspec .= "v$i.$layout1"; + } + $new_regspec .= "}"; + $line =~ s/$regspec/$new_regspec/; + } + } + } + # armasm is unable to parse &0x - add spacing + $line =~ s/&0x/& 0x/g; + } + + if ($force_thumb) { + # Convert register post indexing to a separate add instruction. + # This converts e.g. "ldr r0, [r1], r2" into "ldr r0, [r1]", + # "add r1, r1, r2". + $line =~ s/((?:ldr|str)[bh]?)\s+(\w+),\s*\[(\w+)\],\s*(\w+)/$1 $2, [$3]\n\tadd $3, $3, $4/g; + + # Convert "mov pc, lr" into "bx lr", since the former only works + # for switching from arm to thumb (and only in armv7), but not + # from thumb to arm. + $line =~ s/mov\s*pc\s*,\s*lr/bx lr/g; + + # Convert stmdb/ldmia/stmfd/ldmfd/ldm with only one register into a plain str/ldr with post-increment/decrement. + # Wide thumb2 encoding requires at least two registers in register list while all other encodings support one register too. + $line =~ s/stm(?:db|fd)\s+sp!\s*,\s*\{([^,-]+)\}/str $1, [sp, #-4]!/g; + $line =~ s/ldm(?:ia|fd)?\s+sp!\s*,\s*\{([^,-]+)\}/ldr $1, [sp], #4/g; + + # Convert muls into mul+cmp + $line =~ s/muls\s+(\w+),\s*(\w+)\,\s*(\w+)/mul $1, $2, $3\n\tcmp $1, #0/g; + + # Convert "and r0, sp, #xx" into "mov r0, sp", "and r0, r0, #xx" + $line =~ s/and\s+(\w+),\s*(sp|r13)\,\s*#(\w+)/mov $1, $2\n\tand $1, $1, #$3/g; + + # Convert "ldr r0, [r0, r1, lsl #6]" where the shift is >3 (which + # can't be handled in thumb) into "add r0, r0, r1, lsl #6", + # "ldr r0, [r0]", for the special case where the same address is + # used as base and target for the ldr. + if ($line =~ /(ldr[bh]?)\s+(\w+),\s*\[\2,\s*(\w+),\s*lsl\s*#(\w+)\]/ and $4 > 3) { + $line =~ s/(ldr[bh]?)\s+(\w+),\s*\[\2,\s*(\w+),\s*lsl\s*#(\w+)\]/add $2, $2, $3, lsl #$4\n\t$1 $2, [$2]/; + } + + $line =~ s/\.arm/.thumb/x; + } + + # comment out unsupported directives + $line =~ s/\.type/$comm$&/x if $as_type =~ /^(apple-|armasm)/; + $line =~ s/\.func/$comm$&/x if $as_type =~ /^(apple-|clang)/; + $line =~ s/\.endfunc/$comm$&/x if $as_type =~ /^(apple-|clang)/; + $line =~ s/\.endfunc/ENDP/x if $as_type =~ /armasm/; + $line =~ s/\.ltorg/$comm$&/x if $as_type =~ /^(apple-|clang)/; + $line =~ s/\.ltorg/LTORG/x if $as_type eq "armasm"; + $line =~ s/\.size/$comm$&/x if $as_type =~ /^(apple-|armasm)/; + $line =~ s/\.fpu/$comm$&/x if $as_type =~ /^(apple-|armasm)/; + $line =~ s/\.arch/$comm$&/x if $as_type =~ /^(apple-|clang|armasm)/; + $line =~ s/\.object_arch/$comm$&/x if $as_type =~ /^(apple-|armasm)/; + $line =~ s/.section\s+.note.GNU-stack.*/$comm$&/x if $as_type =~ /^(apple-|armasm)/; + + $line =~ s/\.syntax/$comm$&/x if $as_type =~ /armasm/; + + $line =~ s/\.hword/.short/x; + + if ($as_type =~ /^apple-/) { + # the syntax for these is a little different + $line =~ s/\.global/.globl/x; + # also catch .section .rodata since the equivalent to .const_data is .section __DATA,__const + $line =~ s/(.*)\.rodata/.const_data/x; + $line =~ s/\.int/.long/x; + $line =~ s/\.float/.single/x; + } + if ($as_type eq "apple-gas") { + $line =~ s/vmrs\s+APSR_nzcv/fmrx r15/x; + } + if ($as_type eq "armasm") { + $line =~ s/\.global/EXPORT/x; + $line =~ s/\.extern/IMPORT/x; + $line =~ s/\.int/dcd/x; + $line =~ s/\.long/dcd/x; + $line =~ s/\.float/dcfs/x; + $line =~ s/\.word/dcd/x; + $line =~ s/\.short/dcw/x; + $line =~ s/\.byte/dcb/x; + $line =~ s/\.quad/dcq/x; + $line =~ s/\.ascii/dcb/x; + $line =~ s/\.asciz(.*)$/dcb\1,0/x; + $line =~ s/\.thumb/THUMB/x; + $line =~ s/\.arm/ARM/x; + # The alignment in AREA is the power of two, just as .align in gas + $line =~ s/\.text/AREA |.text|, CODE, READONLY, ALIGN=4, CODEALIGN/; + $line =~ s/(\s*)(.*)\.ro?data/$1AREA |.rdata|, DATA, READONLY, ALIGN=5/; + $line =~ s/\.data/AREA |.data|, DATA, ALIGN=5/; + } + if ($as_type eq "armasm" and $arch eq "arm") { + $line =~ s/fmxr/vmsr/; + $line =~ s/fmrx/vmrs/; + $line =~ s/fadds/vadd.f32/; + } + if ($as_type eq "armasm" and $arch eq "aarch64") { + # Convert "b.eq" into "beq" + $line =~ s/\bb\.($arm_cond_codes)\b/b\1/; + } + + # catch unknown section names that aren't mach-o style (with a comma) + if ($as_type =~ /apple-/ and $line =~ /.section ([^,]*)$/) { + die ".section $1 unsupported; figure out the mach-o section name and add it"; + } + + print ASMFILE $line; +} + +if ($as_type ne "armasm") { + print ASMFILE ".text\n"; + print ASMFILE ".align 2\n"; + foreach my $literal (keys %literal_labels) { + print ASMFILE "$literal_labels{$literal}:\n $literal_expr $literal\n"; + } + + map print(ASMFILE ".thumb_func $_\n"), + grep exists $thumb_labels{$_}, keys %call_targets; +} else { + map print(ASMFILE "\tIMPORT $_\n"), + grep ! exists $labels_seen{$_}, (keys %call_targets, keys %import_symbols); + + print ASMFILE "\tEND\n"; +} + +close(INPUT) or exit 1; +close(ASMFILE) or exit 1; +if ($as_type eq "armasm" and ! defined $ENV{GASPP_DEBUG}) { + print STDERR join(" ", @gcc_cmd)."\n" if $verbose; + system(@gcc_cmd) == 0 or die "Error running assembler"; +} + +END { + unlink($tempfile) if defined $tempfile; +} +#exit 1