diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34d314c55e..dcf2761983 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,9 +48,11 @@ jobs: cd $SOURCE_DIR + BUILD_NUMBER_OFFSET="$(cat build_number_offset)" + export APP_VERSION=$(cat versions.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["app"]);') export COMMIT_COUNT=$(git rev-list --count HEAD) - export COMMIT_COUNT="$(($COMMIT_COUNT+2000))" + export COMMIT_COUNT="$(($COMMIT_COUNT+$BUILD_NUMBER_OFFSET))" export BUILD_NUMBER="$COMMIT_COUNT" echo "BUILD_NUMBER=$(echo $BUILD_NUMBER)" >> $GITHUB_ENV echo "APP_VERSION=$(echo $APP_VERSION)" >> $GITHUB_ENV diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8cad4dbc1..153e1667a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,7 @@ beta_testflight: stage: build only: - beta + - hotfix except: - tags script: @@ -87,6 +88,7 @@ deploy_beta_testflight: stage: deploy only: - beta + - hotfix except: - tags script: @@ -100,6 +102,7 @@ verifysanity_beta_testflight: stage: verifysanity only: - beta + - hotfix except: - tags script: @@ -118,6 +121,7 @@ verify_beta_testflight: stage: verify only: - beta + - hotfix except: - tags script: diff --git a/Random.txt b/Random.txt index 27ef252295..b9f017556d 100644 --- a/Random.txt +++ b/Random.txt @@ -1 +1 @@ -6098b6ed7c06e42f7bb7226e92744e7951c4c3f89787d702280f907e68a60a15 +6eb592f57eca2cd3cda976727ba368ed diff --git a/Telegram/Telegram-iOS/Resources/VoiceCancelReminder.tgs b/Telegram/Telegram-iOS/Resources/VoiceCancelReminder.tgs new file mode 100644 index 0000000000..133d47e1e1 Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceCancelReminder.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToMute.tgs new file mode 100644 index 0000000000..dbd7cd7e93 Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToMute.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToRaiseHand.tgs new file mode 100644 index 0000000000..bc8c45ab81 Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToRaiseHand.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHandOff.tgs b/Telegram/Telegram-iOS/Resources/VoiceHandOff.tgs deleted file mode 100644 index 3e20f03395..0000000000 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHandOff.tgs and /dev/null differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHandOff2.tgs b/Telegram/Telegram-iOS/Resources/VoiceHandOff2.tgs deleted file mode 100644 index ed44efc0ba..0000000000 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHandOff2.tgs and /dev/null differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHandOn.tgs b/Telegram/Telegram-iOS/Resources/VoiceHandOn.tgs deleted file mode 100644 index f0db083d4f..0000000000 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHandOn.tgs and /dev/null differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs index 09612a30a1..8a7845594e 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_10.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_10.tgs new file mode 100644 index 0000000000..f49670a841 Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceHand_10.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs index 5664e4df5b..0fd6090d7d 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs index ea6710d819..3ef3620507 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs index 49e54790cf..0c20c2a4e8 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs index 396e572397..0675d255d6 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs index 04a797f9b4..fdadd74a8e 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs index dd03e566ba..74a6db1b1f 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_8.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_8.tgs new file mode 100644 index 0000000000..b4ef9e3e02 Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceHand_8.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_9.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_9.tgs new file mode 100644 index 0000000000..e1d4e9965b Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceHand_9.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceMute.tgs index a6d20bddcc..533a7a6a2e 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceMute.tgs and b/Telegram/Telegram-iOS/Resources/VoiceMute.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceMuteToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceMuteToRaiseHand.tgs new file mode 100644 index 0000000000..6424171527 Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceMuteToRaiseHand.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceRaiseHandToMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceRaiseHandToMute.tgs new file mode 100644 index 0000000000..ac08b6eb7f Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceRaiseHandToMute.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceSetReminder.tgs b/Telegram/Telegram-iOS/Resources/VoiceSetReminder.tgs new file mode 100644 index 0000000000..fe22c2c4ea Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceSetReminder.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceSetReminderToMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToMute.tgs new file mode 100644 index 0000000000..6edae3e5c2 Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToMute.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceSetReminderToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToRaiseHand.tgs new file mode 100644 index 0000000000..802ca82bde Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToRaiseHand.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceStart.tgs b/Telegram/Telegram-iOS/Resources/VoiceStart.tgs new file mode 100644 index 0000000000..de31e33e5b Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceStart.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs b/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs index 2f38fb678f..57d546d4d2 100644 Binary files a/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs and b/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs differ diff --git a/Telegram/Telegram-iOS/Resources/VoiceUnmuteToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceUnmuteToRaiseHand.tgs new file mode 100644 index 0000000000..0c0d781c7b Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceUnmuteToRaiseHand.tgs differ diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index f56b71fb20..2d5de8ec28 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -104,9 +104,8 @@ "PUSH_MESSAGES_1" = "%1$@|sent you a message"; "PUSH_MESSAGES_any" = "%1$@|sent you %2$d messages"; "PUSH_ALBUM" = "%1$@|sent you an album"; -"PUSH_MESSAGE_DOCS" = "%1$@|sent you %2$d files"; -"PUSH_MESSAGE_DOCS_1" = "%1$@|sent you a file"; -"PUSH_MESSAGE_DOCS_any" = "%1$@|sent you %2$d files"; +"PUSH_MESSAGE_FILES_1" = "%1$@|sent you a file"; +"PUSH_MESSAGE_FILES_any" = "%1$@|sent you %2$d files"; "PUSH_CHANNEL_MESSAGE_TEXT" = "%1$@|%2$@"; @@ -2552,7 +2551,6 @@ Unused sets are archived when you add more."; "Message.ForwardedMessageShort" = "Forwarded From\n%@"; "Checkout.LiabilityAlertTitle" = "Warning"; -"Checkout.LiabilityAlert" = "Neither Telegram, nor %1$@ will have access to your credit card information. Credit card details will be handled only by the payment system, %2$@.\n\nPayments will go directly to the developer of %1$@. Telegram cannot provide any guarantees, so proceed at your own risk. In case of problems, please contact the developer of %1$@ or your bank."; "Settings.AppLanguage" = "Language"; "Settings.AppLanguage.Unofficial" = "UNOFFICIAL"; @@ -5742,6 +5740,7 @@ Sorry for the inconvenience."; "Notification.VoiceChatStarted" = "%1$@ started a voice chat"; "Notification.VoiceChatEnded" = "Voice chat ended (%@)"; +"Notification.VoiceChatEndedGroup" = "%1$@ ended the voice chat (%2$@)"; "VoiceChat.Panel.TapToJoin" = "Tap to join"; "VoiceChat.Panel.Members_0" = "%@ participants"; @@ -5774,6 +5773,8 @@ Sorry for the inconvenience."; "VoiceChat.CreateNewVoiceChatText" = "Voice chat ended. Start a new one?"; "VoiceChat.CreateNewVoiceChatStart" = "Start"; +"VoiceChat.CreateNewVoiceChatStartNow" = "Start Now"; +"VoiceChat.CreateNewVoiceChatSchedule" = "Schedule"; "PUSH_CHAT_VOICECHAT_START" = "%2$@|%1$@ started a voice chat"; "PUSH_CHAT_VOICECHAT_INVITE" = "%2$@|%1$@ invited %3$@ to the voice chat"; @@ -6293,6 +6294,7 @@ Sorry for the inconvenience."; "VoiceChat.LeaveConfirmation" = "Are you sure you want to leave this voice chat?"; "VoiceChat.LeaveVoiceChat" = "Leave Voice Chat"; "VoiceChat.LeaveAndEndVoiceChat" = "End Voice Chat"; +"VoiceChat.LeaveAndCancelVoiceChat" = "Abort Voice Chat"; "VoiceChat.ForwardTooltip.Chat" = "Invite link forwarded to **%@**"; "VoiceChat.ForwardTooltip.TwoChats" = "Invite link forwarded to **%@** and **%@**"; @@ -6319,6 +6321,13 @@ Sorry for the inconvenience."; "VoiceChat.EditBioSave" = "Save"; "VoiceChat.EditBioSuccess" = "Your bio is changed."; +"VoiceChat.EditDescription" = "Edit Description"; +"VoiceChat.EditDescriptionTitle" = "Description"; +"VoiceChat.EditDescriptionText" = "Any details such as age, occupation or city."; +"VoiceChat.EditDescriptionPlaceholder" = "Description"; +"VoiceChat.EditDescriptionSave" = "Save"; +"VoiceChat.EditDescriptionSuccess" = "Description is changed."; + "VoiceChat.SendPublicLinkText" = "%1$@ isn't a member of \"%2$@\" yet. Send them a public invite link instead?"; "VoiceChat.SendPublicLinkSend" = "Send"; @@ -6338,4 +6347,114 @@ Sorry for the inconvenience."; "VoiceChat.PinVideo" = "Pin Video"; "VoiceChat.UnpinVideo" = "Unpin Video"; -"Notification.VoiceChatScheduled" = "Voice chat scheduled"; +"Notification.VoiceChatScheduledChannel" = "Voice chat scheduled for %@"; +"Notification.VoiceChatScheduled" = "%1$@ scheduled a voice chat for %2$@"; + +"Notification.VoiceChatScheduledTodayChannel" = "Voice chat scheduled for today at %@"; +"Notification.VoiceChatScheduledToday" = "%1$@ scheduled a voice chat for today at %2$@"; + +"Notification.VoiceChatScheduledTomorrowChannel" = "Voice chat scheduled for tomorrow at %@"; +"Notification.VoiceChatScheduledTomorrow" = "%1$@ scheduled a voice chat for tomorrow at %2$@"; + +"VoiceChat.StartsIn" = "Starts in"; +"VoiceChat.LateBy" = "Late by"; + +"VoiceChat.StatusStartsIn" = "starts in %@"; +"VoiceChat.StatusLateBy" = "late by %@"; + +"VoiceChat.Scheduled" = "Scheduled"; + +"VoiceChat.StartNow" = "Start Now"; +"VoiceChat.SetReminder" = "Set Reminder"; +"VoiceChat.CancelReminder" = "Cancel Reminder"; + +"VoiceChat.ShareShort" = "share"; +"VoiceChat.TapToEditTitle" = "Tap to edit title"; + +"ChannelInfo.ScheduleVoiceChat" = "Schedule Voice Chat"; + +"ScheduleVoiceChat.Title" = "Schedule Voice Chat"; +"ScheduleVoiceChat.GroupText" = "The members of the group will be notified that the voice chat will start in %@."; +"ScheduleVoiceChat.ChannelText" = "The members of the channel will be notified that the voice chat will start in %@."; + +"ScheduleVoiceChat.ScheduleToday" = "Start today at %@"; +"ScheduleVoiceChat.ScheduleTomorrow" = "Start tomorrow at %@"; +"ScheduleVoiceChat.ScheduleOn" = "Start on %@ at %@"; + +"Conversation.ScheduledVoiceChat" = "Scheduled Voice Chat"; + +"Conversation.ScheduledVoiceChatStartsOn" = "Voice chat starts on %@"; +"Conversation.ScheduledVoiceChatStartsOnShort" = "Starts on %@"; +"Conversation.ScheduledVoiceChatStartsToday" = "Voice chat starts today at %@"; +"Conversation.ScheduledVoiceChatStartsTodayShort" = "Starts today at %@"; +"Conversation.ScheduledVoiceChatStartsTomorrow" = "Voice chat starts tomorrow at %@"; +"Conversation.ScheduledVoiceChatStartsTomorrowShort" = "Starts tomorrow at %@"; + +"VoiceChat.CancelVoiceChat" = "Abort Voice Chat"; +"VoiceChat.CancelConfirmationTitle" = "Abort Voice Chat"; +"VoiceChat.CancelConfirmationText" = "Do you want to abort the scheduled voice chat?"; +"VoiceChat.CancelConfirmationEnd" = "Abort"; + +"ScheduledIn.Seconds_1" = "%@ second"; +"ScheduledIn.Seconds_2" = "%@ seconds"; +"ScheduledIn.Seconds_3_10" = "%@ seconds"; +"ScheduledIn.Seconds_any" = "%@ seconds"; +"ScheduledIn.Seconds_many" = "%@ seconds"; +"ScheduledIn.Seconds_0" = "%@ seconds"; +"ScheduledIn.Minutes_1" = "%@ minute"; +"ScheduledIn.Minutes_2" = "%@ minutes"; +"ScheduledIn.Minutes_3_10" = "%@ minutes"; +"ScheduledIn.Minutes_any" = "%@ minutes"; +"ScheduledIn.Minutes_many" = "%@ minutes"; +"ScheduledIn.Minutes_0" = "%@ minutes"; +"ScheduledIn.Hours_1" = "%@ hour"; +"ScheduledIn.Hours_2" = "%@ hours"; +"ScheduledIn.Hours_3_10" = "%@ hours"; +"ScheduledIn.Hours_any" = "%@ hours"; +"ScheduledIn.Hours_many" = "%@ hours"; +"ScheduledIn.Hours_0" = "%@ hours"; +"ScheduledIn.Days_1" = "%@ day"; +"ScheduledIn.Days_2" = "%@ days"; +"ScheduledIn.Days_3_10" = "%@ days"; +"ScheduledIn.Days_any" = "%@ days"; +"ScheduledIn.Days_many" = "%@ days"; +"ScheduledIn.Days_0" = "%@ days"; +"ScheduledIn.Weeks_1" = "%@ week"; +"ScheduledIn.Weeks_2" = "%@ weeks"; +"ScheduledIn.Weeks_3_10" = "%@ weeks"; +"ScheduledIn.Weeks_any" = "%@ weeks"; +"ScheduledIn.Weeks_many" = "%@ weeks"; +"ScheduledIn.Weeks_0" = "%@ weeks"; +"ScheduledIn.Months_1" = "%@ month"; +"ScheduledIn.Months_2" = "%@ months"; +"ScheduledIn.Months_3_10" = "%@ months"; +"ScheduledIn.Months_any" = "%@ months"; +"ScheduledIn.Months_many" = "%@ months"; +"ScheduledIn.Months_0" = "%@ months"; +"ScheduledIn.Years_1" = "%@ year"; +"ScheduledIn.Years_2" = "%@ years"; +"ScheduledIn.Years_3_10" = "%@ years"; +"ScheduledIn.Years_any" = "%@ years"; +"ScheduledIn.Months_many" = "%@ years"; + +"Checkout.PaymentLiabilityAlert" = "Neither Telegram, nor {target} will have access to your credit card information. Credit card details will be handled only by the payment system, {payment_system}.\n\nPayments will go directly to the developer of {target}. Telegram cannot provide any guarantees, so proceed at your own risk. In case of problems, please contact the developer of {target} or your bank."; + +"Checkout.OptionalTipItem" = "Tip (Optional)"; +"Checkout.TipItem" = "Tip"; +"Checkout.OptionalTipItemPlaceholder" = "Enter Custom"; + +"VoiceChat.ReminderNotify" = "We will notify you when it starts."; + +"Checkout.SuccessfulTooltip" = "You paid %1$@ for %2$@."; + + +"Privacy.ContactsReset.ContactsDeleted" = "All synced contacts deleted."; + +"Privacy.DeleteDrafts.DraftsDeleted" = "All cloud drafts deleted."; + +"Privacy.PaymentsClear.PaymentInfoCleared" = "Payment info cleared."; +"Privacy.PaymentsClear.ShippingInfoCleared" = "Shipping info cleared."; +"Privacy.PaymentsClear.AllInfoCleared" = "Payment and shipping info cleared."; + +"Settings.Tips" = "Telegram Features"; +"Settings.TipsUsername" = "TelegramTips"; diff --git a/build_number_offset b/build_number_offset new file mode 100644 index 0000000000..a97f893390 --- /dev/null +++ b/build_number_offset @@ -0,0 +1 @@ +2100 diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh index 70b300f4ae..f2bc29956c 100644 --- a/buildbox/build-telegram.sh +++ b/buildbox/build-telegram.sh @@ -79,7 +79,8 @@ COMMIT_ID="$(git rev-parse HEAD)" COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an') if [ -z "$2" ]; then COMMIT_COUNT=$(git rev-list --count HEAD) - COMMIT_COUNT="$(($COMMIT_COUNT+2000))" + BUILD_NUMBER_OFFSET="$(cat build_number_offset)" + COMMIT_COUNT="$(($COMMIT_COUNT+$BUILD_NUMBER_OFFSET))" BUILD_NUMBER="$COMMIT_COUNT" else BUILD_NUMBER="$2" diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift index bfc8bcf819..1b3bd875fe 100644 --- a/submodules/AccountContext/Sources/AccountContext.swift +++ b/submodules/AccountContext/Sources/AccountContext.swift @@ -736,6 +736,7 @@ public protocol AccountContext: class { func chatLocationOutgoingReadState(for location: ChatLocation, contextHolder: Atomic) -> Signal func applyMaxReadIndex(for location: ChatLocation, contextHolder: Atomic, messageIndex: MessageIndex) + func scheduleGroupCall(peerId: PeerId) func joinGroupCall(peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, activeCall: CachedChannelData.ActiveCall) func requestCall(peerId: PeerId, isVideo: Bool, completion: @escaping () -> Void) } diff --git a/submodules/AccountContext/Sources/PresentationCallManager.swift b/submodules/AccountContext/Sources/PresentationCallManager.swift index 1d2f24abee..408938bd30 100644 --- a/submodules/AccountContext/Sources/PresentationCallManager.swift +++ b/submodules/AccountContext/Sources/PresentationCallManager.swift @@ -17,6 +17,11 @@ public enum JoinGroupCallManagerResult { case alreadyInProgress(PeerId?) } +public enum RequestScheduleGroupCallResult { + case success + case alreadyInProgress(PeerId?) +} + public struct CallAuxiliaryServer { public enum Connection { case stun @@ -181,6 +186,8 @@ public struct PresentationGroupCallState: Equatable { public var recordingStartTimestamp: Int32? public var title: String? public var raisedHand: Bool + public var scheduleTimestamp: Int32? + public var subscribedToScheduled: Bool public init( myPeerId: PeerId, @@ -191,7 +198,9 @@ public struct PresentationGroupCallState: Equatable { defaultParticipantMuteState: DefaultParticipantMuteState?, recordingStartTimestamp: Int32?, title: String?, - raisedHand: Bool + raisedHand: Bool, + scheduleTimestamp: Int32?, + subscribedToScheduled: Bool ) { self.myPeerId = myPeerId self.networkState = networkState @@ -202,6 +211,8 @@ public struct PresentationGroupCallState: Equatable { self.recordingStartTimestamp = recordingStartTimestamp self.title = title self.raisedHand = raisedHand + self.scheduleTimestamp = scheduleTimestamp + self.subscribedToScheduled = subscribedToScheduled } } @@ -299,6 +310,8 @@ public protocol PresentationGroupCall: class { var isVideo: Bool { get } + var schedulePending: Bool { get } + var audioOutputState: Signal<([AudioSessionOutput], AudioSessionOutput?), NoError> { get } var canBeRemoved: Signal { get } @@ -313,6 +326,10 @@ public protocol PresentationGroupCall: class { var memberEvents: Signal { get } var reconnectedAsEvents: Signal { get } + func toggleScheduledSubscription(_ subscribe: Bool) + func schedule(timestamp: Int32) + func startScheduled() + func reconnect(with invite: String) func reconnect(as peerId: PeerId) func leave(terminateIfPossible: Bool) -> Signal @@ -356,4 +373,5 @@ public protocol PresentationCallManager: class { func requestCall(context: AccountContext, peerId: PeerId, isVideo: Bool, endCurrentIfAny: Bool) -> RequestCallResult func joinGroupCall(context: AccountContext, peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, initialCall: CachedChannelData.ActiveCall, endCurrentIfAny: Bool) -> JoinGroupCallManagerResult + func scheduleGroupCall(context: AccountContext, peerId: PeerId, endCurrentIfAny: Bool) -> RequestScheduleGroupCallResult } diff --git a/submodules/BotPaymentsUI/BUILD b/submodules/BotPaymentsUI/BUILD index f7213427bf..d917b67fe4 100644 --- a/submodules/BotPaymentsUI/BUILD +++ b/submodules/BotPaymentsUI/BUILD @@ -22,6 +22,8 @@ swift_library( "//submodules/CountrySelectionUI:CountrySelectionUI", "//submodules/AppBundle:AppBundle", "//submodules/PresentationDataUtils:PresentationDataUtils", + "//submodules/OverlayStatusController:OverlayStatusController", + "//submodules/ShimmerEffect:ShimmerEffect", ], visibility = [ "//visibility:public", diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift index 70ccb3b58e..e784f933b6 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift @@ -3,103 +3,49 @@ import UIKit import AsyncDisplayKit import Display import PassKit +import ShimmerEffect enum BotCheckoutActionButtonState: Equatable { - case loading case active(String) - case inactive(String) case applePay - - static func ==(lhs: BotCheckoutActionButtonState, rhs: BotCheckoutActionButtonState) -> Bool { - switch lhs { - case .loading: - if case .loading = rhs { - return true - } else { - return false - } - case let .active(title): - if case .active(title) = rhs { - return true - } else { - return false - } - case let .inactive(title): - if case .inactive(title) = rhs { - return true - } else { - return false - } - case .applePay: - if case .applePay = rhs { - return true - } else { - return false - } - } - } + case placeholder } private let titleFont = Font.semibold(17.0) final class BotCheckoutActionButton: HighlightableButtonNode { - static var diameter: CGFloat = 48.0 - - private var inactiveFillColor: UIColor + static var height: CGFloat = 52.0 + private var activeFillColor: UIColor private var foregroundColor: UIColor - - private let progressBackgroundNode: ASImageNode - private let inactiveBackgroundNode: ASImageNode + private let activeBackgroundNode: ASImageNode private var applePayButton: UIButton? private let labelNode: TextNode private var state: BotCheckoutActionButtonState? - private var validLayout: CGSize? + private var validLayout: (CGRect, CGSize)? + + private var placeholderNode: ShimmerEffectNode? - init(inactiveFillColor: UIColor, activeFillColor: UIColor, foregroundColor: UIColor) { - self.inactiveFillColor = inactiveFillColor + init(activeFillColor: UIColor, foregroundColor: UIColor) { self.activeFillColor = activeFillColor self.foregroundColor = foregroundColor - - self.progressBackgroundNode = ASImageNode() - self.progressBackgroundNode.displaysAsynchronously = false - self.progressBackgroundNode.displayWithoutProcessing = true - self.progressBackgroundNode.isLayerBacked = true - self.progressBackgroundNode.image = generateImage(CGSize(width: BotCheckoutActionButton.diameter, height: BotCheckoutActionButton.diameter), rotatedContext: { size, context in - context.clear(CGRect(origin: CGPoint(), size: size)) - let strokeWidth: CGFloat = 2.0 - context.setFillColor(activeFillColor.cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(), size: size)) - - context.setFillColor(inactiveFillColor.cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(x: strokeWidth, y: strokeWidth), size: CGSize(width: size.width - strokeWidth * 2.0, height: size.height - strokeWidth * 2.0))) - let cutout: CGFloat = 10.0 - context.fill(CGRect(origin: CGPoint(x: floor((size.width - cutout) / 2.0), y: 0.0), size: CGSize(width: cutout, height: cutout))) - }) - - self.inactiveBackgroundNode = ASImageNode() - self.inactiveBackgroundNode.displaysAsynchronously = false - self.inactiveBackgroundNode.displayWithoutProcessing = true - self.inactiveBackgroundNode.isLayerBacked = true - self.inactiveBackgroundNode.image = generateStretchableFilledCircleImage(diameter: BotCheckoutActionButton.diameter, color: self.foregroundColor, strokeColor: activeFillColor, strokeWidth: 2.0) - self.inactiveBackgroundNode.alpha = 0.0 + + let diameter: CGFloat = 20.0 self.activeBackgroundNode = ASImageNode() self.activeBackgroundNode.displaysAsynchronously = false self.activeBackgroundNode.displayWithoutProcessing = true self.activeBackgroundNode.isLayerBacked = true - self.activeBackgroundNode.image = generateStretchableFilledCircleImage(diameter: BotCheckoutActionButton.diameter, color: activeFillColor) + self.activeBackgroundNode.image = generateStretchableFilledCircleImage(diameter: diameter, color: activeFillColor) self.labelNode = TextNode() self.labelNode.displaysAsynchronously = false self.labelNode.isUserInteractionEnabled = false super.init() - - self.addSubnode(self.progressBackgroundNode) - self.addSubnode(self.inactiveBackgroundNode) + self.addSubnode(self.activeBackgroundNode) self.addSubnode(self.labelNode) } @@ -109,151 +55,91 @@ final class BotCheckoutActionButton: HighlightableButtonNode { let previousState = self.state self.state = state - if let validLayout = self.validLayout, let previousState = previousState { - switch state { - case .loading: - self.inactiveBackgroundNode.layer.animateFrame(from: self.inactiveBackgroundNode.frame, to: self.progressBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) - if !self.inactiveBackgroundNode.alpha.isZero { - self.inactiveBackgroundNode.alpha = 0.0 - self.inactiveBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3) - } - self.activeBackgroundNode.layer.animateFrame(from: self.activeBackgroundNode.frame, to: self.progressBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) - self.activeBackgroundNode.alpha = 0.0 - self.activeBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3) - self.labelNode.alpha = 0.0 - self.labelNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3) - - self.progressBackgroundNode.alpha = 1.0 - self.progressBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3) - - let basicAnimation = CABasicAnimation(keyPath: "transform.rotation.z") - basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) - basicAnimation.duration = 0.8 - basicAnimation.fromValue = NSNumber(value: Float(0.0)) - basicAnimation.toValue = NSNumber(value: Float.pi * 2.0) - basicAnimation.repeatCount = Float.infinity - basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear) - - self.progressBackgroundNode.layer.add(basicAnimation, forKey: "progressRotation") - case let .active(title): - if case .active = previousState { - let makeLayout = TextNode.asyncLayout(self.labelNode) - let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size) - let _ = labelApply() - } else { - self.inactiveBackgroundNode.layer.animateFrame(from: self.progressBackgroundNode.frame, to: self.activeBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) - self.inactiveBackgroundNode.alpha = 1.0 - self.progressBackgroundNode.alpha = 0.0 - - self.activeBackgroundNode.layer.animateFrame(from: self.progressBackgroundNode.frame, to: self.activeBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) - self.activeBackgroundNode.alpha = 1.0 - self.activeBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) - - let makeLayout = TextNode.asyncLayout(self.labelNode) - let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size) - let _ = labelApply() - self.labelNode.alpha = 1.0 - self.labelNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3) - } - case let .inactive(title): - if case .inactive = previousState { - let makeLayout = TextNode.asyncLayout(self.labelNode) - let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.activeFillColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size) - let _ = labelApply() - } else { - self.inactiveBackgroundNode.layer.animateFrame(from: self.inactiveBackgroundNode.frame, to: self.activeBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) - self.inactiveBackgroundNode.alpha = 1.0 - self.progressBackgroundNode.alpha = 0.0 - - self.activeBackgroundNode.alpha = 0.0 - - let makeLayout = TextNode.asyncLayout(self.labelNode) - let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size) - let _ = labelApply() - self.labelNode.alpha = 1.0 - self.labelNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3) - } - case .applePay: - if case .applePay = previousState { - - } else { - - } - } - } else { - switch state { - case .loading: - self.labelNode.alpha = 0.0 - self.progressBackgroundNode.alpha = 1.0 - self.activeBackgroundNode.alpha = 0.0 - - let basicAnimation = CABasicAnimation(keyPath: "transform.rotation.z") - basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) - basicAnimation.duration = 0.8 - basicAnimation.fromValue = NSNumber(value: Float(0.0)) - basicAnimation.toValue = NSNumber(value: Float.pi * 2.0) - basicAnimation.repeatCount = Float.infinity - basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear) - - self.progressBackgroundNode.layer.add(basicAnimation, forKey: "progressRotation") - case .active: - self.labelNode.alpha = 1.0 - self.progressBackgroundNode.alpha = 0.0 - self.inactiveBackgroundNode.alpha = 0.0 - self.activeBackgroundNode.alpha = 1.0 - case .inactive: - self.labelNode.alpha = 1.0 - self.progressBackgroundNode.alpha = 0.0 - self.inactiveBackgroundNode.alpha = 1.0 - self.activeBackgroundNode.alpha = 0.0 - case .applePay: - self.labelNode.alpha = 0.0 - self.progressBackgroundNode.alpha = 0.0 - self.inactiveBackgroundNode.alpha = 0.0 - self.activeBackgroundNode.alpha = 0.0 - if self.applePayButton == nil { - if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { - let applePayButton = PKPaymentButton(paymentButtonType: .buy, paymentButtonStyle: .black) - self.view.addSubview(applePayButton) - self.applePayButton = applePayButton - } - } - } + if let (absoluteRect, containerSize) = self.validLayout, let previousState = previousState { + self.updateLayout(absoluteRect: absoluteRect, containerSize: containerSize, transition: .immediate) } } } + + @objc private func applePayButtonPressed() { + self.sendActions(forControlEvents: .touchUpInside, with: nil) + } - func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) { - self.validLayout = size - - transition.updateFrame(node: self.progressBackgroundNode, frame: CGRect(origin: CGPoint(x: floor((size.width - BotCheckoutActionButton.diameter) / 2.0), y: 0.0), size: CGSize(width: BotCheckoutActionButton.diameter, height: BotCheckoutActionButton.diameter))) - transition.updateFrame(node: self.inactiveBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.diameter))) - transition.updateFrame(node: self.activeBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.diameter))) - if let applePayButton = self.applePayButton { - applePayButton.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.diameter)) - } + func updateLayout(absoluteRect: CGRect, containerSize: CGSize, transition: ContainedViewLayoutTransition) { + let size = absoluteRect.size + + self.validLayout = (absoluteRect, containerSize) + + transition.updateFrame(node: self.activeBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.height))) var labelSize = self.labelNode.bounds.size if let state = self.state { switch state { - case let .active(title): - let makeLayout = TextNode.asyncLayout(self.labelNode) - let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: size, alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let _ = labelApply() - labelSize = labelLayout.size - case let .inactive(title): - let makeLayout = TextNode.asyncLayout(self.labelNode) - let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.activeFillColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: size, alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let _ = labelApply() - labelSize = labelLayout.size - default: - break + case let .active(title): + if let applePayButton = self.applePayButton { + self.applePayButton = nil + applePayButton.removeFromSuperview() + } + + if let placeholderNode = self.placeholderNode { + self.placeholderNode = nil + placeholderNode.removeFromSupernode() + } + + let makeLayout = TextNode.asyncLayout(self.labelNode) + let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: size, alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + let _ = labelApply() + labelSize = labelLayout.size + case .applePay: + if self.applePayButton == nil { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { + let applePayButton: PKPaymentButton + if #available(iOS 14.0, *) { + applePayButton = PKPaymentButton(paymentButtonType: .buy, paymentButtonStyle: .black) + } else { + applePayButton = PKPaymentButton(paymentButtonType: .buy, paymentButtonStyle: .black) + } + applePayButton.addTarget(self, action: #selector(self.applePayButtonPressed), for: .touchUpInside) + self.view.addSubview(applePayButton) + self.applePayButton = applePayButton + } + } + + if let placeholderNode = self.placeholderNode { + self.placeholderNode = nil + placeholderNode.removeFromSupernode() + } + + if let applePayButton = self.applePayButton { + applePayButton.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.height)) + } + case .placeholder: + if let applePayButton = self.applePayButton { + self.applePayButton = nil + applePayButton.removeFromSuperview() + } + + let contentSize = CGSize(width: 80.0, height: 8.0) + + let shimmerNode: ShimmerEffectNode + if let current = self.placeholderNode { + shimmerNode = current + } else { + shimmerNode = ShimmerEffectNode() + self.placeholderNode = shimmerNode + self.addSubnode(shimmerNode) + } + shimmerNode.frame = CGRect(origin: CGPoint(x: floor((size.width - contentSize.width) / 2.0), y: floor((size.height - contentSize.height) / 2.0)), size: contentSize) + shimmerNode.updateAbsoluteRect(CGRect(origin: CGPoint(x: absoluteRect.minX + shimmerNode.frame.minX, y: absoluteRect.minY + shimmerNode.frame.minY), size: contentSize), within: containerSize) + + var shapes: [ShimmerEffectNode.Shape] = [] + + shapes.append(.roundedRectLine(startPoint: CGPoint(x: 0.0, y: 0.0), width: contentSize.width, diameter: contentSize.height)) + + shimmerNode.update(backgroundColor: self.activeFillColor, foregroundColor: self.activeFillColor.mixedWith(UIColor.white, alpha: 0.25), shimmeringColor: self.activeFillColor.mixedWith(UIColor.white, alpha: 0.15), shapes: shapes, size: contentSize) } } + transition.updateFrame(node: self.labelNode, frame: CGRect(origin: CGPoint(x: floor((size.width - labelSize.width) / 2.0), y: floor((size.height - labelSize.height) / 2.0)), size: labelSize)) } } diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift index c79efa6d0a..93adaa12f1 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift @@ -10,6 +10,64 @@ import TelegramPresentationData import AccountContext public final class BotCheckoutController: ViewController { + public final class InputData { + public enum FetchError { + case generic + } + + let form: BotPaymentForm + let validatedFormInfo: BotPaymentValidatedFormInfo? + + private init( + form: BotPaymentForm, + validatedFormInfo: BotPaymentValidatedFormInfo? + ) { + self.form = form + self.validatedFormInfo = validatedFormInfo + } + + public static func fetch(context: AccountContext, messageId: MessageId) -> Signal { + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let themeParams: [String: Any] = [ + "bg_color": Int32(bitPattern: presentationData.theme.list.plainBackgroundColor.argb), + "text_color": Int32(bitPattern: presentationData.theme.list.itemPrimaryTextColor.argb), + "link_color": Int32(bitPattern: presentationData.theme.list.itemAccentColor.argb), + "button_color": Int32(bitPattern: presentationData.theme.list.itemCheckColors.fillColor.argb), + "button_text_color": Int32(bitPattern: presentationData.theme.list.itemCheckColors.foregroundColor.argb) + ] + + return fetchBotPaymentForm(postbox: context.account.postbox, network: context.account.network, messageId: messageId, themeParams: themeParams) + |> mapError { _ -> FetchError in + return .generic + } + |> mapToSignal { paymentForm -> Signal in + if let current = paymentForm.savedInfo { + return validateBotPaymentForm(account: context.account, saveInfo: true, messageId: messageId, formInfo: current) + |> mapError { _ -> FetchError in + return .generic + } + |> map { result -> InputData in + return InputData( + form: paymentForm, + validatedFormInfo: result + ) + } + |> `catch` { _ -> Signal in + return .single(InputData( + form: paymentForm, + validatedFormInfo: nil + )) + } + } else { + return .single(InputData( + form: paymentForm, + validatedFormInfo: nil + )) + } + } + } + } + private var controllerNode: BotCheckoutControllerNode { return self.displayNode as! BotCheckoutControllerNode } @@ -22,15 +80,20 @@ public final class BotCheckoutController: ViewController { private let context: AccountContext private let invoice: TelegramMediaInvoice private let messageId: MessageId + private let completed: (String, MessageId?) -> Void private var presentationData: PresentationData private var didPlayPresentationAnimation = false + + private let inputData: Promise - public init(context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId) { + public init(context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, inputData: Promise, completed: @escaping (String, MessageId?) -> Void) { self.context = context self.invoice = invoice self.messageId = messageId + self.inputData = inputData + self.completed = completed self.presentationData = context.sharedContext.currentPresentationData.with { $0 } @@ -52,15 +115,15 @@ public final class BotCheckoutController: ViewController { } override public func loadDisplayNode() { - let displayNode = BotCheckoutControllerNode(controller: nil, navigationBar: self.navigationBar!, updateNavigationOffset: { [weak self] offset in + let displayNode = BotCheckoutControllerNode(controller: self, navigationBar: self.navigationBar!, updateNavigationOffset: { [weak self] offset in if let strongSelf = self { strongSelf.navigationOffset = offset } - }, context: self.context, invoice: self.invoice, messageId: self.messageId, present: { [weak self] c, a in + }, context: self.context, invoice: self.invoice, messageId: self.messageId, inputData: self.inputData, present: { [weak self] c, a in self?.present(c, in: .window(.root), with: a) }, dismissAnimated: { [weak self] in self?.dismiss() - }) + }, completed: self.completed) //displayNode.enableInteractiveDismiss = true diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift index de912fe2c1..cf03bb4a04 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift @@ -18,20 +18,23 @@ import TelegramStringFormatting import PasswordSetupUI import Stripe import LocalAuth +import OverlayStatusController final class BotCheckoutControllerArguments { fileprivate let account: Account fileprivate let openInfo: (BotCheckoutInfoControllerFocus) -> Void fileprivate let openPaymentMethod: () -> Void fileprivate let openShippingMethod: () -> Void - fileprivate let openTip: () -> Void + fileprivate let updateTip: (Int64) -> Void + fileprivate let ensureTipInputVisible: () -> Void - fileprivate init(account: Account, openInfo: @escaping (BotCheckoutInfoControllerFocus) -> Void, openPaymentMethod: @escaping () -> Void, openShippingMethod: @escaping () -> Void, openTip: @escaping () -> Void) { + fileprivate init(account: Account, openInfo: @escaping (BotCheckoutInfoControllerFocus) -> Void, openPaymentMethod: @escaping () -> Void, openShippingMethod: @escaping () -> Void, updateTip: @escaping (Int64) -> Void, ensureTipInputVisible: @escaping () -> Void) { self.account = account self.openInfo = openInfo self.openPaymentMethod = openPaymentMethod self.openShippingMethod = openShippingMethod - self.openTip = openTip + self.updateTip = updateTip + self.ensureTipInputVisible = ensureTipInputVisible } } @@ -42,35 +45,51 @@ private enum BotCheckoutSection: Int32 { } enum BotCheckoutEntry: ItemListNodeEntry { + enum StableId: Hashable { + case header + case price(Int) + case actionPlaceholder(Int) + case tip + case paymentMethod + case shippingInfo + case shippingMethod + case nameInfo + case emailInfo + case phoneInfo + } + case header(PresentationTheme, TelegramMediaInvoice, String) - case price(Int, PresentationTheme, String, String, Bool) - case tip(PresentationTheme, String, String) + case price(Int, PresentationTheme, String, String, Bool, Bool, Int?) + case tip(Int, PresentationTheme, String, String, String, Int64, Int64, [(String, Int64)]) case paymentMethod(PresentationTheme, String, String) case shippingInfo(PresentationTheme, String, String) case shippingMethod(PresentationTheme, String, String) case nameInfo(PresentationTheme, String, String) case emailInfo(PresentationTheme, String, String) case phoneInfo(PresentationTheme, String, String) + case actionPlaceholder(Int, Int) var section: ItemListSectionId { switch self { case .header: - return BotCheckoutSection.header.rawValue - case .price: + return BotCheckoutSection.prices.rawValue + case .price, .tip: return BotCheckoutSection.prices.rawValue default: return BotCheckoutSection.info.rawValue } } - var stableId: Int32 { + var sortId: Int32 { switch self { case .header: return 0 - case let .price(index, _, _, _, _): + case let .price(index, _, _, _, _, _, _): + return 1 + Int32(index) + case let .tip(index, _, _, _, _, _, _, _): + return 1 + Int32(index) + case let .actionPlaceholder(index, _): return 1 + Int32(index) - case .tip: - return 10000 + 1 case .paymentMethod: return 10000 + 2 case .shippingInfo: @@ -85,6 +104,31 @@ enum BotCheckoutEntry: ItemListNodeEntry { return 10000 + 7 } } + + var stableId: StableId { + switch self { + case .header: + return .header + case let .price(index, _, _, _, _, _, _): + return .price(index) + case .tip: + return .tip + case let .actionPlaceholder(index, _): + return .actionPlaceholder(index) + case .paymentMethod: + return .paymentMethod + case .shippingInfo: + return .shippingInfo + case .shippingMethod: + return .shippingMethod + case .nameInfo: + return .nameInfo + case .emailInfo: + return .emailInfo + case .phoneInfo: + return .phoneInfo + } + } static func ==(lhs: BotCheckoutEntry, rhs: BotCheckoutEntry) -> Bool { switch lhs { @@ -103,8 +147,8 @@ enum BotCheckoutEntry: ItemListNodeEntry { } else { return false } - case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsFinal): - if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsFinal) = rhs { + case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsFinal, lhsHasSeparator, lhsShimmeringIndex): + if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsFinal, rhsHasSeparator, rhsShimmeringIndex) = rhs { if lhsIndex != rhsIndex { return false } @@ -120,12 +164,29 @@ enum BotCheckoutEntry: ItemListNodeEntry { if lhsFinal != rhsFinal { return false } + if lhsHasSeparator != rhsHasSeparator { + return false + } + if lhsShimmeringIndex != rhsShimmeringIndex { + return false + } return true } else { return false } - case let .tip(lhsTheme, lhsText, lhsValue): - if case let .tip(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue { + case let .tip(lhsIndex, lhsTheme, lhsText, lhsCurrency, lhsValue, lhsNumericValue, lhsMaxValue, lhsVariants): + if case let .tip(rhsIndex, rhsTheme, rhsText, rhsCurrency, rhsValue, rhsNumericValue, rhsMaxValue, rhsVariants) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsText == rhsText, lhsCurrency == rhsCurrency, lhsValue == rhsValue, lhsNumericValue == rhsNumericValue, lhsMaxValue == rhsMaxValue { + if lhsVariants.count != rhsVariants.count { + return false + } + for i in 0 ..< lhsVariants.count { + if lhsVariants[i].0 != rhsVariants[i].0 { + return false + } + if lhsVariants[i].1 != rhsVariants[i].1 { + return false + } + } return true } else { return false @@ -166,11 +227,17 @@ enum BotCheckoutEntry: ItemListNodeEntry { } else { return false } + case let .actionPlaceholder(index, shimmeringIndex): + if case .actionPlaceholder(index, shimmeringIndex) = rhs { + return true + } else { + return false + } } } static func <(lhs: BotCheckoutEntry, rhs: BotCheckoutEntry) -> Bool { - return lhs.stableId < rhs.stableId + return lhs.sortId < rhs.sortId } func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem { @@ -178,11 +245,15 @@ enum BotCheckoutEntry: ItemListNodeEntry { switch self { case let .header(theme, invoice, botName): return BotCheckoutHeaderItem(account: arguments.account, theme: theme, invoice: invoice, botName: botName, sectionId: self.section) - case let .price(_, theme, text, value, isFinal): - return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, sectionId: self.section) - case let .tip(_, text, value): - return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { - arguments.openTip() + case let .price(_, theme, text, value, isFinal, hasSeparator, shimmeringIndex): + return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, hasSeparator: hasSeparator, shimmeringIndex: shimmeringIndex, sectionId: self.section) + case let .tip(_, _, text, currency, value, numericValue, maxValue, variants): + return BotCheckoutTipItem(theme: presentationData.theme, strings: presentationData.strings, title: text, currency: currency, value: value, numericValue: numericValue, maxValue: maxValue, availableVariants: variants, sectionId: self.section, updateValue: { value in + arguments.updateTip(value) + }, updatedFocus: { isFocused in + if isFocused { + arguments.ensureTipInputVisible() + } }) case let .paymentMethod(_, text, value): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { @@ -208,6 +279,9 @@ enum BotCheckoutEntry: ItemListNodeEntry { return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { arguments.openInfo(.phone) }) + case let .actionPlaceholder(_, shimmeringIndex): + return ItemListDisclosureItem(presentationData: presentationData, title: " ", label: " ", sectionId: self.section, style: .blocks, disclosureStyle: .none, action: { + }, shimmeringIndex: shimmeringIndex) } } } @@ -272,7 +346,7 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st var index = 0 for price in paymentForm.invoice.prices { - entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false)) + entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false, index == 0, nil)) totalPrice += price.amount index += 1 } @@ -286,7 +360,7 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st shippingOptionString = option.title for price in option.prices { - entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false)) + entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false, false, nil)) totalPrice += price.amount index += 1 } @@ -296,20 +370,27 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st } } } - - entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: paymentForm.invoice.currency), true)) + + if !entries.isEmpty { + switch entries[entries.count - 1] { + case let .price(index, theme, title, value, _, _, _): + entries[entries.count - 1] = .price(index, theme, title, value, false, index == 0, nil) + default: + break + } + } if let tip = paymentForm.invoice.tip { let tipTitle: String - //TODO:localize - if tip.min == 0 { - tipTitle = "Tip (Optional)" - } else { - tipTitle = "Tip" - } - entries.append(.tip(presentationData.theme, tipTitle, "\(formatCurrencyAmount(currentTip ?? 0, currency: paymentForm.invoice.currency))")) + tipTitle = presentationData.strings.Checkout_OptionalTipItem + entries.append(.tip(index, presentationData.theme, tipTitle, paymentForm.invoice.currency, "\(formatCurrencyAmount(currentTip ?? 0, currency: paymentForm.invoice.currency))", currentTip ?? 0, tip.max, tip.suggested.map { item -> (String, Int64) in + return ("\(formatCurrencyAmount(item, currency: paymentForm.invoice.currency))", item) + })) + index += 1 } + entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: paymentForm.invoice.currency), true, true, nil)) + var paymentMethodTitle = "" if let currentPaymentMethod = currentPaymentMethod { paymentMethodTitle = currentPaymentMethod.title @@ -351,6 +432,15 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st if paymentForm.invoice.requestedFields.contains(.phone) { entries.append(.phoneInfo(presentationData.theme, presentationData.strings.Checkout_Phone, formInfo?.phone ?? "")) } + } else { + let numItems = 4 + for index in 0 ..< numItems { + entries.append(.price(index, presentationData.theme, " ", " ", false, index == 0, index)) + } + + for index in numItems ..< numItems + 2 { + entries.append(.actionPlaceholder(index, index - numItems)) + } } return entries @@ -402,14 +492,21 @@ private func availablePaymentMethods(form: BotPaymentForm, current: BotCheckoutP methods.append(current) } } + if let savedCredentials = form.savedCredentials { + if !methods.contains(.savedCredentials(savedCredentials)) { + methods.append(.savedCredentials(savedCredentials)) + } + } return methods } final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthorizationViewControllerDelegate { + private weak var controller: BotCheckoutController? private let context: AccountContext private let messageId: MessageId private let present: (ViewController, Any?) -> Void private let dismissAnimated: () -> Void + private let completed: (String, MessageId?) -> Void private var stateValue = BotCheckoutControllerState() private let state = ValuePromise(BotCheckoutControllerState(), ignoreRepeated: true) @@ -425,27 +522,36 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz private var currentPaymentMethod: BotCheckoutPaymentMethod? private var currentTipAmount: Int64? private var formRequestDisposable: Disposable? - + + private let actionButtonPanelNode: ASDisplayNode + private let actionButtonPanelSeparator: ASDisplayNode private let actionButton: BotCheckoutActionButton private let inProgressDimNode: ASDisplayNode + private var statusController: ViewController? private let payDisposable = MetaDisposable() private let paymentAuthDisposable = MetaDisposable() private var applePayAuthrorizationCompletion: ((PKPaymentAuthorizationStatus) -> Void)? private var applePayController: PKPaymentAuthorizationViewController? + + private var passwordTip: String? + private var passwordTipDisposable: Disposable? - init(controller: ItemListController?, navigationBar: NavigationBar, updateNavigationOffset: @escaping (CGFloat) -> Void, context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, present: @escaping (ViewController, Any?) -> Void, dismissAnimated: @escaping () -> Void) { + init(controller: BotCheckoutController?, navigationBar: NavigationBar, updateNavigationOffset: @escaping (CGFloat) -> Void, context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, inputData: Promise, present: @escaping (ViewController, Any?) -> Void, dismissAnimated: @escaping () -> Void, completed: @escaping (String, MessageId?) -> Void) { + self.controller = controller self.context = context self.messageId = messageId self.present = present self.dismissAnimated = dismissAnimated + self.completed = completed self.presentationData = context.sharedContext.currentPresentationData.with { $0 } var openInfoImpl: ((BotCheckoutInfoControllerFocus) -> Void)? - var openTipImpl: (() -> Void)? + var updateTipImpl: ((Int64) -> Void)? var openPaymentMethodImpl: (() -> Void)? var openShippingMethodImpl: (() -> Void)? + var ensureTipInputVisibleImpl: (() -> Void)? let arguments = BotCheckoutControllerArguments(account: context.account, openInfo: { item in openInfoImpl?(item) @@ -453,26 +559,45 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz openPaymentMethodImpl?() }, openShippingMethod: { openShippingMethodImpl?() - }, openTip: { - openTipImpl?() + }, updateTip: { value in + updateTipImpl?(value) + }, ensureTipInputVisible: { + ensureTipInputVisibleImpl?() }) + + let paymentBotPeer = paymentFormAndInfo.get() + |> map { paymentFormAndInfo -> PeerId? in + return paymentFormAndInfo?.0.paymentBotId + } + |> distinctUntilChanged + |> mapToSignal { peerId -> Signal in + return context.account.postbox.transaction { transaction -> Peer? in + return peerId.flatMap(transaction.getPeer) + } + } - let signal: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError> = combineLatest(context.sharedContext.presentationData, self.state.get(), paymentFormAndInfo.get(), context.account.postbox.loadedPeerWithId(messageId.peerId)) + let signal: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError> = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, self.state.get(), paymentFormAndInfo.get(), paymentBotPeer) |> map { presentationData, state, paymentFormAndInfo, botPeer -> (ItemListPresentationData, (ItemListNodeState, Any)) in - let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botCheckoutControllerEntries(presentationData: presentationData, state: state, invoice: invoice, paymentForm: paymentFormAndInfo?.0, formInfo: paymentFormAndInfo?.1, validatedFormInfo: paymentFormAndInfo?.2, currentShippingOptionId: paymentFormAndInfo?.3, currentPaymentMethod: paymentFormAndInfo?.4, currentTip: paymentFormAndInfo?.5, botPeer: botPeer), style: .plain, focusItemTag: nil, emptyStateItem: nil, animateChanges: false) + let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botCheckoutControllerEntries(presentationData: presentationData, state: state, invoice: invoice, paymentForm: paymentFormAndInfo?.0, formInfo: paymentFormAndInfo?.1, validatedFormInfo: paymentFormAndInfo?.2, currentShippingOptionId: paymentFormAndInfo?.3, currentPaymentMethod: paymentFormAndInfo?.4, currentTip: paymentFormAndInfo?.5, botPeer: botPeer), style: .blocks, focusItemTag: nil, emptyStateItem: nil, animateChanges: false) return (ItemListPresentationData(presentationData), (nodeState, arguments)) } + + self.actionButtonPanelNode = ASDisplayNode() + self.actionButtonPanelNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor + + self.actionButtonPanelSeparator = ASDisplayNode() + self.actionButtonPanelSeparator.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor - self.actionButton = BotCheckoutActionButton(inactiveFillColor: self.presentationData.theme.list.plainBackgroundColor, activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.itemCheckColors.foregroundColor) - self.actionButton.setState(.loading) + self.actionButton = BotCheckoutActionButton(activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.itemCheckColors.foregroundColor) + self.actionButton.setState(.placeholder) self.inProgressDimNode = ASDisplayNode() self.inProgressDimNode.alpha = 0.0 self.inProgressDimNode.isUserInteractionEnabled = false self.inProgressDimNode.backgroundColor = self.presentationData.theme.list.plainBackgroundColor.withAlphaComponent(0.5) - super.init(controller: controller, navigationBar: navigationBar, updateNavigationOffset: updateNavigationOffset, state: signal) + super.init(controller: nil, navigationBar: navigationBar, updateNavigationOffset: updateNavigationOffset, state: signal) self.arguments = arguments @@ -488,8 +613,9 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz updatedCurrentShippingOptionId = currentShippingOptionId } } + strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, formInfo, validatedInfo, updatedCurrentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount))) - + strongSelf.updateActionButton() } }), ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) @@ -500,6 +626,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz if let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let currentFormInfo = strongSelf.currentFormInfo { strongSelf.currentPaymentMethod = method strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount))) + strongSelf.updateActionButton() } } @@ -529,7 +656,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz var dismissImpl: (() -> Void)? let canSave = paymentForm.canSaveCredentials || paymentForm.passwordMissing - let controller = BotCheckoutNativeCardEntryController(context: strongSelf.context, additionalFields: additionalFields, publishableKey: publishableKey, completion: { method in + let controller = BotCheckoutNativeCardEntryController(context: strongSelf.context, provider: .stripe(additionalFields: additionalFields, publishableKey: publishableKey), completion: { method in guard let strongSelf = self else { return } @@ -573,7 +700,75 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz } })]), nil) default: - break + applyPaymentMethod(method) + } + } else { + applyPaymentMethod(method) + } + dismissImpl?() + }) + dismissImpl = { [weak controller] in + controller?.dismiss() + } + strongSelf.present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + } else if let nativeProvider = paymentForm.nativeProvider, nativeProvider.name == "smartglocal" { + guard let paramsData = nativeProvider.params.data(using: .utf8) else { + return + } + guard let nativeParams = (try? JSONSerialization.jsonObject(with: paramsData)) as? [String: Any] else { + return + } + guard let publicToken = nativeParams["public_token"] as? String else { + return + } + + var dismissImpl: (() -> Void)? + let canSave = paymentForm.canSaveCredentials || paymentForm.passwordMissing + let controller = BotCheckoutNativeCardEntryController(context: strongSelf.context, provider: .smartglobal(isTesting: paymentForm.invoice.isTest, publicToken: publicToken), completion: { method in + guard let strongSelf = self else { + return + } + if canSave && paymentForm.passwordMissing { + switch method { + case let .webToken(webToken) where webToken.saveOnServer: + var text = strongSelf.presentationData.strings.Checkout_NewCard_SaveInfoEnableHelp + text = text.replacingOccurrences(of: "[", with: "") + text = text.replacingOccurrences(of: "]", with: "") + present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_NotNow, action: { + var updatedToken = webToken + updatedToken.saveOnServer = false + applyPaymentMethod(.webToken(updatedToken)) + }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Yes, action: { + guard let strongSelf = self else { + return + } + if paymentForm.passwordMissing { + var updatedToken = webToken + updatedToken.saveOnServer = false + applyPaymentMethod(.webToken(updatedToken)) + + let controller = SetupTwoStepVerificationController(context: strongSelf.context, initialState: .automatic, stateUpdated: { update, shouldDismiss, controller in + if shouldDismiss { + controller.dismiss() + } + switch update { + case .noPassword, .awaitingEmailConfirmation: + break + case .passwordSet: + var updatedToken = webToken + updatedToken.saveOnServer = true + applyPaymentMethod(.webToken(updatedToken)) + } + }) + strongSelf.present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + } else { + var updatedToken = webToken + updatedToken.saveOnServer = true + applyPaymentMethod(.webToken(updatedToken)) + } + })]), nil) + default: + applyPaymentMethod(method) } } else { applyPaymentMethod(method) @@ -647,30 +842,37 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz } } - openTipImpl = { [weak self] in - if let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue { - //TODO:localize - let initialValue: String - if let tipAmount = strongSelf.currentTipAmount, let value = currencyToFractionalAmount(value: tipAmount, currency: paymentFormValue.invoice.currency) { - initialValue = "\(value)" - } else { - initialValue = "0" - } - let controller = tipEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: nil, title: "Tip", text: "Enter Tip Amount", placeholder: "", value: initialValue, apply: { value in - guard let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let currentFormInfo = strongSelf.currentFormInfo, let value = value else { - return - } - - let tipAmount = fractionalToCurrencyAmount(value: (Double(value) ?? 0.0), currency: paymentFormValue.invoice.currency) ?? 0 - - strongSelf.currentTipAmount = tipAmount - - strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount))) - - strongSelf.updateActionButton() - }) - strongSelf.present(controller, nil) + updateTipImpl = { [weak self] value in + guard let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let currentFormInfo = strongSelf.currentFormInfo else { + return } + + if strongSelf.currentTipAmount == value { + return + } + + strongSelf.currentTipAmount = value + + strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount))) + + strongSelf.updateActionButton() + } + + ensureTipInputVisibleImpl = { [weak self] in + self?.afterLayout({ + guard let strongSelf = self else { + return + } + var selectedItemNode: ListViewItemNode? + strongSelf.listNode.forEachItemNode { itemNode in + if let itemNode = itemNode as? BotCheckoutTipItemNode { + selectedItemNode = itemNode + } + } + if let selectedItemNode = selectedItemNode { + strongSelf.listNode.ensureItemNodeVisible(selectedItemNode, atTop: true) + } + }) } openPaymentMethodImpl = { [weak self] in @@ -701,58 +903,64 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz } } - let formAndMaybeValidatedInfo = fetchBotPaymentForm(postbox: context.account.postbox, network: context.account.network, messageId: messageId) - |> mapToSignal { paymentForm -> Signal<(BotPaymentForm, BotPaymentValidatedFormInfo?), BotPaymentFormRequestError> in - if let current = paymentForm.savedInfo { - return validateBotPaymentForm(account: context.account, saveInfo: true, messageId: messageId, formInfo: current) - |> mapError { _ -> BotPaymentFormRequestError in - return .generic - } - |> map { result -> (BotPaymentForm, BotPaymentValidatedFormInfo?) in - return (paymentForm, result) - } - |> `catch` { _ -> Signal<(BotPaymentForm, BotPaymentValidatedFormInfo?), BotPaymentFormRequestError> in - return .single((paymentForm, nil)) - } - } else { - return .single((paymentForm, nil)) - } - } - - self.formRequestDisposable = (formAndMaybeValidatedInfo |> deliverOnMainQueue).start(next: { [weak self] form, validatedInfo in + self.formRequestDisposable = (inputData.get() |> deliverOnMainQueue).start(next: { [weak self] formAndValidatedInfo in if let strongSelf = self { + guard let formAndValidatedInfo = formAndValidatedInfo else { + strongSelf.controller?.dismiss() + return + } + UIView.transition(with: strongSelf.view, duration: 0.25, options: UIView.AnimationOptions.transitionCrossDissolve, animations: { + }, completion: nil) + let savedInfo: BotPaymentRequestedInfo - if let current = form.savedInfo { + if let current = formAndValidatedInfo.form.savedInfo { savedInfo = current } else { savedInfo = BotPaymentRequestedInfo(name: nil, phone: nil, email: nil, shippingAddress: nil) } - strongSelf.paymentFormValue = form + strongSelf.paymentFormValue = formAndValidatedInfo.form strongSelf.currentFormInfo = savedInfo - strongSelf.currentValidatedFormInfo = validatedInfo - if let savedCredentials = form.savedCredentials { + strongSelf.currentValidatedFormInfo = formAndValidatedInfo.validatedFormInfo + if let savedCredentials = formAndValidatedInfo.form.savedCredentials { strongSelf.currentPaymentMethod = .savedCredentials(savedCredentials) } strongSelf.actionButton.isEnabled = true - strongSelf.paymentFormAndInfo.set(.single((form, savedInfo, validatedInfo, nil, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount))) + strongSelf.paymentFormAndInfo.set(.single((formAndValidatedInfo.form, savedInfo, formAndValidatedInfo.validatedFormInfo, nil, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount))) strongSelf.updateActionButton() } - }, error: { _ in - }) + + self.addSubnode(self.actionButtonPanelNode) + self.actionButtonPanelNode.addSubnode(self.actionButtonPanelSeparator) + self.actionButtonPanelNode.addSubnode(self.actionButton) self.actionButton.addTarget(self, action: #selector(self.actionButtonPressed), forControlEvents: .touchUpInside) self.actionButton.isEnabled = false - self.addSubnode(self.actionButton) self.listNode.supernode?.insertSubnode(self.inProgressDimNode, aboveSubnode: self.listNode) + + self.passwordTipDisposable = (twoStepVerificationConfiguration(account: self.context.account) + |> deliverOnMainQueue).start(next: { [weak self] value in + guard let strongSelf = self else { + return + } + switch value { + case .notSet: + break + case let .set(hint, _, _, _): + if !hint.isEmpty { + strongSelf.passwordTip = hint + } + } + }) } deinit { self.formRequestDisposable?.dispose() self.payDisposable.dispose() self.paymentAuthDisposable.dispose() + self.passwordTipDisposable?.dispose() } private func updateActionButton() { @@ -763,21 +971,49 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz } else { payString = self.presentationData.strings.CheckoutInfo_Pay } - if self.actionButton.isEnabled { - self.actionButton.setState(.active(payString)) + if let currentPaymentMethod = self.currentPaymentMethod { + switch currentPaymentMethod { + case .applePay: + self.actionButton.setState(.applePay) + default: + self.actionButton.setState(.active(payString)) + } } else { - self.actionButton.setState(.loading) + self.actionButton.setState(.active(payString)) + } + self.actionButtonPanelNode.isHidden = false + } + + private func updateIsInProgress(_ value: Bool) { + if value { + if self.statusController == nil { + let statusController = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil)) + self.statusController = statusController + self.controller?.present(statusController, in: .window(.root)) + } + } else if let statusController = self.statusController { + self.statusController = nil + statusController.dismiss() } } override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition, additionalInsets: UIEdgeInsets) { var updatedInsets = layout.intrinsicInsets - updatedInsets.bottom += BotCheckoutActionButton.diameter + 20.0 - super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets) - - let actionButtonFrame = CGRect(origin: CGPoint(x: 10.0, y: layout.size.height - 10.0 - BotCheckoutActionButton.diameter - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width - 20.0, height: BotCheckoutActionButton.diameter)) + + let bottomPanelHorizontalInset: CGFloat = 16.0 + let bottomPanelVerticalInset: CGFloat = 16.0 + let bottomPanelHeight = max(updatedInsets.bottom, layout.inputHeight ?? 0.0) + bottomPanelVerticalInset * 2.0 + BotCheckoutActionButton.height + + transition.updateFrame(node: self.actionButtonPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomPanelHeight), size: CGSize(width: layout.size.width, height: bottomPanelHeight))) + transition.updateFrame(node: self.actionButtonPanelSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: UIScreenPixel))) + + let actionButtonFrame = CGRect(origin: CGPoint(x: bottomPanelHorizontalInset, y: bottomPanelVerticalInset), size: CGSize(width: layout.size.width - bottomPanelHorizontalInset * 2.0, height: BotCheckoutActionButton.height)) transition.updateFrame(node: self.actionButton, frame: actionButtonFrame) - self.actionButton.updateLayout(size: actionButtonFrame.size, transition: transition) + self.actionButton.updateLayout(absoluteRect: actionButtonFrame.offsetBy(dx: self.actionButtonPanelNode.frame.minX, dy: self.actionButtonPanelNode.frame.minY), containerSize: layout.size, transition: transition) + + updatedInsets.bottom = bottomPanelHeight + + super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets) transition.updateFrame(node: self.inProgressDimNode, frame: self.listNode.frame) } @@ -923,10 +1159,9 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz if let tipAmount = strongSelf.currentTipAmount { totalAmount += tipAmount - //TODO:localize if let fractional = currencyToFractionalAmount(value: tipAmount, currency: paymentForm.invoice.currency) { let amount = NSDecimalNumber(value: fractional) - items.append(PKPaymentSummaryItem(label: "Tip", amount: amount)) + items.append(PKPaymentSummaryItem(label: strongSelf.presentationData.strings.Checkout_TipItem, amount: amount)) } } @@ -960,13 +1195,17 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz } return nil } - let _ = (combineLatest(ApplicationSpecificNotice.getBotPaymentLiability(accountManager: self.context.sharedContext.accountManager, peerId: self.messageId.peerId), botPeer, self.context.account.postbox.loadedPeerWithId(paymentForm.providerId)) + let _ = (combineLatest(ApplicationSpecificNotice.getBotPaymentLiability(accountManager: self.context.sharedContext.accountManager, peerId: paymentForm.paymentBotId), botPeer, self.context.account.postbox.loadedPeerWithId(paymentForm.providerId)) |> deliverOnMainQueue).start(next: { [weak self] value, botPeer, providerPeer in if let strongSelf = self, let botPeer = botPeer { if value { strongSelf.pay(savedCredentialsToken: savedCredentialsToken, liabilityNoticeAccepted: true) } else { - strongSelf.present(textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Checkout_LiabilityAlertTitle, text: strongSelf.presentationData.strings.Checkout_LiabilityAlert(botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), providerPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: { }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: { + let paymentText = strongSelf.presentationData.strings.Checkout_PaymentLiabilityAlert + .replacingOccurrences(of: "{target}", with: botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)) + .replacingOccurrences(of: "{payment_system}", with: providerPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)) + + strongSelf.present(textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Checkout_LiabilityAlertTitle, text: paymentText, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: { }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: { if let strongSelf = self { let _ = ApplicationSpecificNotice.setBotPaymentLiability(accountManager: strongSelf.context.sharedContext.accountManager, peerId: strongSelf.messageId.peerId).start() strongSelf.pay(savedCredentialsToken: savedCredentialsToken, liabilityNoticeAccepted: true) @@ -980,11 +1219,22 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz self.inProgressDimNode.alpha = 1.0 self.actionButton.isEnabled = false self.updateActionButton() - self.payDisposable.set((sendBotPaymentForm(account: self.context.account, messageId: self.messageId, formId: paymentForm.id, validatedInfoId: self.currentValidatedFormInfo?.id, shippingOptionId: self.currentShippingOptionId, tipAmount: self.currentTipAmount, credentials: credentials) |> deliverOnMainQueue).start(next: { [weak self] result in + self.updateIsInProgress(true) + + var tipAmount = self.currentTipAmount + if tipAmount == nil, let _ = paymentForm.invoice.tip { + tipAmount = 0 + } + + let totalAmount = currentTotalPrice(paymentForm: paymentForm, validatedFormInfo: self.currentValidatedFormInfo, currentShippingOptionId: self.currentShippingOptionId, currentTip: self.currentTipAmount) + let currencyValue = formatCurrencyAmount(totalAmount, currency: paymentForm.invoice.currency) + + self.payDisposable.set((sendBotPaymentForm(account: self.context.account, messageId: self.messageId, formId: paymentForm.id, validatedInfoId: self.currentValidatedFormInfo?.id, shippingOptionId: self.currentShippingOptionId, tipAmount: tipAmount, credentials: credentials) |> deliverOnMainQueue).start(next: { [weak self] result in if let strongSelf = self { strongSelf.inProgressDimNode.isUserInteractionEnabled = false strongSelf.inProgressDimNode.alpha = 0.0 strongSelf.actionButton.isEnabled = true + strongSelf.updateIsInProgress(false) if let applePayAuthrorizationCompletion = strongSelf.applePayAuthrorizationCompletion { strongSelf.applePayAuthrorizationCompletion = nil applePayAuthrorizationCompletion(.success) @@ -993,19 +1243,32 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz strongSelf.applePayController = nil applePayController.presentingViewController?.dismiss(animated: true, completion: nil) } + + let proceedWithCompletion: (Bool, MessageId?) -> Void = { success, receiptMessageId in + guard let strongSelf = self else { + return + } + + if success { + strongSelf.dismissAnimated() + strongSelf.completed(currencyValue, receiptMessageId) + } else { + strongSelf.dismissAnimated() + } + } switch result { - case .done: - strongSelf.dismissAnimated() + case let .done(receiptMessageId): + proceedWithCompletion(true, receiptMessageId) case let .externalVerificationRequired(url): strongSelf.updateActionButton() - var dismissImpl: (() -> Void)? - let controller = BotCheckoutWebInteractionController(context: strongSelf.context, url: url, intent: .externalVerification({ _ in - dismissImpl?() + var dismissImpl: ((Bool) -> Void)? + let controller = BotCheckoutWebInteractionController(context: strongSelf.context, url: url, intent: .externalVerification({ success in + dismissImpl?(success) })) - dismissImpl = { [weak controller] in + dismissImpl = { [weak controller] success in controller?.dismiss() - self?.dismissAnimated() + proceedWithCompletion(success, nil) } strongSelf.present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) } @@ -1016,6 +1279,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz strongSelf.inProgressDimNode.alpha = 0.0 strongSelf.actionButton.isEnabled = true strongSelf.updateActionButton() + strongSelf.updateIsInProgress(false) if let applePayAuthrorizationCompletion = strongSelf.applePayAuthrorizationCompletion { strongSelf.applePayAuthrorizationCompletion = nil applePayAuthrorizationCompletion(.failure) @@ -1053,7 +1317,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz period = 1 * 60 * 60 requiresBiometrics = false } - self.present(botCheckoutPasswordEntryController(context: self.context, strings: self.presentationData.strings, cartTitle: cardTitle, period: period, requiresBiometrics: requiresBiometrics, completion: { [weak self] token in + self.present(botCheckoutPasswordEntryController(context: self.context, strings: self.presentationData.strings, passwordTip: self.passwordTip, cartTitle: cardTitle, period: period, requiresBiometrics: requiresBiometrics, completion: { [weak self] token in if let strongSelf = self { let durationString = timeIntervalString(strings: strongSelf.presentationData.strings, value: period) diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift index ada9ca2d90..2946d5ca0b 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift @@ -80,7 +80,6 @@ class BotCheckoutHeaderItemNode: ListViewItemNode { init() { self.backgroundNode = ASDisplayNode() self.backgroundNode.isLayerBacked = true - self.backgroundNode.backgroundColor = .white self.topStripeNode = ASDisplayNode() self.topStripeNode.isLayerBacked = true @@ -109,7 +108,8 @@ class BotCheckoutHeaderItemNode: ListViewItemNode { self.highlightedBackgroundNode.isLayerBacked = true super.init(layerBacked: false, dynamicBounce: false) - + + self.addSubnode(self.backgroundNode) self.addSubnode(self.imageNode) self.addSubnode(self.titleNode) self.addSubnode(self.textNode) @@ -209,9 +209,9 @@ class BotCheckoutHeaderItemNode: ListViewItemNode { } strongSelf.imageNode.frame = CGRect(origin: CGPoint(x: contentInsets.left, y: contentInsets.top), size: imageSize) - if strongSelf.backgroundNode.supernode != nil { + /*if strongSelf.backgroundNode.supernode != nil { strongSelf.backgroundNode.removeFromSupernode() - } + }*/ if strongSelf.topStripeNode.supernode != nil { strongSelf.topStripeNode.removeFromSupernode() } @@ -231,7 +231,8 @@ class BotCheckoutHeaderItemNode: ListViewItemNode { strongSelf.textNode.frame = textFrame strongSelf.botNameNode.frame = CGRect(origin: CGPoint(x: textFrame.minX, y: textFrame.maxY + textBotNameSpacing), size: botNameLayout.size) - + + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -1000.0), size: CGSize(width: params.width, height: contentSize.height + 1000.0)) strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: 44.0 + UIScreenPixel + UIScreenPixel)) } }) diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift index c0449e73e2..637962b491 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift @@ -30,13 +30,17 @@ struct BotCheckoutNativeCardEntryAdditionalFields: OptionSet { } final class BotCheckoutNativeCardEntryController: ViewController { + enum Provider { + case stripe(additionalFields: BotCheckoutNativeCardEntryAdditionalFields, publishableKey: String) + case smartglobal(isTesting: Bool, publicToken: String) + } + private var controllerNode: BotCheckoutNativeCardEntryControllerNode { return super.displayNode as! BotCheckoutNativeCardEntryControllerNode } private let context: AccountContext - private let additionalFields: BotCheckoutNativeCardEntryAdditionalFields - private let publishableKey: String + private let provider: Provider private let completion: (BotCheckoutPaymentMethod) -> Void private var presentationData: PresentationData @@ -46,10 +50,9 @@ final class BotCheckoutNativeCardEntryController: ViewController { private var doneItem: UIBarButtonItem? private var activityItem: UIBarButtonItem? - public init(context: AccountContext, additionalFields: BotCheckoutNativeCardEntryAdditionalFields, publishableKey: String, completion: @escaping (BotCheckoutPaymentMethod) -> Void) { + public init(context: AccountContext, provider: Provider, completion: @escaping (BotCheckoutPaymentMethod) -> Void) { self.context = context - self.additionalFields = additionalFields - self.publishableKey = publishableKey + self.provider = provider self.completion = completion self.presentationData = context.sharedContext.currentPresentationData.with { $0 } @@ -71,7 +74,7 @@ final class BotCheckoutNativeCardEntryController: ViewController { } override public func loadDisplayNode() { - self.displayNode = BotCheckoutNativeCardEntryControllerNode(additionalFields: self.additionalFields, publishableKey: self.publishableKey, theme: self.presentationData.theme, strings: self.presentationData.strings, present: { [weak self] c, a in + self.displayNode = BotCheckoutNativeCardEntryControllerNode(context: self.context, provider: self.provider, theme: self.presentationData.theme, strings: self.presentationData.strings, present: { [weak self] c, a in self?.present(c, in: .window(.root), with: a) }, dismiss: { [weak self] in self?.presentingViewController?.dismiss(animated: false, completion: nil) diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift index d0b2b3e9d5..0072d16381 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift @@ -9,6 +9,8 @@ import SwiftSignalKit import TelegramPresentationData import Stripe import CountrySelectionUI +import PresentationDataUtils +import AccountContext private final class BotCheckoutNativeCardEntryScrollerNodeView: UIScrollView { var ignoreUpdateBounds = false @@ -42,7 +44,8 @@ private final class BotCheckoutNativeCardEntryScrollerNode: ASDisplayNode { } final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { - private let publishableKey: String + private let context: AccountContext + private let provider: BotCheckoutNativeCardEntryController.Provider private let present: (ViewController, Any?) -> Void private let dismiss: () -> Void @@ -70,9 +73,12 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, private var currentCardData: BotPaymentCardInputData? private var currentCountryIso2: String? + + private var dataTask: URLSessionDataTask? - init(additionalFields: BotCheckoutNativeCardEntryAdditionalFields, publishableKey: String, theme: PresentationTheme, strings: PresentationStrings, present: @escaping (ViewController, Any?) -> Void, dismiss: @escaping () -> Void, openCountrySelection: @escaping () -> Void, updateStatus: @escaping (BotCheckoutNativeCardEntryStatus) -> Void, completion: @escaping (BotCheckoutPaymentMethod) -> Void) { - self.publishableKey = publishableKey + init(context: AccountContext, provider: BotCheckoutNativeCardEntryController.Provider, theme: PresentationTheme, strings: PresentationStrings, present: @escaping (ViewController, Any?) -> Void, dismiss: @escaping () -> Void, openCountrySelection: @escaping () -> Void, updateStatus: @escaping (BotCheckoutNativeCardEntryStatus) -> Void, completion: @escaping (BotCheckoutPaymentMethod) -> Void) { + self.context = context + self.provider = provider self.present = present self.dismiss = dismiss @@ -95,46 +101,53 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, cardUpdatedImpl?(data) } itemNodes.append([BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_PaymentCard), self.cardItem]) - - if additionalFields.contains(.cardholderName) { - var sectionItems: [BotPaymentItemNode] = [] - - sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_CardholderNameTitle)) - - let cardholderItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_CardholderNamePlaceholder, contentType: .name) - self.cardholderItem = cardholderItem - sectionItems.append(cardholderItem) - - itemNodes.append(sectionItems) - } else { - self.cardholderItem = nil - } - - if additionalFields.contains(.country) || additionalFields.contains(.zipCode) { - var sectionItems: [BotPaymentItemNode] = [] - - sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_PostcodeTitle)) - - if additionalFields.contains(.country) { - let countryItem = BotPaymentDisclosureItemNode(title: "", placeholder: strings.CheckoutInfo_ShippingInfoCountryPlaceholder, text: "") - countryItem.action = { - openCountrySelectionImpl?() + + switch provider { + case let .stripe(additionalFields, _): + if additionalFields.contains(.cardholderName) { + var sectionItems: [BotPaymentItemNode] = [] + + sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_CardholderNameTitle)) + + let cardholderItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_CardholderNamePlaceholder, contentType: .name) + self.cardholderItem = cardholderItem + sectionItems.append(cardholderItem) + + itemNodes.append(sectionItems) + } else { + self.cardholderItem = nil + } + + if additionalFields.contains(.country) || additionalFields.contains(.zipCode) { + var sectionItems: [BotPaymentItemNode] = [] + + sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_PostcodeTitle)) + + if additionalFields.contains(.country) { + let countryItem = BotPaymentDisclosureItemNode(title: "", placeholder: strings.CheckoutInfo_ShippingInfoCountryPlaceholder, text: "") + countryItem.action = { + openCountrySelectionImpl?() + } + self.countryItem = countryItem + sectionItems.append(countryItem) + } else { + self.countryItem = nil } - self.countryItem = countryItem - sectionItems.append(countryItem) + if additionalFields.contains(.zipCode) { + let zipCodeItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_PostcodePlaceholder, contentType: .address) + self.zipCodeItem = zipCodeItem + sectionItems.append(zipCodeItem) + } else { + self.zipCodeItem = nil + } + + itemNodes.append(sectionItems) } else { self.countryItem = nil - } - if additionalFields.contains(.zipCode) { - let zipCodeItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_PostcodePlaceholder, contentType: .address) - self.zipCodeItem = zipCodeItem - sectionItems.append(zipCodeItem) - } else { self.zipCodeItem = nil } - - itemNodes.append(sectionItems) - } else { + case .smartglobal: + self.cardholderItem = nil self.countryItem = nil self.zipCodeItem = nil } @@ -214,6 +227,7 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, deinit { self.verifyDisposable.dispose() + self.dataTask?.cancel() } func updateCountry(_ iso2: String) { @@ -232,53 +246,163 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, guard let cardData = self.currentCardData else { return } - - let configuration = STPPaymentConfiguration.shared().copy() as! STPPaymentConfiguration - configuration.smsAutofillDisabled = true - configuration.publishableKey = self.publishableKey - configuration.appleMerchantIdentifier = "merchant.ph.telegra.Telegraph" - - let apiClient = STPAPIClient(configuration: configuration) - - let card = STPCardParams() - card.number = cardData.number - card.cvc = cardData.code - card.expYear = cardData.year - card.expMonth = cardData.month - card.name = self.cardholderItem?.text - card.addressCountry = self.currentCountryIso2 - card.addressZip = self.zipCodeItem?.text - - let createToken: Signal = Signal { subscriber in - apiClient.createToken(withCard: card, completion: { token, error in - if let error = error { - subscriber.putError(error) - } else if let token = token { - subscriber.putNext(token) - subscriber.putCompletion() + + switch self.provider { + case let .stripe(_, publishableKey): + let configuration = STPPaymentConfiguration.shared().copy() as! STPPaymentConfiguration + configuration.smsAutofillDisabled = true + configuration.publishableKey = publishableKey + configuration.appleMerchantIdentifier = "merchant.ph.telegra.Telegraph" + + let apiClient = STPAPIClient(configuration: configuration) + + let card = STPCardParams() + card.number = cardData.number + card.cvc = cardData.code + card.expYear = cardData.year + card.expMonth = cardData.month + card.name = self.cardholderItem?.text + card.addressCountry = self.currentCountryIso2 + card.addressZip = self.zipCodeItem?.text + + let createToken: Signal = Signal { subscriber in + apiClient.createToken(withCard: card, completion: { token, error in + if let error = error { + subscriber.putError(error) + } else if let token = token { + subscriber.putNext(token) + subscriber.putCompletion() + } + }) + + return ActionDisposable { + let _ = apiClient.publishableKey + } + } + + self.isVerifying = true + self.verifyDisposable.set((createToken |> deliverOnMainQueue).start(next: { [weak self] token in + if let strongSelf = self, let card = token.card { + let last4 = card.last4() + let brand = STPAPIClient.string(with: card.brand) + strongSelf.completion(.webToken(BotCheckoutPaymentWebToken(title: "\(brand)*\(last4)", data: "{\"type\": \"card\", \"id\": \"\(token.tokenId)\"}", saveOnServer: strongSelf.saveInfoItem.isOn))) + } + }, error: { [weak self] error in + if let strongSelf = self { + strongSelf.isVerifying = false + strongSelf.updateDone() + } + })) + + self.updateDone() + case let .smartglobal(isTesting, publicToken): + let url: String + if isTesting { + url = "https://tgb-playground.smart-glocal.com/cds/v1/tokenize/card" + } else { + url = "https://tgb.smart-glocal.com/cds/v1/tokenize/card" + } + + let jsonPayload: [String: Any] = [ + "card": [ + "number": cardData.number, + "expiration_month": String(format: "%02d", cardData.month), + "expiration_year": String(format: "%02d", cardData.year), + "security_code": "\(cardData.code)" + ] as [String: Any] + ] + + guard let parsedUrl = URL(string: url) else { + return + } + + var request = URLRequest(url: parsedUrl) + request.httpMethod = "POST" + request.setValue("application/json", forHTTPHeaderField: "Content-Type") + request.setValue(publicToken, forHTTPHeaderField: "X-PUBLIC-TOKEN") + guard let requestBody = try? JSONSerialization.data(withJSONObject: jsonPayload, options: []) else { + return + } + request.httpBody = requestBody + + let session = URLSession.shared + let dataTask = session.dataTask(with: request, completionHandler: { [weak self] data, response, error in + Queue.mainQueue().async { + guard let strongSelf = self else { + return + } + + enum ReponseError: Error { + case generic + } + + do { + guard let data = data else { + throw ReponseError.generic + } + + let jsonRaw = try JSONSerialization.jsonObject(with: data, options: []) + guard let json = jsonRaw as? [String: Any] else { + throw ReponseError.generic + } + guard let resultData = json["data"] as? [String: Any] else { + throw ReponseError.generic + } + guard let resultInfo = resultData["info"] as? [String: Any] else { + throw ReponseError.generic + } + guard let token = resultData["token"] as? String else { + throw ReponseError.generic + } + guard let maskedCardNumber = resultInfo["masked_card_number"] as? String else { + throw ReponseError.generic + } + guard let cardType = resultInfo["card_type"] as? String else { + throw ReponseError.generic + } + + var last4 = maskedCardNumber + if last4.count > 4 { + let lastDigits = String(maskedCardNumber[maskedCardNumber.index(maskedCardNumber.endIndex, offsetBy: -4)...]) + if lastDigits.allSatisfy(\.isNumber) { + last4 = "\(cardType) *\(lastDigits)" + } + } + + let responseJson: [String: Any] = [ + "type": "card", + "token": "\(token)" + ] + + let serializedResponseJson = try JSONSerialization.data(withJSONObject: responseJson, options: []) + + guard let serializedResponseString = String(data: serializedResponseJson, encoding: .utf8) else { + throw ReponseError.generic + } + + strongSelf.completion(.webToken(BotCheckoutPaymentWebToken( + title: last4, + data: serializedResponseString, + saveOnServer: strongSelf.saveInfoItem.isOn + ))) + } catch { + strongSelf.isVerifying = false + strongSelf.updateDone() + + strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.strings.Common_OK, action: { + })]), nil) + } } }) - - return ActionDisposable { - let _ = apiClient.publishableKey - } + self.dataTask = dataTask + + self.isVerifying = true + self.updateDone() + + dataTask.resume() + + break } - - self.isVerifying = true - self.verifyDisposable.set((createToken |> deliverOnMainQueue).start(next: { [weak self] token in - if let strongSelf = self, let card = token.card { - let last4 = card.last4() - let brand = STPAPIClient.string(with: card.brand) - strongSelf.completion(.webToken(BotCheckoutPaymentWebToken(title: "\(brand)*\(last4)", data: "{\"type\": \"card\", \"id\": \"\(token.tokenId)\"}", saveOnServer: strongSelf.saveInfoItem.isOn))) - } - }, error: { [weak self] error in - if let strongSelf = self { - strongSelf.isVerifying = false - strongSelf.updateDone() - } - })) - - self.updateDone() } private func updateDone() { diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift index 13f395f368..7485437a0c 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift @@ -94,7 +94,7 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode { private let hapticFeedback = HapticFeedback() - init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, cardTitle: String, period: Int32, requiresBiometrics: Bool, cancel: @escaping () -> Void, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) { + init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, passwordTip: String?, cardTitle: String, period: Int32, requiresBiometrics: Bool, cancel: @escaping () -> Void, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) { self.context = context self.period = period self.requiresBiometrics = requiresBiometrics @@ -156,6 +156,8 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode { self.textFieldNode.textField.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance self.textFieldNode.textField.isSecureTextEntry = true self.textFieldNode.textField.tintColor = theme.list.itemAccentColor + self.textFieldNode.textField.placeholder = passwordTip + super.init() @@ -218,7 +220,7 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode { let textFieldBackgroundFrame = CGRect(origin: CGPoint(x: insets.left, y: resultSize.height - inputHeight + 12.0 - actionsHeight - insets.bottom), size: CGSize(width: resultSize.width - insets.left - insets.right, height: 25.0)) self.textFieldNodeBackground.frame = textFieldBackgroundFrame - self.textFieldNode.frame = textFieldBackgroundFrame.offsetBy(dx: 0.0, dy: 1.0).insetBy(dx: 4.0, dy: 0.0) + self.textFieldNode.frame = textFieldBackgroundFrame.offsetBy(dx: 0.0, dy: 0.0).insetBy(dx: 4.0, dy: 0.0) self.actionNodesSeparator.frame = CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)) @@ -300,10 +302,10 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode { } } -func botCheckoutPasswordEntryController(context: AccountContext, strings: PresentationStrings, cartTitle: String, period: Int32, requiresBiometrics: Bool, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) -> AlertController { +func botCheckoutPasswordEntryController(context: AccountContext, strings: PresentationStrings, passwordTip: String?, cartTitle: String, period: Int32, requiresBiometrics: Bool, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) -> AlertController { var dismissImpl: (() -> Void)? let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: BotCheckoutPasswordAlertContentNode(context: context, theme: presentationData.theme, strings: strings, cardTitle: cartTitle, period: period, requiresBiometrics: requiresBiometrics, cancel: { + let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: BotCheckoutPasswordAlertContentNode(context: context, theme: presentationData.theme, strings: strings, passwordTip: passwordTip, cardTitle: cartTitle, period: period, requiresBiometrics: requiresBiometrics, cancel: { dismissImpl?() }, completion: { token in completion(token) diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift index 46df1456df..2e33d49e95 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift @@ -6,28 +6,33 @@ import SwiftSignalKit import TelegramPresentationData import ItemListUI import PresentationDataUtils +import ShimmerEffect class BotCheckoutPriceItem: ListViewItem, ItemListItem { let theme: PresentationTheme let title: String let label: String let isFinal: Bool + let hasSeparator: Bool + let shimmeringIndex: Int? let sectionId: ItemListSectionId let requestsNoInset: Bool = true - init(theme: PresentationTheme, title: String, label: String, isFinal: Bool, sectionId: ItemListSectionId) { + init(theme: PresentationTheme, title: String, label: String, isFinal: Bool, hasSeparator: Bool, shimmeringIndex: Int?, sectionId: ItemListSectionId) { self.theme = theme self.title = title self.label = label self.isFinal = isFinal + self.hasSeparator = hasSeparator + self.shimmeringIndex = shimmeringIndex self.sectionId = sectionId } func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { async { let node = BotCheckoutPriceItemNode() - let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), previousItem, nextItem) node.contentSize = layout.contentSize node.insets = layout.insets @@ -46,7 +51,7 @@ class BotCheckoutPriceItem: ListViewItem, ItemListItem { let makeLayout = nodeValue.asyncLayout() async { - let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), previousItem, nextItem) Queue.mainQueue().async { completion(layout, { _ in apply() @@ -67,13 +72,13 @@ private func priceItemInsets(_ neighbors: ItemListNeighbors) -> UIEdgeInsets { var insets = UIEdgeInsets() switch neighbors.top { case .otherSection: - insets.top += 8.0 + insets.top += 24.0 case .none, .sameSection: break } switch neighbors.bottom { case .none, .otherSection: - insets.bottom += 8.0 + insets.bottom += 24.0 case .sameSection: break } @@ -83,6 +88,13 @@ private func priceItemInsets(_ neighbors: ItemListNeighbors) -> UIEdgeInsets { class BotCheckoutPriceItemNode: ListViewItemNode { let titleNode: TextNode let labelNode: TextNode + + let backgroundNode: ASDisplayNode + let separatorNode: ASDisplayNode + let bottomSeparatorNode: ASDisplayNode + + private var placeholderNode: ShimmerEffectNode? + private var absoluteLocation: (CGRect, CGSize)? private var item: BotCheckoutPriceItem? @@ -92,21 +104,58 @@ class BotCheckoutPriceItemNode: ListViewItemNode { self.labelNode = TextNode() self.labelNode.isUserInteractionEnabled = false + + self.backgroundNode = ASDisplayNode() + self.separatorNode = ASDisplayNode() + self.bottomSeparatorNode = ASDisplayNode() super.init(layerBacked: false, dynamicBounce: false) - + + self.addSubnode(self.backgroundNode) self.addSubnode(self.titleNode) self.addSubnode(self.labelNode) + self.addSubnode(self.separatorNode) + self.addSubnode(self.bottomSeparatorNode) + } + + override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) { + var rect = rect + rect.origin.y += self.insets.top + self.absoluteLocation = (rect, containerSize) + if let shimmerNode = self.placeholderNode { + shimmerNode.updateAbsoluteRect(rect, within: containerSize) + } } - func asyncLayout() -> (_ item: BotCheckoutPriceItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + func asyncLayout() -> (_ item: BotCheckoutPriceItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors, _ previousItem: ListViewItem?, _ nextItem: ListViewItem?) -> (ListViewItemNodeLayout, () -> Void) { let makeTitleLayout = TextNode.asyncLayout(self.titleNode) let makeLabelLayout = TextNode.asyncLayout(self.labelNode) - return { item, params, neighbors in + return { item, params, neighbors, previousItem, nextItem in let rightInset: CGFloat = 16.0 + params.rightInset + + let naturalContentHeight: CGFloat + var verticalOffset: CGFloat = 0.0 + if item.isFinal { + naturalContentHeight = 44.0 + } else { + switch neighbors.bottom { + case .otherSection, .none: + naturalContentHeight = 44.0 + default: + naturalContentHeight = 34.0 + } + } + if let _ = previousItem as? BotCheckoutHeaderItem { + verticalOffset += 8.0 + } - let contentSize = CGSize(width: params.width, height: 34.0) + var contentSize = CGSize(width: params.width, height: naturalContentHeight + verticalOffset) + if let nextItem = nextItem as? BotCheckoutPriceItem { + if nextItem.isFinal { + contentSize.height += 8.0 + } + } let insets = priceItemInsets(neighbors) let textFont: UIFont @@ -130,9 +179,58 @@ class BotCheckoutPriceItemNode: ListViewItemNode { let _ = labelApply() let leftInset: CGFloat = 16.0 + params.leftInset + + strongSelf.separatorNode.isHidden = !item.hasSeparator + strongSelf.separatorNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor + strongSelf.separatorNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: params.width - leftInset, height: UIScreenPixel)) + + switch neighbors.bottom { + case .otherSection, .none: + strongSelf.bottomSeparatorNode.isHidden = false + default: + strongSelf.bottomSeparatorNode.isHidden = !item.isFinal + } + + strongSelf.bottomSeparatorNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor + strongSelf.bottomSeparatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: contentSize.height), size: CGSize(width: params.width, height: UIScreenPixel)) + + strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: params.width, height: contentSize.height)) - strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((contentSize.height - titleLayout.size.height) / 2.0)), size: titleLayout.size) - strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: params.width - rightInset - labelLayout.size.width, y: floor((contentSize.height - labelLayout.size.height) / 2.0)), size: labelLayout.size) + strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: verticalOffset + floor((naturalContentHeight - titleLayout.size.height) / 2.0)), size: titleLayout.size) + strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: params.width - rightInset - labelLayout.size.width, y: verticalOffset + floor((naturalContentHeight - labelLayout.size.height) / 2.0)), size: labelLayout.size) + + if let shimmeringIndex = item.shimmeringIndex { + let shimmerNode: ShimmerEffectNode + if let current = strongSelf.placeholderNode { + shimmerNode = current + } else { + shimmerNode = ShimmerEffectNode() + strongSelf.placeholderNode = shimmerNode + if strongSelf.separatorNode.supernode != nil { + strongSelf.insertSubnode(shimmerNode, belowSubnode: strongSelf.separatorNode) + } else { + strongSelf.addSubnode(shimmerNode) + } + } + shimmerNode.frame = CGRect(origin: CGPoint(), size: contentSize) + if let (rect, size) = strongSelf.absoluteLocation { + shimmerNode.updateAbsoluteRect(rect, within: size) + } + + var shapes: [ShimmerEffectNode.Shape] = [] + + let titleLineWidth: CGFloat = (shimmeringIndex % 2 == 0) ? 120.0 : 80.0 + let lineDiameter: CGFloat = 8.0 + + let titleFrame = strongSelf.titleNode.frame + shapes.append(.roundedRectLine(startPoint: CGPoint(x: titleFrame.minX, y: titleFrame.minY + floor((titleFrame.height - lineDiameter) / 2.0)), width: titleLineWidth, diameter: lineDiameter)) + + shimmerNode.update(backgroundColor: item.theme.list.itemBlocksBackgroundColor, foregroundColor: item.theme.list.mediaPlaceholderColor, shimmeringColor: item.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4), shapes: shapes, size: contentSize) + } else if let shimmerNode = strongSelf.placeholderNode { + strongSelf.placeholderNode = nil + shimmerNode.removeFromSupernode() + } } }) } diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutTipItem.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutTipItem.swift new file mode 100644 index 0000000000..847acd5a14 --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutTipItem.swift @@ -0,0 +1,462 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import SwiftSignalKit +import TelegramPresentationData +import ItemListUI +import PresentationDataUtils +import TelegramStringFormatting + +class BotCheckoutTipItem: ListViewItem, ItemListItem { + let theme: PresentationTheme + let strings: PresentationStrings + let title: String + let currency: String + let value: String + let numericValue: Int64 + let maxValue: Int64 + let availableVariants: [(String, Int64)] + let updateValue: (Int64) -> Void + let updatedFocus: (Bool) -> Void + + let sectionId: ItemListSectionId + + let requestsNoInset: Bool = true + + init(theme: PresentationTheme, strings: PresentationStrings, title: String, currency: String, value: String, numericValue: Int64, maxValue: Int64, availableVariants: [(String, Int64)], sectionId: ItemListSectionId, updateValue: @escaping (Int64) -> Void, updatedFocus: @escaping (Bool) -> Void) { + self.theme = theme + self.strings = strings + self.title = title + self.currency = currency + self.value = value + self.numericValue = numericValue + self.maxValue = maxValue + self.availableVariants = availableVariants + self.updateValue = updateValue + self.updatedFocus = updatedFocus + self.sectionId = sectionId + } + + func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { + async { + let node = BotCheckoutTipItemNode() + 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? BotCheckoutTipItemNode { + 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() + }) + } + } + } + } + } + + let selectable: Bool = false +} + +private let titleFont = Font.regular(17.0) +private let finalFont = Font.semibold(17.0) + +private func priceItemInsets(_ neighbors: ItemListNeighbors) -> UIEdgeInsets { + var insets = UIEdgeInsets() + switch neighbors.top { + case .otherSection: + insets.top += 8.0 + case .none, .sameSection: + break + } + switch neighbors.bottom { + case .none, .otherSection: + insets.bottom += 8.0 + case .sameSection: + break + } + return insets +} + +private final class TipValueNode: ASDisplayNode { + private let backgroundNode: ASImageNode + private let titleNode: ImmediateTextNode + + private let button: HighlightTrackingButtonNode + + private var currentBackgroundColor: UIColor? + + var action: (() -> Void)? + + override init() { + self.backgroundNode = ASImageNode() + self.titleNode = ImmediateTextNode() + + self.button = HighlightTrackingButtonNode() + + super.init() + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.titleNode) + self.addSubnode(self.button) + self.button.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside) + } + + @objc private func buttonPressed() { + self.action?() + } + + func update(theme: PresentationTheme, text: String, isHighlighted: Bool, height: CGFloat) -> (CGFloat, (CGFloat) -> Void) { + var updateBackground = false + let backgroundColor = isHighlighted ? theme.list.paymentOption.activeFillColor : theme.list.paymentOption.inactiveFillColor + if let currentBackgroundColor = self.currentBackgroundColor { + if !currentBackgroundColor.isEqual(backgroundColor) { + updateBackground = true + } + } else { + updateBackground = true + } + if updateBackground { + self.currentBackgroundColor = backgroundColor + self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 20.0, color: backgroundColor) + } + + self.titleNode.attributedText = NSAttributedString(string: text, font: Font.semibold(15.0), textColor: isHighlighted ? theme.list.paymentOption.activeForegroundColor : theme.list.paymentOption.inactiveForegroundColor) + let titleSize = self.titleNode.updateLayout(CGSize(width: 200.0, height: height)) + + let minWidth: CGFloat = 80.0 + + let calculatedWidth = max(titleSize.width + 16.0 * 2.0, minWidth) + + return (calculatedWidth, { calculatedWidth in + self.titleNode.frame = CGRect(origin: CGPoint(x: floor((calculatedWidth - titleSize.width) / 2.0), y: floor((height - titleSize.height) / 2.0)), size: titleSize) + + let size = CGSize(width: calculatedWidth, height: height) + self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size) + + self.button.frame = CGRect(origin: CGPoint(), size: size) + }) + } +} + +class BotCheckoutTipItemNode: ListViewItemNode, UITextFieldDelegate { + private let backgroundNode: ASDisplayNode + let titleNode: TextNode + let labelNode: TextNode + let tipMeasurementNode: ImmediateTextNode + let tipCurrencyNode: ImmediateTextNode + private let textNode: TextFieldNode + + private let scrollNode: ASScrollNode + private var valueNodes: [TipValueNode] = [] + + private var item: BotCheckoutTipItem? + + private var formatterDelegate: CurrencyUITextFieldDelegate? + + init() { + self.backgroundNode = ASDisplayNode() + + self.titleNode = TextNode() + self.titleNode.isUserInteractionEnabled = false + + self.labelNode = TextNode() + self.labelNode.isUserInteractionEnabled = false + + self.tipMeasurementNode = ImmediateTextNode() + self.tipCurrencyNode = ImmediateTextNode() + + self.textNode = TextFieldNode() + + self.scrollNode = ASScrollNode() + self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true + self.scrollNode.view.showsVerticalScrollIndicator = false + self.scrollNode.view.showsHorizontalScrollIndicator = false + self.scrollNode.view.scrollsToTop = false + self.scrollNode.view.delaysContentTouches = false + self.scrollNode.view.canCancelContentTouches = true + if #available(iOS 11.0, *) { + self.scrollNode.view.contentInsetAdjustmentBehavior = .never + } + + super.init(layerBacked: false, dynamicBounce: false) + + self.addSubnode(self.backgroundNode) + + self.addSubnode(self.titleNode) + self.addSubnode(self.labelNode) + self.addSubnode(self.textNode) + self.addSubnode(self.tipCurrencyNode) + self.addSubnode(self.scrollNode) + + self.textNode.clipsToBounds = true + self.textNode.textField.addTarget(self, action: #selector(self.textFieldTextChanged(_:)), for: .editingChanged) + self.textNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0) + } + + func asyncLayout() -> (_ item: BotCheckoutTipItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + let makeTitleLayout = TextNode.asyncLayout(self.titleNode) + let makeLabelLayout = TextNode.asyncLayout(self.labelNode) + + return { item, params, neighbors in + //let rightInset: CGFloat = 16.0 + params.rightInset + + let labelsContentHeight: CGFloat = 34.0 + + var contentSize = CGSize(width: params.width, height: labelsContentHeight) + if !item.availableVariants.isEmpty { + contentSize.height += 75.0 + } + + let insets = priceItemInsets(neighbors) + + let textFont: UIFont + let textColor: UIColor + + textFont = titleFont + textColor = item.theme.list.itemSecondaryTextColor + + let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: textFont, textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 20.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.strings.Checkout_OptionalTipItemPlaceholder, font: textFont, textColor: textColor.withMultipliedAlpha(0.8)), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 20.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in + if let strongSelf = self { + strongSelf.item = item + + let _ = titleApply() + let _ = labelApply() + + let leftInset: CGFloat = 16.0 + params.leftInset + + strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((labelsContentHeight - titleLayout.size.height) / 2.0)), size: titleLayout.size) + strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: params.width - leftInset - labelLayout.size.width, y: floor((labelsContentHeight - labelLayout.size.height) / 2.0)), size: labelLayout.size) + + if strongSelf.formatterDelegate == nil { + strongSelf.formatterDelegate = CurrencyUITextFieldDelegate(formatter: CurrencyFormatter(currency: item.currency, { formatter in + formatter.maxValue = currencyToFractionalAmount(value: item.maxValue, currency: item.currency) ?? 10000.0 + formatter.minValue = 0.0 + formatter.hasDecimals = true + })) + strongSelf.formatterDelegate?.passthroughDelegate = strongSelf + + strongSelf.formatterDelegate?.textUpdated = { + guard let strongSelf = self else { + return + } + strongSelf.textFieldTextChanged(strongSelf.textNode.textField) + } + + strongSelf.textNode.clipsToBounds = true + strongSelf.textNode.textField.delegate = strongSelf.formatterDelegate + + /*let toolbar: UIToolbar = UIToolbar() + toolbar.tintColor = item.theme.rootController.navigationBar.accentTextColor + toolbar.barTintColor = item.theme.rootController.navigationBar.backgroundColor + toolbar.barStyle = .default + toolbar.items = [ + UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: self, action: nil), + UIBarButtonItem(title: item.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.dismissKeyboard)) + ] + toolbar.sizeToFit() + + strongSelf.textNode.textField.inputAccessoryView = toolbar*/ + } + + strongSelf.textNode.textField.typingAttributes = [NSAttributedString.Key.font: titleFont] + strongSelf.textNode.textField.font = titleFont + + strongSelf.textNode.textField.textColor = textColor + strongSelf.textNode.textField.textAlignment = .right + strongSelf.textNode.textField.keyboardAppearance = item.theme.rootController.keyboardColor.keyboardAppearance + strongSelf.textNode.textField.keyboardType = .decimalPad + strongSelf.textNode.textField.returnKeyType = .next + strongSelf.textNode.textField.tintColor = item.theme.list.itemAccentColor + + var textInputFrame = CGRect(origin: CGPoint(x: params.width - leftInset - 150.0, y: -2.0), size: CGSize(width: 150.0, height: labelsContentHeight)) + + let currencyText: (String, String, Bool) = formatCurrencyAmountCustom(item.numericValue, currency: item.currency) + + let currencySymbolOnTheLeft = currencyText.2 + //let currencySymbolOnTheLeft = true + + if strongSelf.textNode.textField.text ?? "" != currencyText.0 { + strongSelf.textNode.textField.text = currencyText.0 + strongSelf.labelNode.isHidden = !currencyText.0.isEmpty + } + + strongSelf.tipMeasurementNode.attributedText = NSAttributedString(string: currencyText.0, font: titleFont, textColor: textColor) + let inputTextSize = strongSelf.tipMeasurementNode.updateLayout(textInputFrame.size) + + let spaceRect = NSAttributedString(string: " ", font: titleFont, textColor: textColor).boundingRect(with: CGSize(width: 100.0, height: 100.0), options: .usesLineFragmentOrigin, context: nil) + + strongSelf.tipCurrencyNode.attributedText = NSAttributedString(string: "\(currencyText.1)", font: titleFont, textColor: textColor) + let currencySize = strongSelf.tipCurrencyNode.updateLayout(CGSize(width: 100.0, height: .greatestFiniteMagnitude)) + if currencySymbolOnTheLeft { + strongSelf.tipCurrencyNode.frame = CGRect(origin: CGPoint(x: textInputFrame.maxX - currencySize.width - inputTextSize.width - spaceRect.width, y: floor((labelsContentHeight - currencySize.height) / 2.0) - 1.0), size: currencySize) + } else { + strongSelf.tipCurrencyNode.frame = CGRect(origin: CGPoint(x: textInputFrame.maxX - currencySize.width, y: floor((labelsContentHeight - currencySize.height) / 2.0) - 1.0), size: currencySize) + textInputFrame.origin.x -= currencySize.width + spaceRect.width + } + + strongSelf.textNode.frame = textInputFrame + + let valueHeight: CGFloat = 52.0 + let valueY: CGFloat = labelsContentHeight + 9.0 + + var index = 0 + var variantLayouts: [(CGFloat, (CGFloat) -> Void)] = [] + var totalMinWidth: CGFloat = 0.0 + for (variantText, variantValue) in item.availableVariants { + let valueNode: TipValueNode + if strongSelf.valueNodes.count > index { + valueNode = strongSelf.valueNodes[index] + } else { + valueNode = TipValueNode() + strongSelf.valueNodes.append(valueNode) + strongSelf.scrollNode.addSubnode(valueNode) + } + let (nodeMinWidth, nodeApply) = valueNode.update(theme: item.theme, text: variantText, isHighlighted: item.value == variantText, height: valueHeight) + valueNode.action = { + guard let strongSelf = self else { + return + } + strongSelf.item?.updateValue(variantValue) + } + totalMinWidth += nodeMinWidth + variantLayouts.append((nodeMinWidth, nodeApply)) + index += 1 + } + + let sideInset: CGFloat = params.leftInset + 16.0 + var scaleFactor: CGFloat = 1.0 + let availableWidth = params.width - sideInset * 2.0 - CGFloat(max(0, item.availableVariants.count - 1)) * 12.0 + if totalMinWidth < availableWidth { + scaleFactor = availableWidth / totalMinWidth + } + + var variantsOffset: CGFloat = sideInset + for index in 0 ..< item.availableVariants.count { + if index != 0 { + variantsOffset += 12.0 + } + + let valueNode: TipValueNode = strongSelf.valueNodes[index] + let (minWidth, nodeApply) = variantLayouts[index] + + let nodeWidth = floor(scaleFactor * minWidth) + + var valueFrame = CGRect(origin: CGPoint(x: variantsOffset, y: 0.0), size: CGSize(width: nodeWidth, height: valueHeight)) + if scaleFactor > 1.0 && index == item.availableVariants.count - 1 { + valueFrame.size.width = params.width - sideInset - valueFrame.minX + } + + valueNode.frame = valueFrame + nodeApply(nodeWidth) + variantsOffset += nodeWidth + } + + variantsOffset += 16.0 + + strongSelf.scrollNode.frame = CGRect(origin: CGPoint(x: 0.0, y: valueY), size: CGSize(width: params.width, height: max(0.0, contentSize.height - valueY))) + strongSelf.scrollNode.view.contentSize = CGSize(width: variantsOffset, height: strongSelf.scrollNode.frame.height) + + strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: params.width, height: contentSize.height)) + } + }) + } + } + + @objc private func dismissKeyboard() { + self.textNode.textField.resignFirstResponder() + } + + @objc private func textFieldTextChanged(_ textField: UITextField) { + let text = textField.text ?? "" + self.labelNode.isHidden = !text.isEmpty + + guard let item = self.item else { + return + } + + if text.isEmpty { + item.updateValue(0) + return + } + + var cleanText = "" + for c in text { + if c.isNumber { + cleanText.append(c) + } else if c == "," { + cleanText.append(".") + } + } + + guard let doubleValue = Double(cleanText) else { + return + } + + if var value = fractionalToCurrencyAmount(value: doubleValue, currency: item.currency) { + if value > item.maxValue { + value = item.maxValue + + let currencyText = formatCurrencyAmountCustom(value, currency: item.currency) + if self.textNode.textField.text ?? "" != currencyText.0 { + self.textNode.textField.text = currencyText.0 + } + } + item.updateValue(value) + } + } + + @objc public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { + return true + } + + @objc public func textFieldShouldReturn(_ textField: UITextField) -> Bool { + return false + } + + @objc public func textFieldDidBeginEditing(_ textField: UITextField) { + textField.selectedTextRange = textField.textRange(from: textField.endOfDocument, to: textField.endOfDocument) + + self.item?.updatedFocus(true) + } + + @objc public func textFieldDidChangeSelection(_ textField: UITextField) { + textField.selectedTextRange = textField.textRange(from: textField.endOfDocument, to: textField.endOfDocument) + } + + @objc public func textFieldDidEndEditing(_ textField: UITextField) { + } + + 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/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift b/submodules/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift index 615488fc73..947331fc9c 100644 --- a/submodules/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift @@ -117,7 +117,7 @@ final class BotPaymentFieldItemNode: BotPaymentItemNode, UITextFieldDelegate { textInset = max(measuredInset, textInset) - transition.updateFrame(node: self.textField, frame: CGRect(origin: CGPoint(x: textInset, y: 3.0), size: CGSize(width: max(1.0, width - textInset - 8.0), height: 40.0))) + transition.updateFrame(node: self.textField, frame: CGRect(origin: CGPoint(x: textInset, y: 0.0), size: CGSize(width: max(1.0, width - textInset - 8.0), height: 40.0))) return 44.0 } diff --git a/submodules/BotPaymentsUI/Sources/BotReceiptController.swift b/submodules/BotPaymentsUI/Sources/BotReceiptController.swift index 35522c55cb..7469586563 100644 --- a/submodules/BotPaymentsUI/Sources/BotReceiptController.swift +++ b/submodules/BotPaymentsUI/Sources/BotReceiptController.swift @@ -20,16 +20,14 @@ public final class BotReceiptController: ViewController { } private let context: AccountContext - private let invoice: TelegramMediaInvoice private let messageId: MessageId private var presentationData: PresentationData private var didPlayPresentationAnimation = false - public init(context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId) { + public init(context: AccountContext, messageId: MessageId) { self.context = context - self.invoice = invoice self.messageId = messageId self.presentationData = context.sharedContext.currentPresentationData.with { $0 } @@ -38,10 +36,10 @@ public final class BotReceiptController: ViewController { self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style - var title = self.presentationData.strings.Checkout_Receipt_Title - if invoice.flags.contains(.isTest) { + let title = self.presentationData.strings.Checkout_Receipt_Title + /*if invoice.flags.contains(.isTest) { title += " (Test)" - } + }*/ self.title = title } @@ -54,7 +52,7 @@ public final class BotReceiptController: ViewController { if let strongSelf = self { strongSelf.navigationOffset = offset } - }, context: self.context, invoice: self.invoice, messageId: self.messageId, dismissAnimated: { [weak self] in + }, context: self.context, messageId: self.messageId, dismissAnimated: { [weak self] in self?.dismiss() }) diff --git a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift index 66f7a19f37..f605cf78dd 100644 --- a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift @@ -28,7 +28,7 @@ private enum BotReceiptSection: Int32 { enum BotReceiptEntry: ItemListNodeEntry { case header(PresentationTheme, TelegramMediaInvoice, String) - case price(Int, PresentationTheme, String, String, Bool) + case price(Int, PresentationTheme, String, String, Bool, Bool) case paymentMethod(PresentationTheme, String, String) case shippingInfo(PresentationTheme, String, String) case shippingMethod(PresentationTheme, String, String) @@ -39,7 +39,7 @@ enum BotReceiptEntry: ItemListNodeEntry { var section: ItemListSectionId { switch self { case .header: - return BotReceiptSection.header.rawValue + return BotReceiptSection.prices.rawValue case .price: return BotReceiptSection.prices.rawValue default: @@ -51,7 +51,7 @@ enum BotReceiptEntry: ItemListNodeEntry { switch self { case .header: return 0 - case let .price(index, _, _, _, _): + case let .price(index, _, _, _, _, _): return 1 + Int32(index) case .paymentMethod: return 10000 + 0 @@ -85,8 +85,8 @@ enum BotReceiptEntry: ItemListNodeEntry { } else { return false } - case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsFinal): - if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsFinal) = rhs { + case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsHasSeparator, lhsFinal): + if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsHasSeparator, rhsFinal) = rhs { if lhsIndex != rhsIndex { return false } @@ -99,6 +99,9 @@ enum BotReceiptEntry: ItemListNodeEntry { if lhsValue != rhsValue { return false } + if lhsHasSeparator != rhsHasSeparator { + return false + } if lhsFinal != rhsFinal { return false } @@ -154,39 +157,41 @@ enum BotReceiptEntry: ItemListNodeEntry { switch self { case let .header(theme, invoice, botName): return BotCheckoutHeaderItem(account: arguments.account, theme: theme, invoice: invoice, botName: botName, sectionId: self.section) - case let .price(_, theme, text, value, isFinal): - return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, sectionId: self.section) - case let .paymentMethod(theme, text, value): + case let .price(_, theme, text, value, hasSeparator, isFinal): + return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, hasSeparator: hasSeparator, shimmeringIndex: nil, sectionId: self.section) + case let .paymentMethod(_, text, value): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil) - case let .shippingInfo(theme, text, value): + case let .shippingInfo(_, text, value): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil) - case let .shippingMethod(theme, text, value): + case let .shippingMethod(_, text, value): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil) - case let .nameInfo(theme, text, value): + case let .nameInfo(_, text, value): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil) - case let .emailInfo(theme, text, value): + case let .emailInfo(_, text, value): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil) - case let .phoneInfo(theme, text, value): + case let .phoneInfo(_, text, value): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil) } } } -private func botReceiptControllerEntries(presentationData: PresentationData, invoice: TelegramMediaInvoice, formInvoice: BotPaymentInvoice?, formInfo: BotPaymentRequestedInfo?, shippingOption: BotPaymentShippingOption?, paymentMethodTitle: String?, botPeer: Peer?) -> [BotReceiptEntry] { +private func botReceiptControllerEntries(presentationData: PresentationData, invoice: TelegramMediaInvoice?, formInvoice: BotPaymentInvoice?, formInfo: BotPaymentRequestedInfo?, shippingOption: BotPaymentShippingOption?, paymentMethodTitle: String?, botPeer: Peer?, tipAmount: Int64?) -> [BotReceiptEntry] { var entries: [BotReceiptEntry] = [] var botName = "" if let botPeer = botPeer { botName = botPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) } - entries.append(.header(presentationData.theme, invoice, botName)) + if let invoice = invoice { + entries.append(.header(presentationData.theme, invoice, botName)) + } if let formInvoice = formInvoice { var totalPrice: Int64 = 0 var index = 0 for price in formInvoice.prices { - entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), false)) + entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), index == 0, false)) totalPrice += price.amount index += 1 } @@ -196,13 +201,19 @@ private func botReceiptControllerEntries(presentationData: PresentationData, inv shippingOptionString = shippingOption.title for price in shippingOption.prices { - entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), false)) + entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), index == 0, false)) totalPrice += price.amount index += 1 } } + + if let tipAmount = tipAmount, tipAmount != 0 { + entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TipItem, formatCurrencyAmount(tipAmount, currency: formInvoice.currency), index == 0, false)) + totalPrice += tipAmount + index += 1 + } - entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: formInvoice.currency), true)) + entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: formInvoice.currency), true, true)) if let paymentMethodTitle = paymentMethodTitle { entries.append(.paymentMethod(presentationData.theme, presentationData.strings.Checkout_PaymentMethod, paymentMethodTitle)) @@ -262,12 +273,14 @@ final class BotReceiptControllerNode: ItemListControllerNode { private var presentationData: PresentationData - private let receiptData = Promise<(BotPaymentInvoice, BotPaymentRequestedInfo?, BotPaymentShippingOption?, String?)?>(nil) + private let receiptData = Promise<(BotPaymentInvoice, BotPaymentRequestedInfo?, BotPaymentShippingOption?, String?, TelegramMediaInvoice, Int64?)?>(nil) private var dataRequestDisposable: Disposable? - + + private let actionButtonPanelNode: ASDisplayNode + private let actionButtonPanelSeparator: ASDisplayNode private let actionButton: BotCheckoutActionButton - init(controller: ItemListController?, navigationBar: NavigationBar, updateNavigationOffset: @escaping (CGFloat) -> Void, context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, dismissAnimated: @escaping () -> Void) { + init(controller: ItemListController?, navigationBar: NavigationBar, updateNavigationOffset: @escaping (CGFloat) -> Void, context: AccountContext, messageId: MessageId, dismissAnimated: @escaping () -> Void) { self.context = context self.dismissAnimated = dismissAnimated @@ -277,24 +290,36 @@ final class BotReceiptControllerNode: ItemListControllerNode { let signal: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError> = combineLatest(context.sharedContext.presentationData, receiptData.get(), context.account.postbox.loadedPeerWithId(messageId.peerId)) |> map { presentationData, receiptData, botPeer -> (ItemListPresentationData, (ItemListNodeState, Any)) in - let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botReceiptControllerEntries(presentationData: presentationData, invoice: invoice, formInvoice: receiptData?.0, formInfo: receiptData?.1, shippingOption: receiptData?.2, paymentMethodTitle: receiptData?.3, botPeer: botPeer), style: .plain, focusItemTag: nil, emptyStateItem: nil, animateChanges: false) + let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botReceiptControllerEntries(presentationData: presentationData, invoice: receiptData?.4, formInvoice: receiptData?.0, formInfo: receiptData?.1, shippingOption: receiptData?.2, paymentMethodTitle: receiptData?.3, botPeer: botPeer, tipAmount: receiptData?.5), style: .blocks, focusItemTag: nil, emptyStateItem: nil, animateChanges: false) return (ItemListPresentationData(presentationData), (nodeState, arguments)) } + + self.actionButtonPanelNode = ASDisplayNode() + self.actionButtonPanelNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor + + self.actionButtonPanelSeparator = ASDisplayNode() + self.actionButtonPanelSeparator.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor - self.actionButton = BotCheckoutActionButton(inactiveFillColor: self.presentationData.theme.list.plainBackgroundColor, activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.plainBackgroundColor) - self.actionButton.setState(.inactive(self.presentationData.strings.Common_Done)) + self.actionButton = BotCheckoutActionButton(activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.plainBackgroundColor) + self.actionButton.setState(.active(self.presentationData.strings.Common_Done)) super.init(controller: controller, navigationBar: navigationBar, updateNavigationOffset: updateNavigationOffset, state: signal) self.dataRequestDisposable = (requestBotPaymentReceipt(account: context.account, messageId: messageId) |> deliverOnMainQueue).start(next: { [weak self] receipt in if let strongSelf = self { - strongSelf.receiptData.set(.single((receipt.invoice, receipt.info, receipt.shippingOption, receipt.credentialsTitle))) + UIView.transition(with: strongSelf.view, duration: 0.25, options: UIView.AnimationOptions.transitionCrossDissolve, animations: { + }, completion: nil) + + strongSelf.receiptData.set(.single((receipt.invoice, receipt.info, receipt.shippingOption, receipt.credentialsTitle, receipt.invoiceMedia, receipt.tipAmount))) } }) self.actionButton.addTarget(self, action: #selector(self.actionButtonPressed), forControlEvents: .touchUpInside) - self.addSubnode(self.actionButton) + + self.addSubnode(self.actionButtonPanelNode) + self.actionButtonPanelNode.addSubnode(self.actionButtonPanelSeparator) + self.actionButtonPanelNode.addSubnode(self.actionButton) } deinit { @@ -303,12 +328,21 @@ final class BotReceiptControllerNode: ItemListControllerNode { override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition, additionalInsets: UIEdgeInsets) { var updatedInsets = layout.intrinsicInsets - updatedInsets.bottom += BotCheckoutActionButton.diameter + 20.0 - super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets) - - let actionButtonFrame = CGRect(origin: CGPoint(x: 10.0, y: layout.size.height - 10.0 - BotCheckoutActionButton.diameter - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width - 20.0, height: BotCheckoutActionButton.diameter)) + + let bottomPanelHorizontalInset: CGFloat = 16.0 + let bottomPanelVerticalInset: CGFloat = 16.0 + let bottomPanelHeight = max(updatedInsets.bottom, layout.inputHeight ?? 0.0) + bottomPanelVerticalInset * 2.0 + BotCheckoutActionButton.height + + transition.updateFrame(node: self.actionButtonPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomPanelHeight), size: CGSize(width: layout.size.width, height: bottomPanelHeight))) + transition.updateFrame(node: self.actionButtonPanelSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: UIScreenPixel))) + + let actionButtonFrame = CGRect(origin: CGPoint(x: bottomPanelHorizontalInset, y: bottomPanelVerticalInset), size: CGSize(width: layout.size.width - bottomPanelHorizontalInset * 2.0, height: BotCheckoutActionButton.height)) transition.updateFrame(node: self.actionButton, frame: actionButtonFrame) - self.actionButton.updateLayout(size: actionButtonFrame.size, transition: transition) + self.actionButton.updateLayout(absoluteRect: actionButtonFrame.offsetBy(dx: self.actionButtonPanelNode.frame.minX, dy: self.actionButtonPanelNode.frame.minY), containerSize: layout.size, transition: transition) + + updatedInsets.bottom = bottomPanelHeight + + super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets) } @objc func actionButtonPressed() { diff --git a/submodules/BotPaymentsUI/Sources/Formatter/Currency.swift b/submodules/BotPaymentsUI/Sources/Formatter/Currency.swift new file mode 100644 index 0000000000..de6e7c03d2 --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/Formatter/Currency.swift @@ -0,0 +1,178 @@ +// +// CurrencyCode.swift +// CurrencyText +// +// Created by Felipe Lefèvre Marino on 1/26/19. +// + +import Foundation + +/// Currency wraps all availabe currencies that can represented as formatted monetary values +/// A currency code is a three-letter code that is, in most cases, +/// composed of a country’s two-character Internet country code plus an extra character +/// to denote the currency unit. For example, the currency code for the Australian +/// dollar is “AUD”. Currency codes are based on the ISO 4217 standard +public enum Currency: String { + case afghani = "AFN", + algerianDinar = "DZD", + argentinePeso = "ARS", + armenianDram = "AMD", + arubanFlorin = "AWG", + australianDollar = "AUD", + azerbaijanManat = "AZN", + bahamianDollar = "BSD", + bahrainiDinar = "BHD", + baht = "THB", + balboa = "PAB", + barbadosDollar = "BBD", + belarusianRuble = "BYN", + belizeDollar = "BZD", + bermudianDollar = "BMD", + boliviano = "BOB", + bolívar = "VEF", + brazilianReal = "BRL", + bruneiDollar = "BND", + bulgarianLev = "BGN", + burundiFranc = "BIF", + caboVerdeEscudo = "CVE", + canadianDollar = "CAD", + caymanIslandsDollar = "KYD", + chileanPeso = "CLP", + colombianPeso = "COP", + comorianFranc = "KMF", + congoleseFranc = "CDF", + convertibleMark = "BAM", + cordobaOro = "NIO", + costaRicanColon = "CRC", + cubanPeso = "CUP", + czechKoruna = "CZK", + dalasi = "GMD", + danishKrone = "DKK", + denar = "MKD", + djiboutiFranc = "DJF", + dobra = "STN", + dollar = "USD", + dominicanPeso = "DOP", + dong = "VND", + eastCaribbeanDollar = "XCD", + egyptianPound = "EGP", + elSalvadorColon = "SVC", + ethiopianBirr = "ETB", + euro = "EUR", + falklandIslandsPound = "FKP", + fijiDollar = "FJD", + forint = "HUF", + ghanaCedi = "GHS", + gibraltarPound = "GIP", + gourde = "HTG", + guarani = "PYG", + guineanFranc = "GNF", + guyanaDollar = "GYD", + hongKongDollar = "HKD", + hryvnia = "UAH", + icelandKrona = "ISK", + indianRupee = "INR", + iranianRial = "IRR", + iraqiDinar = "IQD", + jamaicanDollar = "JMD", + jordanianDinar = "JOD", + kenyanShilling = "KES", + kina = "PGK", + kuna = "HRK", + kuwaitiDinar = "KWD", + kwanza = "AOA", + kyat = "MMK", + laoKip = "LAK", + lari = "GEL", + lebanesePound = "LBP", + lek = "ALL", + lempira = "HNL", + leone = "SLL", + liberianDollar = "LRD", + libyanDinar = "LYD", + lilangeni = "SZL", + loti = "LSL", + malagasyAriary = "MGA", + malawiKwacha = "MWK", + malaysianRinggit = "MYR", + mauritiusRupee = "MUR", + mexicanPeso = "MXN", + mexicanUnidadDeInversion = "MXV", + moldovanLeu = "MDL", + moroccanDirham = "MAD", + mozambiqueMetical = "MZN", + mvdol = "BOV", + naira = "NGN", + nakfa = "ERN", + namibiaDollar = "NAD", + nepaleseRupee = "NPR", + netherlandsAntilleanGuilder = "ANG", + newIsraeliSheqel = "ILS", + newTaiwanDollar = "TWD", + newZealandDollar = "NZD", + ngultrum = "BTN", + northKoreanWon = "KPW", + norwegianKrone = "NOK", + ouguiya = "MRU", + paanga = "TOP", + pakistanRupee = "PKR", + pataca = "MOP", + pesoConvertible = "CUC", + pesoUruguayo = "UYU", + philippinePiso = "PHP", + poundSterling = "GBP", + pula = "BWP", + qatariRial = "QAR", + quetzal = "GTQ", + rand = "ZAR", + rialOmani = "OMR", + riel = "KHR", + romanianLeu = "RON", + rufiyaa = "MVR", + rupiah = "IDR", + russianRuble = "RUB", + rwandaFranc = "RWF", + saintHelenaPound = "SHP", + saudiRiyal = "SAR", + serbianDinar = "RSD", + seychellesRupee = "SCR", + singaporeDollar = "SGD", + sol = "PEN", + solomonIslandsDollar = "SBD", + som = "KGS", + somaliShilling = "SOS", + somoni = "TJS", + southSudanesePound = "SSP", + sriLankaRupee = "LKR", + sudanesePound = "SDG", + surinamDollar = "SRD", + swedishKrona = "SEK", + swissFranc = "CHF", + syrianPound = "SYP", + taka = "BDT", + tala = "WST", + tanzanianShilling = "TZS", + tenge = "KZT", + trinidadAndTobagoDollar = "TTD", + tugrik = "MNT", + tunisianDinar = "TND", + turkishLira = "TRY", + turkmenistanNewManat = "TMT", + uaeDirham = "AED", + ugandaShilling = "UGX", + unidadDeFomento = "CLF", + unidadDeValorReal = "COU", + uruguayPesoEnUnidadesIndexadas = "UYI", + uzbekistanSum = "UZS", + vatu = "VUV", + wirEuro = "CHE", + wirFranc = "CHW", + won = "KRW", + yemeniRial = "YER", + yen = "JPY", + yuanRenminbi = "CNY", + zambianKwacha = "ZMW", + zimbabweDollar = "ZWL", + zloty = "PLN", + none +} diff --git a/submodules/BotPaymentsUI/Sources/Formatter/CurrencyFormatter.swift b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyFormatter.swift new file mode 100644 index 0000000000..ef732a1874 --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyFormatter.swift @@ -0,0 +1,345 @@ +// +// CurrencyFormatter.swift +// CurrencyText +// +// Created by Felipe Lefèvre Marino on 1/27/19. +// + +import Foundation + +import TelegramStringFormatting + +// MARK: - Currency protocols + +public protocol CurrencyFormatting { + var maxDigitsCount: Int { get } + var decimalDigits: Int { get set } + var maxValue: Double? { get set } + var minValue: Double? { get set } + var initialText: String { get } + var currencySymbol: String { get set } + + func string(from double: Double) -> String? + func unformatted(string: String) -> String? + func double(from string: String) -> Double? +} + +public protocol CurrencyAdjusting { + func formattedStringWithAdjustedDecimalSeparator(from string: String) -> String? + func formattedStringAdjustedToFitAllowedValues(from string: String) -> String? +} + +// MARK: - Currency formatter + +public class CurrencyFormatter: CurrencyFormatting { + + /// Set the locale to retrieve the currency from + /// You can pass a Swift type Locale or one of the + /// Locales enum options - that encapsulates all available locales. + public var locale: LocaleConvertible { + set { self.numberFormatter.locale = newValue.locale } + get { self.numberFormatter.locale } + } + + /// Set the desired currency type + /// * Note: The currency take effetcs above the displayed currency symbol, + /// however details such as decimal separators, grouping separators and others + /// will be set based on the defined locale. So for a precise experience, please + /// preferarbly setup both, when you are setting a currency that does not match the + /// default/current user locale. + public var currency: Currency { + set { numberFormatter.currencyCode = newValue.rawValue } + get { Currency(rawValue: numberFormatter.currencyCode) ?? .dollar } + } + + /// Define if currency symbol should be presented or not. + /// Note: when set to false the current currency symbol is removed + public var showCurrencySymbol: Bool = true { + didSet { + numberFormatter.currencySymbol = showCurrencySymbol ? numberFormatter.currencySymbol : "" + } + } + + /// The currency's symbol. + /// Can be used to read or set a custom symbol. + /// Note: showCurrencySymbol must be set to true for + /// the currencySymbol to be correctly changed. + public var currencySymbol: String { + set { + guard showCurrencySymbol else { return } + numberFormatter.currencySymbol = newValue + } + get { numberFormatter.currencySymbol } + } + + /// The lowest number allowed as input. + /// This value is initially set to the text field text + /// when defined. + public var minValue: Double? { + set { + guard let newValue = newValue else { return } + numberFormatter.minimum = NSNumber(value: newValue) + } + get { + if let minValue = numberFormatter.minimum { + return Double(truncating: minValue) + } + return nil + } + } + + /// The highest number allowed as input. + /// The text field will not allow the user to increase the input + /// value beyond it, when defined. + public var maxValue: Double? { + set { + guard let newValue = newValue else { return } + numberFormatter.maximum = NSNumber(value: newValue) + } + get { + if let maxValue = numberFormatter.maximum { + return Double(truncating: maxValue) + } + return nil + } + } + + /// The number of decimal digits shown. + /// default is set to zero. + /// * Example: With decimal digits set to 3, if the value to represent is "1", + /// the formatted text in the fractions will be ",001". + /// Other than that with the value as 1, the formatted text fractions will be ",1". + public var decimalDigits: Int { + set { + numberFormatter.minimumFractionDigits = newValue + numberFormatter.maximumFractionDigits = newValue + } + get { numberFormatter.minimumFractionDigits } + } + + /// Set decimal numbers behavior. + /// When set to true decimalDigits are automatically set to 2 (most currencies pattern), + /// and the decimal separator is presented. Otherwise decimal digits are not shown and + /// the separator gets hidden as well + /// When reading it returns the current pattern based on the setup. + /// Note: Setting decimal digits after, or alwaysShowsDecimalSeparator can overlap this definitios, + /// and should be only done if you need specific cases + public var hasDecimals: Bool { + set { + self.decimalDigits = newValue ? 2 : 0 + self.numberFormatter.alwaysShowsDecimalSeparator = newValue ? true : false + } + get { decimalDigits != 0 } + } + + /// Defines the string that is the decimal separator + /// Note: only presented when hasDecimals is true OR decimalDigits + /// is greater than 0. + public var decimalSeparator: String { + set { self.numberFormatter.currencyDecimalSeparator = newValue } + get { numberFormatter.currencyDecimalSeparator } + } + + /// Can be used to set a custom currency code string + public var currencyCode: String { + set { self.numberFormatter.currencyCode = newValue } + get { numberFormatter.currencyCode } + } + + /// Sets if decimal separator should always be presented, + /// even when decimal digits are disabled + public var alwaysShowsDecimalSeparator: Bool { + set { self.numberFormatter.alwaysShowsDecimalSeparator = newValue } + get { numberFormatter.alwaysShowsDecimalSeparator } + } + + /// The amount of grouped numbers. This definition is fixed for at least + /// the first non-decimal group of numbers, and is applied to all other + /// groups if secondaryGroupingSize does not have another value. + public var groupingSize: Int { + set { self.numberFormatter.groupingSize = newValue } + get { numberFormatter.groupingSize } + } + + /// The amount of grouped numbers after the first group. + /// Example: for the given value of 99999999999, when grouping size + /// is set to 3 and secondaryGroupingSize has 4 as value, + /// the number is represented as: (9999) (9999) [999]. + /// Beign [] grouping size and () secondary grouping size. + public var secondaryGroupingSize: Int { + set { self.numberFormatter.secondaryGroupingSize = newValue } + get { numberFormatter.secondaryGroupingSize } + } + + /// Defines the string that is shown between groups of numbers + /// * Example: a monetary value of a thousand (1000) with a grouping + /// separator == "." is represented as `1.000` *. + /// Note: It automatically sets hasGroupingSeparator to true. + public var groupingSeparator: String { + set { + self.numberFormatter.currencyGroupingSeparator = newValue + self.numberFormatter.usesGroupingSeparator = true + } + get { self.numberFormatter.currencyGroupingSeparator } + } + + /// Sets if has separator between all group of numbers. + /// * Example: when set to false, a bug number such as a million + /// is represented by tight numbers "1000000". Otherwise if set + /// to true each group is separated by the defined `groupingSeparator`. * + /// Note: When set to true only works by defining a grouping separator. + public var hasGroupingSeparator: Bool { + set { self.numberFormatter.usesGroupingSeparator = newValue } + get { self.numberFormatter.usesGroupingSeparator } + } + + /// Value that will be presented when the text field + /// text values matches zero (0) + public var zeroSymbol: String? { + set { numberFormatter.zeroSymbol = newValue } + get { numberFormatter.zeroSymbol } + } + + /// Value that will be presented when the text field + /// is empty. The default is "" - empty string + public var nilSymbol: String { + set { numberFormatter.nilSymbol = newValue } + get { return numberFormatter.nilSymbol } + } + + /// Encapsulated Number formatter + let numberFormatter: NumberFormatter + + /// Maximum allowed number of integers + public var maxIntegers: Int? { + set { + guard let maxIntegers = newValue else { return } + numberFormatter.maximumIntegerDigits = maxIntegers + } + get { return numberFormatter.maximumIntegerDigits } + } + + /// Returns the maximum allowed number of numerical characters + public var maxDigitsCount: Int { + numberFormatter.maximumIntegerDigits + numberFormatter.maximumFractionDigits + } + + /// The value zero formatted to serve as initial text. + public var initialText: String { + numberFormatter.string(from: 0) ?? "0.0" + } + + //MARK: - INIT + + /// Handler to initialize a new style. + public typealias InitHandler = ((CurrencyFormatter) -> (Void)) + + /// Initialize a new currency formatter with optional configuration handler callback. + /// + /// - Parameter handler: configuration handler callback. + + public init(currency: String, _ handler: InitHandler? = nil) { + numberFormatter = setupCurrencyNumberFormatter(currency: currency) + + numberFormatter.alwaysShowsDecimalSeparator = false + /*numberFormatter.numberStyle = .currency + + numberFormatter.minimumFractionDigits = 2 + numberFormatter.maximumFractionDigits = 2 + numberFormatter.minimumIntegerDigits = 1*/ + + handler?(self) + } +} + +// MARK: Format +extension CurrencyFormatter { + + /// Returns a currency string from a given double value. + /// + /// - Parameter double: the monetary amount. + /// - Returns: formatted currency string. + public func string(from double: Double) -> String? { + let validValue = valueAdjustedToFitAllowedValues(from: double) + return numberFormatter.string(from: validValue) + } + + /// Returns a double from a string that represents a numerical value. + /// + /// - Parameter string: string that describes the numerical value. + /// - Returns: the value as a Double. + public func double(from string: String) -> Double? { + Double(string) + } + + /// Receives a currency formatted string and returns its + /// numerical/unformatted representation. + /// + /// - Parameter string: currency formatted string + /// - Returns: numerical representation + public func unformatted(string: String) -> String? { + string.numeralFormat() + } +} + +// MARK: - Currency adjusting conformance + +extension CurrencyFormatter: CurrencyAdjusting { + + /// Receives a currency formatted String, and returns it with its decimal separator adjusted. + /// + /// _Note_: Useful when appending values to a currency formatted String. + /// E.g. "$ 23.24" after users taps an additional number, is equal = "$ 23.247". + /// Which gets updated to "$ 232.47". + /// + /// - Parameter string: The currency formatted String + /// - Returns: The currency formatted received String with its decimal separator adjusted + public func formattedStringWithAdjustedDecimalSeparator(from string: String) -> String? { + let adjustedString = numeralStringWithAdjustedDecimalSeparator(from: string) + guard let value = double(from: adjustedString) else { return nil } + + return self.numberFormatter.string(from: value) + } + + /// Receives a currency formatted String, and returns it to fit the formatter's min and max values, when needed. + /// + /// - Parameter string: The currency formatted String + /// - Returns: The currency formatted String, or the formatted version of its closes allowed value, min or max, depending on the closest boundary. + public func formattedStringAdjustedToFitAllowedValues(from string: String) -> String? { + let adjustedString = numeralStringWithAdjustedDecimalSeparator(from: string) + guard let originalValue = double(from: adjustedString) else { return nil } + + return self.string(from: originalValue) + } + + /// Receives a currency formatted String, and returns a numeral version of it with its decimal separator adjusted. + /// + /// E.g. "$ 23.24", after users taps an additional number, get equal as "$ 23.247". The returned value would be "232.47". + /// + /// - Parameter string: The currency formatted String + /// - Returns: The received String with numeral format and with its decimal separator adjusted + private func numeralStringWithAdjustedDecimalSeparator(from string: String) -> String { + var updatedString = string.numeralFormat() + let isNegative: Bool = string.contains(String.negativeSymbol) + + updatedString = isNegative ? .negativeSymbol + updatedString : updatedString + updatedString.updateDecimalSeparator(decimalDigits: decimalDigits) + + return updatedString + } + + /// Receives a Double value, and returns it adjusted to fit min and max allowed values, when needed. + /// If the value respect number formatter's min and max, it will be returned without changes. + /// + /// - Parameter value: The value to be adjusted if needed + /// - Returns: The value updated or not, depending on the formatter's settings + private func valueAdjustedToFitAllowedValues(from value: Double) -> Double { + if let minValue = minValue, value < minValue { + return minValue + } else if let maxValue = maxValue, value > maxValue { + return maxValue + } + + return value + } +} diff --git a/submodules/BotPaymentsUI/Sources/Formatter/CurrencyLocale.swift b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyLocale.swift new file mode 100644 index 0000000000..e9af7b2f76 --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyLocale.swift @@ -0,0 +1,755 @@ +// +// CurrencyLocale.swift +// CurrencyText +// +// Created by Felipe Lefèvre Marino on 1/26/19. +// + +import Foundation + +/// All locales were extracted from: +/// jacobbubu/ioslocaleidentifiers.csv - https://gist.github.com/jacobbubu/1836273 + +/// The LocaleConvertible pattern is inspired in SwiftDate by malcommac +/// https://github.com/malcommac/SwiftDate + +/// LocaleConvertible defines the behavior to convert locale info to system Locale type +public protocol LocaleConvertible { + var locale: Locale { get } +} + +extension Locale: LocaleConvertible { + public var locale: Locale { return self } +} + +/// Defines locales available in system +public enum CurrencyLocale: String, LocaleConvertible { + + case current = "current" + case autoUpdating = "currentAutoUpdating" + + case afrikaans = "af" + case afrikaansNamibia = "af_NA" + case afrikaansSouthAfrica = "af_ZA" + case aghem = "agq" + case aghemCameroon = "agq_CM" + case akan = "ak" + case akanGhana = "ak_GH" + case albanian = "sq" + case albanianAlbania = "sq_AL" + case albanianKosovo = "sq_XK" + case albanianMacedonia = "sq_MK" + case amharic = "am" + case amharicEthiopia = "am_ET" + case arabic = "ar" + case arabicAlgeria = "ar_DZ" + case arabicBahrain = "ar_BH" + case arabicChad = "ar_TD" + case arabicComoros = "ar_KM" + case arabicDjibouti = "ar_DJ" + case arabicEgypt = "ar_EG" + case arabicEritrea = "ar_ER" + case arabicIraq = "ar_IQ" + case arabicIsrael = "ar_IL" + case arabicJordan = "ar_JO" + case arabicKuwait = "ar_KW" + case arabicLebanon = "ar_LB" + case arabicLibya = "ar_LY" + case arabicMauritania = "ar_MR" + case arabicMorocco = "ar_MA" + case arabicOman = "ar_OM" + case arabicPalestinianTerritories = "ar_PS" + case arabicQatar = "ar_QA" + case arabicSaudiArabia = "ar_SA" + case arabicSomalia = "ar_SO" + case arabicSouthSudan = "ar_SS" + case arabicSudan = "ar_SD" + case arabicSyria = "ar_SY" + case arabicTunisia = "ar_TN" + case arabicUnitedArabEmirates = "ar_AE" + case arabicWesternSahara = "ar_EH" + case arabicWorld = "ar_001" + case arabicYemen = "ar_YE" + case armenian = "hy" + case armenianArmenia = "hy_AM" + case assamese = "as" + case assameseIndia = "as_IN" + case asu = "asa" + case asuTanzania = "asa_TZ" + case azerbaijani = "az_Latn" + case azerbaijaniAzerbaijan = "az_Latn_AZ" + case azerbaijaniCyrillic = "az_Cyrl" + case azerbaijaniCyrillicAzerbaijan = "az_Cyrl_AZ" + case bafia = "ksf" + case bafiaCameroon = "ksf_CM" + case bambara = "bm_Latn" + case bambaraMali = "bm_Latn_ML" + case basaa = "bas" + case basaaCameroon = "bas_CM" + case basque = "eu" + case basqueSpain = "eu_ES" + case belarusian = "be" + case belarusianBelarus = "be_BY" + case bemba = "bem" + case bembaZambia = "bem_ZM" + case bena = "bez" + case benaTanzania = "bez_TZ" + case bengali = "bn" + case bengaliBangladesh = "bn_BD" + case engaliIndia = "bn_IN" + case bodo = "brx" + case bodoIndia = "brx_IN" + case bosnian = "bs_Latn" + case bosnianBosniaHerzegovina = "bs_Latn_BA" + case bosnianCyrillic = "bs_Cyrl" + case bosnianCyrillicBosniaHerzegovina = "bs_Cyrl_BA" + case breton = "br" + case bretonFrance = "br_FR" + case bulgarian = "bg" + case bulgarianBulgaria = "bg_BG" + case burmese = "my" + case burmeseMyanmarBurma = "my_MM" + case catalan = "ca" + case catalanAndorra = "ca_AD" + case catalanFrance = "ca_FR" + case catalanItaly = "ca_IT" + case catalanSpain = "ca_ES" + case centralAtlasTamazight = "tzm_Latn" + case centralAtlasTamazightMorocco = "tzm_Latn_MA" + case centralKurdish = "ckb" + case centralKurdishIran = "ckb_IR" + case centralKurdishIraq = "ckb_IQ" + case cherokee = "chr" + case cherokeeUnitedStates = "chr_US" + case chiga = "cgg" + case chigaUganda = "cgg_UG" + case chinese = "zh" + case chineseChina = "zh_Hans_CN" + case chineseHongKongSarChina = "zh_Hant_HK" + case chineseMacauSarChina = "zh_Hant_MO" + case chineseSimplified = "zh_Hans" + case chineseSimplifiedHongKongSarChina = "zh_Hans_HK" + case chineseSimplifiedMacauSarChina = "zh_Hans_MO" + case chineseSingapore = "zh_Hans_SG" + case chineseTaiwan = "zh_Hant_TW" + case chineseTraditional = "zh_Hant" + case colognian = "ksh" + case colognianGermany = "ksh_DE" + case cornish = "kw" + case cornishUnitedKingdom = "kw_GB" + case croatian = "hr" + case croatianBosniaHerzegovina = "hr_BA" + case croatianCroatia = "hr_HR" + case czech = "cs" + case czechCzechRepublic = "cs_CZ" + case danish = "da" + case danishDenmark = "da_DK" + case danishGreenland = "da_GL" + case duala = "dua" + case dualaCameroon = "dua_CM" + case dutch = "nl" + case dutchAruba = "nl_AW" + case dutchBelgium = "nl_BE" + case dutchCaribbeanNetherlands = "nl_BQ" + case dutchCuraao = "nl_CW" + case dutchNetherlands = "nl_NL" + case dutchSintMaarten = "nl_SX" + case dutchSuriname = "nl_SR" + case dzongkha = "dz" + case dzongkhaBhutan = "dz_BT" + case embu = "ebu" + case embuKenya = "ebu_KE" + case english = "en" + case englishAlbania = "en_AL" + case englishAmericanSamoa = "en_AS" + case englishAndorra = "en_AD" + case englishAnguilla = "en_AI" + case englishAntiguaBarbuda = "en_AG" + case englishAustralia = "en_AU" + case englishAustria = "en_AT" + case englishBahamas = "en_BS" + case englishBarbados = "en_BB" + case englishBelgium = "en_BE" + case englishBelize = "en_BZ" + case englishBermuda = "en_BM" + case englishBosniaHerzegovina = "en_BA" + case englishBotswana = "en_BW" + case englishBritishIndianOceanTerritory = "en_IO" + case englishBritishVirginIslands = "en_VG" + case englishCameroon = "en_CM" + case englishCanada = "en_CA" + case englishCaymanIslands = "en_KY" + case englishChristmasIsland = "en_CX" + case englishCocosKeelingIslands = "en_CC" + case englishCookIslands = "en_CK" + case englishCroatia = "en_HR" + case englishCyprus = "en_CY" + case englishCzechRepublic = "en_CZ" + case englishDenmark = "en_DK" + case englishDiegoGarcia = "en_DG" + case englishDominica = "en_DM" + case englishEritrea = "en_ER" + case englishEstonia = "en_EE" + case englishEurope = "en_150" + case englishFalklandIslands = "en_FK" + case englishFiji = "en_FJ" + case englishFinland = "en_FI" + case englishFrance = "en_FR" + case englishGambia = "en_GM" + case englishGermany = "en_DE" + case englishGhana = "en_GH" + case englishGibraltar = "en_GI" + case englishGreece = "en_GR" + case englishGrenada = "en_GD" + case englishGuam = "en_GU" + case englishGuernsey = "en_GG" + case englishGuyana = "en_GY" + case englishHongKongSarChina = "en_HK" + case englishHungary = "en_HU" + case englishIceland = "en_IS" + case englishIndia = "en_IN" + case englishIreland = "en_IE" + case englishIsleOfMan = "en_IM" + case englishIsrael = "en_IL" + case englishItaly = "en_IT" + case englishJamaica = "en_JM" + case englishJersey = "en_JE" + case englishKenya = "en_KE" + case englishKiribati = "en_KI" + case englishLatvia = "en_LV" + case englishLesotho = "en_LS" + case englishLiberia = "en_LR" + case englishLithuania = "en_LT" + case englishLuxembourg = "en_LU" + case englishMacauSarChina = "en_MO" + case englishMadagascar = "en_MG" + case englishMalawi = "en_MW" + case englishMalaysia = "en_MY" + case englishMalta = "en_MT" + case englishMarshallIslands = "en_MH" + case englishMauritius = "en_MU" + case englishMicronesia = "en_FM" + case englishMontenegro = "en_ME" + case englishMontserrat = "en_MS" + case englishNamibia = "en_NA" + case englishNauru = "en_NR" + case englishNetherlands = "en_NL" + case englishNewZealand = "en_NZ" + case englishNigeria = "en_NG" + case englishNiue = "en_NU" + case englishNorfolkIsland = "en_NF" + case englishNorthernMarianaIslands = "en_MP" + case englishNorway = "en_NO" + case englishPakistan = "en_PK" + case englishPalau = "en_PW" + case englishPapuaNewGuinea = "en_PG" + case englishPhilippines = "en_PH" + case englishPitcairnIslands = "en_PN" + case englishPoland = "en_PL" + case englishPortugal = "en_PT" + case englishPuertoRico = "en_PR" + case englishRomania = "en_RO" + case englishRussia = "en_RU" + case englishRwanda = "en_RW" + case englishSamoa = "en_WS" + case englishSeychelles = "en_SC" + case englishSierraLeone = "en_SL" + case englishSingapore = "en_SG" + case englishSintMaarten = "en_SX" + case englishSlovakia = "en_SK" + case englishSlovenia = "en_SI" + case englishSolomonIslands = "en_SB" + case englishSouthAfrica = "en_ZA" + case englishSouthSudan = "en_SS" + case englishSpain = "en_ES" + case englishStHelena = "en_SH" + case englishStKittsNevis = "en_KN" + case englishStLucia = "en_LC" + case englishStVincentGrenadines = "en_VC" + case englishSudan = "en_SD" + case englishSwaziland = "en_SZ" + case englishSweden = "en_SE" + case englishSwitzerland = "en_CH" + case englishTanzania = "en_TZ" + case englishTokelau = "en_TK" + case englishTonga = "en_TO" + case englishTrinidadTobago = "en_TT" + case englishTurkey = "en_TR" + case englishTurksCaicosIslands = "en_TC" + case englishTuvalu = "en_TV" + case englishUSOutlyingIslands = "en_UM" + case englishUSVirginIslands = "en_VI" + case englishUganda = "en_UG" + case englishUnitedKingdom = "en_GB" + case englishUnitedStates = "en_US" + case englishUnitedStatesComputer = "en_US_POSIX" + case englishVanuatu = "en_VU" + case englishWorld = "en_001" + case englishZambia = "en_ZM" + case englishZimbabwe = "en_ZW" + case esperanto = "eo" + case estonian = "et" + case estonianEstonia = "et_EE" + case ewe = "ee" + case eweGhana = "ee_GH" + case eweTogo = "ee_TG" + case ewondo = "ewo" + case ewondoCameroon = "ewo_CM" + case faroese = "fo" + case faroeseFaroeIslands = "fo_FO" + case filipino = "fil" + case filipinoPhilippines = "fil_PH" + case finnish = "fi" + case finnishFinland = "fi_FI" + case french = "fr" + case frenchAlgeria = "fr_DZ" + case frenchBelgium = "fr_BE" + case frenchBenin = "fr_BJ" + case frenchBurkinaFaso = "fr_BF" + case frenchBurundi = "fr_BI" + case frenchCameroon = "fr_CM" + case frenchCanada = "fr_CA" + case frenchCentralAfricanRepublic = "fr_CF" + case frenchChad = "fr_TD" + case frenchComoros = "fr_KM" + case frenchCongoBrazzaville = "fr_CG" + case frenchCongoKinshasa = "fr_CD" + case frenchCteDivoire = "fr_CI" + case frenchDjibouti = "fr_DJ" + case frenchEquatorialGuinea = "fr_GQ" + case frenchFrance = "fr_FR" + case frenchFrenchGuiana = "fr_GF" + case frenchFrenchPolynesia = "fr_PF" + case frenchGabon = "fr_GA" + case frenchGuadeloupe = "fr_GP" + case frenchGuinea = "fr_GN" + case frenchHaiti = "fr_HT" + case frenchLuxembourg = "fr_LU" + case frenchMadagascar = "fr_MG" + case frenchMali = "fr_ML" + case frenchMartinique = "fr_MQ" + case frenchMauritania = "fr_MR" + case frenchMauritius = "fr_MU" + case frenchMayotte = "fr_YT" + case frenchMonaco = "fr_MC" + case frenchMorocco = "fr_MA" + case frenchNewCaledonia = "fr_NC" + case frenchNiger = "fr_NE" + case frenchRunion = "fr_RE" + case frenchRwanda = "fr_RW" + case frenchSenegal = "fr_SN" + case frenchSeychelles = "fr_SC" + case frenchStBarthlemy = "fr_BL" + case frenchStMartin = "fr_MF" + case frenchStPierreMiquelon = "fr_PM" + case frenchSwitzerland = "fr_CH" + case frenchSyria = "fr_SY" + case frenchTogo = "fr_TG" + case frenchTunisia = "fr_TN" + case frenchVanuatu = "fr_VU" + case frenchWallisFutuna = "fr_WF" + case friulian = "fur" + case friulianItaly = "fur_IT" + case fulah = "ff" + case fulahCameroon = "ff_CM" + case fulahGuinea = "ff_GN" + case fulahMauritania = "ff_MR" + case fulahSenegal = "ff_SN" + case galician = "gl" + case galicianSpain = "gl_ES" + case ganda = "lg" + case gandaUganda = "lg_UG" + case georgian = "ka" + case georgianGeorgia = "ka_GE" + case german = "de" + case germanAustria = "de_AT" + case germanBelgium = "de_BE" + case germanGermany = "de_DE" + case germanLiechtenstein = "de_LI" + case germanLuxembourg = "de_LU" + case germanSwitzerland = "de_CH" + case greek = "el" + case greekCyprus = "el_CY" + case greekGreece = "el_GR" + case gujarati = "gu" + case gujaratiIndia = "gu_IN" + case gusii = "guz" + case gusiiKenya = "guz_KE" + case hausa = "ha_Latn" + case hausaGhana = "ha_Latn_GH" + case hausaNiger = "ha_Latn_NE" + case hausaNigeria = "ha_Latn_NG" + case hawaiian = "haw" + case hawaiianUnitedStates = "haw_US" + case hebrew = "he" + case hebrewIsrael = "he_IL" + case hindi = "hi" + case hindiIndia = "hi_IN" + case hungarian = "hu" + case hungarianHungary = "hu_HU" + case icelandic = "is" + case icelandicIceland = "is_IS" + case igbo = "ig" + case igboNigeria = "ig_NG" + case inariSami = "smn" + case inariSamiFinland = "smn_FI" + case indonesian = "id" + case indonesianIndonesia = "id_ID" + case inuktitut = "iu" + case inuktitutUnifiedCanadianAboriginalSyllabics = "iu_Cans" + case inuktitutUnifiedCanadianAboriginalSyllabicsCanada = "iu_Cans_CA" + case irish = "ga" + case irishIreland = "ga_IE" + case italian = "it" + case italianItaly = "it_IT" + case italianSanMarino = "it_SM" + case italianSwitzerland = "it_CH" + case japanese = "ja" + case japaneseJapan = "ja_JP" + case jolaFonyi = "dyo" + case jolaFonyiSenegal = "dyo_SN" + case kabuverdianu = "kea" + case kabuverdianuCapeVerde = "kea_CV" + case kabyle = "kab" + case kabyleAlgeria = "kab_DZ" + case kako = "kkj" + case kakoCameroon = "kkj_CM" + case kalaallisut = "kl" + case kalaallisutGreenland = "kl_GL" + case kalenjin = "kln" + case kalenjinKenya = "kln_KE" + case kamba = "kam" + case kambaKenya = "kam_KE" + case kannada = "kn" + case kannadaIndia = "kn_IN" + case kashmiri = "ks" + case kashmiriArabic = "ks_Arab" + case kashmiriArabicIndia = "ks_Arab_IN" + case kazakh = "kk_Cyrl" + case kazakhKazakhstan = "kk_Cyrl_KZ" + case khmer = "km" + case khmerCambodia = "km_KH" + case kikuyu = "ki" + case kikuyuKenya = "ki_KE" + case kinyarwanda = "rw" + case kinyarwandaRwanda = "rw_RW" + case konkani = "kok" + case konkaniIndia = "kok_IN" + case korean = "ko" + case koreanNorthKorea = "ko_KP" + case koreanSouthKorea = "ko_KR" + case koyraChiini = "khq" + case koyraChiiniMali = "khq_ML" + case koyraboroSenni = "ses" + case koyraboroSenniMali = "ses_ML" + case kwasio = "nmg" + case kwasioCameroon = "nmg_CM" + case kyrgyz = "ky_Cyrl" + case kyrgyzKyrgyzstan = "ky_Cyrl_KG" + case lakota = "lkt" + case lakotaUnitedStates = "lkt_US" + case langi = "lag" + case langiTanzania = "lag_TZ" + case lao = "lo" + case laoLaos = "lo_LA" + case latvian = "lv" + case latvianLatvia = "lv_LV" + case lingala = "ln" + case lingalaAngola = "ln_AO" + case lingalaCentralAfricanRepublic = "ln_CF" + case lingalaCongoBrazzaville = "ln_CG" + case lingalaCongoKinshasa = "ln_CD" + case lithuanian = "lt" + case lithuanianLithuania = "lt_LT" + case lowerSorbian = "dsb" + case lowerSorbianGermany = "dsb_DE" + case lubaKatanga = "lu" + case lubaKatangaCongoKinshasa = "lu_CD" + case luo = "luo" + case luoKenya = "luo_KE" + case luxembourgish = "lb" + case luxembourgishLuxembourg = "lb_LU" + case luyia = "luy" + case luyiaKenya = "luy_KE" + case macedonian = "mk" + case macedonianMacedonia = "mk_MK" + case machame = "jmc" + case machameTanzania = "jmc_TZ" + case makhuwaMeetto = "mgh" + case makhuwaMeettoMozambique = "mgh_MZ" + case makonde = "kde" + case makondeTanzania = "kde_TZ" + case malagasy = "mg" + case malagasyMadagascar = "mg_MG" + case malay = "ms_Latn" + case malayArabic = "ms_Arab" + case malayArabicBrunei = "ms_Arab_BN" + case malayArabicMalaysia = "ms_Arab_MY" + case malayBrunei = "ms_Latn_BN" + case malayMalaysia = "ms_Latn_MY" + case malaySingapore = "ms_Latn_SG" + case malayalam = "ml" + case malayalamIndia = "ml_IN" + case maltese = "mt" + case malteseMalta = "mt_MT" + case manx = "gv" + case manxIsleOfMan = "gv_IM" + case marathi = "mr" + case marathiIndia = "mr_IN" + case masai = "mas" + case masaiKenya = "mas_KE" + case masaiTanzania = "mas_TZ" + case meru = "mer" + case meruKenya = "mer_KE" + case meta = "mgo" + case metaCameroon = "mgo_CM" + case mongolian = "mn_Cyrl" + case mongolianMongolia = "mn_Cyrl_MN" + case morisyen = "mfe" + case morisyenMauritius = "mfe_MU" + case mundang = "mua" + case mundangCameroon = "mua_CM" + case nama = "naq" + case namaNamibia = "naq_NA" + case nepali = "ne" + case nepaliIndia = "ne_IN" + case nepaliNepal = "ne_NP" + case ngiemboon = "nnh" + case ngiemboonCameroon = "nnh_CM" + case ngomba = "jgo" + case ngombaCameroon = "jgo_CM" + case northNdebele = "nd" + case northNdebeleZimbabwe = "nd_ZW" + case northernSami = "se" + case northernSamiFinland = "se_FI" + case northernSamiNorway = "se_NO" + case northernSamiSweden = "se_SE" + case norwegianBokml = "nb" + case norwegianBokmlNorway = "nb_NO" + case norwegianBokmlSvalbardJanMayen = "nb_SJ" + case norwegianNynorsk = "nn" + case norwegianNynorskNorway = "nn_NO" + case nuer = "nus" + case nuerSudan = "nus_SD" + case nyankole = "nyn" + case nyankoleUganda = "nyn_UG" + case oriya = "or" + case oriyaIndia = "or_IN" + case oromo = "om" + case oromoEthiopia = "om_ET" + case oromoKenya = "om_KE" + case ossetic = "os" + case osseticGeorgia = "os_GE" + case osseticRussia = "os_RU" + case pashto = "ps" + case pashtoAfghanistan = "ps_AF" + case persian = "fa" + case persianAfghanistan = "fa_AF" + case persianIran = "fa_IR" + case polish = "pl" + case polishPoland = "pl_PL" + case portuguese = "pt" + case portugueseAngola = "pt_AO" + case portugueseBrazil = "pt_BR" + case portugueseCapeVerde = "pt_CV" + case portugueseGuineaBissau = "pt_GW" + case portugueseMacauSarChina = "pt_MO" + case portugueseMozambique = "pt_MZ" + case portuguesePortugal = "pt_PT" + case portugueseSoTomPrncipe = "pt_ST" + case portugueseTimorLeste = "pt_TL" + case punjabi = "pa_Guru" + case punjabiArabic = "pa_Arab" + case punjabiArabicPakistan = "pa_Arab_PK" + case punjabiIndia = "pa_Guru_IN" + case quechua = "qu" + case quechuaBolivia = "qu_BO" + case quechuaEcuador = "qu_EC" + case quechuaPeru = "qu_PE" + case romanian = "ro" + case romanianMoldova = "ro_MD" + case romanianRomania = "ro_RO" + case romansh = "rm" + case romanshSwitzerland = "rm_CH" + case rombo = "rof" + case romboTanzania = "rof_TZ" + case rundi = "rn" + case rundiBurundi = "rn_BI" + case russian = "ru" + case russianBelarus = "ru_BY" + case russianKazakhstan = "ru_KZ" + case russianKyrgyzstan = "ru_KG" + case russianMoldova = "ru_MD" + case russianRussia = "ru_RU" + case russianUkraine = "ru_UA" + case rwa = "rwk" + case rwaTanzania = "rwk_TZ" + case sakha = "sah" + case sakhaRussia = "sah_RU" + case samburu = "saq" + case samburuKenya = "saq_KE" + case sango = "sg" + case sangoCentralAfricanRepublic = "sg_CF" + case sangu = "sbp" + case sanguTanzania = "sbp_TZ" + case scottishGaelic = "gd" + case scottishGaelicUnitedKingdom = "gd_GB" + case sena = "seh" + case senaMozambique = "seh_MZ" + case serbian = "sr_Cyrl" + case serbianBosniaHerzegovina = "sr_Cyrl_BA" + case serbianKosovo = "sr_Cyrl_XK" + case serbianLatin = "sr_Latn" + case serbianLatinBosniaHerzegovina = "sr_Latn_BA" + case serbianLatinKosovo = "sr_Latn_XK" + case serbianLatinMontenegro = "sr_Latn_ME" + case serbianLatinSerbia = "sr_Latn_RS" + case serbianMontenegro = "sr_Cyrl_ME" + case serbianSerbia = "sr_Cyrl_RS" + case shambala = "ksb" + case shambalaTanzania = "ksb_TZ" + case shona = "sn" + case shonaZimbabwe = "sn_ZW" + case sichuanYi = "ii" + case sichuanYiChina = "ii_CN" + case sinhala = "si" + case sinhalaSriLanka = "si_LK" + case slovak = "sk" + case slovakSlovakia = "sk_SK" + case slovenian = "sl" + case slovenianSlovenia = "sl_SI" + case soga = "xog" + case sogaUganda = "xog_UG" + case somali = "so" + case somaliDjibouti = "so_DJ" + case somaliEthiopia = "so_ET" + case somaliKenya = "so_KE" + case somaliSomalia = "so_SO" + case spanish = "es" + case spanishArgentina = "es_AR" + case spanishBolivia = "es_BO" + case spanishCanaryIslands = "es_IC" + case spanishCeutaMelilla = "es_EA" + case spanishChile = "es_CL" + case spanishColombia = "es_CO" + case spanishCostaRica = "es_CR" + case spanishCuba = "es_CU" + case spanishDominicanRepublic = "es_DO" + case spanishEcuador = "es_EC" + case spanishElSalvador = "es_SV" + case spanishEquatorialGuinea = "es_GQ" + case spanishGuatemala = "es_GT" + case spanishHonduras = "es_HN" + case spanishLatinAmerica = "es_419" + case spanishMexico = "es_MX" + case spanishNicaragua = "es_NI" + case spanishPanama = "es_PA" + case spanishParaguay = "es_PY" + case spanishPeru = "es_PE" + case spanishPhilippines = "es_PH" + case spanishPuertoRico = "es_PR" + case spanishSpain = "es_ES" + case spanishUnitedStates = "es_US" + case spanishUruguay = "es_UY" + case spanishVenezuela = "es_VE" + case standardMoroccanTamazight = "zgh" + case standardMoroccanTamazightMorocco = "zgh_MA" + case swahili = "sw" + case swahiliCongoKinshasa = "sw_CD" + case swahiliKenya = "sw_KE" + case swahiliTanzania = "sw_TZ" + case swahiliUganda = "sw_UG" + case swedish = "sv" + case swedishlandIslands = "sv_AX" + case swedishFinland = "sv_FI" + case swedishSweden = "sv_SE" + case swissGerman = "gsw" + case swissGermanFrance = "gsw_FR" + case swissGermanLiechtenstein = "gsw_LI" + case swissGermanSwitzerland = "gsw_CH" + case tachelhit = "shi_Latn" + case tachelhitMorocco = "shi_Latn_MA" + case tachelhitTifinagh = "shi_Tfng" + case tachelhitTifinaghMorocco = "shi_Tfng_MA" + case taita = "dav" + case taitaKenya = "dav_KE" + case tajik = "tg_Cyrl" + case tajikTajikistan = "tg_Cyrl_TJ" + case tamil = "ta" + case tamilIndia = "ta_IN" + case tamilMalaysia = "ta_MY" + case tamilSingapore = "ta_SG" + case tamilSriLanka = "ta_LK" + case tasawaq = "twq" + case tasawaqNiger = "twq_NE" + case telugu = "te" + case teluguIndia = "te_IN" + case teso = "teo" + case tesoKenya = "teo_KE" + case tesoUganda = "teo_UG" + case thai = "th" + case thaiThailand = "th_TH" + case tibetan = "bo" + case tibetanChina = "bo_CN" + case tibetanIndia = "bo_IN" + case tigrinya = "ti" + case tigrinyaEritrea = "ti_ER" + case tigrinyaEthiopia = "ti_ET" + case tongan = "to" + case tonganTonga = "to_TO" + case turkish = "tr" + case turkishCyprus = "tr_CY" + case turkishTurkey = "tr_TR" + case turkmen = "tk_Latn" + case turkmenTurkmenistan = "tk_Latn_TM" + case ukrainian = "uk" + case ukrainianUkraine = "uk_UA" + case upperSorbian = "hsb" + case upperSorbianGermany = "hsb_DE" + case urdu = "ur" + case urduIndia = "ur_IN" + case urduPakistan = "ur_PK" + case uyghur = "ug" + case uyghurArabic = "ug_Arab" + case uyghurArabicChina = "ug_Arab_CN" + case uzbek = "uz_Cyrl" + case uzbekArabic = "uz_Arab" + case uzbekArabicAfghanistan = "uz_Arab_AF" + case uzbekLatin = "uz_Latn" + case uzbekLatinUzbekistan = "uz_Latn_UZ" + case uzbekUzbekistan = "uz_Cyrl_UZ" + case vai = "vai_Vaii" + case vaiLatin = "vai_Latn" + case vaiLatinLiberia = "vai_Latn_LR" + case vaiLiberia = "vai_Vaii_LR" + case vietnamese = "vi" + case vietnameseVietnam = "vi_VN" + case vunjo = "vun" + case vunjoTanzania = "vun_TZ" + case walser = "wae" + case walserSwitzerland = "wae_CH" + case welsh = "cy" + case welshUnitedKingdom = "cy_GB" + case westernFrisian = "fy" + case westernFrisianNetherlands = "fy_NL" + case yangben = "yav" + case yangbenCameroon = "yav_CM" + case yiddish = "yi" + case yiddishWorld = "yi_001" + case yoruba = "yo" + case yorubaBenin = "yo_BJ" + case yorubaNigeria = "yo_NG" + case zarma = "dje" + case zarmaNiger = "dje_NE" + case zulu = "zu" + case zuluSouthAfrica = "zu_ZA" + + /// Return a valid `Locale` instance from currency locale enum + public var locale: Locale { + switch self { + case .current: return Locale.current + case .autoUpdating: return Locale.autoupdatingCurrent + default: return Locale(identifier: rawValue) + } + } +} diff --git a/submodules/BotPaymentsUI/Sources/Formatter/NumberFormatter.swift b/submodules/BotPaymentsUI/Sources/Formatter/NumberFormatter.swift new file mode 100644 index 0000000000..0103b6989b --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/Formatter/NumberFormatter.swift @@ -0,0 +1,18 @@ +// +// NumberFormatter.swift +// CurrencyText +// +// Created by Felipe Lefèvre Marino on 12/27/18. +// + +import Foundation + +public extension NumberFormatter { + + func string(from doubleValue: Double?) -> String? { + if let doubleValue = doubleValue { + return string(from: NSNumber(value: doubleValue)) + } + return nil + } +} diff --git a/submodules/BotPaymentsUI/Sources/Formatter/String.swift b/submodules/BotPaymentsUI/Sources/Formatter/String.swift new file mode 100644 index 0000000000..eabb906e25 --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/Formatter/String.swift @@ -0,0 +1,69 @@ +// +// String.swift +// CurrencyText +// +// Created by Felipe Lefèvre Marino on 4/3/18. +// Copyright © 2018 Felipe Lefèvre Marino. All rights reserved. +// + +import Foundation + +public protocol CurrencyString { + var representsZero: Bool { get } + var hasNumbers: Bool { get } + var lastNumberOffsetFromEnd: Int? { get } + func numeralFormat() -> String + mutating func updateDecimalSeparator(decimalDigits: Int) +} + +//Currency String Extension +extension String: CurrencyString { + + // MARK: Properties + + /// Informs with the string represents the value of zero + public var representsZero: Bool { + return numeralFormat().replacingOccurrences(of: "0", with: "").count == 0 + } + + /// Returns if the string does have any character that represents numbers + public var hasNumbers: Bool { + return numeralFormat().count > 0 + } + + /// The offset from end index to the index _right after_ the last number in the String. + /// e.g. For the String "123some", the last number position is 4, because from the _end index_ to the index of _3_ + /// there is an offset of 4, "e, m, o and s". + public var lastNumberOffsetFromEnd: Int? { + guard let indexOfLastNumber = lastIndex(where: { $0.isNumber }) else { return nil } + let indexAfterLastNumber = index(after: indexOfLastNumber) + return distance(from: endIndex, to: indexAfterLastNumber) + } + + // MARK: Functions + + /// Updates a currency string decimal separator position based on + /// the amount of decimal digits desired + /// + /// - Parameter decimalDigits: The amount of decimal digits of the currency formatted string + public mutating func updateDecimalSeparator(decimalDigits: Int) { + guard decimalDigits != 0 && count >= decimalDigits else { return } + let decimalsRange = index(endIndex, offsetBy: -decimalDigits).. String { + return replacingOccurrences(of:"[^0-9]", with: "", options: .regularExpression) + } +} + +// MARK: - Static constants + +extension String { + public static let negativeSymbol = "-" +} diff --git a/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/CurrencyUITextFieldDelegate.swift b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/CurrencyUITextFieldDelegate.swift new file mode 100644 index 0000000000..5eeb602a6e --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/CurrencyUITextFieldDelegate.swift @@ -0,0 +1,188 @@ +// +// CurrencyUITextFieldDelegate.swift +// CurrencyText +// +// Created by Felipe Lefèvre Marino on 12/26/18. +// Copyright © 2018 Felipe Lefèvre Marino. All rights reserved. +// + +import UIKit + +/// Custom text field delegate, that formats user inputs based on a given currency formatter. +public class CurrencyUITextFieldDelegate: NSObject { + + public var formatter: (CurrencyFormatting & CurrencyAdjusting)! + + public var textUpdated: (() -> Void)? + + /// Text field clears its text when value value is equal to zero. + public var clearsWhenValueIsZero: Bool = false + + /// A delegate object to receive and potentially handle `UITextFieldDelegate events` that are sent to `CurrencyUITextFieldDelegate`. + /// + /// Note: Make sure the implementation of this object does not wrongly interfere with currency formatting. + /// + /// By returning `false` on`textField(textField:shouldChangeCharactersIn:replacementString:)` no currency formatting is done. + public var passthroughDelegate: UITextFieldDelegate? { + get { return _passthroughDelegate } + set { + guard newValue !== self else { return } + _passthroughDelegate = newValue + } + } + weak private(set) var _passthroughDelegate: UITextFieldDelegate? + + public init(formatter: CurrencyFormatter) { + self.formatter = formatter + } +} + +// MARK: - UITextFieldDelegate + +extension CurrencyUITextFieldDelegate: UITextFieldDelegate { + + @discardableResult + open func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool { + return passthroughDelegate?.textFieldShouldBeginEditing?(textField) ?? true + } + + public func textFieldDidBeginEditing(_ textField: UITextField) { + textField.setInitialSelectedTextRange() + passthroughDelegate?.textFieldDidBeginEditing?(textField) + } + + @discardableResult + public func textFieldShouldEndEditing(_ textField: UITextField) -> Bool { + if let text = textField.text, text.representsZero && clearsWhenValueIsZero { + textField.text = "" + } + else if let text = textField.text, let updated = formatter.formattedStringAdjustedToFitAllowedValues(from: text), updated != text { + textField.text = updated + } + return passthroughDelegate?.textFieldShouldEndEditing?(textField) ?? true + } + + open func textFieldDidEndEditing(_ textField: UITextField) { + passthroughDelegate?.textFieldDidEndEditing?(textField) + } + + @discardableResult + open func textFieldShouldClear(_ textField: UITextField) -> Bool { + return passthroughDelegate?.textFieldShouldClear?(textField) ?? true + } + + @discardableResult + open func textFieldShouldReturn(_ textField: UITextField) -> Bool { + return passthroughDelegate?.textFieldShouldReturn?(textField) ?? true + } + + @discardableResult + public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { + let shouldChangeCharactersInRange = passthroughDelegate?.textField?(textField, + shouldChangeCharactersIn: range, + replacementString: string) ?? true + guard shouldChangeCharactersInRange else { + return false + } + + // Store selected text range offset from end, before updating and reformatting the currency string. + let lastSelectedTextRangeOffsetFromEnd = textField.selectedTextRangeOffsetFromEnd + + // Before leaving the scope, update selected text range, + // respecting previous selected text range offset from end. + defer { + textField.updateSelectedTextRange(lastOffsetFromEnd: lastSelectedTextRangeOffsetFromEnd) + textUpdated?() + } + + guard !string.isEmpty else { + handleDeletion(in: textField, at: range) + return false + } + guard string.hasNumbers else { + addNegativeSymbolIfNeeded(in: textField, at: range, replacementString: string) + return false + } + + setFormattedText(in: textField, inputString: string, range: range) + + return false + } + + public func textFieldDidChangeSelection(_ textField: UITextField) { + if #available(iOSApplicationExtension 13.0, iOS 13.0, *) { + passthroughDelegate?.textFieldDidChangeSelection?(textField) + } + } +} + +// MARK: - Private + +extension CurrencyUITextFieldDelegate { + + /// Verifies if user inputed a negative symbol at the first lowest + /// bound of the text field and add it. + /// + /// - Parameters: + /// - textField: text field that user interacted with + /// - range: user input range + /// - string: user input string + private func addNegativeSymbolIfNeeded(in textField: UITextField, at range: NSRange, replacementString string: String) { + guard textField.keyboardType == .numbersAndPunctuation else { return } + + if string == .negativeSymbol && textField.text?.isEmpty == true { + textField.text = .negativeSymbol + } else if range.lowerBound == 0 && string == .negativeSymbol && + textField.text?.contains(String.negativeSymbol) == false { + + textField.text = .negativeSymbol + (textField.text ?? "") + } + } + + /// Correctly delete characters when user taps remove key. + /// + /// - Parameters: + /// - textField: text field that user interacted with + /// - range: range to be removed + private func handleDeletion(in textField: UITextField, at range: NSRange) { + if var text = textField.text { + if let textRange = Range(range, in: text) { + text.removeSubrange(textRange) + } else { + text.removeLast() + } + + if text.isEmpty { + textField.text = text + } else { + textField.text = formatter.formattedStringWithAdjustedDecimalSeparator(from: text) + } + } + } + + /// Formats text field's text with new input string and changed range + /// + /// - Parameters: + /// - textField: text field that user interacted with + /// - inputString: typed string + /// - range: range where the string should be added + private func setFormattedText(in textField: UITextField, inputString: String, range: NSRange) { + var updatedText = "" + + if let text = textField.text { + if text.isEmpty { + updatedText = formatter.initialText + inputString + } else if let range = Range(range, in: text) { + updatedText = text.replacingCharacters(in: range, with: inputString) + } else { + updatedText = text.appending(inputString) + } + } + + if updatedText.numeralFormat().count > formatter.maxDigitsCount { + updatedText.removeLast() + } + + textField.text = formatter.formattedStringWithAdjustedDecimalSeparator(from: updatedText) + } +} diff --git a/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/UITextField.swift b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/UITextField.swift new file mode 100644 index 0000000000..cabd313e2f --- /dev/null +++ b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/UITextField.swift @@ -0,0 +1,61 @@ +// +// UITextField.swift +// CurrencyText +// +// Created by Felipe Lefèvre Marino on 12/26/18. +// + +import UIKit + +public extension UITextField { + + // MARK: Public + + var selectedTextRangeOffsetFromEnd: Int { + return offset(from: endOfDocument, to: selectedTextRange?.end ?? endOfDocument) + } + + /// Sets the selected text range when the text field is starting to be edited. + /// _Should_ be called when text field start to be the first responder. + func setInitialSelectedTextRange() { + // update selected text range if needed + adjustSelectedTextRange(lastOffsetFromEnd: 0) // at the end when first selected + } + + /// Interface to update the selected text range as expected. + /// - Parameter lastOffsetFromEnd: The last stored selected text range offset from end. Used to keep it concise with pre-formatting. + func updateSelectedTextRange(lastOffsetFromEnd: Int) { + adjustSelectedTextRange(lastOffsetFromEnd: lastOffsetFromEnd) + } + + // MARK: Private + + /// Adjust the selected text range to match the best position. + private func adjustSelectedTextRange(lastOffsetFromEnd: Int) { + /// If text is empty the offset is set to zero, the selected text range does need to be changed. + if let text = text, text.isEmpty { + return + } + + var offsetFromEnd = lastOffsetFromEnd + + /// Adjust offset if needed. When the last number character offset from end is less than the current offset, + /// or in other words, is more distant to the end of the string, the offset is readjusted to it, + /// so the selected text range is correctly set to the last index with a number. + if let lastNumberOffsetFromEnd = text?.lastNumberOffsetFromEnd, + case let shouldOffsetBeAdjusted = lastNumberOffsetFromEnd < offsetFromEnd, + shouldOffsetBeAdjusted { + + offsetFromEnd = lastNumberOffsetFromEnd + } + + updateSelectedTextRange(offsetFromEnd: offsetFromEnd) + } + + /// Update the selected text range with given offset from end. + private func updateSelectedTextRange(offsetFromEnd: Int) { + if let updatedCursorPosition = position(from: endOfDocument, offset: offsetFromEnd) { + selectedTextRange = textRange(from: updatedCursorPosition, to: updatedCursorPosition) + } + } +} diff --git a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift index a8c34852be..93af51f808 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift @@ -841,9 +841,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode { } let accountPeer = context.account.postbox.loadedPeerWithId(context.account.peerId) |> take(1) - let foundLocalPeers: Signal<(peers: [RenderedPeer], unread: [PeerId: (Int32, Bool)]), NoError> - if let query = query { foundLocalPeers = context.account.postbox.searchPeers(query: query.lowercased()) |> mapToSignal { local -> Signal<([PeerView], [RenderedPeer]), NoError> in @@ -1279,7 +1277,6 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode { }, openUrl: { url in interaction.openUrl(url) }, openPeer: { peer, navigation in -// interaction.openPeer(peer.id, navigation) }, callPeer: { _, _ in }, enqueueMessage: { _ in }, sendSticker: nil, setupTemporaryHiddenMedia: { _, _, _ in }, chatAvatarHiddenMedia: { _, _ in }, playlistLocation: .custom(messages: foundMessages, at: message.id, loadMore: { diff --git a/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift b/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift index d74c1208e9..7979476472 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift @@ -320,21 +320,6 @@ private final class VisualMediaItemNode: ASDisplayNode { func updateIsVisible(_ isVisible: Bool) { self.hasVisibility = isVisible -// if let _ = self.videoLayerFrameManager { -// let displayLink: ConstantDisplayLinkAnimator -// if let current = self.displayLink { -// displayLink = current -// } else { -// displayLink = ConstantDisplayLinkAnimator { [weak self] in -// guard let strongSelf = self else { -// return -// } -// strongSelf.displayLinkTimestamp += 1.0 / 30.0 -// } -// displayLink.frameInterval = 2 -// self.displayLink = displayLink -// } -// } self.displayLink?.isPaused = !self.hasVisibility || self.isHidden } @@ -422,8 +407,8 @@ private final class VisualMediaItem { let dimensions: CGSize let aspectRatio: CGFloat - init(message: Message) { - self.index = nil + init(message: Message, index: UInt32?) { + self.index = index self.message = message var aspectRatio: CGFloat = 1.0 @@ -441,10 +426,10 @@ private final class VisualMediaItem { } var stableId: UInt32 { - if let message = self.message { - return message.stableId - } else if let index = self.index { + if let index = self.index { return index + } else if let message = self.message { + return message.stableId } else { return 0 } @@ -708,7 +693,6 @@ final class ChatListSearchMediaNode: ASDisplayNode, UIScrollViewDelegate { self.animationTimer?.invalidate() } - func updateHistory(entries: [ChatListSearchEntry]?, totalCount: Int32, updateType: ViewUpdateType) { switch updateType { case .FillHole: @@ -716,11 +700,13 @@ final class ChatListSearchMediaNode: ASDisplayNode, UIScrollViewDelegate { default: self.mediaItems.removeAll() + var index: UInt32 = 0 if let entries = entries { for entry in entries { if case let .message(message, _, _, _, _, _, _) = entry { - self.mediaItems.append(VisualMediaItem(message: message)) + self.mediaItems.append(VisualMediaItem(message: message, index: nil)) } + index += 1 } } self.itemsLayout = nil diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift index 51eef18469..5a6f282b89 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift @@ -518,7 +518,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { } else { result += item.presentationData.strings.VoiceOver_ChatList_OutgoingMessage } - let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false) + let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false) if message.flags.contains(.Incoming), !initialHideAuthor, let author = message.author, author is TelegramUser { result += "\n\(item.presentationData.strings.VoiceOver_ChatList_MessageFrom(author.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)).0)" } @@ -552,7 +552,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { } else { result += item.presentationData.strings.VoiceOver_ChatList_OutgoingMessage } - let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false) + let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false) if message.flags.contains(.Incoming), !initialHideAuthor, let author = message.author, author is TelegramUser { result += "\n\(item.presentationData.strings.VoiceOver_ChatList_MessageFrom(author.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)).0)" } @@ -958,7 +958,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { var hideAuthor = false switch contentPeer { case let .chat(itemPeer): - var (peer, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: messages, chatPeer: itemPeer, accountPeerId: item.context.account.peerId, enableMediaEmoji: !enableChatListPhotos, isPeerGroup: isPeerGroup) + var (peer, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: messages, chatPeer: itemPeer, accountPeerId: item.context.account.peerId, enableMediaEmoji: !enableChatListPhotos, isPeerGroup: isPeerGroup) if case let .psa(_, maybePsaText) = promoInfo, let psaText = maybePsaText { initialHideAuthor = true diff --git a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift index f30ee72089..c7e3c3b503 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift @@ -46,7 +46,7 @@ private func messageGroupType(messages: [Message]) -> MessageGroupType { return currentType } -public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, messages: [Message], chatPeer: RenderedPeer, accountPeerId: PeerId, enableMediaEmoji: Bool = true, isPeerGroup: Bool = false) -> (peer: Peer?, hideAuthor: Bool, messageText: String) { +public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, messages: [Message], chatPeer: RenderedPeer, accountPeerId: PeerId, enableMediaEmoji: Bool = true, isPeerGroup: Bool = false) -> (peer: Peer?, hideAuthor: Bool, messageText: String) { let peer: Peer? let message = messages.last @@ -262,12 +262,12 @@ public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder: } default: hideAuthor = true - if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: true) { + if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: true) { messageText = text } } case _ as TelegramMediaExpiredContent: - if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: true) { + if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: true) { messageText = text } case let poll as TelegramMediaPoll: diff --git a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift index 70837d63f4..c09c105d8c 100644 --- a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift +++ b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift @@ -569,12 +569,15 @@ final class ContextActionsContainerNode: ASDisplayNode { } func animateOut(offset: CGFloat, transition: ContainedViewLayoutTransition) { - guard let additionalActionsNode = self.additionalActionsNode else { + guard let additionalActionsNode = self.additionalActionsNode, let additionalShadowNode = self.additionalShadowNode else { return } transition.animatePosition(node: additionalActionsNode, to: CGPoint(x: 0.0, y: offset / 2.0), additive: true) + transition.animatePosition(node: additionalShadowNode, to: CGPoint(x: 0.0, y: offset / 2.0), additive: true) additionalActionsNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) + additionalShadowNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) additionalActionsNode.layer.animateScale(from: 1.0, to: 0.75, duration: 0.15, removeOnCompletion: false) + additionalShadowNode.layer.animateScale(from: 1.0, to: 0.75, duration: 0.15, removeOnCompletion: false) } } diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift index 865b6613e9..a31f2f4d01 100644 --- a/submodules/ContextUI/Sources/ContextController.swift +++ b/submodules/ContextUI/Sources/ContextController.swift @@ -1561,11 +1561,10 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi } } } - - + if let previousActionsContainerNode = previousActionsContainerNode { if transition.isAnimated { - if previousActionsContainerNode.hasAdditionalActions && !self.actionsContainerNode.hasAdditionalActions { + if previousActionsContainerNode.hasAdditionalActions && !self.actionsContainerNode.hasAdditionalActions && self.getController()?.useComplexItemsTransitionAnimation == true { var initialFrame = self.actionsContainerNode.frame let delta = (previousActionsContainerNode.frame.height - self.actionsContainerNode.frame.height) initialFrame.origin.y = self.actionsContainerNode.frame.minY + previousActionsContainerNode.frame.height - self.actionsContainerNode.frame.height @@ -1773,6 +1772,8 @@ public final class ContextController: ViewController, StandalonePresentableContr public var reactionSelected: ((ReactionContextItem.Reaction) -> Void)? public var dismissed: (() -> Void)? + public var useComplexItemsTransitionAnimation = false + private var shouldBeDismissedDisposable: Disposable? public init(account: Account, presentationData: PresentationData, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], recognizer: TapLongTapOrDoubleTapGestureRecognizer? = nil, gesture: ContextGesture? = nil, displayTextSelectionTip: Bool = false) { diff --git a/submodules/ContextUI/Sources/PinchController.swift b/submodules/ContextUI/Sources/PinchController.swift new file mode 100644 index 0000000000..ba9ade47eb --- /dev/null +++ b/submodules/ContextUI/Sources/PinchController.swift @@ -0,0 +1,487 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import TelegramPresentationData +import TextSelectionNode +import ReactionSelectionNode +import TelegramCore +import SyncCore +import SwiftSignalKit + +private func convertFrame(_ frame: CGRect, from fromView: UIView, to toView: UIView) -> CGRect { + let sourceWindowFrame = fromView.convert(frame, to: nil) + var targetWindowFrame = toView.convert(sourceWindowFrame, from: nil) + + if let fromWindow = fromView.window, let toWindow = toView.window { + targetWindowFrame.origin.x += toWindow.bounds.width - fromWindow.bounds.width + } + return targetWindowFrame +} + +final class PinchSourceGesture: UIPinchGestureRecognizer { + private final class Target { + var updated: (() -> Void)? + + @objc func onGesture(_ gesture: UIPinchGestureRecognizer) { + self.updated?() + } + } + + private let target: Target + + private(set) var currentTransform: (CGFloat, CGPoint, CGPoint)? + + var began: (() -> Void)? + var updated: ((CGFloat, CGPoint, CGPoint) -> Void)? + var ended: (() -> Void)? + + private var initialLocation: CGPoint? + private var pinchLocation = CGPoint() + private var currentOffset = CGPoint() + + private var currentNumberOfTouches = 0 + + init() { + self.target = Target() + + super.init(target: self.target, action: #selector(self.target.onGesture(_:))) + + self.target.updated = { [weak self] in + self?.gestureUpdated() + } + } + + override func reset() { + super.reset() + + self.currentNumberOfTouches = 0 + self.initialLocation = nil + } + + override func touchesBegan(_ touches: Set, with event: UIEvent) { + super.touchesBegan(touches, with: event) + + //self.currentTouches.formUnion(touches) + } + + override func touchesEnded(_ touches: Set, with event: UIEvent) { + super.touchesEnded(touches, with: event) + } + + override func touchesCancelled(_ touches: Set, with event: UIEvent) { + super.touchesCancelled(touches, with: event) + } + + override func touchesMoved(_ touches: Set, with event: UIEvent) { + super.touchesMoved(touches, with: event) + } + + private func gestureUpdated() { + switch self.state { + case .began: + self.currentOffset = CGPoint() + + let pinchLocation = self.location(in: self.view) + self.pinchLocation = pinchLocation + self.initialLocation = pinchLocation + let scale = max(1.0, self.scale) + self.currentTransform = (scale, self.pinchLocation, self.currentOffset) + + self.currentNumberOfTouches = self.numberOfTouches + + self.began?() + case .changed: + let locationSum = self.location(in: self.view) + + if self.numberOfTouches < 2 && self.currentNumberOfTouches >= 2 { + self.initialLocation = CGPoint(x: locationSum.x - self.currentOffset.x, y: locationSum.y - self.currentOffset.y) + } + self.currentNumberOfTouches = self.numberOfTouches + + if let initialLocation = self.initialLocation { + self.currentOffset = CGPoint(x: locationSum.x - initialLocation.x, y: locationSum.y - initialLocation.y) + } + if let (scale, pinchLocation, _) = self.currentTransform { + self.currentTransform = (scale, pinchLocation, self.currentOffset) + self.updated?(scale, pinchLocation, self.currentOffset) + } + + let scale = max(1.0, self.scale) + self.currentTransform = (scale, self.pinchLocation, self.currentOffset) + self.updated?(scale, self.pinchLocation, self.currentOffset) + case .ended, .cancelled: + self.ended?() + default: + break + } + } +} + +private func cancelContextGestures(node: ASDisplayNode) { + if let node = node as? ContextControllerSourceNode { + node.cancelGesture() + } + + if let supernode = node.supernode { + cancelContextGestures(node: supernode) + } +} + +private func cancelContextGestures(view: UIView) { + if let gestureRecognizers = view.gestureRecognizers { + for recognizer in gestureRecognizers { + if let recognizer = recognizer as? InteractiveTransitionGestureRecognizer { + recognizer.cancel() + } else if let recognizer = recognizer as? WindowPanRecognizer { + recognizer.cancel() + } + } + } + + if let superview = view.superview { + cancelContextGestures(view: superview) + } +} + +public final class PinchSourceContainerNode: ASDisplayNode, UIGestureRecognizerDelegate { + public let contentNode: ASDisplayNode + public var contentRect: CGRect = CGRect() + private(set) var naturalContentFrame: CGRect? + + fileprivate let gesture: PinchSourceGesture + fileprivate var panGesture: UIPanGestureRecognizer? + + public var isPinchGestureEnabled: Bool = true { + didSet { + if self.isPinchGestureEnabled != oldValue { + self.gesture.isEnabled = self.isPinchGestureEnabled + } + } + } + + public var maxPinchScale: CGFloat = 10.0 + + private var isActive: Bool = false + + public var activate: ((PinchSourceContainerNode) -> Void)? + public var scaleUpdated: ((CGFloat, ContainedViewLayoutTransition) -> Void)? + public var animatedOut: (() -> Void)? + var deactivate: (() -> Void)? + var updated: ((CGFloat, CGPoint, CGPoint) -> Void)? + + override public init() { + self.gesture = PinchSourceGesture() + self.contentNode = ASDisplayNode() + + super.init() + + self.addSubnode(self.contentNode) + + self.gesture.began = { [weak self] in + guard let strongSelf = self else { + return + } + cancelContextGestures(node: strongSelf) + cancelContextGestures(view: strongSelf.view) + strongSelf.isActive = true + + strongSelf.activate?(strongSelf) + } + + self.gesture.ended = { [weak self] in + guard let strongSelf = self else { + return + } + + strongSelf.isActive = false + strongSelf.deactivate?() + } + + self.gesture.updated = { [weak self] scale, pinchLocation, offset in + guard let strongSelf = self else { + return + } + strongSelf.updated?(min(scale, strongSelf.maxPinchScale), pinchLocation, offset) + strongSelf.scaleUpdated?(min(scale, strongSelf.maxPinchScale), .immediate) + } + } + + override public func didLoad() { + super.didLoad() + + self.view.addGestureRecognizer(self.gesture) + self.view.disablesInteractiveTransitionGestureRecognizerNow = { [weak self] in + guard let strongSelf = self else { + return false + } + return strongSelf.isActive + } + } + + @objc private func panGestureRecognized(_ recognizer: UIPanGestureRecognizer) { + } + + public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { + return false + } + + public func update(size: CGSize, transition: ContainedViewLayoutTransition) { + let contentFrame = CGRect(origin: CGPoint(), size: size) + self.naturalContentFrame = contentFrame + if !self.isActive { + transition.updateFrame(node: self.contentNode, frame: contentFrame) + } + } + + func restoreToNaturalSize() { + guard let naturalContentFrame = self.naturalContentFrame else { + return + } + self.contentNode.frame = naturalContentFrame + } +} + +private final class PinchControllerNode: ViewControllerTracingNode { + private weak var controller: PinchController? + + private var initialSourceFrame: CGRect? + + private let clippingNode: ASDisplayNode + private let scrollingContainer: ASDisplayNode + + private let sourceNode: PinchSourceContainerNode + private let getContentAreaInScreenSpace: () -> CGRect + + private let dimNode: ASDisplayNode + + private var validLayout: ContainerViewLayout? + private var isAnimatingOut: Bool = false + + private var hapticFeedback: HapticFeedback? + + init(controller: PinchController, sourceNode: PinchSourceContainerNode, getContentAreaInScreenSpace: @escaping () -> CGRect) { + self.controller = controller + self.sourceNode = sourceNode + self.getContentAreaInScreenSpace = getContentAreaInScreenSpace + + self.dimNode = ASDisplayNode() + self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5) + self.dimNode.alpha = 0.0 + + self.clippingNode = ASDisplayNode() + self.clippingNode.clipsToBounds = true + + self.scrollingContainer = ASDisplayNode() + + super.init() + + self.addSubnode(self.dimNode) + self.addSubnode(self.clippingNode) + self.clippingNode.addSubnode(self.scrollingContainer) + + self.sourceNode.deactivate = { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.controller?.dismiss() + } + + self.sourceNode.updated = { [weak self] scale, pinchLocation, offset in + guard let strongSelf = self, let initialSourceFrame = strongSelf.initialSourceFrame else { + return + } + strongSelf.dimNode.alpha = max(0.0, min(1.0, scale - 1.0)) + + let pinchOffset = CGPoint( + x: pinchLocation.x - initialSourceFrame.width / 2.0, + y: pinchLocation.y - initialSourceFrame.height / 2.0 + ) + + var transform = CATransform3DIdentity + transform = CATransform3DTranslate(transform, offset.x - pinchOffset.x * (scale - 1.0), offset.y - pinchOffset.y * (scale - 1.0), 0.0) + transform = CATransform3DScale(transform, scale, scale, 0.0) + + strongSelf.sourceNode.contentNode.transform = transform + } + } + + deinit { + } + + override func didLoad() { + super.didLoad() + } + + func updateLayout(layout: ContainerViewLayout, transition: ContainedViewLayoutTransition, previousActionsContainerNode: ContextActionsContainerNode?) { + if self.isAnimatingOut { + return + } + + self.validLayout = layout + + transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + transition.updateFrame(node: self.clippingNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + } + + func animateIn() { + let convertedFrame = convertFrame(self.sourceNode.bounds, from: self.sourceNode.view, to: self.view) + self.sourceNode.contentNode.frame = convertedFrame + self.initialSourceFrame = convertedFrame + self.scrollingContainer.addSubnode(self.sourceNode.contentNode) + + var updatedContentAreaInScreenSpace = self.getContentAreaInScreenSpace() + updatedContentAreaInScreenSpace.origin.x = 0.0 + updatedContentAreaInScreenSpace.size.width = self.bounds.width + + self.clippingNode.layer.animateFrame(from: updatedContentAreaInScreenSpace, to: self.clippingNode.frame, duration: 0.18 * 1.0, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue) + self.clippingNode.layer.animateBoundsOriginYAdditive(from: updatedContentAreaInScreenSpace.minY, to: 0.0, duration: 0.18 * 1.0, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue) + } + + func animateOut(completion: @escaping () -> Void) { + self.isAnimatingOut = true + + let performCompletion: () -> Void = { [weak self] in + guard let strongSelf = self else { + return + } + + strongSelf.isAnimatingOut = false + + strongSelf.sourceNode.restoreToNaturalSize() + strongSelf.sourceNode.addSubnode(strongSelf.sourceNode.contentNode) + + strongSelf.sourceNode.animatedOut?() + + completion() + } + + let convertedFrame = convertFrame(self.sourceNode.bounds, from: self.sourceNode.view, to: self.view) + self.sourceNode.contentNode.frame = convertedFrame + self.initialSourceFrame = convertedFrame + + if let (scale, pinchLocation, offset) = self.sourceNode.gesture.currentTransform, let initialSourceFrame = self.initialSourceFrame { + let duration = 0.3 + let transitionCurve: ContainedViewLayoutTransitionCurve = .easeInOut + + var updatedContentAreaInScreenSpace = self.getContentAreaInScreenSpace() + updatedContentAreaInScreenSpace.origin.x = 0.0 + updatedContentAreaInScreenSpace.size.width = self.bounds.width + + self.clippingNode.layer.animateFrame(from: self.clippingNode.frame, to: updatedContentAreaInScreenSpace, duration: duration * 1.0, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false) + self.clippingNode.layer.animateBoundsOriginYAdditive(from: 0.0, to: updatedContentAreaInScreenSpace.minY, duration: duration * 1.0, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false) + + let transition: ContainedViewLayoutTransition = .animated(duration: duration, curve: .spring) + if self.hapticFeedback == nil { + self.hapticFeedback = HapticFeedback() + } + self.hapticFeedback?.prepareImpact(.light) + self.hapticFeedback?.impact(.light) + + self.sourceNode.scaleUpdated?(1.0, transition) + + let pinchOffset = CGPoint( + x: pinchLocation.x - initialSourceFrame.width / 2.0, + y: pinchLocation.y - initialSourceFrame.height / 2.0 + ) + + var transform = CATransform3DIdentity + transform = CATransform3DScale(transform, scale, scale, 0.0) + + self.sourceNode.contentNode.transform = CATransform3DIdentity + self.sourceNode.contentNode.position = CGPoint(x: initialSourceFrame.midX, y: initialSourceFrame.midY) + self.sourceNode.contentNode.layer.animateSpring(from: scale as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: duration * 1.2, damping: 110.0) + self.sourceNode.contentNode.layer.animatePosition(from: CGPoint(x: offset.x - pinchOffset.x * (scale - 1.0), y: offset.y - pinchOffset.y * (scale - 1.0)), to: CGPoint(), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, additive: true, force: true, completion: { _ in + performCompletion() + }) + + let dimNodeTransition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: transitionCurve) + dimNodeTransition.updateAlpha(node: self.dimNode, alpha: 0.0) + } else { + performCompletion() + } + } + + func addRelativeContentOffset(_ offset: CGPoint, transition: ContainedViewLayoutTransition) { + if self.isAnimatingOut { + self.scrollingContainer.bounds = self.scrollingContainer.bounds.offsetBy(dx: 0.0, dy: offset.y) + transition.animateOffsetAdditive(node: self.scrollingContainer, offset: -offset.y) + } + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + return nil + } +} + +public final class PinchController: ViewController, StandalonePresentableController { + private let _ready = Promise() + override public var ready: Promise { + return self._ready + } + + private let sourceNode: PinchSourceContainerNode + private let getContentAreaInScreenSpace: () -> CGRect + + private var wasDismissed = false + + private var controllerNode: PinchControllerNode { + return self.displayNode as! PinchControllerNode + } + + public init(sourceNode: PinchSourceContainerNode, getContentAreaInScreenSpace: @escaping () -> CGRect) { + self.sourceNode = sourceNode + self.getContentAreaInScreenSpace = getContentAreaInScreenSpace + + super.init(navigationBarPresentationData: nil) + + self.statusBar.statusBarStyle = .Ignore + + self.lockOrientation = true + self.blocksBackgroundWhenInOverlay = true + } + + required init(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + deinit { + } + + override public func loadDisplayNode() { + self.displayNode = PinchControllerNode(controller: self, sourceNode: self.sourceNode, getContentAreaInScreenSpace: self.getContentAreaInScreenSpace) + + self.displayNodeDidLoad() + + self._ready.set(.single(true)) + } + + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.controllerNode.updateLayout(layout: layout, transition: transition, previousActionsContainerNode: nil) + } + + override public func viewDidAppear(_ animated: Bool) { + if self.ignoreAppearanceMethodInvocations() { + return + } + super.viewDidAppear(animated) + + self.controllerNode.animateIn() + } + + override public func dismiss(completion: (() -> Void)? = nil) { + if !self.wasDismissed { + self.wasDismissed = true + self.controllerNode.animateOut(completion: { [weak self] in + self?.presentingViewController?.dismiss(animated: false, completion: nil) + completion?() + }) + } + } + + public func addRelativeContentOffset(_ offset: CGPoint, transition: ContainedViewLayoutTransition) { + self.controllerNode.addRelativeContentOffset(offset, transition: transition) + } +} diff --git a/submodules/DebugSettingsUI/Sources/DebugController.swift b/submodules/DebugSettingsUI/Sources/DebugController.swift index 9c4b1a535c..bc10d7a500 100644 --- a/submodules/DebugSettingsUI/Sources/DebugController.swift +++ b/submodules/DebugSettingsUI/Sources/DebugController.swift @@ -62,7 +62,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { case skipReadHistory(PresentationTheme, Bool) case crashOnSlowQueries(PresentationTheme, Bool) case clearTips(PresentationTheme) - case reimport(PresentationTheme) + case crash(PresentationTheme) case resetData(PresentationTheme) case resetDatabase(PresentationTheme) case resetDatabaseAndCache(PresentationTheme) @@ -73,6 +73,8 @@ private enum DebugControllerEntry: ItemListNodeEntry { case photoPreview(PresentationTheme, Bool) case knockoutWallpaper(PresentationTheme, Bool) case demoVideoChats(Bool) + case experimentalCompatibility(Bool) + case enableNoiseSuppression(Bool) case playerEmbedding(Bool) case playlistPlayback(Bool) case voiceConference @@ -92,7 +94,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { return DebugControllerSection.logging.rawValue case .enableRaiseToSpeak, .keepChatNavigationStack, .skipReadHistory, .crashOnSlowQueries: return DebugControllerSection.experiments.rawValue - case .clearTips, .reimport, .resetData, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .reindexUnread, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .demoVideoChats, .playerEmbedding, .playlistPlayback, .voiceConference: + case .clearTips, .crash, .resetData, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .reindexUnread, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .demoVideoChats, .playerEmbedding, .playlistPlayback, .voiceConference, .experimentalCompatibility, .enableNoiseSuppression: return DebugControllerSection.experiments.rawValue case .preferredVideoCodec: return DebugControllerSection.videoExperiments.rawValue @@ -133,7 +135,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { return 12 case .clearTips: return 13 - case .reimport: + case .crash: return 14 case .resetData: return 15 @@ -155,14 +157,18 @@ private enum DebugControllerEntry: ItemListNodeEntry { return 23 case .demoVideoChats: return 24 - case .playerEmbedding: + case .experimentalCompatibility: + return 25 + case .enableNoiseSuppression: return 26 - case .playlistPlayback: + case .playerEmbedding: return 27 - case .voiceConference: + case .playlistPlayback: return 28 + case .voiceConference: + return 29 case let .preferredVideoCodec(index, _, _, _): - return 29 + index + return 30 + index case .disableVideoAspectScaling: return 100 case .enableVoipTcp: @@ -550,20 +556,9 @@ private enum DebugControllerEntry: ItemListNodeEntry { }).start() } }) - case let .reimport(theme): - return ItemListActionItem(presentationData: presentationData, title: "Reimport Application Data", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { - let appGroupName = "group.\(Bundle.main.bundleIdentifier!)" - let maybeAppGroupUrl = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupName) - - guard let appGroupUrl = maybeAppGroupUrl else { - return - } - - let statusPath = appGroupUrl.path + "/Documents/importcompleted" - if FileManager.default.fileExists(atPath: statusPath) { - let _ = try? FileManager.default.removeItem(at: URL(fileURLWithPath: statusPath)) - exit(0) - } + case let .crash(theme): + return ItemListActionItem(presentationData: presentationData, title: "Crash", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { + preconditionFailure() }) case let .resetData(theme): return ItemListActionItem(presentationData: presentationData, title: "Reset Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { @@ -712,6 +707,26 @@ private enum DebugControllerEntry: ItemListNodeEntry { }) }).start() }) + case let .experimentalCompatibility(value): + return ItemListSwitchItem(presentationData: presentationData, title: "Experimental Compatibility", value: value, sectionId: self.section, style: .blocks, updated: { value in + let _ = arguments.sharedContext.accountManager.transaction ({ transaction in + transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in + var settings = settings as? ExperimentalUISettings ?? ExperimentalUISettings.defaultSettings + settings.experimentalCompatibility = value + return settings + }) + }).start() + }) + case let .enableNoiseSuppression(value): + return ItemListSwitchItem(presentationData: presentationData, title: "Noise Suppression", value: value, sectionId: self.section, style: .blocks, updated: { value in + let _ = arguments.sharedContext.accountManager.transaction ({ transaction in + transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in + var settings = settings as? ExperimentalUISettings ?? ExperimentalUISettings.defaultSettings + settings.enableNoiseSuppression = value + return settings + }) + }).start() + }) case let .playerEmbedding(value): return ItemListSwitchItem(presentationData: presentationData, title: "Player Embedding", value: value, sectionId: self.section, style: .blocks, updated: { value in let _ = arguments.sharedContext.accountManager.transaction ({ transaction in @@ -809,6 +824,7 @@ private func debugControllerEntries(sharedContext: SharedAccountContext, present if isMainApp { entries.append(.clearTips(presentationData.theme)) } + entries.append(.crash(presentationData.theme)) entries.append(.resetData(presentationData.theme)) entries.append(.resetDatabase(presentationData.theme)) entries.append(.resetDatabaseAndCache(presentationData.theme)) @@ -820,6 +836,8 @@ private func debugControllerEntries(sharedContext: SharedAccountContext, present if isMainApp { entries.append(.knockoutWallpaper(presentationData.theme, experimentalSettings.knockoutWallpaper)) entries.append(.demoVideoChats(experimentalSettings.demoVideoChats)) + entries.append(.experimentalCompatibility(experimentalSettings.experimentalCompatibility)) + entries.append(.enableNoiseSuppression(experimentalSettings.enableNoiseSuppression)) entries.append(.playerEmbedding(experimentalSettings.playerEmbedding)) entries.append(.playlistPlayback(experimentalSettings.playlistPlayback)) } diff --git a/submodules/Display/Source/GenerateImage.swift b/submodules/Display/Source/GenerateImage.swift index e2d8433351..9468cbe92d 100644 --- a/submodules/Display/Source/GenerateImage.swift +++ b/submodules/Display/Source/GenerateImage.swift @@ -383,7 +383,12 @@ public func generateGradientTintedImage(image: UIImage?, colors: [UIColor]) -> U return tintedImage } -public func generateGradientImage(size: CGSize, colors: [UIColor], locations: [CGFloat]) -> UIImage? { +public enum GradientImageDirection { + case vertical + case horizontal +} + +public func generateGradientImage(size: CGSize, colors: [UIColor], locations: [CGFloat], direction: GradientImageDirection = .vertical) -> UIImage? { guard colors.count == locations.count else { return nil } @@ -395,7 +400,7 @@ public func generateGradientImage(size: CGSize, colors: [UIColor], locations: [C var locations = locations let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! - context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions()) + context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: direction == .horizontal ? CGPoint(x: size.width, y: 0.0) : CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions()) } let image = UIGraphicsGetImageFromCurrentImageContext()! diff --git a/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift b/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift index 48761f12a1..e0b2655301 100644 --- a/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift +++ b/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift @@ -82,6 +82,10 @@ public class InteractiveTransitionGestureRecognizer: UIPanGestureRecognizer { self.validatedGesture = false self.currentAllowedDirections = [] } + + public func cancel() { + self.state = .cancelled + } override public func touchesBegan(_ touches: Set, with event: UIEvent) { let touch = touches.first! diff --git a/submodules/Display/Source/ListView.swift b/submodules/Display/Source/ListView.swift index 5b28121d9b..ffbae84226 100644 --- a/submodules/Display/Source/ListView.swift +++ b/submodules/Display/Source/ListView.swift @@ -4024,13 +4024,21 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture } } - public func ensureItemNodeVisible(_ node: ListViewItemNode, animated: Bool = true, overflow: CGFloat = 0.0, allowIntersection: Bool = false, curve: ListViewAnimationCurve = .Default(duration: 0.25)) { + public func ensureItemNodeVisible(_ node: ListViewItemNode, animated: Bool = true, overflow: CGFloat = 0.0, allowIntersection: Bool = false, atTop: Bool = false, curve: ListViewAnimationCurve = .Default(duration: 0.25)) { if let index = node.index { if node.apparentHeight > self.visibleSize.height - self.insets.top - self.insets.bottom { - if node.frame.maxY > self.visibleSize.height - self.insets.bottom { - self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.bottom(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Down), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) - } else if node.frame.minY < self.insets.top && overflow > 0.0 { - self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + if atTop { + if node.frame.maxY > self.visibleSize.height - self.insets.bottom { + self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Down), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + } else if node.frame.minY < self.insets.top && overflow > 0.0 { + self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + } + } else { + if node.frame.maxY > self.visibleSize.height - self.insets.bottom { + self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.bottom(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Down), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + } else if node.frame.minY < self.insets.top && overflow > 0.0 { + self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + } } } else { if self.experimentalSnapScrollToItem { diff --git a/submodules/Display/Source/TransformImageArguments.swift b/submodules/Display/Source/TransformImageArguments.swift index fd3b359d7e..d874eb56de 100644 --- a/submodules/Display/Source/TransformImageArguments.swift +++ b/submodules/Display/Source/TransformImageArguments.swift @@ -12,15 +12,15 @@ public protocol TransformImageCustomArguments { } public struct TransformImageArguments: Equatable { - public let corners: ImageCorners + public var corners: ImageCorners - public let imageSize: CGSize - public let boundingSize: CGSize - public let intrinsicInsets: UIEdgeInsets - public let resizeMode: TransformImageResizeMode - public let emptyColor: UIColor? - public let custom: TransformImageCustomArguments? - public let scale: CGFloat? + public var imageSize: CGSize + public var boundingSize: CGSize + public var intrinsicInsets: UIEdgeInsets + public var resizeMode: TransformImageResizeMode + public var emptyColor: UIColor? + public var custom: TransformImageCustomArguments? + public var scale: CGFloat? public init(corners: ImageCorners, imageSize: CGSize, boundingSize: CGSize, intrinsicInsets: UIEdgeInsets, resizeMode: TransformImageResizeMode = .fill(.black), emptyColor: UIColor? = nil, custom: TransformImageCustomArguments? = nil, scale: CGFloat? = nil) { self.corners = corners diff --git a/submodules/Display/Source/WindowPanRecognizer.swift b/submodules/Display/Source/WindowPanRecognizer.swift index d9180edbaa..53ed394912 100644 --- a/submodules/Display/Source/WindowPanRecognizer.swift +++ b/submodules/Display/Source/WindowPanRecognizer.swift @@ -13,6 +13,10 @@ public final class WindowPanRecognizer: UIGestureRecognizer { self.previousPoints.removeAll() } + + public func cancel() { + self.state = .cancelled + } private func addPoint(_ point: CGPoint) { self.previousPoints.append((point, CACurrentMediaTime())) diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift index a32fd16150..46fdf27b98 100644 --- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift @@ -907,7 +907,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll var generalMessageContentKind: MessageContentKind? for message in messages { - let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: strongSelf.context.account.peerId) + let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: strongSelf.context.account.peerId) if generalMessageContentKind == nil || generalMessageContentKind == currentKind { generalMessageContentKind = currentKind } else { @@ -1056,7 +1056,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll var messageContentKinds = Set() for message in messages { - let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: strongSelf.context.account.peerId) + let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: strongSelf.context.account.peerId) if beganContentKindScanning && currentKind != generalMessageContentKind { generalMessageContentKind = nil } else if !beganContentKindScanning || currentKind == generalMessageContentKind { diff --git a/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift b/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift index 7ff05d9c24..9dc2305790 100644 --- a/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPageAnchorItem: InstantPageItem { let wantsNode: Bool = false @@ -28,7 +29,7 @@ final class InstantPageAnchorItem: InstantPageItem { func drawInTile(context: CGContext) { } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return nil } diff --git a/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift b/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift index efc678f687..c188042ead 100644 --- a/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPageArticleItem: InstantPageItem { var frame: CGRect @@ -35,7 +36,7 @@ final class InstantPageArticleItem: InstantPageItem { self.hasRTL = hasRTL } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return InstantPageArticleNode(context: context, item: self, webPage: self.webPage, strings: strings, theme: theme, contentItems: self.contentItems, contentSize: self.contentSize, cover: self.cover, url: self.url, webpageId: self.webpageId, openUrl: openUrl) } diff --git a/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift b/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift index 8516284d54..024b3148f7 100644 --- a/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPageAudioItem: InstantPageItem { var frame: CGRect @@ -24,7 +25,7 @@ final class InstantPageAudioItem: InstantPageItem { self.medias = [media] } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return InstantPageAudioNode(context: context, strings: strings, theme: theme, webPage: self.webpage, media: self.media, openMedia: openMedia) } diff --git a/submodules/InstantPageUI/Sources/InstantPageContentNode.swift b/submodules/InstantPageUI/Sources/InstantPageContentNode.swift index be14889554..897fba5a63 100644 --- a/submodules/InstantPageUI/Sources/InstantPageContentNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageContentNode.swift @@ -193,7 +193,10 @@ final class InstantPageContentNode : ASDisplayNode { self?.openMedia(media) }, longPressMedia: { [weak self] media in self?.longPressMedia(media) - }, openPeer: { [weak self] peerId in + }, + activatePinchPreview: nil, + pinchPreviewFinished: nil, + openPeer: { [weak self] peerId in self?.openPeer(peerId) }, openUrl: { [weak self] url in self?.openUrl(url) diff --git a/submodules/InstantPageUI/Sources/InstantPageController.swift b/submodules/InstantPageUI/Sources/InstantPageController.swift index 5bbb5f9c17..474edd941a 100644 --- a/submodules/InstantPageUI/Sources/InstantPageController.swift +++ b/submodules/InstantPageUI/Sources/InstantPageController.swift @@ -146,7 +146,7 @@ public final class InstantPageController: ViewController { } override public func loadDisplayNode() { - self.displayNode = InstantPageControllerNode(context: self.context, settings: self.settings, themeSettings: self.themeSettings, presentationTheme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, autoNightModeTriggered: self.presentationData.autoNightModeTriggered, statusBar: self.statusBar, sourcePeerType: self.sourcePeerType, getNavigationController: { [weak self] in + self.displayNode = InstantPageControllerNode(controller: self, context: self.context, settings: self.settings, themeSettings: self.themeSettings, presentationTheme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, autoNightModeTriggered: self.presentationData.autoNightModeTriggered, statusBar: self.statusBar, sourcePeerType: self.sourcePeerType, getNavigationController: { [weak self] in return self?.navigationController as? NavigationController }, present: { [weak self] c, a in self?.present(c, in: .window(.root), with: a, blockInteraction: true) diff --git a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift index 423e567a5f..19e09fbc4f 100644 --- a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift @@ -16,8 +16,10 @@ import GalleryUI import OpenInExternalAppUI import LocationUI import UndoUI +import ContextUI final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { + private weak var controller: InstantPageController? private let context: AccountContext private var settings: InstantPagePresentationSettings? private var themeSettings: PresentationThemeSettings? @@ -89,7 +91,8 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { return InstantPageStoredState(contentOffset: Double(self.scrollNode.view.contentOffset.y), details: details) } - init(context: AccountContext, settings: InstantPagePresentationSettings?, themeSettings: PresentationThemeSettings?, presentationTheme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, autoNightModeTriggered: Bool, statusBar: StatusBar, sourcePeerType: MediaAutoDownloadPeerType, getNavigationController: @escaping () -> NavigationController?, present: @escaping (ViewController, Any?) -> Void, pushController: @escaping (ViewController) -> Void, openPeer: @escaping (PeerId) -> Void, navigateBack: @escaping () -> Void) { + init(controller: InstantPageController, context: AccountContext, settings: InstantPagePresentationSettings?, themeSettings: PresentationThemeSettings?, presentationTheme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, autoNightModeTriggered: Bool, statusBar: StatusBar, sourcePeerType: MediaAutoDownloadPeerType, getNavigationController: @escaping () -> NavigationController?, present: @escaping (ViewController, Any?) -> Void, pushController: @escaping (ViewController) -> Void, openPeer: @escaping (PeerId) -> Void, navigateBack: @escaping () -> Void) { + self.controller = controller self.context = context self.presentationTheme = presentationTheme self.dateTimeFormat = dateTimeFormat @@ -556,6 +559,31 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { self?.openMedia(media) }, longPressMedia: { [weak self] media in self?.longPressMedia(media) + }, activatePinchPreview: { [weak self] sourceNode in + guard let strongSelf = self, let controller = strongSelf.controller else { + return + } + let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: { + guard let strongSelf = self else { + return CGRect() + } + + let localRect = CGRect(origin: CGPoint(x: 0.0, y: strongSelf.navigationBar.frame.maxY), size: CGSize(width: strongSelf.bounds.width, height: strongSelf.bounds.height - strongSelf.navigationBar.frame.maxY)) + return strongSelf.view.convert(localRect, to: nil) + }) + controller.window?.presentInGlobalOverlay(pinchController) + }, pinchPreviewFinished: { [weak self] itemNode in + guard let strongSelf = self else { + return + } + for (_, listItemNode) in strongSelf.visibleItemsWithNodes { + if let listItemNode = listItemNode as? InstantPagePeerReferenceNode { + if listItemNode.frame.intersects(itemNode.frame) && listItemNode.frame.maxY <= itemNode.frame.maxY + 2.0 { + listItemNode.layer.animateAlpha(from: 0.0, to: listItemNode.alpha, duration: 0.25) + break + } + } + } }, openPeer: { [weak self] peerId in self?.openPeer(peerId) }, openUrl: { [weak self] url in diff --git a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift index 4dfef89b24..681f993b8e 100644 --- a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift @@ -8,6 +8,7 @@ import Display import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPageDetailsItem: InstantPageItem { var frame: CGRect @@ -40,7 +41,7 @@ final class InstantPageDetailsItem: InstantPageItem { self.index = index } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { var expanded: Bool? if let expandedDetails = currentExpandedDetails, let currentlyExpanded = expandedDetails[self.index] { expanded = currentlyExpanded diff --git a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift index 4bcf2e92e9..6d7092f015 100644 --- a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPageFeedbackItem: InstantPageItem { var frame: CGRect @@ -21,7 +22,7 @@ final class InstantPageFeedbackItem: InstantPageItem { self.webPage = webPage } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return InstantPageFeedbackNode(context: context, strings: strings, theme: theme, webPage: self.webPage, openUrl: openUrl) } diff --git a/submodules/InstantPageUI/Sources/InstantPageImageItem.swift b/submodules/InstantPageUI/Sources/InstantPageImageItem.swift index 6bed10a920..3a6d1da89a 100644 --- a/submodules/InstantPageUI/Sources/InstantPageImageItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageImageItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI protocol InstantPageImageAttribute { } @@ -45,8 +46,8 @@ final class InstantPageImageItem: InstantPageItem { self.fit = fit } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { - return InstantPageImageNode(context: context, sourcePeerType: sourcePeerType, theme: theme, webPage: self.webPage, media: self.media, attributes: self.attributes, interactive: self.interactive, roundCorners: self.roundCorners, fit: self.fit, openMedia: openMedia, longPressMedia: longPressMedia) + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { + return InstantPageImageNode(context: context, sourcePeerType: sourcePeerType, theme: theme, webPage: self.webPage, media: self.media, attributes: self.attributes, interactive: self.interactive, roundCorners: self.roundCorners, fit: self.fit, openMedia: openMedia, longPressMedia: longPressMedia, activatePinchPreview: activatePinchPreview, pinchPreviewFinished: pinchPreviewFinished) } func matchesAnchor(_ anchor: String) -> Bool { diff --git a/submodules/InstantPageUI/Sources/InstantPageImageNode.swift b/submodules/InstantPageUI/Sources/InstantPageImageNode.swift index 73e634010e..a63f6dbc28 100644 --- a/submodules/InstantPageUI/Sources/InstantPageImageNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageImageNode.swift @@ -15,6 +15,7 @@ import LocationResources import LiveLocationPositionNode import AppBundle import TelegramUIPreferences +import ContextUI private struct FetchControls { let fetch: (Bool) -> Void @@ -34,7 +35,8 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode { private let longPressMedia: (InstantPageMedia) -> Void private var fetchControls: FetchControls? - + + private let pinchContainerNode: PinchSourceContainerNode private let imageNode: TransformImageNode private let statusNode: RadialStatusNode private let linkIconNode: ASImageNode @@ -48,7 +50,7 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode { private var themeUpdated: Bool = false - init(context: AccountContext, sourcePeerType: MediaAutoDownloadPeerType, theme: InstantPageTheme, webPage: TelegramMediaWebpage, media: InstantPageMedia, attributes: [InstantPageImageAttribute], interactive: Bool, roundCorners: Bool, fit: Bool, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void) { + init(context: AccountContext, sourcePeerType: MediaAutoDownloadPeerType, theme: InstantPageTheme, webPage: TelegramMediaWebpage, media: InstantPageMedia, attributes: [InstantPageImageAttribute], interactive: Bool, roundCorners: Bool, fit: Bool, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?) { self.context = context self.theme = theme self.webPage = webPage @@ -59,15 +61,17 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode { self.fit = fit self.openMedia = openMedia self.longPressMedia = longPressMedia - + + self.pinchContainerNode = PinchSourceContainerNode() self.imageNode = TransformImageNode() self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(white: 0.0, alpha: 0.6)) self.linkIconNode = ASImageNode() self.pinNode = ChatMessageLiveLocationPositionNode() super.init() - - self.addSubnode(self.imageNode) + + self.pinchContainerNode.contentNode.addSubnode(self.imageNode) + self.addSubnode(self.pinchContainerNode) if let image = media.media as? TelegramMediaImage, let largest = largestImageRepresentation(image.representations) { let imageReference = ImageMediaReference.webPage(webPage: WebpageReference(webPage), media: image) @@ -97,10 +101,10 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode { if media.url != nil { self.linkIconNode.image = UIImage(bundleImageName: "Instant View/ImageLink") - self.addSubnode(self.linkIconNode) + self.pinchContainerNode.contentNode.addSubnode(self.linkIconNode) } - self.addSubnode(self.statusNode) + self.pinchContainerNode.contentNode.addSubnode(self.statusNode) } } else if let file = media.media as? TelegramMediaFile { let fileReference = FileMediaReference.webPage(webPage: WebpageReference(webPage), media: file) @@ -114,16 +118,14 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode { } if file.isVideo { self.statusNode.transitionToState(.play(.white), animated: false, completion: {}) - self.addSubnode(self.statusNode) + self.pinchContainerNode.contentNode.addSubnode(self.statusNode) } } else if let map = media.media as? TelegramMediaMap { self.addSubnode(self.pinNode) - - var zoom: Int32 = 12 + var dimensions = CGSize(width: 200.0, height: 100.0) for attribute in self.attributes { if let mapAttribute = attribute as? InstantPageMapAttribute { - zoom = mapAttribute.zoom dimensions = mapAttribute.dimensions break } @@ -135,7 +137,19 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode { self.imageNode.setSignal(chatMessagePhoto(postbox: context.account.postbox, photoReference: imageReference)) self.fetchedDisposable.set(chatMessagePhotoInteractiveFetched(context: context, photoReference: imageReference, displayAtSize: nil, storeToDownloadsPeerType: nil).start()) self.statusNode.transitionToState(.play(.white), animated: false, completion: {}) - self.addSubnode(self.statusNode) + self.pinchContainerNode.contentNode.addSubnode(self.statusNode) + } + + if let activatePinchPreview = activatePinchPreview { + self.pinchContainerNode.activate = { sourceNode in + activatePinchPreview(sourceNode) + } + self.pinchContainerNode.animatedOut = { [weak self] in + guard let strongSelf = self else { + return + } + pinchPreviewFinished?(strongSelf) + } } } @@ -198,7 +212,9 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode { if self.currentSize != size || self.themeUpdated { self.currentSize = size self.themeUpdated = false - + + self.pinchContainerNode.frame = CGRect(origin: CGPoint(), size: size) + self.pinchContainerNode.update(size: size, transition: .immediate) self.imageNode.frame = CGRect(origin: CGPoint(), size: size) let radialStatusSize: CGFloat = 50.0 diff --git a/submodules/InstantPageUI/Sources/InstantPageItem.swift b/submodules/InstantPageUI/Sources/InstantPageItem.swift index c60bd39cf0..436678bf5a 100644 --- a/submodules/InstantPageUI/Sources/InstantPageItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI protocol InstantPageItem { var frame: CGRect { get set } @@ -16,7 +17,7 @@ protocol InstantPageItem { func matchesAnchor(_ anchor: String) -> Bool func drawInTile(context: CGContext) - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? func matchesNode(_ node: InstantPageNode) -> Bool func linkSelectionRects(at point: CGPoint) -> [CGRect] diff --git a/submodules/InstantPageUI/Sources/InstantPageNode.swift b/submodules/InstantPageUI/Sources/InstantPageNode.swift index 3eb643e1b4..591d8693cc 100644 --- a/submodules/InstantPageUI/Sources/InstantPageNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageNode.swift @@ -4,7 +4,7 @@ import AsyncDisplayKit import Display import TelegramPresentationData -protocol InstantPageNode { +protocol InstantPageNode: ASDisplayNode { func updateIsVisible(_ isVisible: Bool) func transitionNode(media: InstantPageMedia) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? diff --git a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift index 3b5e71ccc4..86075eba4e 100644 --- a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPagePeerReferenceItem: InstantPageItem { var frame: CGRect @@ -27,7 +28,7 @@ final class InstantPagePeerReferenceItem: InstantPageItem { self.rtl = rtl } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return InstantPagePeerReferenceNode(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, initialPeer: self.initialPeer, safeInset: self.safeInset, transparent: self.transparent, rtl: self.rtl, openPeer: openPeer) } diff --git a/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift b/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift index d43d84cc0c..82d0b9efeb 100644 --- a/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPagePlayableVideoItem: InstantPageItem { var frame: CGRect @@ -29,7 +30,7 @@ final class InstantPagePlayableVideoItem: InstantPageItem { self.interactive = interactive } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return InstantPagePlayableVideoNode(context: context, webPage: self.webPage, theme: theme, media: self.media, interactive: self.interactive, openMedia: openMedia) } diff --git a/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift b/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift index 3d22f56dd6..fe506f8626 100644 --- a/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI enum InstantPageShape { case rect @@ -62,7 +63,7 @@ final class InstantPageShapeItem: InstantPageItem { return false } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return nil } diff --git a/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift b/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift index 9ce77fc9a6..cf0f8a9d49 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPageSlideshowItem: InstantPageItem { var frame: CGRect @@ -21,7 +22,7 @@ final class InstantPageSlideshowItem: InstantPageItem { self.medias = medias } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return InstantPageSlideshowNode(context: context, sourcePeerType: sourcePeerType, theme: theme, webPage: webPage, medias: self.medias, openMedia: openMedia, longPressMedia: longPressMedia) } diff --git a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift index d545caade5..624bf4501f 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift @@ -183,7 +183,7 @@ private final class InstantPageSlideshowPagerNode: ASDisplayNode, UIScrollViewDe let media = self.items[index] let contentNode: ASDisplayNode if let _ = media.media as? TelegramMediaImage { - contentNode = InstantPageImageNode(context: self.context, sourcePeerType: self.sourcePeerType, theme: self.theme, webPage: self.webPage, media: media, attributes: [], interactive: true, roundCorners: false, fit: false, openMedia: self.openMedia, longPressMedia: self.longPressMedia) + contentNode = InstantPageImageNode(context: self.context, sourcePeerType: self.sourcePeerType, theme: self.theme, webPage: self.webPage, media: media, attributes: [], interactive: true, roundCorners: false, fit: false, openMedia: self.openMedia, longPressMedia: self.longPressMedia, activatePinchPreview: nil, pinchPreviewFinished: nil) } else if let file = media.media as? TelegramMediaFile { contentNode = ASDisplayNode() } else { diff --git a/submodules/InstantPageUI/Sources/InstantPageTableItem.swift b/submodules/InstantPageUI/Sources/InstantPageTableItem.swift index b496136023..8dd07125ee 100644 --- a/submodules/InstantPageUI/Sources/InstantPageTableItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageTableItem.swift @@ -8,6 +8,7 @@ import Display import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI private struct TableSide: OptionSet { var rawValue: Int32 = 0 @@ -200,12 +201,12 @@ final class InstantPageTableItem: InstantPageScrollableItem { return false } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { var additionalNodes: [InstantPageNode] = [] for cell in self.cells { for item in cell.additionalItems { if item.wantsNode { - if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { + if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, activatePinchPreview: nil, pinchPreviewFinished: nil, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { node.frame = item.frame.offsetBy(dx: cell.frame.minX, dy: cell.frame.minY) additionalNodes.append(node) } diff --git a/submodules/InstantPageUI/Sources/InstantPageTextItem.swift b/submodules/InstantPageUI/Sources/InstantPageTextItem.swift index c9483f1fba..60e725ca0f 100644 --- a/submodules/InstantPageUI/Sources/InstantPageTextItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageTextItem.swift @@ -9,6 +9,7 @@ import TelegramPresentationData import TelegramUIPreferences import TextFormat import AccountContext +import ContextUI public final class InstantPageUrlItem: Equatable { public let url: String @@ -436,7 +437,7 @@ final class InstantPageTextItem: InstantPageItem { return false } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return nil } @@ -485,11 +486,11 @@ final class InstantPageScrollableTextItem: InstantPageScrollableItem { context.restoreGState() } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { var additionalNodes: [InstantPageNode] = [] for item in additionalItems { if item.wantsNode { - if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { + if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, activatePinchPreview: nil, pinchPreviewFinished: nil, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { node.frame = item.frame additionalNodes.append(node) } diff --git a/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift b/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift index f432f660ba..14f06fad3f 100644 --- a/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramUIPreferences import AccountContext +import ContextUI final class InstantPageWebEmbedItem: InstantPageItem { var frame: CGRect @@ -25,7 +26,7 @@ final class InstantPageWebEmbedItem: InstantPageItem { self.enableScrolling = enableScrolling } - func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? { return InstantPageWebEmbedNode(frame: self.frame, url: self.url, html: self.html, enableScrolling: self.enableScrolling, updateWebEmbedHeight: updateWebEmbedHeight) } diff --git a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift index b15cecdda8..9b75fc2fc0 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift @@ -839,7 +839,7 @@ public final class InviteLinkViewController: ViewController { } else { let elapsedTime = expireDate - currentTime if elapsedTime >= 86400 { - subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(timeIntervalString(strings: self.presentationData.strings, value: elapsedTime)).0 + subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(scheduledTimeIntervalString(strings: self.presentationData.strings, value: elapsedTime)).0 } else { subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(textForTimeout(value: elapsedTime)).0 if self.countdownTimer == nil { diff --git a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift index be3a22af2b..ee217b013e 100644 --- a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift @@ -392,7 +392,7 @@ public class ItemListInviteLinkItemNode: ListViewItemNode, ItemListItemNode { } let elapsedTime = expireDate - currentTime if elapsedTime >= 86400 { - subtitleText += item.presentationData.strings.InviteLink_ExpiresIn(timeIntervalString(strings: item.presentationData.strings, value: elapsedTime)).0 + subtitleText += item.presentationData.strings.InviteLink_ExpiresIn(scheduledTimeIntervalString(strings: item.presentationData.strings, value: elapsedTime)).0 } else { subtitleText += item.presentationData.strings.InviteLink_ExpiresIn(textForTimeout(value: elapsedTime)).0 } diff --git a/submodules/ItemListUI/BUILD b/submodules/ItemListUI/BUILD index 68433a99c3..9a38bf8d03 100644 --- a/submodules/ItemListUI/BUILD +++ b/submodules/ItemListUI/BUILD @@ -22,6 +22,7 @@ swift_library( "//submodules/SegmentedControlNode:SegmentedControlNode", "//submodules/AccountContext:AccountContext", "//submodules/AnimationUI:AnimationUI", + "//submodules/ShimmerEffect:ShimmerEffect", ], visibility = [ "//visibility:public", diff --git a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift index 585b750ae1..1c58b50e54 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift @@ -4,6 +4,7 @@ import Display import AsyncDisplayKit import SwiftSignalKit import TelegramPresentationData +import ShimmerEffect public enum ItemListDisclosureItemTitleColor { case primary @@ -38,8 +39,9 @@ public class ItemListDisclosureItem: ListViewItem, ItemListItem { let action: (() -> Void)? let clearHighlightAutomatically: Bool public let tag: ItemListItemTag? + public let shimmeringIndex: Int? - public init(presentationData: ItemListPresentationData, icon: UIImage? = nil, title: String, enabled: Bool = true, titleColor: ItemListDisclosureItemTitleColor = .primary, label: String, labelStyle: ItemListDisclosureLabelStyle = .text, sectionId: ItemListSectionId, style: ItemListStyle, disclosureStyle: ItemListDisclosureStyle = .arrow, action: (() -> Void)?, clearHighlightAutomatically: Bool = true, tag: ItemListItemTag? = nil) { + public init(presentationData: ItemListPresentationData, icon: UIImage? = nil, title: String, enabled: Bool = true, titleColor: ItemListDisclosureItemTitleColor = .primary, label: String, labelStyle: ItemListDisclosureLabelStyle = .text, sectionId: ItemListSectionId, style: ItemListStyle, disclosureStyle: ItemListDisclosureStyle = .arrow, action: (() -> Void)?, clearHighlightAutomatically: Bool = true, tag: ItemListItemTag? = nil, shimmeringIndex: Int? = nil) { self.presentationData = presentationData self.icon = icon self.title = title @@ -53,6 +55,7 @@ public class ItemListDisclosureItem: ListViewItem, ItemListItem { self.action = action self.clearHighlightAutomatically = clearHighlightAutomatically self.tag = tag + self.shimmeringIndex = shimmeringIndex } public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { @@ -131,6 +134,9 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode { public var tag: ItemListItemTag? { return self.item?.tag } + + private var placeholderNode: ShimmerEffectNode? + private var absoluteLocation: (CGRect, CGSize)? public init() { self.backgroundNode = ASDisplayNode() @@ -179,6 +185,15 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode { self.addSubnode(self.activateArea) } + + override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) { + var rect = rect + rect.origin.y += self.insets.top + self.absoluteLocation = (rect, containerSize) + if let shimmerNode = self.placeholderNode { + shimmerNode.updateAbsoluteRect(rect, within: containerSize) + } + } public func asyncLayout() -> (_ item: ItemListDisclosureItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { let makeTitleLayout = TextNode.asyncLayout(self.titleNode) @@ -479,6 +494,38 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode { } strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: height + UIScreenPixel)) + + if let shimmeringIndex = item.shimmeringIndex { + let shimmerNode: ShimmerEffectNode + if let current = strongSelf.placeholderNode { + shimmerNode = current + } else { + shimmerNode = ShimmerEffectNode() + strongSelf.placeholderNode = shimmerNode + if strongSelf.backgroundNode.supernode != nil { + strongSelf.insertSubnode(shimmerNode, aboveSubnode: strongSelf.backgroundNode) + } else { + strongSelf.addSubnode(shimmerNode) + } + } + shimmerNode.frame = CGRect(origin: CGPoint(), size: contentSize) + if let (rect, size) = strongSelf.absoluteLocation { + shimmerNode.updateAbsoluteRect(rect, within: size) + } + + var shapes: [ShimmerEffectNode.Shape] = [] + + let titleLineWidth: CGFloat = (shimmeringIndex % 2 == 0) ? 120.0 : 80.0 + let lineDiameter: CGFloat = 8.0 + + let titleFrame = strongSelf.titleNode.frame + shapes.append(.roundedRectLine(startPoint: CGPoint(x: titleFrame.minX, y: titleFrame.minY + floor((titleFrame.height - lineDiameter) / 2.0)), width: titleLineWidth, diameter: lineDiameter)) + + shimmerNode.update(backgroundColor: item.presentationData.theme.list.itemBlocksBackgroundColor, foregroundColor: item.presentationData.theme.list.mediaPlaceholderColor, shimmeringColor: item.presentationData.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4), shapes: shapes, size: contentSize) + } else if let shimmerNode = strongSelf.placeholderNode { + strongSelf.placeholderNode = nil + shimmerNode.removeFromSupernode() + } } }) } diff --git a/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift b/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift index d42228667f..9e4a89025a 100644 --- a/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift +++ b/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift @@ -145,6 +145,12 @@ open class ManagedAnimationNode: ASDisplayNode { } } + public var scale: CGFloat = 1.0 { + didSet { + self.imageNode.transform = CATransform3DMakeScale(self.scale, self.scale, 1.0) + } + } + public init(size: CGSize) { self.intrinsicSize = size @@ -286,4 +292,11 @@ open class ManagedAnimationNode: ASDisplayNode { self.didTryAdvancingState = false self.updateAnimation() } + + open override func layout() { + super.layout() + + self.imageNode.bounds = self.bounds + self.imageNode.position = CGPoint(x: self.bounds.width / 2.0, y: self.bounds.height / 2.0) + } } diff --git a/submodules/PhotoResources/Sources/PhotoResources.swift b/submodules/PhotoResources/Sources/PhotoResources.swift index 6202d5678f..b2e90993a5 100644 --- a/submodules/PhotoResources/Sources/PhotoResources.swift +++ b/submodules/PhotoResources/Sources/PhotoResources.swift @@ -32,8 +32,8 @@ public func largestRepresentationForPhoto(_ photo: TelegramMediaImage) -> Telegr private let progressiveRangeMap: [(Int, [Int])] = [ (100, [0]), - (400, [1]), - (600, [2, 3]), + (400, [3]), + (600, [4]), (Int(Int32.max), [2, 3, 4]) ] @@ -565,7 +565,7 @@ public func rawMessagePhoto(postbox: Postbox, photoReference: ImageMediaReferenc } } -public func chatMessagePhoto(postbox: Postbox, photoReference: ImageMediaReference, synchronousLoad: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { +public func chatMessagePhoto(postbox: Postbox, photoReference: ImageMediaReference, synchronousLoad: Bool = false, highQuality: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { return chatMessagePhotoInternal(photoData: chatMessagePhotoDatas(postbox: postbox, photoReference: photoReference, tryAdditionalRepresentations: true, synchronousLoad: synchronousLoad), synchronousLoad: synchronousLoad) |> map { _, _, generate in return generate @@ -684,7 +684,7 @@ public func chatMessagePhotoInternal(photoData: Signal InternalGlobalMessageTagsEntry in + addedEntries += postbox.messageHistoryTable.laterEntries(globalTagMask: self.globalTag, index: later.globalPredecessor(), count: self.count).map { entry -> InternalGlobalMessageTagsEntry in switch entry { case let .message(message): return .intermediateMessage(message) @@ -358,7 +358,7 @@ final class MutableGlobalMessageTagsView: MutablePostboxView { } } if let earlier = self.earlier { - addedEntries += postbox.messageHistoryTable.earlierEntries(globalTagMask: self.globalTag, index: earlier.successor(), count: self.count).map { entry -> InternalGlobalMessageTagsEntry in + addedEntries += postbox.messageHistoryTable.earlierEntries(globalTagMask: self.globalTag, index: earlier.globalSuccessor(), count: self.count).map { entry -> InternalGlobalMessageTagsEntry in switch entry { case let .message(message): return .intermediateMessage(message) diff --git a/submodules/Postbox/Sources/MediaBox.swift b/submodules/Postbox/Sources/MediaBox.swift index e7188645ed..97d8777d84 100644 --- a/submodules/Postbox/Sources/MediaBox.swift +++ b/submodules/Postbox/Sources/MediaBox.swift @@ -104,9 +104,10 @@ private struct CachedMediaResourceRepresentationKey: Hashable { static func ==(lhs: CachedMediaResourceRepresentationKey, rhs: CachedMediaResourceRepresentationKey) -> Bool { return lhs.resourceId.isEqual(to: rhs.resourceId) && lhs.representation.isEqual(to: rhs.representation) } - - var hashValue: Int { - return self.resourceId.hashValue + + func hash(into hasher: inout Hasher) { + hasher.combine(self.resourceId.hashValue) + hasher.combine(self.representation.uniqueId) } } diff --git a/submodules/Postbox/Sources/Message.swift b/submodules/Postbox/Sources/Message.swift index 23d4a2875a..85b35fefca 100644 --- a/submodules/Postbox/Sources/Message.swift +++ b/submodules/Postbox/Sources/Message.swift @@ -103,12 +103,24 @@ public struct MessageIndex: Comparable, Hashable { self.timestamp = timestamp } - public func predecessor() -> MessageIndex { + public func globalPredecessor() -> MessageIndex { let previousPeerId = self.id.peerId.predecessor if previousPeerId != self.id.peerId { return MessageIndex(id: MessageId(peerId: previousPeerId, namespace: self.id.namespace, id: self.id.id), timestamp: self.timestamp) } else if self.id.id != 0 { - return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id), timestamp: self.timestamp) + return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id - 1), timestamp: self.timestamp) + } else if self.id.namespace != 0 { + return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace - 1, id: Int32.max - 1), timestamp: self.timestamp) + } else if self.timestamp != 0 { + return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: Int32(Int8.max) - 1, id: Int32.max - 1), timestamp: self.timestamp - 1) + } else { + return self + } + } + + public func peerLocalPredecessor() -> MessageIndex { + if self.id.id != 0 { + return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id - 1), timestamp: self.timestamp) } else if self.id.namespace != 0 { return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace - 1, id: Int32.max - 1), timestamp: self.timestamp) } else if self.timestamp != 0 { @@ -118,7 +130,7 @@ public struct MessageIndex: Comparable, Hashable { } } - public func successor() -> MessageIndex { + public func globalSuccessor() -> MessageIndex { let nextPeerId = self.id.peerId.successor if nextPeerId != self.id.peerId { return MessageIndex(id: MessageId(peerId: nextPeerId, namespace: self.id.namespace, id: self.id.id), timestamp: self.timestamp) @@ -126,6 +138,10 @@ public struct MessageIndex: Comparable, Hashable { return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id == Int32.max ? self.id.id : (self.id.id + 1)), timestamp: self.timestamp) } } + + public func peerLocalSuccessor() -> MessageIndex { + return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id == Int32.max ? self.id.id : (self.id.id + 1)), timestamp: self.timestamp) + } public static func absoluteUpperBound() -> MessageIndex { return MessageIndex(id: MessageId(peerId: PeerId.max, namespace: Int32(Int8.max), id: Int32.max), timestamp: Int32.max) @@ -217,11 +233,11 @@ public struct ChatListIndex: Comparable, Hashable { } public var predecessor: ChatListIndex { - return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.predecessor()) + return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.globalPredecessor()) } public var successor: ChatListIndex { - return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.successor()) + return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.globalSuccessor()) } } diff --git a/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift b/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift index fbbd8ffd59..15f2fb9af5 100644 --- a/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift +++ b/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift @@ -315,7 +315,7 @@ final class MessageHistoryReadStateTable: Table { readPastTopIndex = true } if maxIncomingReadIndex < messageIndex || markedUnread || readPastTopIndex { - let (realDeltaCount, holes, messageIds) = incomingStatsInRange(maxIncomingReadIndex.successor(), messageIndex) + let (realDeltaCount, holes, messageIds) = incomingStatsInRange(maxIncomingReadIndex.peerLocalSuccessor(), messageIndex) var deltaCount = realDeltaCount if readPastTopIndex { deltaCount = max(Int(count), deltaCount) @@ -366,7 +366,7 @@ final class MessageHistoryReadStateTable: Table { break case let .indexBased(maxIncomingReadIndex, maxOutgoingReadIndex, count, markedUnread): if maxOutgoingReadIndex < messageIndex { - let messageIds: [MessageId] = outgoingIndexStatsInRange(maxOutgoingReadIndex.successor(), messageIndex) + let messageIds: [MessageId] = outgoingIndexStatsInRange(maxOutgoingReadIndex.peerLocalSuccessor(), messageIndex) self.markReadStatesAsUpdated(messageIndex.id.peerId, namespaces: states.namespaces) states.namespaces[messageIndex.id.namespace] = .indexBased(maxIncomingReadIndex: maxIncomingReadIndex, maxOutgoingReadIndex: messageIndex, count: count, markedUnread: markedUnread) diff --git a/submodules/Postbox/Sources/MessageHistoryView.swift b/submodules/Postbox/Sources/MessageHistoryView.swift index 71b6869b36..277598ec9e 100644 --- a/submodules/Postbox/Sources/MessageHistoryView.swift +++ b/submodules/Postbox/Sources/MessageHistoryView.swift @@ -1053,7 +1053,7 @@ public final class MessageHistoryView { index = 0 for entry in entries { if entry.index.id.peerId == peerId && entry.index.id.namespace == namespace { - maxNamespaceIndex = entry.index.predecessor() + maxNamespaceIndex = entry.index.peerLocalPredecessor() break } index += 1 @@ -1109,7 +1109,7 @@ public final class MessageHistoryView { index = 0 for entry in entries { if entry.index.id.peerId == peerId && entry.index.id.namespace == namespace { - maxNamespaceIndex = entry.index.predecessor() + maxNamespaceIndex = entry.index.peerLocalPredecessor() break } index += 1 diff --git a/submodules/Postbox/Sources/MessageHistoryViewState.swift b/submodules/Postbox/Sources/MessageHistoryViewState.swift index 98de702b7b..7257692472 100644 --- a/submodules/Postbox/Sources/MessageHistoryViewState.swift +++ b/submodules/Postbox/Sources/MessageHistoryViewState.swift @@ -468,11 +468,11 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace: if items.higherThanAnchor.count == 0 { clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound()) } else { - let clipIndex = items.higherThanAnchor[0].index.predecessor() + let clipIndex = items.higherThanAnchor[0].index.peerLocalPredecessor() clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex) } } else { - let clipIndex = items.lowerOrAtAnchor[0].index.predecessor() + let clipIndex = items.lowerOrAtAnchor[0].index.peerLocalPredecessor() clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex) } } else { @@ -480,7 +480,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace: if items.higherThanAnchor.count == 0 { clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound()) } else { - let clipIndex = items.higherThanAnchor[0].index.predecessor() + let clipIndex = items.higherThanAnchor[0].index.peerLocalPredecessor() clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex) } } else { @@ -488,7 +488,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace: if indices.contains(Int(items.lowerOrAtAnchor[i + 1].index.id.id)) { clipIndex = items.lowerOrAtAnchor[i + 1].index } else { - clipIndex = items.lowerOrAtAnchor[i + 1].index.predecessor() + clipIndex = items.lowerOrAtAnchor[i + 1].index.peerLocalPredecessor() } clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex) } @@ -536,11 +536,11 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace: if items.lowerOrAtAnchor.count == 0 { clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound()) } else { - let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.successor() + let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.peerLocalSuccessor() clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound()) } } else { - let clipIndex = items.higherThanAnchor[items.higherThanAnchor.count - 1].index.successor() + let clipIndex = items.higherThanAnchor[items.higherThanAnchor.count - 1].index.peerLocalSuccessor() clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound()) } } else { @@ -548,7 +548,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace: if items.lowerOrAtAnchor.count == 0 { clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound()) } else { - let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.successor() + let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.peerLocalSuccessor() clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound()) } } else { @@ -556,7 +556,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace: if indices.contains(Int(items.higherThanAnchor[i - 1].index.id.id)) { clipIndex = items.higherThanAnchor[i - 1].index } else { - clipIndex = items.higherThanAnchor[i - 1].index.successor() + clipIndex = items.higherThanAnchor[i - 1].index.peerLocalSuccessor() } clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound()) } diff --git a/submodules/Postbox/Sources/Postbox.swift b/submodules/Postbox/Sources/Postbox.swift index 262612663f..699cba0300 100644 --- a/submodules/Postbox/Sources/Postbox.swift +++ b/submodules/Postbox/Sources/Postbox.swift @@ -985,6 +985,11 @@ public final class Transaction { assert(!self.disposed) self.postbox?.scanMessages(peerId: peerId, namespace: namespace, tag: tag, f) } + + public func scanTopMessages(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (Message) -> Bool) { + assert(!self.disposed) + self.postbox?.scanTopMessages(peerId: peerId, namespace: namespace, limit: limit, f) + } public func scanMessageAttributes(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (MessageId, [MessageAttribute]) -> Bool) { self.postbox?.scanMessageAttributes(peerId: peerId, namespace: namespace, limit: limit, f) @@ -3411,6 +3416,26 @@ public final class Postbox { } } } + + fileprivate func scanTopMessages(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (Message) -> Bool) { + let lowerBound = MessageIndex.lowerBound(peerId: peerId, namespace: namespace) + var index = MessageIndex.upperBound(peerId: peerId, namespace: namespace) + var remainingLimit = limit + while remainingLimit > 0 { + let messages = self.messageHistoryTable.fetch(peerId: peerId, namespace: namespace, tag: nil, threadId: nil, from: index, includeFrom: false, to: lowerBound, limit: 10) + remainingLimit -= 10 + for message in messages { + if !f(self.renderIntermediateMessage(message)) { + break + } + } + if let last = messages.last { + index = last.index + } else { + break + } + } + } fileprivate func scanMessageAttributes(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (MessageId, [MessageAttribute]) -> Bool) { var remainingLimit = limit diff --git a/submodules/Postbox/Sources/SqliteValueBox.swift b/submodules/Postbox/Sources/SqliteValueBox.swift index 0ae732a92a..b9409cecc4 100644 --- a/submodules/Postbox/Sources/SqliteValueBox.swift +++ b/submodules/Postbox/Sources/SqliteValueBox.swift @@ -65,7 +65,7 @@ struct SqlitePreparedStatement { } return res == SQLITE_ROW } - + struct SqlError: Error { var code: Int32 } @@ -234,10 +234,8 @@ public final class SqliteValueBox: ValueBox { let _ = try? FileManager.default.createDirectory(atPath: basePath, withIntermediateDirectories: true, attributes: nil) let path = basePath + "/db_sqlite" - - #if DEBUG - print("Instance \(self) opening sqlite at \(path)") - #endif + + postboxLog("Instance \(self) opening sqlite at \(path)") #if DEBUG let exists = FileManager.default.fileExists(atPath: path) @@ -297,8 +295,10 @@ public final class SqliteValueBox: ValueBox { let _ = try? FileManager.default.removeItem(atPath: path) preconditionFailure("Couldn't open database") } - - sqlite3_busy_timeout(database.handle, 1000 * 10000) + + postboxLog("Did open DB at \(path)") + + sqlite3_busy_timeout(database.handle, 5 * 1000) var resultCode: Bool = true @@ -306,8 +306,12 @@ public final class SqliteValueBox: ValueBox { assert(resultCode) resultCode = database.execute("PRAGMA cipher_default_plaintext_header_size=32") assert(resultCode) + + postboxLog("Did set up cipher") if self.isEncrypted(database) { + postboxLog("Database is encrypted") + if let encryptionParameters = encryptionParameters { precondition(encryptionParameters.salt.data.count == 16) precondition(encryptionParameters.key.data.count == 32) @@ -316,12 +320,15 @@ public final class SqliteValueBox: ValueBox { resultCode = database.execute("PRAGMA key=\"x'\(hexKey)'\"") assert(resultCode) + + postboxLog("Setting encryption key") if self.isEncrypted(database) { + postboxLog("Encryption key is invalid") + if isTemporary || isReadOnly { return nil } - postboxLog("Encryption key is invalid") for fileName in dabaseFileNames { let _ = try? FileManager.default.removeItem(atPath: basePath + "/\(fileName)") @@ -354,6 +361,8 @@ public final class SqliteValueBox: ValueBox { assert(resultCode) } } else if let encryptionParameters = encryptionParameters, encryptionParameters.forceEncryptionIfNoSet { + postboxLog("Not encrypted") + let hexKey = hexString(encryptionParameters.key.data + encryptionParameters.salt.data) if FileManager.default.fileExists(atPath: path) { @@ -409,6 +418,8 @@ public final class SqliteValueBox: ValueBox { } } } + + postboxLog("Did set up encryption") //database.execute("PRAGMA cache_size=-2097152") resultCode = database.execute("PRAGMA mmap_size=0") @@ -421,6 +432,9 @@ public final class SqliteValueBox: ValueBox { assert(resultCode) resultCode = database.execute("PRAGMA cipher_memory_security = OFF") assert(resultCode) + + postboxLog("Did set up pragmas") + //resultCode = database.execute("PRAGMA wal_autocheckpoint=500") //database.execute("PRAGMA journal_size_limit=1536") @@ -441,8 +455,12 @@ public final class SqliteValueBox: ValueBox { let _ = self.runPragma(database, "checkpoint_fullfsync = 1") assert(self.runPragma(database, "checkpoint_fullfsync") == "1") + + postboxLog("Did set up checkpoint_fullfsync") self.beginInternal(database: database) + + postboxLog("Did begin transaction") let result = self.getUserVersion(database) @@ -462,8 +480,12 @@ public final class SqliteValueBox: ValueBox { for table in self.listFullTextTables(database) { self.fullTextTables[table.id] = table } + + postboxLog("Did load tables") self.commitInternal(database: database) + + postboxLog("Did commit final") lock.unlock() @@ -518,7 +540,21 @@ public final class SqliteValueBox: ValueBox { private func isEncrypted(_ database: Database) -> Bool { var statement: OpaquePointer? = nil + postboxLog("isEncrypted prepare...") + + let allIsOk = Atomic(value: false) + let databasePath = self.databasePath + DispatchQueue.global().asyncAfter(deadline: .now() + 5.0, execute: { + if allIsOk.with({ $0 }) == false { + postboxLog("Timeout reached, discarding database") + try? FileManager.default.removeItem(atPath: databasePath) + + exit(0) + } + }) let status = sqlite3_prepare_v2(database.handle, "SELECT * FROM sqlite_master LIMIT 1", -1, &statement, nil) + let _ = allIsOk.swap(true) + postboxLog("isEncrypted prepare done") if statement == nil { postboxLog("isEncrypted: sqlite3_prepare_v2 status = \(status) [\(self.databasePath)]") return true @@ -536,6 +572,7 @@ public final class SqliteValueBox: ValueBox { preparedStatement.destroy() return true } + postboxLog("isEncrypted step done") preparedStatement.destroy() return status == SQLITE_NOTADB } diff --git a/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift b/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift index f7b4f026b9..3e25abcabf 100644 --- a/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift +++ b/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift @@ -12,8 +12,10 @@ import AlertUI import PresentationDataUtils import CountrySelectionUI import PhoneNumberFormat +import CoreTelephony +import MessageUI -final class ChangePhoneNumberController: ViewController { +final class ChangePhoneNumberController: ViewController, MFMailComposeViewControllerDelegate { private var controllerNode: ChangePhoneNumberControllerNode { return self.displayNode as! ChangePhoneNumberControllerNode } @@ -133,18 +135,39 @@ final class ChangePhoneNumberController: ViewController { let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } let text: String + var actions: [TextAlertAction] = [] switch error { case .limitExceeded: text = presentationData.strings.Login_CodeFloodError + actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) case .invalidPhoneNumber: text = presentationData.strings.Login_InvalidPhoneError + actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) case .phoneNumberOccupied: text = presentationData.strings.ChangePhone_ErrorOccupied(formatPhoneNumber(phoneNumber)).0 + actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) + case .phoneBanned: + text = presentationData.strings.Login_PhoneBannedError + actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) + actions.append(TextAlertAction(type: .genericAction, title: presentationData.strings.Login_PhoneNumberHelp, action: { [weak self] in + guard let strongSelf = self else { + return + } + let formattedNumber = formatPhoneNumber(number) + let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown" + let systemVersion = UIDevice.current.systemVersion + let locale = Locale.current.identifier + let carrier = CTCarrier() + let mnc = carrier.mobileNetworkCode ?? "none" + + strongSelf.presentEmailComposeController(address: "login@stel.com", subject: presentationData.strings.Login_PhoneBannedEmailSubject(formattedNumber).0, body: presentationData.strings.Login_PhoneBannedEmailBody(formattedNumber, appVersion, systemVersion, locale, mnc).0) + })) case .generic: text = presentationData.strings.Login_UnknownError + actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) } - strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: actions), in: .window(.root)) } })) } else { @@ -152,4 +175,22 @@ final class ChangePhoneNumberController: ViewController { self.controllerNode.animateError() } } + + private func presentEmailComposeController(address: String, subject: String, body: String) { + if MFMailComposeViewController.canSendMail() { + let composeController = MFMailComposeViewController() + composeController.setToRecipients([address]) + composeController.setSubject(subject) + composeController.setMessageBody(body, isHTML: false) + composeController.mailComposeDelegate = self + + self.view.window?.rootViewController?.present(composeController, animated: true, completion: nil) + } else { + self.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: self.presentationData), title: nil, text: self.presentationData.strings.Login_EmailNotConfiguredError, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + } + } + + public func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) { + controller.dismiss(animated: true, completion: nil) + } } diff --git a/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift index 2372c84b27..3aa25bcff8 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift @@ -9,11 +9,11 @@ import TelegramPresentationData import TelegramUIPreferences import ItemListUI import PresentationDataUtils -import OverlayStatusController import AccountContext import AlertUI import PresentationDataUtils import TelegramNotices +import UndoUI private final class DataPrivacyControllerArguments { let account: Account @@ -368,7 +368,19 @@ public func dataPrivacyController(context: AccountContext) -> ViewController { return state } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .success)) + let text: String? + if info.contains([.paymentInfo, .shippingInfo]) { + text = presentationData.strings.Privacy_PaymentsClear_AllInfoCleared + } else if info.contains(.paymentInfo) { + text = presentationData.strings.Privacy_PaymentsClear_PaymentInfoCleared + } else if info.contains(.shippingInfo) { + text = presentationData.strings.Privacy_PaymentsClear_ShippingInfoCleared + } else { + text = nil + } + if let text = text { + presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: text), elevatedLayout: false, action: { _ in return false })) + } })) } dismissAction() @@ -422,7 +434,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController { return state } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .success)) + presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.Privacy_ContactsReset_ContactsDeleted), elevatedLayout: false, action: { _ in return false })) })) }), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Cancel, action: {})])) } @@ -478,7 +490,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController { return state } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .success)) + presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.Privacy_DeleteDrafts_DraftsDeleted), elevatedLayout: false, action: { _ in return false })) })) } dismissAction() @@ -530,7 +542,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController { let controller = ItemListController(context: context, state: signal) presentControllerImpl = { [weak controller] c in - controller?.present(c, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + controller?.present(c, in: .window(.root)) } return controller diff --git a/submodules/ShareController/Sources/ShareControllerNode.swift b/submodules/ShareController/Sources/ShareControllerNode.swift index 45d79ed873..4678c1d123 100644 --- a/submodules/ShareController/Sources/ShareControllerNode.swift +++ b/submodules/ShareController/Sources/ShareControllerNode.swift @@ -596,7 +596,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate }) self.completed?(peerIds) - Queue.mainQueue().after(0.1) { + Queue.mainQueue().after(0.44) { if self.hapticFeedback == nil { self.hapticFeedback = HapticFeedback() } diff --git a/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift b/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift index f25d6743ea..2f63f71b6f 100644 --- a/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift +++ b/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift @@ -3,8 +3,6 @@ import UIKit import AsyncDisplayKit import Display -private let textFont: UIFont = Font.regular(16.0) - public final class SolidRoundedButtonTheme { public let backgroundColor: UIColor public let foregroundColor: UIColor diff --git a/submodules/StatisticsUI/Sources/StatsMessageItem.swift b/submodules/StatisticsUI/Sources/StatsMessageItem.swift index 0851a6a5e8..c097cecdb8 100644 --- a/submodules/StatisticsUI/Sources/StatsMessageItem.swift +++ b/submodules/StatisticsUI/Sources/StatsMessageItem.swift @@ -241,7 +241,8 @@ public class StatsMessageItemNode: ListViewItemNode, ItemListItemNode { let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize) - let contentKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.message, strings: item.presentationData.strings, nameDisplayOrder: .firstLast, accountPeerId: item.context.account.peerId) + let presentationData = item.context.sharedContext.currentPresentationData.with { $0 } + let contentKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.message, strings: item.presentationData.strings, nameDisplayOrder: .firstLast, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: item.context.account.peerId) var text = !item.message.text.isEmpty ? item.message.text : stringForMediaKind(contentKind, strings: item.presentationData.strings).0 text = foldLineBreaks(text) @@ -288,7 +289,6 @@ public class StatsMessageItemNode: ListViewItemNode, ItemListItemNode { let labelFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 13.0 / 17.0)) - let presentationData = item.context.sharedContext.currentPresentationData.with { $0 } let label = stringForFullDate(timestamp: item.message.timestamp, strings: item.presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat) let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: label, font: labelFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - totalLeftInset - rightInset - additionalRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) diff --git a/submodules/SyncCore/Sources/CachedChannelData.swift b/submodules/SyncCore/Sources/CachedChannelData.swift index 24adca7534..5b994dc253 100644 --- a/submodules/SyncCore/Sources/CachedChannelData.swift +++ b/submodules/SyncCore/Sources/CachedChannelData.swift @@ -159,21 +159,29 @@ public final class CachedChannelData: CachedPeerData { public var id: Int64 public var accessHash: Int64 public var title: String? + public var scheduleTimestamp: Int32? + public var subscribedToScheduled: Bool public init( id: Int64, accessHash: Int64, - title: String? + title: String?, + scheduleTimestamp: Int32?, + subscribedToScheduled: Bool ) { self.id = id self.accessHash = accessHash self.title = title + self.scheduleTimestamp = scheduleTimestamp + self.subscribedToScheduled = subscribedToScheduled } public init(decoder: PostboxDecoder) { self.id = decoder.decodeInt64ForKey("id", orElse: 0) self.accessHash = decoder.decodeInt64ForKey("accessHash", orElse: 0) self.title = decoder.decodeOptionalStringForKey("title") + self.scheduleTimestamp = decoder.decodeOptionalInt32ForKey("scheduleTimestamp") + self.subscribedToScheduled = decoder.decodeBoolForKey("subscribed", orElse: false) } public func encode(_ encoder: PostboxEncoder) { @@ -184,6 +192,12 @@ public final class CachedChannelData: CachedPeerData { } else { encoder.encodeNil(forKey: "title") } + if let scheduleTimestamp = self.scheduleTimestamp { + encoder.encodeInt32(scheduleTimestamp, forKey: "scheduleTimestamp") + } else { + encoder.encodeNil(forKey: "scheduleTimestamp") + } + encoder.encodeBool(self.subscribedToScheduled, forKey: "subscribed") } } diff --git a/submodules/SyncCore/Sources/CloudFileMediaResource.swift b/submodules/SyncCore/Sources/CloudFileMediaResource.swift index 666706c3d0..ef238fc3ed 100644 --- a/submodules/SyncCore/Sources/CloudFileMediaResource.swift +++ b/submodules/SyncCore/Sources/CloudFileMediaResource.swift @@ -1,7 +1,7 @@ import Foundation import Postbox -public struct CloudFileMediaResourceId: MediaResourceId { +public struct CloudFileMediaResourceId: MediaResourceId, Hashable, Equatable { let datacenterId: Int let volumeId: Int64 let localId: Int32 @@ -18,13 +18,9 @@ public struct CloudFileMediaResourceId: MediaResourceId { return "telegram-cloud-file-\(self.datacenterId)-\(self.volumeId)-\(self.localId)-\(self.secret)" } - public var hashValue: Int { - return self.secret.hashValue - } - public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? CloudFileMediaResourceId { - return self.datacenterId == to.datacenterId && self.volumeId == to.volumeId && self.localId == to.localId && self.secret == to.secret + return self == to } else { return false } @@ -91,7 +87,7 @@ public final class CloudFileMediaResource: TelegramMediaResource { } } -public struct CloudPhotoSizeMediaResourceId: MediaResourceId, Hashable { +public struct CloudPhotoSizeMediaResourceId: MediaResourceId, Hashable, Equatable { let datacenterId: Int32 let photoId: Int64 let sizeSpec: String @@ -108,7 +104,7 @@ public struct CloudPhotoSizeMediaResourceId: MediaResourceId, Hashable { public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? CloudPhotoSizeMediaResourceId { - return self.datacenterId == to.datacenterId && self.photoId == to.photoId && self.sizeSpec == to.sizeSpec + return self == to } else { return false } @@ -175,7 +171,7 @@ public final class CloudPhotoSizeMediaResource: TelegramMediaResource { } } -public struct CloudDocumentSizeMediaResourceId: MediaResourceId, Hashable { +public struct CloudDocumentSizeMediaResourceId: MediaResourceId, Hashable, Equatable { let datacenterId: Int32 let documentId: Int64 let sizeSpec: String @@ -192,7 +188,7 @@ public struct CloudDocumentSizeMediaResourceId: MediaResourceId, Hashable { public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? CloudDocumentSizeMediaResourceId { - return self.datacenterId == to.datacenterId && self.documentId == to.documentId && self.sizeSpec == to.sizeSpec + return self == to } else { return false } @@ -252,7 +248,7 @@ public enum CloudPeerPhotoSizeSpec: Int32 { case fullSize } -public struct CloudPeerPhotoSizeMediaResourceId: MediaResourceId, Hashable { +public struct CloudPeerPhotoSizeMediaResourceId: MediaResourceId, Hashable, Equatable { let datacenterId: Int32 let photoId: Int64? let sizeSpec: CloudPeerPhotoSizeSpec @@ -277,7 +273,7 @@ public struct CloudPeerPhotoSizeMediaResourceId: MediaResourceId, Hashable { public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? CloudPeerPhotoSizeMediaResourceId { - return self.datacenterId == to.datacenterId && self.photoId == to.photoId && self.sizeSpec == to.sizeSpec && self.volumeId == to.volumeId && self.localId == to.localId + return self == to } else { return false } @@ -340,7 +336,7 @@ public final class CloudPeerPhotoSizeMediaResource: TelegramMediaResource { } } -public struct CloudStickerPackThumbnailMediaResourceId: MediaResourceId, Hashable { +public struct CloudStickerPackThumbnailMediaResourceId: MediaResourceId, Hashable, Equatable { let datacenterId: Int32 let thumbVersion: Int32? let volumeId: Int64? @@ -363,7 +359,7 @@ public struct CloudStickerPackThumbnailMediaResourceId: MediaResourceId, Hashabl public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? CloudStickerPackThumbnailMediaResourceId { - return self.datacenterId == to.datacenterId && self.volumeId == to.volumeId && self.localId == to.localId + return self == to } else { return false } @@ -422,7 +418,7 @@ public final class CloudStickerPackThumbnailMediaResource: TelegramMediaResource } } -public struct CloudDocumentMediaResourceId: MediaResourceId { +public struct CloudDocumentMediaResourceId: MediaResourceId, Hashable, Equatable { public let datacenterId: Int public let fileId: Int64 @@ -435,13 +431,9 @@ public struct CloudDocumentMediaResourceId: MediaResourceId { return "telegram-cloud-document-\(self.datacenterId)-\(self.fileId)" } - public var hashValue: Int { - return self.fileId.hashValue - } - public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? CloudDocumentMediaResourceId { - return self.datacenterId == to.datacenterId && self.fileId == to.fileId + return self == to } else { return false } @@ -512,20 +504,16 @@ public final class CloudDocumentMediaResource: TelegramMediaResource { } } -public struct LocalFileMediaResourceId: MediaResourceId { +public struct LocalFileMediaResourceId: MediaResourceId, Hashable, Equatable { public let fileId: Int64 public var uniqueId: String { return "telegram-local-file-\(self.fileId)" } - public var hashValue: Int { - return self.fileId.hashValue - } - public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? LocalFileMediaResourceId { - return self.fileId == to.fileId + return self == to } else { return false } @@ -577,20 +565,16 @@ public class LocalFileMediaResource: TelegramMediaResource { } } -public struct LocalFileReferenceMediaResourceId: MediaResourceId { +public struct LocalFileReferenceMediaResourceId: MediaResourceId, Hashable, Equatable { public let randomId: Int64 public var uniqueId: String { return "local-file-\(self.randomId)" } - public var hashValue: Int { - return self.randomId.hashValue - } - public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? LocalFileReferenceMediaResourceId { - return self.randomId == to.randomId + return self == to } else { return false } @@ -641,21 +625,17 @@ public class LocalFileReferenceMediaResource: TelegramMediaResource { } } -public struct HttpReferenceMediaResourceId: MediaResourceId { +public struct HttpReferenceMediaResourceId: MediaResourceId, Hashable, Equatable { public let url: String public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? HttpReferenceMediaResourceId { - return self.url == to.url + return self == to } else { return false } } - public var hashValue: Int { - return self.url.hashValue - } - public var uniqueId: String { return "http-\(persistentHash32(self.url))" } @@ -701,23 +681,19 @@ public final class HttpReferenceMediaResource: TelegramMediaResource { } } -public struct WebFileReferenceMediaResourceId: MediaResourceId { +public struct WebFileReferenceMediaResourceId: MediaResourceId, Hashable, Equatable { public let url: String public let accessHash: Int64 public let size: Int32 public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? WebFileReferenceMediaResourceId { - return self.url == to.url && size == to.size && accessHash == to.accessHash + return self == to } else { return false } } - public var hashValue: Int { - return self.url.hashValue - } - public var uniqueId: String { return "proxy-\(persistentHash32(self.url))-\(size)-\(accessHash)" } @@ -760,7 +736,7 @@ public final class WebFileReferenceMediaResource: TelegramMediaResource { } -public struct SecretFileMediaResourceId: MediaResourceId { +public struct SecretFileMediaResourceId: MediaResourceId, Hashable, Equatable { public let fileId: Int64 public let datacenterId: Int32 @@ -773,13 +749,9 @@ public struct SecretFileMediaResourceId: MediaResourceId { self.datacenterId = datacenterId } - public var hashValue: Int { - return self.fileId.hashValue - } - public func isEqual(to: MediaResourceId) -> Bool { if let to = to as? SecretFileMediaResourceId { - return self.fileId == to.fileId && self.datacenterId == to.datacenterId + return self == to } else { return false } diff --git a/submodules/TelegramApi/Sources/Api4.swift b/submodules/TelegramApi/Sources/Api4.swift index 8728232aab..774fb67497 100644 --- a/submodules/TelegramApi/Sources/Api4.swift +++ b/submodules/TelegramApi/Sources/Api4.swift @@ -7958,6 +7958,21 @@ public extension Api { return result }) } + + public static func saveDefaultGroupCallJoinAs(peer: Api.InputPeer, joinAs: Api.InputPeer) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(1465786252) + peer.serialize(buffer, true) + joinAs.serialize(buffer, true) + return (FunctionDescription(name: "phone.saveDefaultGroupCallJoinAs", parameters: [("peer", peer), ("joinAs", joinAs)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in + let reader = BufferReader(buffer) + var result: Api.Bool? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.Bool + } + return result + }) + } } } } diff --git a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift index 534023efba..95bfc3281d 100644 --- a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift +++ b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift @@ -333,7 +333,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { if previousCurrentGroupCall != nil && currentGroupCall == nil && availableState?.participantCount == 1 { panelData = nil } else { - panelData = currentGroupCall != nil || availableState?.participantCount == 0 ? nil : availableState + panelData = currentGroupCall != nil || (availableState?.participantCount == 0 && availableState?.info.scheduleTimestamp == nil) ? nil : availableState } let wasEmpty = strongSelf.groupCallPanelData == nil @@ -406,7 +406,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { strongSelf.joinGroupCall( peerId: groupCallPanelData.peerId, invite: nil, - activeCall: CachedChannelData.ActiveCall(id: groupCallPanelData.info.id, accessHash: groupCallPanelData.info.accessHash, title: groupCallPanelData.info.title) + activeCall: CachedChannelData.ActiveCall(id: groupCallPanelData.info.id, accessHash: groupCallPanelData.info.accessHash, title: groupCallPanelData.info.title, scheduleTimestamp: groupCallPanelData.info.scheduleTimestamp, subscribedToScheduled: groupCallPanelData.info.subscribedToScheduled) ) }) if let navigationBar = self.navigationBar { diff --git a/submodules/TelegramCallsUI/Sources/CallControllerButton.swift b/submodules/TelegramCallsUI/Sources/CallControllerButton.swift index 77ce6f1627..2f80b15fc1 100644 --- a/submodules/TelegramCallsUI/Sources/CallControllerButton.swift +++ b/submodules/TelegramCallsUI/Sources/CallControllerButton.swift @@ -41,6 +41,7 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode { case accept case end case cancel + case share } var appearance: Appearance @@ -254,6 +255,8 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode { context.addLine(to: CGPoint(x: 2.0 + UIScreenPixel, y: 26.0 - UIScreenPixel)) context.strokePath() }) + case .share: + image = generateTintedImage(image: UIImage(bundleImageName: "Call/CallShareButton"), color: imageColor) } if let image = image { diff --git a/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift b/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift index 5dbf6ecaf4..90d0e21530 100644 --- a/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift +++ b/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift @@ -15,11 +15,23 @@ private let blue = UIColor(rgb: 0x0078ff) private let lightBlue = UIColor(rgb: 0x59c7f8) private let green = UIColor(rgb: 0x33c659) private let activeBlue = UIColor(rgb: 0x00a0b9) +private let purple = UIColor(rgb: 0x3252ef) +private let pink = UIColor(rgb: 0xef436c) +private let latePurple = UIColor(rgb: 0xaa56a6) +private let latePink = UIColor(rgb: 0xef476f) private class CallStatusBarBackgroundNode: ASDisplayNode { + enum State { + case connecting + case cantSpeak + case late + case active + case speaking + } private let foregroundView: UIView private let foregroundGradientLayer: CAGradientLayer private let maskCurveView: VoiceCurveView + private let initialTimestamp = CACurrentMediaTime() var audioLevel: Float = 0.0 { didSet { @@ -35,9 +47,9 @@ private class CallStatusBarBackgroundNode: ASDisplayNode { } } - var speaking: Bool? = nil { + var state: State = .connecting { didSet { - if self.speaking != oldValue { + if self.state != oldValue { self.updateGradientColors() } } @@ -46,13 +58,28 @@ private class CallStatusBarBackgroundNode: ASDisplayNode { private func updateGradientColors() { let initialColors = self.foregroundGradientLayer.colors let targetColors: [CGColor] - if let speaking = self.speaking { - targetColors = speaking ? [green.cgColor, activeBlue.cgColor] : [blue.cgColor, lightBlue.cgColor] - } else { - targetColors = [connectingColor.cgColor, connectingColor.cgColor] + switch self.state { + case .connecting: + targetColors = [connectingColor.cgColor, connectingColor.cgColor] + case .active: + targetColors = [blue.cgColor, lightBlue.cgColor] + case .speaking: + targetColors = [green.cgColor, activeBlue.cgColor] + case .cantSpeak: + targetColors = [purple.cgColor, pink.cgColor] + case .late: + targetColors = [latePurple.cgColor, latePink.cgColor] + } + + if CACurrentMediaTime() - self.initialTimestamp > 0.1 { + self.foregroundGradientLayer.colors = targetColors + self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3) + } else { + CATransaction.begin() + CATransaction.setDisableActions(true) + self.foregroundGradientLayer.colors = targetColors + CATransaction.commit() } - self.foregroundGradientLayer.colors = targetColors - self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3) } private let hierarchyTrackingNode: HierarchyTrackingNode @@ -177,6 +204,8 @@ public class CallStatusBarNodeImpl: CallStatusBarNode { private var currentCallState: PresentationCallState? private var currentGroupCallState: PresentationGroupCallSummaryState? private var currentIsMuted = true + private var currentCantSpeak = false + private var currentScheduleTimestamp: Int32? private var currentMembers: PresentationGroupCallMembers? private var currentIsConnected = true @@ -279,16 +308,25 @@ public class CallStatusBarNodeImpl: CallStatusBarNode { strongSelf.currentMembers = members var isMuted = isMuted + var cantSpeak = false if let state = state, let muteState = state.callState.muteState { if !muteState.canUnmute { isMuted = true + cantSpeak = true } } + if state?.callState.scheduleTimestamp != nil { + cantSpeak = true + } strongSelf.currentIsMuted = isMuted + strongSelf.currentCantSpeak = cantSpeak + strongSelf.currentScheduleTimestamp = state?.callState.scheduleTimestamp let currentIsConnected: Bool if let state = state, case .connected = state.callState.networkState { currentIsConnected = true + } else if state?.callState.scheduleTimestamp != nil { + currentIsConnected = true } else { currentIsConnected = false } @@ -316,10 +354,11 @@ public class CallStatusBarNodeImpl: CallStatusBarNode { var title: String = "" var speakerSubtitle: String = "" - let textFont = Font.regular(13.0) + let textFont = Font.with(size: 13.0, design: .regular, weight: .regular, traits: [.monospacedNumbers]) let textColor = UIColor.white var segments: [AnimatedCountLabelNode.Segment] = [] var displaySpeakerSubtitle = false + var isLate = false if let presentationData = self.presentationData { if let voiceChatTitle = self.currentGroupCallState?.info?.title, !voiceChatTitle.isEmpty { @@ -350,7 +389,23 @@ public class CallStatusBarNodeImpl: CallStatusBarNode { } displaySpeakerSubtitle = speakerSubtitle != title && !speakerSubtitle.isEmpty - if let membersCount = membersCount { + var requiresTimer = false + if let scheduleTime = self.currentGroupCallState?.info?.scheduleTimestamp { + requiresTimer = true + + let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970) + let elapsedTime = scheduleTime - currentTime + let timerText: String + if elapsedTime >= 86400 { + timerText = presentationData.strings.VoiceChat_StatusStartsIn(scheduledTimeIntervalString(strings: presentationData.strings, value: elapsedTime)).0 + } else if elapsedTime < 0 { + isLate = true + timerText = presentationData.strings.VoiceChat_StatusLateBy(textForTimeout(value: abs(elapsedTime))).0 + } else { + timerText = presentationData.strings.VoiceChat_StatusStartsIn(textForTimeout(value: elapsedTime)).0 + } + segments.append(.text(0, NSAttributedString(string: timerText, font: textFont, textColor: textColor))) + } else if let membersCount = membersCount { var membersPart = presentationData.strings.VoiceChat_Status_Members(membersCount) if membersPart.contains("[") && membersPart.contains("]") { if let startIndex = membersPart.firstIndex(of: "["), let endIndex = membersPart.firstIndex(of: "]") { @@ -402,6 +457,19 @@ public class CallStatusBarNodeImpl: CallStatusBarNode { } self.backgroundNode.connectingColor = color + + if requiresTimer { + if self.currentCallTimer == nil { + let timer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in + self?.update() + }, queue: Queue.mainQueue()) + timer.start() + self.currentCallTimer = timer + } + } else if let currentCallTimer = self.currentCallTimer { + self.currentCallTimer = nil + currentCallTimer.invalidate() + } } if self.subtitleNode.segments != segments && !displaySpeakerSubtitle { @@ -439,7 +507,19 @@ public class CallStatusBarNodeImpl: CallStatusBarNode { self.speakerNode.frame = CGRect(origin: CGPoint(x: horizontalOrigin + titleSize.width + spacing, y: verticalOrigin + floor((contentHeight - speakerSize.height) / 2.0)), size: speakerSize) } - self.backgroundNode.speaking = self.currentIsConnected ? !self.currentIsMuted : nil + let state: CallStatusBarBackgroundNode.State + if self.currentIsConnected { + if self.currentCantSpeak { + state = isLate ? .late : .cantSpeak + } else if self.currentIsMuted { + state = .active + } else { + state = .speaking + } + } else { + state = .connecting + } + self.backgroundNode.state = state self.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height + 18.0)) } } diff --git a/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift b/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift index e49dc24222..8c8ad11003 100644 --- a/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift +++ b/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift @@ -7,12 +7,29 @@ import SyncCore import Postbox import TelegramPresentationData import TelegramUIPreferences +import TelegramStringFormatting import AccountContext import AppBundle import SwiftSignalKit import AnimatedAvatarSetNode import AudioBlob +func textForTimeout(value: Int32) -> String { + if value < 3600 { + let minutes = value / 60 + let seconds = value % 60 + let secondsPadding = seconds < 10 ? "0" : "" + return "\(minutes):\(secondsPadding)\(seconds)" + } else { + let hours = value / 3600 + let minutes = (value % 3600) / 60 + let minutesPadding = minutes < 10 ? "0" : "" + let seconds = value % 60 + let secondsPadding = seconds < 10 ? "0" : "" + return "\(hours):\(minutesPadding)\(minutes):\(secondsPadding)\(seconds)" + } +} + private let titleFont = Font.semibold(15.0) private let subtitleFont = Font.regular(13.0) @@ -79,6 +96,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { private let context: AccountContext private var theme: PresentationTheme private var strings: PresentationStrings + private var dateTimeFormat: PresentationDateTimeFormat private let tapAction: () -> Void @@ -102,6 +120,11 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { private var textIsActive = false private let muteIconNode: ASImageNode + private var isScheduled = false + private var isLate = false + private var currentText: String = "" + private var updateTimer: SwiftSignalKit.Timer? + private let avatarsContext: AnimatedAvatarSetContext private var avatarsContent: AnimatedAvatarSetContext.Content? private let avatarsNode: AnimatedAvatarSetNode @@ -125,6 +148,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { self.context = context self.theme = presentationData.theme self.strings = presentationData.strings + self.dateTimeFormat = presentationData.dateTimeFormat self.tapAction = tapAction @@ -135,6 +159,9 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { self.joinButton = HighlightableButtonNode() self.joinButtonTitleNode = ImmediateTextNode() self.joinButtonBackgroundNode = ASImageNode() + self.joinButtonBackgroundNode.clipsToBounds = true + self.joinButtonBackgroundNode.displaysAsynchronously = false + self.joinButtonBackgroundNode.cornerRadius = 14.0 self.micButton = HighlightTrackingButtonNode() self.micButtonForegroundNode = VoiceChatMicrophoneNode() @@ -198,6 +225,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { self.membersDisposable.dispose() self.isMutedDisposable.dispose() self.audioLevelGeneratorTimer?.invalidate() + self.updateTimer?.invalidate() } public override func didLoad() { @@ -250,25 +278,51 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { public func updatePresentationData(_ presentationData: PresentationData) { self.theme = presentationData.theme self.strings = presentationData.strings + self.dateTimeFormat = presentationData.dateTimeFormat self.contentNode.backgroundColor = self.theme.rootController.navigationBar.backgroundColor - - self.theme = presentationData.theme - self.separatorNode.backgroundColor = presentationData.theme.chat.historyNavigation.strokeColor - self.joinButtonTitleNode.attributedText = NSAttributedString(string: presentationData.strings.VoiceChat_PanelJoin.uppercased(), font: Font.semibold(15.0), textColor: presentationData.theme.chat.inputPanel.actionControlForegroundColor) - self.joinButtonBackgroundNode.image = generateStretchableFilledCircleImage(diameter: 28.0, color: presentationData.theme.chat.inputPanel.actionControlFillColor) - + self.joinButtonTitleNode.attributedText = NSAttributedString(string: self.joinButtonTitleNode.attributedText?.string ?? "", font: Font.with(size: 15.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: self.isScheduled ? .white : presentationData.theme.chat.inputPanel.actionControlForegroundColor) self.textNode.attributedText = NSAttributedString(string: self.textNode.attributedText?.string ?? "", font: Font.regular(13.0), textColor: presentationData.theme.chat.inputPanel.secondaryTextColor) self.muteIconNode.image = PresentationResourcesChat.chatTitleMuteIcon(presentationData.theme) + self.updateJoinButton() + if let (size, leftInset, rightInset) = self.validLayout { self.updateLayout(size: size, leftInset: leftInset, rightInset: rightInset, transition: .immediate) } } + private func updateJoinButton() { + if self.isScheduled { + let purple = UIColor(rgb: 0x5d4ed1) + let pink = UIColor(rgb: 0xea436f) + let latePurple = UIColor(rgb: 0xaa56a6) + let latePink = UIColor(rgb: 0xef476f) + let colors: [UIColor] + if self.isLate { + colors = [latePurple, latePink] + } else { + colors = [purple, pink] + } + if self.joinButtonBackgroundNode.image != nil, let snapshotView = self.joinButtonBackgroundNode.view.snapshotContentTree() { + self.joinButtonBackgroundNode.view.superview?.insertSubview(snapshotView, aboveSubview: self.joinButtonBackgroundNode.view) + + snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 1.0, removeOnCompletion: false, completion: { [weak snapshotView] _ in + snapshotView?.removeFromSuperview() + }) + } + + self.joinButtonBackgroundNode.image = generateGradientImage(size: CGSize(width: 100.0, height: 1.0), colors: colors, locations: [0.0, 1.0], direction: .horizontal) + self.joinButtonBackgroundNode.backgroundColor = nil + } else { + self.joinButtonBackgroundNode.image = nil + self.joinButtonBackgroundNode.backgroundColor = self.theme.chat.inputPanel.actionControlFillColor + } + } + private func animateTextChange() { if let snapshotView = self.textNode.view.snapshotContentTree() { let offset: CGFloat = self.textIsActive ? -7.0 : 7.0 @@ -298,6 +352,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { } else { membersText = self.strings.VoiceChat_Panel_Members(Int32(data.participantCount)) } + self.currentText = membersText self.avatarsContent = self.avatarsContext.update(peers: data.topParticipants.map { $0.peer }, animated: false) @@ -321,9 +376,8 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { } else { membersText = strongSelf.strings.VoiceChat_Panel_Members(Int32(summaryState.participantCount)) } - - strongSelf.textNode.attributedText = NSAttributedString(string: membersText, font: Font.regular(13.0), textColor: strongSelf.theme.chat.inputPanel.secondaryTextColor) - + strongSelf.currentText = membersText + strongSelf.avatarsContent = strongSelf.avatarsContext.update(peers: summaryState.topParticipants.map { $0.peer }, animated: false) if let (size, leftInset, rightInset) = strongSelf.validLayout { @@ -382,7 +436,6 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { strongSelf.micButton.view.insertSubview(audioLevelView, at: 0) } - let level = min(1.0, max(0.0, CGFloat(value))) strongSelf.audioLevelView?.updateLevel(CGFloat(value) * 2.0) if value > 0.0 { strongSelf.audioLevelView?.startAnimating() @@ -400,9 +453,8 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { } else { membersText = self.strings.VoiceChat_Panel_Members(Int32(data.participantCount)) } + self.currentText = membersText - self.textNode.attributedText = NSAttributedString(string: membersText, font: Font.regular(13.0), textColor: self.theme.chat.inputPanel.secondaryTextColor) - self.avatarsContent = self.avatarsContext.update(peers: data.topParticipants.map { $0.peer }, animated: false) updateAudioLevels = true @@ -466,6 +518,59 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { transition.updateFrame(node: self.avatarsNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - avatarsSize.width) / 2.0), y: floor((size.height - avatarsSize.height) / 2.0)), size: avatarsSize)) } + var joinText = self.strings.VoiceChat_PanelJoin + var title = self.strings.VoiceChat_Title + var text = self.currentText + var isScheduled = false + var isLate = false + if let scheduleTime = self.currentData?.info.scheduleTimestamp { + isScheduled = true + if let voiceChatTitle = self.currentData?.info.title { + title = voiceChatTitle + text = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: scheduleTime, alwaysShowTime: true, format: HumanReadableStringFormat(dateFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsOn($0).0 }, tomorrowFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsTomorrow($0).0 }, todayFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsToday($0).0 }, yesterdayFormatString: { $0 })) + } else { + title = self.strings.Conversation_ScheduledVoiceChat + text = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: scheduleTime, alwaysShowTime: true, format: HumanReadableStringFormat(dateFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsOnShort($0).0 }, tomorrowFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsTomorrowShort($0).0 }, todayFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsTodayShort($0).0 }, yesterdayFormatString: { $0 })) + } + + let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970) + let elapsedTime = scheduleTime - currentTime + if elapsedTime >= 86400 { + joinText = scheduledTimeIntervalString(strings: strings, value: elapsedTime) + } else if elapsedTime < 0 { + joinText = "-\(textForTimeout(value: abs(elapsedTime)))" + isLate = true + } else { + joinText = textForTimeout(value: elapsedTime) + } + + if self.updateTimer == nil { + let timer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in + if let strongSelf = self, let (size, leftInset, rightInset) = strongSelf.validLayout { + strongSelf.updateLayout(size: size, leftInset: leftInset, rightInset: rightInset, transition: .immediate) + } + }, queue: Queue.mainQueue()) + self.updateTimer = timer + timer.start() + } + } else { + if let timer = self.updateTimer { + self.updateTimer = nil + timer.invalidate() + } + if let voiceChatTitle = self.currentData?.info.title, voiceChatTitle.count < 15 { + title = voiceChatTitle + } + } + + if self.isScheduled != isScheduled || self.isLate != isLate { + self.isScheduled = isScheduled + self.isLate = isLate + self.updateJoinButton() + } + + self.joinButtonTitleNode.attributedText = NSAttributedString(string: joinText.uppercased(), font: Font.with(size: 15.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: isScheduled ? .white : self.theme.chat.inputPanel.actionControlForegroundColor) + let joinButtonTitleSize = self.joinButtonTitleNode.updateLayout(CGSize(width: 150.0, height: .greatestFiniteMagnitude)) let joinButtonSize = CGSize(width: joinButtonTitleSize.width + 20.0, height: 28.0) let joinButtonFrame = CGRect(origin: CGPoint(x: size.width - rightInset - 7.0 - joinButtonSize.width, y: floor((panelHeight - joinButtonSize.height) / 2.0)), size: joinButtonSize) @@ -500,15 +605,17 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode { self.micButtonBackgroundNode.image = updatedImage } } - - var title = self.strings.VoiceChat_Title - if let voiceChatTitle = self.currentData?.info.title, voiceChatTitle.count < 15 { - title = voiceChatTitle - } - + self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(15.0), textColor: self.theme.chat.inputPanel.primaryTextColor) - let titleSize = self.titleNode.updateLayout(CGSize(width: size.width / 2.0 - 56.0, height: .greatestFiniteMagnitude)) + self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(13.0), textColor: self.theme.chat.inputPanel.secondaryTextColor) + + var constrainedWidth = size.width / 2.0 - 56.0 + if isScheduled { + constrainedWidth = size.width - 100.0 + } + + let titleSize = self.titleNode.updateLayout(CGSize(width: constrainedWidth, height: .greatestFiniteMagnitude)) let textSize = self.textNode.updateLayout(CGSize(width: size.width, height: .greatestFiniteMagnitude)) let titleFrame = CGRect(origin: CGPoint(x: leftInset + 16.0, y: 9.0), size: titleSize) diff --git a/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift b/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift index 08b27f546f..f0d671d9ca 100644 --- a/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift +++ b/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift @@ -624,6 +624,113 @@ public final class PresentationCallManagerImpl: PresentationCallManager { } } + private func requestScheduleGroupCall(accountContext: AccountContext, peerId: PeerId, internalId: CallSessionInternalId = CallSessionInternalId()) -> Signal { + let (presentationData, present, openSettings) = self.getDeviceAccessData() + + let isVideo = false + + let accessEnabledSignal: Signal = Signal { subscriber in + DeviceAccess.authorizeAccess(to: .microphone(.voiceCall), presentationData: presentationData, present: { c, a in + present(c, a) + }, openSettings: { + openSettings() + }, { value in + if isVideo && value { + DeviceAccess.authorizeAccess(to: .camera(.videoCall), presentationData: presentationData, present: { c, a in + present(c, a) + }, openSettings: { + openSettings() + }, { value in + subscriber.putNext(value) + subscriber.putCompletion() + }) + } else { + subscriber.putNext(value) + subscriber.putCompletion() + } + }) + return EmptyDisposable + } + |> runOn(Queue.mainQueue()) + + return accessEnabledSignal + |> deliverOnMainQueue + |> mapToSignal { [weak self] accessEnabled -> Signal in + guard let strongSelf = self else { + return .single(false) + } + + if !accessEnabled { + return .single(false) + } + + let call = PresentationGroupCallImpl( + accountContext: accountContext, + audioSession: strongSelf.audioSession, + callKitIntegration: nil, + getDeviceAccessData: strongSelf.getDeviceAccessData, + initialCall: nil, + internalId: internalId, + peerId: peerId, + invite: nil, + joinAsPeerId: nil + ) + strongSelf.updateCurrentGroupCall(call) + strongSelf.currentGroupCallPromise.set(.single(call)) + strongSelf.hasActiveGroupCallsPromise.set(true) + strongSelf.removeCurrentGroupCallDisposable.set((call.canBeRemoved + |> filter { $0 } + |> take(1) + |> deliverOnMainQueue).start(next: { [weak call] value in + guard let strongSelf = self, let call = call else { + return + } + if value { + if strongSelf.currentGroupCall === call { + strongSelf.updateCurrentGroupCall(nil) + strongSelf.currentGroupCallPromise.set(.single(nil)) + strongSelf.hasActiveGroupCallsPromise.set(false) + } + } + })) + + return .single(true) + } + } + + public func scheduleGroupCall(context: AccountContext, peerId: PeerId, endCurrentIfAny: Bool) -> RequestScheduleGroupCallResult { + let begin: () -> Void = { [weak self] in + let _ = self?.requestScheduleGroupCall(accountContext: context, peerId: peerId).start() + } + + if let currentGroupCall = self.currentGroupCallValue { + if endCurrentIfAny { + let endSignal = currentGroupCall.leave(terminateIfPossible: false) + |> filter { $0 } + |> take(1) + |> deliverOnMainQueue + self.startCallDisposable.set(endSignal.start(next: { _ in + begin() + })) + } else { + return .alreadyInProgress(currentGroupCall.peerId) + } + } else if let currentCall = self.currentCall { + if endCurrentIfAny { + self.callKitIntegration?.dropCall(uuid: currentCall.internalId) + self.startCallDisposable.set((currentCall.hangUp() + |> deliverOnMainQueue).start(next: { _ in + begin() + })) + } else { + return .alreadyInProgress(currentCall.peerId) + } + } else { + begin() + } + return .success + } + public func joinGroupCall(context: AccountContext, peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, initialCall: CachedChannelData.ActiveCall, endCurrentIfAny: Bool) -> JoinGroupCallManagerResult { let begin: () -> Void = { [weak self] in if let requestJoinAsPeerId = requestJoinAsPeerId { diff --git a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift index c0c561af3b..e583fca985 100644 --- a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift +++ b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift @@ -77,8 +77,11 @@ public final class AccountGroupCallContextImpl: AccountGroupCallContext { clientParams: nil, streamDcId: nil, title: call.title, + scheduleTimestamp: call.scheduleTimestamp, + subscribedToScheduled: call.subscribedToScheduled, recordingStartTimestamp: nil, - sortAscending: true + sortAscending: true, + defaultParticipantsAreMuted: nil ), topParticipants: [], participantCount: 0, @@ -120,7 +123,7 @@ public final class AccountGroupCallContextImpl: AccountGroupCallContext { } return GroupCallPanelData( peerId: peerId, - info: GroupCallInfo(id: call.id, accessHash: call.accessHash, participantCount: state.totalCount, clientParams: nil, streamDcId: nil, title: state.title, recordingStartTimestamp: nil, sortAscending: state.sortAscending), + info: GroupCallInfo(id: call.id, accessHash: call.accessHash, participantCount: state.totalCount, clientParams: nil, streamDcId: nil, title: state.title, scheduleTimestamp: state.scheduleTimestamp, subscribedToScheduled: state.subscribedToScheduled, recordingStartTimestamp: nil, sortAscending: state.sortAscending, defaultParticipantsAreMuted: state.defaultParticipantsAreMuted), topParticipants: topParticipants, participantCount: state.totalCount, activeSpeakers: activeSpeakers, @@ -205,7 +208,7 @@ public final class AccountGroupCallContextCacheImpl: AccountGroupCallContextCach } private extension PresentationGroupCallState { - static func initialValue(myPeerId: PeerId, title: String?) -> PresentationGroupCallState { + static func initialValue(myPeerId: PeerId, title: String?, scheduleTimestamp: Int32?, subscribedToScheduled: Bool) -> PresentationGroupCallState { return PresentationGroupCallState( myPeerId: myPeerId, networkState: .connecting, @@ -215,7 +218,9 @@ private extension PresentationGroupCallState { defaultParticipantMuteState: nil, recordingStartTimestamp: nil, title: title, - raisedHand: false + raisedHand: false, + scheduleTimestamp: scheduleTimestamp, + subscribedToScheduled: subscribedToScheduled ) } } @@ -508,6 +513,8 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { private let joinDisposable = MetaDisposable() private let requestDisposable = MetaDisposable() + private let startDisposable = MetaDisposable() + private let subscribeDisposable = MetaDisposable() private var groupCallParticipantUpdatesDisposable: Disposable? private let networkStateDisposable = MetaDisposable() @@ -550,6 +557,10 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { private var peerUpdatesSubscription: Disposable? + public private(set) var schedulePending = false + private var isScheduled = false + private var isScheduledStarted = false + init( accountContext: AccountContext, audioSession: ManagedAudioSession, @@ -572,8 +583,10 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { self.peerId = peerId self.invite = invite self.joinAsPeerId = joinAsPeerId ?? accountContext.account.peerId + self.schedulePending = initialCall == nil + self.isScheduled = initialCall == nil || initialCall?.scheduleTimestamp != nil - self.stateValue = PresentationGroupCallState.initialValue(myPeerId: self.joinAsPeerId, title: initialCall?.title) + self.stateValue = PresentationGroupCallState.initialValue(myPeerId: self.joinAsPeerId, title: initialCall?.title, scheduleTimestamp: initialCall?.scheduleTimestamp, subscribedToScheduled: initialCall?.subscribedToScheduled ?? false) self.statePromise = ValuePromise(self.stateValue) self.temporaryJoinTimestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970) @@ -728,7 +741,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { addedParticipants.append((ssrc, participantUpdate.jsonParams)) } } - case let .call(isTerminated, _, _, _): + case let .call(isTerminated, _, _, _, _): if isTerminated { strongSelf.markAsCanBeRemoved() } @@ -761,7 +774,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { }) if let initialCall = initialCall, let temporaryParticipantsContext = (self.accountContext.cachedGroupCallContexts as? AccountGroupCallContextCacheImpl)?.impl.syncWith({ impl in - impl.get(account: accountContext.account, peerId: peerId, call: CachedChannelData.ActiveCall(id: initialCall.id, accessHash: initialCall.accessHash, title: initialCall.title)) + impl.get(account: accountContext.account, peerId: peerId, call: CachedChannelData.ActiveCall(id: initialCall.id, accessHash: initialCall.accessHash, title: initialCall.title, scheduleTimestamp: initialCall.scheduleTimestamp, subscribedToScheduled: initialCall.subscribedToScheduled)) }) { self.switchToTemporaryParticipantsContext(sourceContext: temporaryParticipantsContext.context.participantsContext, oldMyPeerId: self.joinAsPeerId) } else { @@ -805,16 +818,22 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { strongSelf.stateValue = updatedValue }) - self.requestCall(movingFromBroadcastToRtc: false) + if let _ = self.initialCall { + self.requestCall(movingFromBroadcastToRtc: false) + } } deinit { + assert(Queue.mainQueue().isCurrent()) + self.audioSessionShouldBeActiveDisposable?.dispose() self.audioSessionActiveDisposable?.dispose() self.summaryStateDisposable?.dispose() self.audioSessionDisposable?.dispose() self.joinDisposable.dispose() self.requestDisposable.dispose() + self.startDisposable.dispose() + self.subscribeDisposable.dispose() self.groupCallParticipantUpdatesDisposable?.dispose() self.leaveDisposable.dispose() self.isMutedDisposable.dispose() @@ -844,6 +863,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { private func switchToTemporaryParticipantsContext(sourceContext: GroupCallParticipantsContext?, oldMyPeerId: PeerId) { let myPeerId = self.joinAsPeerId + let accountContext = self.accountContext let myPeer = self.accountContext.account.postbox.transaction { transaction -> (Peer, CachedPeerData?)? in if let peer = transaction.getPeer(myPeerId) { return (peer, transaction.getPeerCachedData(peerId: myPeerId)) @@ -851,6 +871,11 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { return nil } } + |> beforeNext { view in + if let view = view, view.1 == nil { + let _ = fetchAndUpdateCachedPeerData(accountPeerId: accountContext.account.peerId, peerId: myPeerId, network: accountContext.account.network, postbox: accountContext.account.postbox).start() + } + } if let sourceContext = sourceContext, let initialState = sourceContext.immediateState { let temporaryParticipantsContext = GroupCallParticipantsContext(account: self.account, peerId: self.peerId, myPeerId: myPeerId, id: sourceContext.id, accessHash: sourceContext.accessHash, state: initialState, previousServiceState: sourceContext.serviceState) self.temporaryParticipantsContext = temporaryParticipantsContext @@ -895,7 +920,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } else if let cachedData = cachedData as? CachedUserData { about = cachedData.about } else { - about = nil + about = " " } participants.append(GroupCallParticipantsContext.Participant( peer: myPeer, @@ -975,7 +1000,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } else if let cachedData = cachedData as? CachedUserData { about = cachedData.about } else { - about = nil + about = " " } participants.append(GroupCallParticipantsContext.Participant( peer: myPeer, @@ -1010,6 +1035,194 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } } + private func switchToTemporaryScheduledParticipantsContext() { + guard let callInfo = self.internalState.callInfo, callInfo.scheduleTimestamp != nil else { + return + } + let accountContext = self.accountContext + let peerId = self.peerId + let rawAdminIds: Signal, NoError> + if peerId.namespace == Namespaces.Peer.CloudChannel { + rawAdminIds = Signal { subscriber in + let (disposable, _) = accountContext.peerChannelMemberCategoriesContextsManager.admins(postbox: accountContext.account.postbox, network: accountContext.account.network, accountPeerId: accountContext.account.peerId, peerId: peerId, updated: { list in + var peerIds = Set() + for item in list.list { + if let adminInfo = item.participant.adminInfo, adminInfo.rights.rights.contains(.canManageCalls) { + peerIds.insert(item.peer.id) + } + } + subscriber.putNext(peerIds) + }) + return disposable + } + |> distinctUntilChanged + |> runOn(.mainQueue()) + } else { + rawAdminIds = accountContext.account.postbox.combinedView(keys: [.cachedPeerData(peerId: peerId)]) + |> map { views -> Set in + guard let view = views.views[.cachedPeerData(peerId: peerId)] as? CachedPeerDataView else { + return Set() + } + guard let cachedData = view.cachedPeerData as? CachedGroupData, let participants = cachedData.participants else { + return Set() + } + return Set(participants.participants.compactMap { item -> PeerId? in + switch item { + case .creator, .admin: + return item.peerId + default: + return nil + } + }) + } + |> distinctUntilChanged + } + + let adminIds = combineLatest(queue: .mainQueue(), + rawAdminIds, + accountContext.account.postbox.combinedView(keys: [.basicPeer(peerId)]) + ) + |> map { rawAdminIds, view -> Set in + var rawAdminIds = rawAdminIds + if let peerView = view.views[.basicPeer(peerId)] as? BasicPeerView, let peer = peerView.peer as? TelegramChannel { + if peer.hasPermission(.manageCalls) { + rawAdminIds.insert(accountContext.account.peerId) + } else { + rawAdminIds.remove(accountContext.account.peerId) + } + } + return rawAdminIds + } + |> distinctUntilChanged + + let participantsContext = GroupCallParticipantsContext( + account: self.accountContext.account, + peerId: self.peerId, + myPeerId: self.joinAsPeerId, + id: callInfo.id, + accessHash: callInfo.accessHash, + state: GroupCallParticipantsContext.State( + participants: [], + nextParticipantsFetchOffset: nil, + adminIds: Set(), + isCreator: false, + defaultParticipantsAreMuted: callInfo.defaultParticipantsAreMuted ?? GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: self.stateValue.defaultParticipantMuteState == .muted, canChange: true), + sortAscending: true, + recordingStartTimestamp: nil, + title: self.stateValue.title, + scheduleTimestamp: self.stateValue.scheduleTimestamp, + subscribedToScheduled: self.stateValue.subscribedToScheduled, + totalCount: 0, + version: 0 + ), + previousServiceState: nil + ) + self.temporaryParticipantsContext = nil + self.participantsContext = participantsContext + + let myPeerId = self.joinAsPeerId + let myPeer = self.accountContext.account.postbox.transaction { transaction -> (Peer, CachedPeerData?)? in + if let peer = transaction.getPeer(myPeerId) { + return (peer, transaction.getPeerCachedData(peerId: myPeerId)) + } else { + return nil + } + } + |> beforeNext { view in + if let view = view, view.1 == nil { + let _ = fetchAndUpdateCachedPeerData(accountPeerId: accountContext.account.peerId, peerId: myPeerId, network: accountContext.account.network, postbox: accountContext.account.postbox).start() + } + } + self.participantsContextStateDisposable.set(combineLatest(queue: .mainQueue(), + participantsContext.state, + adminIds, + myPeer, + accountContext.account.postbox.peerView(id: peerId) + ).start(next: { [weak self] state, adminIds, myPeerAndCachedData, view in + guard let strongSelf = self else { + return + } + + var members = PresentationGroupCallMembers( + participants: [], + speakingParticipants: Set(), + totalCount: state.totalCount, + loadMoreToken: state.nextParticipantsFetchOffset + ) + + strongSelf.stateValue.adminIds = adminIds + let canManageCall = state.isCreator || strongSelf.stateValue.adminIds.contains(strongSelf.accountContext.account.peerId) + + var participants: [GroupCallParticipantsContext.Participant] = [] + var topParticipants: [GroupCallParticipantsContext.Participant] = [] + if let (myPeer, cachedData) = myPeerAndCachedData { + let about: String? + if let cachedData = cachedData as? CachedUserData { + about = cachedData.about + } else if let cachedData = cachedData as? CachedUserData { + about = cachedData.about + } else { + about = " " + } + participants.append(GroupCallParticipantsContext.Participant( + peer: myPeer, + ssrc: nil, + jsonParams: nil, + joinTimestamp: strongSelf.temporaryJoinTimestamp, + raiseHandRating: strongSelf.temporaryRaiseHandRating, + hasRaiseHand: strongSelf.temporaryHasRaiseHand, + activityTimestamp: strongSelf.temporaryActivityTimestamp, + activityRank: strongSelf.temporaryActivityRank, + muteState: strongSelf.temporaryMuteState ?? GroupCallParticipantsContext.Participant.MuteState(canUnmute: canManageCall || !state.defaultParticipantsAreMuted.isMuted, mutedByYou: false), + volume: nil, + about: about + )) + } + + for participant in participants { + members.participants.append(participant) + + if topParticipants.count < 3 { + topParticipants.append(participant) + } + } + + strongSelf.membersValue = members + strongSelf.stateValue.canManageCall = state.isCreator || adminIds.contains(strongSelf.accountContext.account.peerId) + strongSelf.stateValue.defaultParticipantMuteState = state.defaultParticipantsAreMuted.isMuted ? .muted : .unmuted + + + strongSelf.stateValue.recordingStartTimestamp = state.recordingStartTimestamp + strongSelf.stateValue.title = state.title + strongSelf.stateValue.muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: canManageCall || !state.defaultParticipantsAreMuted.isMuted, mutedByYou: false) + + strongSelf.stateValue.scheduleTimestamp = strongSelf.isScheduledStarted ? nil : state.scheduleTimestamp + if state.scheduleTimestamp == nil && !strongSelf.isScheduledStarted { + strongSelf.updateSessionState(internalState: .active(GroupCallInfo(id: callInfo.id, accessHash: callInfo.accessHash, participantCount: state.totalCount, clientParams: callInfo.clientParams, streamDcId: callInfo.streamDcId, title: state.title, scheduleTimestamp: nil, subscribedToScheduled: false, recordingStartTimestamp: nil, sortAscending: true, defaultParticipantsAreMuted: callInfo.defaultParticipantsAreMuted ?? state.defaultParticipantsAreMuted)), audioSessionControl: strongSelf.audioSessionControl) + } else { + strongSelf.summaryInfoState.set(.single(SummaryInfoState(info: GroupCallInfo( + id: callInfo.id, + accessHash: callInfo.accessHash, + participantCount: state.totalCount, + clientParams: nil, + streamDcId: nil, + title: state.title, + scheduleTimestamp: state.scheduleTimestamp, + subscribedToScheduled: false, + recordingStartTimestamp: state.recordingStartTimestamp, + sortAscending: state.sortAscending, + defaultParticipantsAreMuted: state.defaultParticipantsAreMuted + )))) + + strongSelf.summaryParticipantsState.set(.single(SummaryParticipantsState( + participantCount: state.totalCount, + topParticipants: topParticipants, + activeSpeakers: Set() + ))) + } + })) + } + private func updateSessionState(internalState: InternalState, audioSessionControl: ManagedAudioSessionControl?) { let previousControl = self.audioSessionControl self.audioSessionControl = audioSessionControl @@ -1039,287 +1252,309 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } } + var shouldJoin = false + let activeCallInfo: GroupCallInfo? switch previousInternalState { - case .active: - break - default: - if case let .active(callInfo) = internalState { - let callContext: OngoingGroupCallContext - if let current = self.callContext { - callContext = current + case let .active(previousCallInfo): + if case let .active(callInfo) = internalState { + shouldJoin = previousCallInfo.scheduleTimestamp != nil && callInfo.scheduleTimestamp == nil + self.participantsContext = nil + activeCallInfo = callInfo } else { - var outgoingAudioBitrateKbit: Int32? - let appConfiguration = self.accountContext.currentAppConfiguration.with({ $0 }) - if let data = appConfiguration.data, let value = data["voice_chat_send_bitrate"] as? Int32 { - outgoingAudioBitrateKbit = value - } + activeCallInfo = nil + } + default: + if case let .active(callInfo) = internalState { + shouldJoin = callInfo.scheduleTimestamp == nil + activeCallInfo = callInfo + } else { + activeCallInfo = nil + } + } + if self.leaving { + shouldJoin = false + } + + if shouldJoin, let callInfo = activeCallInfo { + let callContext: OngoingGroupCallContext + if let current = self.callContext { + callContext = current + } else { + var outgoingAudioBitrateKbit: Int32? + let appConfiguration = self.accountContext.currentAppConfiguration.with({ $0 }) + if let data = appConfiguration.data, let value = data["voice_chat_send_bitrate"] as? Int32 { + outgoingAudioBitrateKbit = value + } - callContext = OngoingGroupCallContext(video: self.videoCapturer, participantDescriptionsRequired: { [weak self] ssrcs in - Queue.mainQueue().async { - guard let strongSelf = self else { - return - } - strongSelf.maybeRequestParticipants(ssrcs: ssrcs) - } - }, audioStreamData: OngoingGroupCallContext.AudioStreamData(account: self.accountContext.account, callId: callInfo.id, accessHash: callInfo.accessHash), rejoinNeeded: { [weak self] in - Queue.mainQueue().async { - guard let strongSelf = self else { - return - } - if case .established = strongSelf.internalState { - strongSelf.requestCall(movingFromBroadcastToRtc: false) - } - } - }, outgoingAudioBitrateKbit: outgoingAudioBitrateKbit, enableVideo: self.isVideo) - self.incomingVideoSourcePromise.set(callContext.videoSources - |> deliverOnMainQueue - |> map { [weak self] sources -> [PeerId: UInt32] in + let enableNoiseSuppression = accountContext.sharedContext.immediateExperimentalUISettings.enableNoiseSuppression + + callContext = OngoingGroupCallContext(video: self.videoCapturer, participantDescriptionsRequired: { [weak self] ssrcs in + Queue.mainQueue().async { guard let strongSelf = self else { - return [:] + return } - var result: [PeerId: UInt32] = [:] - for source in sources { - if let peerId = strongSelf.ssrcMapping[source] { - result[peerId] = source + strongSelf.maybeRequestParticipants(ssrcs: ssrcs) + } + }, audioStreamData: OngoingGroupCallContext.AudioStreamData(account: self.accountContext.account, callId: callInfo.id, accessHash: callInfo.accessHash), rejoinNeeded: { [weak self] in + Queue.mainQueue().async { + guard let strongSelf = self else { + return + } + if case .established = strongSelf.internalState { + strongSelf.requestCall(movingFromBroadcastToRtc: false) + } + } + }, outgoingAudioBitrateKbit: outgoingAudioBitrateKbit, enableVideo: self.isVideo, enableNoiseSuppression: enableNoiseSuppression) + self.incomingVideoSourcePromise.set(callContext.videoSources + |> deliverOnMainQueue + |> map { [weak self] sources -> [PeerId: UInt32] in + guard let strongSelf = self else { + return [:] + } + var result: [PeerId: UInt32] = [:] + for source in sources { + if let peerId = strongSelf.ssrcMapping[source] { + result[peerId] = source + } + } + return result + }) + self.callContext = callContext + } + self.joinDisposable.set((callContext.joinPayload + |> distinctUntilChanged(isEqual: { lhs, rhs in + if lhs.0 != rhs.0 { + return false + } + if lhs.1 != rhs.1 { + return false + } + return true + }) + |> deliverOnMainQueue).start(next: { [weak self] joinPayload, ssrc in + guard let strongSelf = self else { + return + } + + let peerAdminIds: Signal<[PeerId], NoError> + let peerId = strongSelf.peerId + if strongSelf.peerId.namespace == Namespaces.Peer.CloudChannel { + peerAdminIds = Signal { subscriber in + let (disposable, _) = strongSelf.accountContext.peerChannelMemberCategoriesContextsManager.admins(postbox: strongSelf.accountContext.account.postbox, network: strongSelf.accountContext.account.network, accountPeerId: strongSelf.accountContext.account.peerId, peerId: peerId, updated: { list in + var peerIds = Set() + for item in list.list { + if let adminInfo = item.participant.adminInfo, adminInfo.rights.rights.contains(.canManageCalls) { + peerIds.insert(item.peer.id) + } + } + subscriber.putNext(Array(peerIds)) + }) + return disposable + } + |> distinctUntilChanged + |> runOn(.mainQueue()) + } else { + peerAdminIds = strongSelf.account.postbox.transaction { transaction -> [PeerId] in + var result: [PeerId] = [] + if let cachedData = transaction.getPeerCachedData(peerId: peerId) as? CachedGroupData { + if let participants = cachedData.participants { + for participant in participants.participants { + if case .creator = participant { + result.append(participant.peerId) + } else if case .admin = participant { + result.append(participant.peerId) + } + } } } return result - }) - self.callContext = callContext + } } - self.joinDisposable.set((callContext.joinPayload - |> distinctUntilChanged(isEqual: { lhs, rhs in - if lhs.0 != rhs.0 { - return false - } - if lhs.1 != rhs.1 { - return false - } - return true - }) - |> deliverOnMainQueue).start(next: { [weak self] joinPayload, ssrc in + + strongSelf.currentLocalSsrc = ssrc + strongSelf.requestDisposable.set((joinGroupCall( + account: strongSelf.account, + peerId: strongSelf.peerId, + joinAs: strongSelf.joinAsPeerId, + callId: callInfo.id, + accessHash: callInfo.accessHash, + preferMuted: true, + joinPayload: joinPayload, + peerAdminIds: peerAdminIds, + inviteHash: strongSelf.invite + ) + |> deliverOnMainQueue).start(next: { joinCallResult in guard let strongSelf = self else { return } - - let peerAdminIds: Signal<[PeerId], NoError> - let peerId = strongSelf.peerId - if strongSelf.peerId.namespace == Namespaces.Peer.CloudChannel { - peerAdminIds = Signal { subscriber in - let (disposable, _) = strongSelf.accountContext.peerChannelMemberCategoriesContextsManager.admins(postbox: strongSelf.accountContext.account.postbox, network: strongSelf.accountContext.account.network, accountPeerId: strongSelf.accountContext.account.peerId, peerId: peerId, updated: { list in - var peerIds = Set() - for item in list.list { - if let adminInfo = item.participant.adminInfo, adminInfo.rights.rights.contains(.canManageCalls) { - peerIds.insert(item.peer.id) - } + if let clientParams = joinCallResult.callInfo.clientParams { + strongSelf.ssrcMapping.removeAll() + let addedParticipants: [(UInt32, String?)] = [] + for participant in joinCallResult.state.participants { + if let ssrc = participant.ssrc { + strongSelf.ssrcMapping[ssrc] = participant.peer.id + //addedParticipants.append((participant.ssrc, participant.jsonParams)) + } + } + + switch joinCallResult.connectionMode { + case .rtc: + strongSelf.currentConnectionMode = .rtc + strongSelf.callContext?.setConnectionMode(.rtc, keepBroadcastConnectedIfWasEnabled: false) + strongSelf.callContext?.setJoinResponse(payload: clientParams, participants: addedParticipants) + case .broadcast: + strongSelf.currentConnectionMode = .broadcast + strongSelf.callContext?.setConnectionMode(.broadcast, keepBroadcastConnectedIfWasEnabled: false) + } + + strongSelf.updateSessionState(internalState: .established(info: joinCallResult.callInfo, connectionMode: joinCallResult.connectionMode, clientParams: clientParams, localSsrc: ssrc, initialState: joinCallResult.state), audioSessionControl: strongSelf.audioSessionControl) + } + }, error: { error in + guard let strongSelf = self else { + return + } + if case .anonymousNotAllowed = error { + let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 } + strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_AnonymousDisabledAlertText, actions: [ + TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {}) + ]), on: .root, blockInteraction: false, completion: {}) + } else if case .tooManyParticipants = error { + let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 } + strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_ChatFullAlertText, actions: [ + TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {}) + ]), on: .root, blockInteraction: false, completion: {}) + } else if case .invalidJoinAsPeer = error { + let peerId = strongSelf.peerId + let _ = clearCachedGroupCallDisplayAsAvailablePeers(account: strongSelf.accountContext.account, peerId: peerId).start() + let _ = (strongSelf.accountContext.account.postbox.transaction { transaction -> Void in + transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in + if let current = current as? CachedChannelData { + return current.withUpdatedCallJoinPeerId(nil) + } else if let current = current as? CachedGroupData { + return current.withUpdatedCallJoinPeerId(nil) + } else { + return current } - subscriber.putNext(Array(peerIds)) }) - return disposable - } - |> distinctUntilChanged - |> runOn(.mainQueue()) - } else { - peerAdminIds = strongSelf.account.postbox.transaction { transaction -> [PeerId] in - var result: [PeerId] = [] - if let cachedData = transaction.getPeerCachedData(peerId: peerId) as? CachedGroupData { - if let participants = cachedData.participants { - for participant in participants.participants { - if case .creator = participant { - result.append(participant.peerId) - } else if case .admin = participant { - result.append(participant.peerId) - } - } - } - } - return result - } + }).start() } - - strongSelf.currentLocalSsrc = ssrc - strongSelf.requestDisposable.set((joinGroupCall( - account: strongSelf.account, - peerId: strongSelf.peerId, - joinAs: strongSelf.joinAsPeerId, - callId: callInfo.id, - accessHash: callInfo.accessHash, - preferMuted: true, - joinPayload: joinPayload, - peerAdminIds: peerAdminIds, - inviteHash: strongSelf.invite - ) - |> deliverOnMainQueue).start(next: { joinCallResult in - guard let strongSelf = self else { - return - } - if let clientParams = joinCallResult.callInfo.clientParams { - strongSelf.ssrcMapping.removeAll() - let addedParticipants: [(UInt32, String?)] = [] - for participant in joinCallResult.state.participants { - if let ssrc = participant.ssrc { - strongSelf.ssrcMapping[ssrc] = participant.peer.id - //addedParticipants.append((participant.ssrc, participant.jsonParams)) - } - } - - switch joinCallResult.connectionMode { - case .rtc: - strongSelf.currentConnectionMode = .rtc - strongSelf.callContext?.setConnectionMode(.rtc, keepBroadcastConnectedIfWasEnabled: false) - strongSelf.callContext?.setJoinResponse(payload: clientParams, participants: addedParticipants) - case .broadcast: - strongSelf.currentConnectionMode = .broadcast - strongSelf.callContext?.setConnectionMode(.broadcast, keepBroadcastConnectedIfWasEnabled: false) - } - - strongSelf.updateSessionState(internalState: .established(info: joinCallResult.callInfo, connectionMode: joinCallResult.connectionMode, clientParams: clientParams, localSsrc: ssrc, initialState: joinCallResult.state), audioSessionControl: strongSelf.audioSessionControl) - } - }, error: { error in - guard let strongSelf = self else { - return - } - if case .anonymousNotAllowed = error { - let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 } - strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_AnonymousDisabledAlertText, actions: [ - TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {}) - ]), on: .root, blockInteraction: false, completion: {}) - } else if case .tooManyParticipants = error { - let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 } - strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_ChatFullAlertText, actions: [ - TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {}) - ]), on: .root, blockInteraction: false, completion: {}) - } else if case .invalidJoinAsPeer = error { - let peerId = strongSelf.peerId - let _ = clearCachedGroupCallDisplayAsAvailablePeers(account: strongSelf.accountContext.account, peerId: peerId).start() - let _ = (strongSelf.accountContext.account.postbox.transaction { transaction -> Void in - transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in - if let current = current as? CachedChannelData { - return current.withUpdatedCallJoinPeerId(nil) - } else if let current = current as? CachedGroupData { - return current.withUpdatedCallJoinPeerId(nil) - } else { - return current - } - }) - }).start() - } - strongSelf.markAsCanBeRemoved() - })) + strongSelf.markAsCanBeRemoved() })) + })) + + self.networkStateDisposable.set((callContext.networkState + |> deliverOnMainQueue).start(next: { [weak self] state in + guard let strongSelf = self else { + return + } + let mappedState: PresentationGroupCallState.NetworkState + if state.isConnected { + mappedState = .connected + } else { + mappedState = .connecting + } + + let wasConnecting = strongSelf.stateValue.networkState == .connecting + if strongSelf.stateValue.networkState != mappedState { + strongSelf.stateValue.networkState = mappedState + } + let isConnecting = mappedState == .connecting - self.networkStateDisposable.set((callContext.networkState - |> deliverOnMainQueue).start(next: { [weak self] state in - guard let strongSelf = self else { - return - } - let mappedState: PresentationGroupCallState.NetworkState - if state.isConnected { - mappedState = .connected - } else { - mappedState = .connecting - } - - let wasConnecting = strongSelf.stateValue.networkState == .connecting - if strongSelf.stateValue.networkState != mappedState { - strongSelf.stateValue.networkState = mappedState - } - let isConnecting = mappedState == .connecting - - if strongSelf.isCurrentlyConnecting != isConnecting { - strongSelf.isCurrentlyConnecting = isConnecting - if isConnecting { - strongSelf.startCheckingCallIfNeeded() - } else { - strongSelf.checkCallDisposable?.dispose() - strongSelf.checkCallDisposable = nil - } - } - - strongSelf.isReconnectingAsSpeaker = state.isTransitioningFromBroadcastToRtc - - if (wasConnecting != isConnecting && strongSelf.didConnectOnce) { - if isConnecting { - let toneRenderer = PresentationCallToneRenderer(tone: .groupConnecting) - strongSelf.toneRenderer = toneRenderer - toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive) - } else { - strongSelf.toneRenderer = nil - } - } - + if strongSelf.isCurrentlyConnecting != isConnecting { + strongSelf.isCurrentlyConnecting = isConnecting if isConnecting { - strongSelf.didStartConnectingOnce = true + strongSelf.startCheckingCallIfNeeded() + } else { + strongSelf.checkCallDisposable?.dispose() + strongSelf.checkCallDisposable = nil } - - if state.isConnected { - if !strongSelf.didConnectOnce { - strongSelf.didConnectOnce = true - + } + + strongSelf.isReconnectingAsSpeaker = state.isTransitioningFromBroadcastToRtc + + if (wasConnecting != isConnecting && strongSelf.didConnectOnce) { + if isConnecting { + let toneRenderer = PresentationCallToneRenderer(tone: .groupConnecting) + strongSelf.toneRenderer = toneRenderer + toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive) + } else { + strongSelf.toneRenderer = nil + } + } + + if isConnecting { + strongSelf.didStartConnectingOnce = true + } + + if state.isConnected { + if !strongSelf.didConnectOnce { + strongSelf.didConnectOnce = true + + if !strongSelf.isScheduled { let toneRenderer = PresentationCallToneRenderer(tone: .groupJoined) strongSelf.toneRenderer = toneRenderer toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive) } + } - if let peer = strongSelf.reconnectingAsPeer { - strongSelf.reconnectingAsPeer = nil - strongSelf.reconnectedAsEventsPipe.putNext(peer) - } + if let peer = strongSelf.reconnectingAsPeer { + strongSelf.reconnectingAsPeer = nil + strongSelf.reconnectedAsEventsPipe.putNext(peer) } - })) + } + })) - self.isNoiseSuppressionEnabledDisposable.set((callContext.isNoiseSuppressionEnabled - |> deliverOnMainQueue).start(next: { [weak self] value in - guard let strongSelf = self else { - return + self.isNoiseSuppressionEnabledDisposable.set((callContext.isNoiseSuppressionEnabled + |> deliverOnMainQueue).start(next: { [weak self] value in + guard let strongSelf = self else { + return + } + strongSelf.isNoiseSuppressionEnabledPromise.set(value) + })) + + self.audioLevelsDisposable.set((callContext.audioLevels + |> deliverOnMainQueue).start(next: { [weak self] levels in + guard let strongSelf = self else { + return + } + var result: [(PeerId, UInt32, Float, Bool)] = [] + var myLevel: Float = 0.0 + var myLevelHasVoice: Bool = false + var missingSsrcs = Set() + for (ssrcKey, level, hasVoice) in levels { + var peerId: PeerId? + let ssrcValue: UInt32 + switch ssrcKey { + case .local: + peerId = strongSelf.joinAsPeerId + ssrcValue = 0 + case let .source(ssrc): + peerId = strongSelf.ssrcMapping[ssrc] + ssrcValue = ssrc } - strongSelf.isNoiseSuppressionEnabledPromise.set(value) - })) - - self.audioLevelsDisposable.set((callContext.audioLevels - |> deliverOnMainQueue).start(next: { [weak self] levels in - guard let strongSelf = self else { - return - } - var result: [(PeerId, UInt32, Float, Bool)] = [] - var myLevel: Float = 0.0 - var myLevelHasVoice: Bool = false - var missingSsrcs = Set() - for (ssrcKey, level, hasVoice) in levels { - var peerId: PeerId? - let ssrcValue: UInt32 - switch ssrcKey { - case .local: - peerId = strongSelf.joinAsPeerId - ssrcValue = 0 - case let .source(ssrc): - peerId = strongSelf.ssrcMapping[ssrc] - ssrcValue = ssrc - } - if let peerId = peerId { - if case .local = ssrcKey { - if !strongSelf.isMutedValue.isEffectivelyMuted { - myLevel = level - myLevelHasVoice = hasVoice - } + if let peerId = peerId { + if case .local = ssrcKey { + if !strongSelf.isMutedValue.isEffectivelyMuted { + myLevel = level + myLevelHasVoice = hasVoice } - result.append((peerId, ssrcValue, level, hasVoice)) - } else if ssrcValue != 0 { - missingSsrcs.insert(ssrcValue) } + result.append((peerId, ssrcValue, level, hasVoice)) + } else if ssrcValue != 0 { + missingSsrcs.insert(ssrcValue) } - - strongSelf.speakingParticipantsContext.update(levels: result) - - let mappedLevel = myLevel * 1.5 - strongSelf.myAudioLevelPipe.putNext(mappedLevel) - strongSelf.processMyAudioLevel(level: mappedLevel, hasVoice: myLevelHasVoice) - - if !missingSsrcs.isEmpty { - strongSelf.participantsContext?.ensureHaveParticipants(ssrcs: missingSsrcs) - } - })) - } + } + + strongSelf.speakingParticipantsContext.update(levels: result) + + let mappedLevel = myLevel * 1.5 + strongSelf.myAudioLevelPipe.putNext(mappedLevel) + strongSelf.processMyAudioLevel(level: mappedLevel, hasVoice: myLevelHasVoice) + + if !missingSsrcs.isEmpty { + strongSelf.participantsContext?.ensureHaveParticipants(ssrcs: missingSsrcs) + } + })) } switch previousInternalState { @@ -1339,6 +1574,9 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { if self.stateValue.title != initialState.title { self.stateValue.title = initialState.title } + if self.stateValue.scheduleTimestamp != initialState.scheduleTimestamp { + self.stateValue.scheduleTimestamp = initialState.scheduleTimestamp + } let accountContext = self.accountContext let peerId = self.peerId @@ -1424,6 +1662,11 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { return nil } } + |> beforeNext { view in + if let view = view, view.1 == nil { + let _ = fetchAndUpdateCachedPeerData(accountPeerId: accountContext.account.peerId, peerId: myPeerId, network: accountContext.account.network, postbox: accountContext.account.postbox).start() + } + } self.participantsContextStateDisposable.set(combineLatest(queue: .mainQueue(), participantsContext.state, @@ -1492,7 +1735,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } else if let cachedData = cachedData as? CachedChannelData { about = cachedData.about } else { - about = nil + about = " " } participants.append(GroupCallParticipantsContext.Participant( @@ -1531,7 +1774,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } else if let cachedData = cachedData as? CachedChannelData { about = cachedData.about } else { - about = nil + about = " " } participant.peer = myPeer participant.about = about @@ -1630,6 +1873,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } strongSelf.stateValue.recordingStartTimestamp = state.recordingStartTimestamp strongSelf.stateValue.title = state.title + strongSelf.stateValue.scheduleTimestamp = state.scheduleTimestamp strongSelf.summaryInfoState.set(.single(SummaryInfoState(info: GroupCallInfo( id: callInfo.id, @@ -1638,8 +1882,11 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { clientParams: nil, streamDcId: nil, title: state.title, + scheduleTimestamp: state.scheduleTimestamp, + subscribedToScheduled: false, recordingStartTimestamp: state.recordingStartTimestamp, - sortAscending: state.sortAscending + sortAscending: state.sortAscending, + defaultParticipantsAreMuted: state.defaultParticipantsAreMuted )))) strongSelf.summaryParticipantsState.set(.single(SummaryParticipantsState( @@ -1678,6 +1925,8 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { if let isCurrentlyConnecting = self.isCurrentlyConnecting, isCurrentlyConnecting { self.startCheckingCallIfNeeded() } + } else if case let .active(callInfo) = internalState, callInfo.scheduleTimestamp != nil { + self.switchToTemporaryScheduledParticipantsContext() } } } @@ -1853,11 +2102,9 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { return transaction.getPeer(peerId) } |> deliverOnMainQueue).start(next: { [weak self] myPeer in - guard let strongSelf = self, let _ = myPeer else { + guard let strongSelf = self, let myPeer = myPeer else { return } - - strongSelf.reconnectingAsPeer = myPeer let previousPeerId = strongSelf.joinAsPeerId if let localSsrc = strongSelf.currentLocalSsrc { @@ -1865,29 +2112,37 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } strongSelf.joinAsPeerId = peerId - if let participantsContext = strongSelf.participantsContext, let immediateState = participantsContext.immediateState { - for participant in immediateState.participants { - if participant.peer.id == previousPeerId { - strongSelf.temporaryJoinTimestamp = participant.joinTimestamp - strongSelf.temporaryActivityTimestamp = participant.activityTimestamp - strongSelf.temporaryActivityRank = participant.activityRank - strongSelf.temporaryRaiseHandRating = participant.raiseHandRating - strongSelf.temporaryHasRaiseHand = participant.hasRaiseHand - strongSelf.temporaryMuteState = participant.muteState - } - } - strongSelf.switchToTemporaryParticipantsContext(sourceContext: participantsContext, oldMyPeerId: previousPeerId) - } else { + if strongSelf.stateValue.scheduleTimestamp != nil { strongSelf.stateValue.myPeerId = peerId + strongSelf.reconnectedAsEventsPipe.putNext(myPeer) + strongSelf.switchToTemporaryScheduledParticipantsContext() + } else { + strongSelf.reconnectingAsPeer = myPeer + + if let participantsContext = strongSelf.participantsContext, let immediateState = participantsContext.immediateState { + for participant in immediateState.participants { + if participant.peer.id == previousPeerId { + strongSelf.temporaryJoinTimestamp = participant.joinTimestamp + strongSelf.temporaryActivityTimestamp = participant.activityTimestamp + strongSelf.temporaryActivityRank = participant.activityRank + strongSelf.temporaryRaiseHandRating = participant.raiseHandRating + strongSelf.temporaryHasRaiseHand = participant.hasRaiseHand + strongSelf.temporaryMuteState = participant.muteState + } + } + strongSelf.switchToTemporaryParticipantsContext(sourceContext: participantsContext, oldMyPeerId: previousPeerId) + } else { + strongSelf.stateValue.myPeerId = peerId + } + + strongSelf.requestCall(movingFromBroadcastToRtc: false) } - - strongSelf.requestCall(movingFromBroadcastToRtc: false) }) } public func leave(terminateIfPossible: Bool) -> Signal { self.leaving = true - if let callInfo = self.internalState.callInfo, let localSsrc = self.currentLocalSsrc { + if let callInfo = self.internalState.callInfo { if terminateIfPossible { self.leaveDisposable.set((stopGroupCall(account: self.account, peerId: self.peerId, callId: callInfo.id, accessHash: callInfo.accessHash) |> deliverOnMainQueue).start(completed: { [weak self] in @@ -1896,7 +2151,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } strongSelf.markAsCanBeRemoved() })) - } else { + } else if let localSsrc = self.currentLocalSsrc { if let contexts = self.accountContext.cachedGroupCallContexts as? AccountGroupCallContextCacheImpl { let account = self.account let id = callInfo.id @@ -1907,6 +2162,8 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } } self.markAsCanBeRemoved() + } else { + self.markAsCanBeRemoved() } } else { self.markAsCanBeRemoved() @@ -1957,6 +2214,66 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { self.callContext?.setIsNoiseSuppressionEnabled(isNoiseSuppressionEnabled) } + public func toggleScheduledSubscription(_ subscribe: Bool) { + guard case let .active(callInfo) = self.internalState, callInfo.scheduleTimestamp != nil else { + return + } + + self.stateValue.subscribedToScheduled = subscribe + + self.subscribeDisposable.set((toggleScheduledGroupCallSubscription(account: self.account, peerId: self.peerId, callId: callInfo.id, accessHash: callInfo.accessHash, subscribe: subscribe) + |> deliverOnMainQueue).start()) + } + + public func schedule(timestamp: Int32) { + guard self.schedulePending else { + return + } + + self.schedulePending = false + self.stateValue.scheduleTimestamp = timestamp + + self.summaryParticipantsState.set(.single(SummaryParticipantsState( + participantCount: 1, + topParticipants: [], + activeSpeakers: Set() + ))) + + self.startDisposable.set((createGroupCall(account: self.account, peerId: self.peerId, title: nil, scheduleDate: timestamp) + |> deliverOnMainQueue).start(next: { [weak self] callInfo in + guard let strongSelf = self else { + return + } + strongSelf.updateSessionState(internalState: .active(callInfo), audioSessionControl: strongSelf.audioSessionControl) + }, error: { [weak self] error in + if let strongSelf = self { + strongSelf.markAsCanBeRemoved() + } + })) + } + + + public func startScheduled() { + guard case let .active(callInfo) = self.internalState else { + return + } + + self.isScheduledStarted = true + self.stateValue.scheduleTimestamp = nil + + self.startDisposable.set((startScheduledGroupCall(account: self.account, peerId: self.peerId, callId: callInfo.id, accessHash: callInfo.accessHash) + |> deliverOnMainQueue).start(next: { [weak self] callInfo in + guard let strongSelf = self else { + return + } + strongSelf.updateSessionState(internalState: .active(callInfo), audioSessionControl: strongSelf.audioSessionControl) + + let toneRenderer = PresentationCallToneRenderer(tone: .groupJoined) + strongSelf.toneRenderer = toneRenderer + toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive) + })) + } + public func raiseHand() { guard let membersValue = self.membersValue else { return @@ -2170,7 +2487,6 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } let account = self.account - let currentCall: Signal if let initialCall = self.initialCall { currentCall = getCurrentGroupCall(account: account, callId: initialCall.id, accessHash: initialCall.accessHash) @@ -2180,6 +2496,14 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { |> map { summary -> GroupCallInfo? in return summary?.info } + } else if case let .active(callInfo) = self.internalState { + currentCall = getCurrentGroupCall(account: account, callId: callInfo.id, accessHash: callInfo.accessHash) + |> mapError { _ -> CallError in + return .generic + } + |> map { summary -> GroupCallInfo? in + return summary?.info + } } else { currentCall = .single(nil) } @@ -2212,7 +2536,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } if let value = value { - strongSelf.initialCall = CachedChannelData.ActiveCall(id: value.id, accessHash: value.accessHash, title: value.title) + strongSelf.initialCall = CachedChannelData.ActiveCall(id: value.id, accessHash: value.accessHash, title: value.title, scheduleTimestamp: nil, subscribedToScheduled: false) strongSelf.updateSessionState(internalState: .active(value), audioSessionControl: strongSelf.audioSessionControl) } else { @@ -2222,7 +2546,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { } public func invitePeer(_ peerId: PeerId) -> Bool { - guard case let .established(callInfo, _, _, _, _) = self.internalState, !self.invitedPeersValue.contains(peerId) else { + guard let callInfo = self.internalState.callInfo, !self.invitedPeersValue.contains(peerId) else { return false } @@ -2241,11 +2565,11 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { self.invitedPeersValue = updatedInvitedPeers } - public func updateTitle(_ title: String){ - guard case let .established(callInfo, _, _, _, _) = self.internalState else { + public func updateTitle(_ title: String) { + guard let callInfo = self.internalState.callInfo else { return } - + self.stateValue.title = title.isEmpty ? nil : title let _ = editGroupCallTitle(account: self.account, callId: callInfo.id, accessHash: callInfo.accessHash, title: title).start() } diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift b/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift index 886f8a3807..355faf490f 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift @@ -27,6 +27,8 @@ private let blobSize = CGSize(width: 190.0, height: 190.0) private let smallScale: CGFloat = 0.48 private let smallIconScale: CGFloat = 0.69 +private let buttonHeight: CGFloat = 52.0 + final class VoiceChatActionButton: HighlightTrackingButtonNode { enum State: Equatable { enum ActiveState: Equatable { @@ -34,7 +36,15 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { case muted case on } + + enum ScheduledState: Equatable { + case start + case subscribe + case unsubscribe + } + case button(text: String) + case scheduled(state: ScheduledState) case connecting case active(state: ActiveState) } @@ -51,8 +61,9 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { private let containerNode: ASDisplayNode private let backgroundNode: VoiceChatActionButtonBackgroundNode private let iconNode: VoiceChatActionButtonIconNode - private let titleLabel: ImmediateTextNode + let titleLabel: ImmediateTextNode private let subtitleLabel: ImmediateTextNode + private let buttonTitleLabel: ImmediateTextNode private var currentParams: (size: CGSize, buttonSize: CGSize, state: VoiceChatActionButton.State, dark: Bool, small: Bool, title: String, subtitle: String, snap: Bool)? @@ -103,7 +114,7 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { default: break } - case .connecting: + case .connecting, .button, .scheduled: break } } else { @@ -121,12 +132,17 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { init() { self.bottomNode = ASDisplayNode() + self.bottomNode.isUserInteractionEnabled = false self.containerNode = ASDisplayNode() + self.containerNode.isUserInteractionEnabled = false self.backgroundNode = VoiceChatActionButtonBackgroundNode() self.iconNode = VoiceChatActionButtonIconNode(isColored: false) self.titleLabel = ImmediateTextNode() self.subtitleLabel = ImmediateTextNode() + self.buttonTitleLabel = ImmediateTextNode() + self.buttonTitleLabel.isUserInteractionEnabled = false + self.buttonTitleLabel.alpha = 0.0 super.init() @@ -138,26 +154,38 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { self.containerNode.addSubnode(self.backgroundNode) self.containerNode.addSubnode(self.iconNode) + self.containerNode.addSubnode(self.buttonTitleLabel) + self.highligthedChanged = { [weak self] pressing in if let strongSelf = self { - guard let (_, _, _, _, small, _, _, snap) = strongSelf.currentParams else { + guard let (_, _, state, _, small, _, _, snap) = strongSelf.currentParams else { return } if pressing { - let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring) - if small { - transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallScale * 0.9) - transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallIconScale * 0.9) + if case .button = state { + strongSelf.containerNode.layer.removeAnimation(forKey: "opacity") + strongSelf.containerNode.alpha = 0.4 } else { - transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 0.9) + let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring) + if small { + transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallScale * 0.9) + transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallIconScale * 0.9) + } else { + transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 0.9) + } } } else if !strongSelf.pressing { - let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring) - if small { - transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallScale) - transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallIconScale) + if case .button = state { + strongSelf.containerNode.alpha = 1.0 + strongSelf.containerNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) } else { - transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 1.0) + let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring) + if small { + transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallScale) + transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallIconScale) + } else { + transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 1.0) + } } } } @@ -214,7 +242,7 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { let subtitleSize = self.subtitleLabel.updateLayout(CGSize(width: size.width, height: .greatestFiniteMagnitude)) let totalHeight = titleSize.height + subtitleSize.height + 1.0 - self.titleLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor(size.height - totalHeight / 2.0) - 70.0), size: titleSize) + self.titleLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor((size.height - totalHeight) / 2.0) + 84.0), size: titleSize) self.subtitleLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - subtitleSize.width) / 2.0), y: self.titleLabel.frame.maxY + 1.0), size: subtitleSize) self.bottomNode.frame = CGRect(origin: CGPoint(), size: size) @@ -232,7 +260,7 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { default: break } - case .connecting: + case .connecting, .button, .scheduled: break } @@ -272,6 +300,17 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { let icon: VoiceChatActionButtonIconAnimationState switch state { + case .button: + icon = .empty + case let .scheduled(state): + switch state { + case .start: + icon = .start + case .subscribe: + icon = .subscribe + case .unsubscribe: + icon = .unsubscribe + } case let .active(state): switch state { case .on: @@ -312,8 +351,30 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { self.statePromise.set(state) + if let previousState = previousState, case .button = previousState, case .scheduled = state { + self.buttonTitleLabel.alpha = 0.0 + self.buttonTitleLabel.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2) + self.buttonTitleLabel.layer.animateScale(from: 1.0, to: 0.001, duration: 0.24) + + self.iconNode.alpha = 1.0 + self.iconNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + self.iconNode.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.42, damping: 104.0) + } + var backgroundState: VoiceChatActionButtonBackgroundNode.State + var animated = true switch state { + case let .button(text): + backgroundState = .button + self.buttonTitleLabel.alpha = 1.0 + self.buttonTitleLabel.attributedText = NSAttributedString(string: text, font: Font.semibold(17.0), textColor: .white) + let titleSize = self.buttonTitleLabel.updateLayout(CGSize(width: size.width, height: 100.0)) + self.buttonTitleLabel.frame = CGRect(origin: CGPoint(x: floor((self.bounds.width - titleSize.width) / 2.0), y: floor((self.bounds.height - titleSize.height) / 2.0)), size: titleSize) + case .scheduled: + backgroundState = .disabled + if previousState == .connecting { + animated = false + } case let .active(state): switch state { case .on: @@ -330,7 +391,7 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { self.backgroundNode.glowHidden = (self.currentParams?.snap ?? false) || small self.backgroundNode.isDark = dark - self.backgroundNode.update(state: backgroundState, animated: true) + self.backgroundNode.update(state: backgroundState, animated: animated) if case .active = state, let previousState = previousState, case .connecting = previousState, animated { self.activeDisposable.set((self.activePromise.get() @@ -341,14 +402,18 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode { } })) } else { - applyParams(animated: animated) + self.applyParams(animated: animated) } } override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { var hitRect = self.bounds - if let (_, buttonSize, _, _, _, _, _, _) = self.currentParams { - hitRect = self.bounds.insetBy(dx: (self.bounds.width - buttonSize.width) / 2.0, dy: (self.bounds.height - buttonSize.height) / 2.0) + if let (_, buttonSize, state, _, _, _, _, _) = self.currentParams { + if case .button = state { + hitRect = CGRect(x: 0.0, y: floor((self.bounds.height - buttonHeight) / 2.0), width: self.bounds.width, height: buttonHeight) + } else { + hitRect = self.bounds.insetBy(dx: (self.bounds.width - buttonSize.width) / 2.0, dy: (self.bounds.height - buttonSize.height) / 2.0) + } } let result = super.hitTest(point, with: event) if !hitRect.contains(point) { @@ -454,6 +519,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { enum State: Equatable { case connecting case disabled + case button case blob(Bool) } @@ -547,9 +613,11 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { self.maskProgressLayer.lineCap = .round self.maskProgressLayer.path = path - let largerCirclePath = UIBezierPath(ovalIn: CGRect(origin: CGPoint(), size: CGSize(width: buttonSize.width + progressLineWidth, height: buttonSize.height + progressLineWidth))).cgPath - self.maskCircleLayer.fillColor = white.cgColor + let circleFrame = CGRect(origin: CGPoint(x: (areaSize.width - buttonSize.width) / 2.0, y: (areaSize.height - buttonSize.height) / 2.0), size: buttonSize).insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0) + let largerCirclePath = UIBezierPath(roundedRect: CGRect(x: circleFrame.minX, y: circleFrame.minY, width: circleFrame.width, height: circleFrame.height), cornerRadius: circleFrame.width / 2.0).cgPath + self.maskCircleLayer.path = largerCirclePath + self.maskCircleLayer.fillColor = white.cgColor self.maskCircleLayer.isHidden = true updateInHierarchy = { [weak self] value in @@ -590,11 +658,11 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { let previousValue = self.foregroundGradientLayer.startPoint let newValue: CGPoint if self.maskBlobView.presentationAudioLevel > 0.22 { - newValue = CGPoint(x: CGFloat.random(in: 0.9 ..< 1.0), y: CGFloat.random(in: 0.1 ..< 0.35)) + newValue = CGPoint(x: CGFloat.random(in: 0.9 ..< 1.0), y: CGFloat.random(in: 0.15 ..< 0.35)) } else if self.maskBlobView.presentationAudioLevel > 0.01 { - newValue = CGPoint(x: CGFloat.random(in: 0.77 ..< 0.95), y: CGFloat.random(in: 0.1 ..< 0.35)) + newValue = CGPoint(x: CGFloat.random(in: 0.57 ..< 0.85), y: CGFloat.random(in: 0.15 ..< 0.45)) } else { - newValue = CGPoint(x: CGFloat.random(in: 0.65 ..< 0.85), y: CGFloat.random(in: 0.1 ..< 0.45)) + newValue = CGPoint(x: CGFloat.random(in: 0.6 ..< 0.75), y: CGFloat.random(in: 0.25 ..< 0.45)) } self.foregroundGradientLayer.startPoint = newValue @@ -693,7 +761,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { case muted } - func updateGlowAndGradientAnimations(type: Gradient, previousType: Gradient? = nil) { + func updateGlowAndGradientAnimations(type: Gradient, previousType: Gradient? = nil, animated: Bool = true) { let effectivePreviousTyoe = previousType ?? .active let scale: CGFloat @@ -737,12 +805,14 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { self.maskGradientLayer.transform = CATransform3DMakeScale(targetScale, targetScale, 1.0) if let _ = previousType { self.maskGradientLayer.animateScale(from: initialScale, to: targetScale, duration: 0.3) - } else { + } else if animated { self.maskGradientLayer.animateSpring(from: initialScale as NSNumber, to: targetScale as NSNumber, keyPath: "transform.scale", duration: 0.45) } self.foregroundGradientLayer.colors = targetColors - self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3) + if animated { + self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3) + } } private func playMuteAnimation() { @@ -831,7 +901,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { self.maskBlobView.startAnimating() self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.45) } - + private func playConnectionAnimation(type: Gradient, completion: @escaping () -> Void) { CATransaction.begin() let initialRotation: CGFloat = CGFloat((self.maskProgressLayer.value(forKeyPath: "presentationLayer.transform.rotation.z") as? NSNumber)?.floatValue ?? 0.0) @@ -878,7 +948,8 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { self.updateGlowAndGradientAnimations(type: type, previousType: nil) - if case .blob = self.state { + if case .connecting = self.state { + } else { self.maskBlobView.isHidden = false self.maskBlobView.startAnimating() self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.45) @@ -913,6 +984,53 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { CATransaction.commit() } + private var maskIsCircle = true + private func setupButtonAnimation() { + CATransaction.begin() + CATransaction.setDisableActions(true) + self.backgroundCircleLayer.isHidden = true + self.foregroundCircleLayer.isHidden = true + self.maskCircleLayer.isHidden = false + self.maskProgressLayer.isHidden = true + self.maskGradientLayer.isHidden = true + + let path = UIBezierPath(roundedRect: CGRect(x: 0.0, y: floor((self.bounds.height - buttonHeight) / 2.0), width: self.bounds.width, height: buttonHeight), cornerRadius: 10.0).cgPath + self.maskCircleLayer.path = path + self.maskIsCircle = false + + CATransaction.commit() + + self.updateGlowAndGradientAnimations(type: .muted, previousType: nil) + + self.updatedActive?(true) + } + + private func playScheduledAnimation() { + CATransaction.begin() + CATransaction.setDisableActions(true) + self.maskGradientLayer.isHidden = false + CATransaction.commit() + + let circleFrame = CGRect(origin: CGPoint(x: (self.bounds.width - buttonSize.width) / 2.0, y: (self.bounds.height - buttonSize.height) / 2.0), size: buttonSize).insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0) + let largerCirclePath = UIBezierPath(roundedRect: CGRect(x: circleFrame.minX, y: circleFrame.minY, width: circleFrame.width, height: circleFrame.height), cornerRadius: circleFrame.width / 2.0).cgPath + + let previousPath = self.maskCircleLayer.path + self.maskCircleLayer.path = largerCirclePath + self.maskIsCircle = true + + self.maskCircleLayer.animateSpring(from: previousPath as AnyObject, to: largerCirclePath as AnyObject, keyPath: "path", duration: 0.6, initialVelocity: 0.0, damping: 100.0) + + self.maskBlobView.isHidden = false + self.maskBlobView.startAnimating() + self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.6, damping: 100.0) + + self.disableGlowAnimations = true + self.maskGradientLayer.removeAllAnimations() + self.maskGradientLayer.animateSpring(from: 0.3 as NSNumber, to: 0.85 as NSNumber, keyPath: "transform.scale", duration: 0.45, completion: { [weak self] _ in + self?.disableGlowAnimations = false + }) + } + var isActive = false func updateAnimations() { if !self.isCurrentlyInHierarchy { @@ -965,7 +1083,9 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { self.isActive = false if let transition = self.transition { - if case .connecting = transition { + if case .button = transition { + self.playScheduledAnimation() + } else if case .connecting = transition { self.playConnectionAnimation(type: .muted) { [weak self] in self?.isActive = false } @@ -974,8 +1094,21 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { self.playMuteAnimation() } self.transition = nil + } else { + if self.maskBlobView.isHidden { + self.updateGlowAndGradientAnimations(type: .muted, previousType: nil, animated: false) + self.maskCircleLayer.isHidden = false + self.maskProgressLayer.isHidden = true + self.maskGradientLayer.isHidden = false + self.maskBlobView.isHidden = false + self.maskBlobView.startAnimating() + self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.45) + } } - break + case .button: + self.updatedActive?(true) + self.isActive = false + self.setupButtonAnimation() } } @@ -1040,23 +1173,41 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode { self.updateAnimations() } + var previousSize: CGSize? override func layout() { super.layout() - let center = CGPoint(x: self.bounds.width / 2.0, y: self.bounds.height / 2.0) + let sizeUpdated = self.previousSize != self.bounds.size + self.previousSize = self.bounds.size - let circleFrame = CGRect(origin: CGPoint(x: (self.bounds.width - buttonSize.width) / 2.0, y: (self.bounds.height - buttonSize.height) / 2.0), size: buttonSize) + let bounds = CGRect(x: (self.bounds.width - areaSize.width) / 2.0, y: (self.bounds.height - areaSize.height) / 2.0, width: areaSize.width, height: areaSize.height) + let center = bounds.center + + self.maskBlobView.frame = CGRect(origin: CGPoint(x: bounds.minX + (bounds.width - blobSize.width) / 2.0, y: bounds.minY + (bounds.height - blobSize.height) / 2.0), size: blobSize) + + let circleFrame = CGRect(origin: CGPoint(x: bounds.minX + (bounds.width - buttonSize.width) / 2.0, y: bounds.minY + (bounds.height - buttonSize.height) / 2.0), size: buttonSize) self.backgroundCircleLayer.frame = circleFrame self.foregroundCircleLayer.position = center self.foregroundCircleLayer.bounds = CGRect(origin: CGPoint(), size: CGSize(width: circleFrame.width - progressLineWidth, height: circleFrame.height - progressLineWidth)) self.growingForegroundCircleLayer.position = center self.growingForegroundCircleLayer.bounds = self.foregroundCircleLayer.bounds - self.maskCircleLayer.frame = circleFrame.insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0) + self.maskCircleLayer.frame = self.bounds + + if sizeUpdated && self.maskIsCircle { + CATransaction.begin() + CATransaction.setDisableActions(true) + let circleFrame = CGRect(origin: CGPoint(x: (self.bounds.width - buttonSize.width) / 2.0, y: (self.bounds.height - buttonSize.height) / 2.0), size: buttonSize).insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0) + let largerCirclePath = UIBezierPath(roundedRect: CGRect(x: circleFrame.minX, y: circleFrame.minY, width: circleFrame.width, height: circleFrame.height), cornerRadius: circleFrame.width / 2.0).cgPath + + self.maskCircleLayer.path = largerCirclePath + CATransaction.commit() + } + self.maskProgressLayer.frame = circleFrame.insetBy(dx: -3.0, dy: -3.0) self.foregroundView.frame = self.bounds self.foregroundGradientLayer.frame = self.bounds self.maskGradientLayer.position = center - self.maskGradientLayer.bounds = self.bounds + self.maskGradientLayer.bounds = bounds self.maskView.frame = self.bounds } } @@ -1392,6 +1543,10 @@ final class BlobView: UIView { } enum VoiceChatActionButtonIconAnimationState: Equatable { + case empty + case start + case subscribe + case unsubscribe case unmute case mute case hand @@ -1416,30 +1571,77 @@ final class VoiceChatActionButtonIconNode: ManagedAnimationNode { let previousState = self.iconState self.iconState = state + if state != .empty { + self.alpha = 1.0 + } switch previousState { + case .empty: + switch state { + case .start: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceStart"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001)) + default: + break + } + case .subscribe: + switch state { + case .unsubscribe: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminder"))) + case .mute: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminderToMute"))) + case .hand: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminderToRaiseHand"))) + default: + break + } + case .unsubscribe: + switch state { + case .subscribe: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminder"))) + case .mute: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminderToMute"))) + case .hand: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminderToRaiseHand"))) + default: + break + } + case .start: + switch state { + case .mute: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceStart"))) + default: + break + } case .unmute: switch state { case .mute: self.trackTo(item: ManagedAnimationItem(source: .local("VoiceMute"))) case .hand: - self.trackTo(item: ManagedAnimationItem(source: .local("VoiceHandOff2"))) - case .unmute: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceUnmuteToRaiseHand"))) + default: break } case .mute: switch state { + case .start: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceStart"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001)) case .unmute: - self.trackTo(item: ManagedAnimationItem(source: .local("VoiceUnmute"), frames: .range(startFrame: 0, endFrame: 12), duration: 0.2)) + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceUnmute"))) case .hand: - self.trackTo(item: ManagedAnimationItem(source: .local("VoiceHandOff"))) - case .mute: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceMuteToRaiseHand"))) + case .subscribe: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminderToRaiseHand"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001)) + case .unsubscribe: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminderToRaiseHand"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001)) + case .empty: + self.alpha = 0.0 + default: break } case .hand: switch state { case .mute, .unmute: - self.trackTo(item: ManagedAnimationItem(source: .local("VoiceHandOn"))) - case .hand: + self.trackTo(item: ManagedAnimationItem(source: .local("VoiceRaiseHandToMute"))) + default: break } } @@ -1452,15 +1654,25 @@ final class VoiceChatActionButtonIconNode: ManagedAnimationNode { } var useTiredAnimation = false + var useAngryAnimation = false let val = Float.random(in: 0.0..<1.0) if val <= 0.01 { useTiredAnimation = true + } else if val <= 0.05 { + useAngryAnimation = true } - let normalAnimations = ["VoiceHand_1", "VoiceHand_2", "VoiceHand_3", "VoiceHand_4", "VoiceHand_7"] + let normalAnimations = ["VoiceHand_1", "VoiceHand_2", "VoiceHand_3", "VoiceHand_4", "VoiceHand_7", "VoiceHand_8"] let tiredAnimations = ["VoiceHand_5", "VoiceHand_6"] - let animations = useTiredAnimation ? tiredAnimations : normalAnimations - + let angryAnimations = ["VoiceHand_9", "VoiceHand_10"] + let animations: [String] + if useTiredAnimation { + animations = tiredAnimations + } else if useAngryAnimation { + animations = angryAnimations + } else { + animations = normalAnimations + } if let animationName = animations.randomElement() { self.trackTo(item: ManagedAnimationItem(source: .local(animationName))) } diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift index 16638681c3..bbdea52471 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift @@ -144,10 +144,14 @@ class VoiceChatActionItemNode: ListViewItemNode { return { item, params, firstWithHeader, last in var updatedTheme: PresentationTheme? + var updatedContent = false if currentItem?.presentationData.theme !== item.presentationData.theme { updatedTheme = item.presentationData.theme } + if currentItem?.title != item.title { + updatedContent = true + } let titleFont = Font.regular(17.0) @@ -178,6 +182,8 @@ class VoiceChatActionItemNode: ListViewItemNode { strongSelf.bottomStripeNode.backgroundColor = UIColor(rgb: 0xffffff, alpha: 0.08) strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor + strongSelf.iconNode.image = generateTintedImage(image: item.icon.image, color: UIColor(rgb: 0xffffff)) + } else if updatedContent { strongSelf.iconNode.image = generateTintedImage(image: item.icon.image, color: UIColor(rgb: 0xffffff)) } diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift index 3de1fe6716..6ab54eb15d 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift @@ -5,6 +5,7 @@ import AsyncDisplayKit import SwiftSignalKit import TelegramPresentationData import TelegramUIPreferences +import TelegramStringFormatting import TelegramVoip import TelegramAudio import AccountContext @@ -29,6 +30,7 @@ import LegacyComponents import LegacyMediaPickerUI import WebSearchUI import MapResourceToAvatarSizes +import SolidRoundedButtonNode private let panelBackgroundColor = UIColor(rgb: 0x1c1c1e) private let secondaryPanelBackgroundColor = UIColor(rgb: 0x2c2c2e) @@ -67,105 +69,6 @@ private func cornersImage(top: Bool, bottom: Bool, dark: Bool) -> UIImage? { })?.stretchableImage(withLeftCapWidth: 25, topCapHeight: 25) } - -private final class VoiceChatControllerTitleNode: ASDisplayNode { - private var theme: PresentationTheme - - private let titleNode: ASTextNode - private let infoNode: ASTextNode - fileprivate let recordingIconNode: VoiceChatRecordingIconNode - - public var isRecording: Bool = false { - didSet { - self.recordingIconNode.isHidden = !self.isRecording - } - } - - var tapped: (() -> Void)? - - init(theme: PresentationTheme) { - self.theme = theme - - self.titleNode = ASTextNode() - self.titleNode.displaysAsynchronously = false - self.titleNode.maximumNumberOfLines = 1 - self.titleNode.truncationMode = .byTruncatingTail - self.titleNode.isOpaque = false - - self.infoNode = ASTextNode() - self.infoNode.displaysAsynchronously = false - self.infoNode.maximumNumberOfLines = 1 - self.infoNode.truncationMode = .byTruncatingTail - self.infoNode.isOpaque = false - - self.recordingIconNode = VoiceChatRecordingIconNode(hasBackground: false) - - super.init() - - self.addSubnode(self.titleNode) - self.addSubnode(self.infoNode) - self.addSubnode(self.recordingIconNode) - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - override func didLoad() { - super.didLoad() - - self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tap))) - } - - override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { - if point.y > 0.0 && point.y < self.frame.size.height && point.x > min(self.titleNode.frame.minX, self.infoNode.frame.minX) && point.x < max(self.recordingIconNode.frame.maxX, self.infoNode.frame.maxX) { - return true - } else { - return false - } - } - - @objc private func tap() { - self.tapped?() - } - - func update(size: CGSize, title: String, subtitle: String, transition: ContainedViewLayoutTransition) { - var titleUpdated = false - if let previousTitle = self.titleNode.attributedText?.string { - titleUpdated = previousTitle != title - } - - if titleUpdated, let snapshotView = self.titleNode.view.snapshotContentTree() { - snapshotView.frame = self.titleNode.frame - self.view.addSubview(snapshotView) - - snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in - snapshotView?.removeFromSuperview() - }) - - self.titleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) - } - - self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(17.0), textColor: UIColor(rgb: 0xffffff)) - self.infoNode.attributedText = NSAttributedString(string: subtitle, font: Font.regular(13.0), textColor: UIColor(rgb: 0xffffff, alpha: 0.5)) - - let constrainedSize = CGSize(width: size.width - 140.0, height: size.height) - let titleSize = self.titleNode.measure(constrainedSize) - let infoSize = self.infoNode.measure(constrainedSize) - let titleInfoSpacing: CGFloat = 0.0 - - let combinedHeight = titleSize.height + infoSize.height + titleInfoSpacing - - let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0)), size: titleSize) - self.titleNode.frame = titleFrame - self.infoNode.frame = CGRect(origin: CGPoint(x: floor((size.width - infoSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0) + titleSize.height + titleInfoSpacing), size: infoSize) - - let iconSide = 16.0 + (1.0 + UIScreenPixel) * 2.0 - let iconSize: CGSize = CGSize(width: iconSide, height: iconSide) - self.recordingIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX + 1.0, y: titleFrame.minY + 1.0), size: iconSize) - } -} - final class GroupVideoNode: ASDisplayNode { private let videoViewContainer: UIView private let videoView: PresentationCallVideoView @@ -585,7 +488,7 @@ public final class VoiceChatController: ViewController { } private enum ListEntry: Comparable, Identifiable { - case invite(PresentationTheme, PresentationStrings, String) + case invite(PresentationTheme, PresentationStrings, String, Bool) case peer(PeerEntry) var stableId: EntryId { @@ -599,8 +502,8 @@ public final class VoiceChatController: ViewController { static func ==(lhs: ListEntry, rhs: ListEntry) -> Bool { switch lhs { - case let .invite(lhsTheme, lhsStrings, lhsText): - if case let .invite(rhsTheme, rhsStrings, rhsText) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsText == rhsText { + case let .invite(lhsTheme, lhsStrings, lhsText, lhsIsLink): + if case let .invite(rhsTheme, rhsStrings, rhsText, rhsIsLink) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsText == rhsText, lhsIsLink == rhsIsLink { return true } else { return false @@ -631,8 +534,8 @@ public final class VoiceChatController: ViewController { func item(context: AccountContext, presentationData: PresentationData, interaction: Interaction, style: VoiceChatParticipantItem.LayoutStyle) -> ListViewItem { switch self { - case let .invite(_, _, text): - return VoiceChatActionItem(presentationData: ItemListPresentationData(presentationData), title: text, icon: .generic(UIImage(bundleImageName: "Chat/Context Menu/AddUser")!), action: { + case let .invite(_, _, text, isLink): + return VoiceChatActionItem(presentationData: ItemListPresentationData(presentationData), title: text, icon: .generic(UIImage(bundleImageName: isLink ? "Chat/Context Menu/Link" : "Chat/Context Menu/AddUser")!), action: { interaction.openInvite() }) case let .peer(peerEntry): @@ -772,7 +675,15 @@ public final class VoiceChatController: ViewController { private let leftBorderNode: ASDisplayNode private let rightBorderNode: ASDisplayNode - private let titleNode: VoiceChatControllerTitleNode + private var isScheduling = false + private let timerNode: VoiceChatTimerNode + private var pickerView: UIDatePicker? + private let dateFormatter: DateFormatter + private let scheduleTextNode: ImmediateTextNode + private let scheduleCancelButton: SolidRoundedButtonNode + private var scheduleButtonTitle = "" + + private let titleNode: VoiceChatTitleNode private var enqueuedTransitions: [ListTransition] = [] private var floatingHeaderOffset: CGFloat? @@ -783,6 +694,9 @@ public final class VoiceChatController: ViewController { private var didSetContentsReady: Bool = false private var didSetDataReady: Bool = false + private var isFirstTime = true + private var topInset: CGFloat? + private var peer: Peer? private var currentTitle: String = "" private var currentTitleIsCustom = false @@ -831,7 +745,6 @@ public final class VoiceChatController: ViewController { private var itemInteraction: Interaction? private let inviteDisposable = MetaDisposable() - private let memberEventsDisposable = MetaDisposable() private let reconnectedAsEventsDisposable = MetaDisposable() private let voiceSourcesDisposable = MetaDisposable() @@ -855,6 +768,9 @@ public final class VoiceChatController: ViewController { private let updateAvatarPromise = Promise<(TelegramMediaImageRepresentation, Float)?>(nil) private var currentUpdatingAvatar: TelegramMediaImageRepresentation? + private var ignoreConnecting = false + private var ignoreConnectingTimer: SwiftSignalKit.Timer? + private enum DisplayMode { case `default` case fullscreen(controlsHidden: Bool) @@ -868,6 +784,8 @@ public final class VoiceChatController: ViewController { self.context = call.accountContext self.call = call + self.isScheduling = call.schedulePending + let presentationData = sharedContext.currentPresentationData.with { $0 } self.presentationData = presentationData @@ -881,7 +799,7 @@ public final class VoiceChatController: ViewController { self.contentContainer.isHidden = true self.backgroundNode = ASDisplayNode() - self.backgroundNode.backgroundColor = secondaryPanelBackgroundColor + self.backgroundNode.backgroundColor = self.isScheduling ? panelBackgroundColor : secondaryPanelBackgroundColor self.backgroundNode.clipsToBounds = false self.mainVideoClippingNode = ASDisplayNode() @@ -892,6 +810,8 @@ public final class VoiceChatController: ViewController { } self.listNode = ListView() + self.listNode.alpha = self.isScheduling ? 0.0 : 1.0 + self.listNode.isUserInteractionEnabled = !self.isScheduling self.listNode.verticalScrollIndicatorColor = UIColor(white: 1.0, alpha: 0.3) self.listNode.clipsToBounds = true self.listNode.scroller.bounces = false @@ -926,7 +846,7 @@ public final class VoiceChatController: ViewController { self.closeButton = VoiceChatHeaderButton(context: self.context) self.closeButton.setContent(.image(closeButtonImage(dark: false))) - self.titleNode = VoiceChatControllerTitleNode(theme: self.presentationData.theme) + self.titleNode = VoiceChatTitleNode(theme: self.presentationData.theme) self.topCornersNode = ASImageNode() self.topCornersNode.displaysAsynchronously = false @@ -951,6 +871,13 @@ public final class VoiceChatController: ViewController { self.switchCameraButton.isUserInteractionEnabled = false self.leaveButton = CallControllerButtonItemNode() self.actionButton = VoiceChatActionButton() + + if self.isScheduling { + self.audioButton.alpha = 0.0 + self.audioButton.isUserInteractionEnabled = false + self.leaveButton.alpha = 0.0 + self.leaveButton.isUserInteractionEnabled = false + } self.leftBorderNode = ASDisplayNode() self.leftBorderNode.backgroundColor = panelBackgroundColor @@ -962,6 +889,23 @@ public final class VoiceChatController: ViewController { self.rightBorderNode.isUserInteractionEnabled = false self.rightBorderNode.clipsToBounds = false + self.scheduleTextNode = ImmediateTextNode() + self.scheduleTextNode.isHidden = !self.isScheduling + self.scheduleTextNode.isUserInteractionEnabled = false + self.scheduleTextNode.textAlignment = .center + self.scheduleTextNode.maximumNumberOfLines = 4 + + self.scheduleCancelButton = SolidRoundedButtonNode(title: self.presentationData.strings.Common_Cancel, theme: SolidRoundedButtonTheme(backgroundColor: UIColor(rgb: 0x2b2b2f), foregroundColor: .white), height: 52.0, cornerRadius: 10.0) + self.scheduleCancelButton.isHidden = !self.isScheduling + + self.dateFormatter = DateFormatter() + self.dateFormatter.timeStyle = .none + self.dateFormatter.dateStyle = .short + self.dateFormatter.timeZone = TimeZone.current + + self.timerNode = VoiceChatTimerNode(strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat) + self.timerNode.isHidden = true + super.init() let statePromise = ValuePromise(State(), ignoreRepeated: true) @@ -1303,22 +1247,33 @@ public final class VoiceChatController: ViewController { let itemsForEntry: (PeerEntry, GroupCallParticipantsContext.Participant.MuteState?) -> [ContextMenuItem] = { entry, muteState in var items: [ContextMenuItem] = [] + var hasVolumeSlider = false let peer = entry.peer if let muteState = muteState, !muteState.canUnmute || muteState.mutedByYou { } else { - let minValue: CGFloat - if let callState = strongSelf.callState, callState.canManageCall && callState.adminIds.contains(peer.id) && muteState != nil { - minValue = 0.01 - } else { - minValue = 0.0 - } - items.append(.custom(VoiceChatVolumeContextItem(minValue: minValue, value: entry.volume.flatMap { CGFloat($0) / 10000.0 } ?? 1.0, valueChanged: { newValue, finished in - if finished && newValue.isZero { - let updatedMuteState = strongSelf.call.updateMuteState(peerId: peer.id, isMuted: true) - muteStatePromise.set(.single(updatedMuteState)) + if entry.canManageCall || !entry.isMyPeer { + hasVolumeSlider = true + + let minValue: CGFloat + if let callState = strongSelf.callState, callState.canManageCall && callState.adminIds.contains(peer.id) && muteState != nil { + minValue = 0.01 } else { - strongSelf.call.setVolume(peerId: peer.id, volume: Int32(newValue * 10000), sync: finished) + minValue = 0.0 } + items.append(.custom(VoiceChatVolumeContextItem(minValue: minValue, value: entry.volume.flatMap { CGFloat($0) / 10000.0 } ?? 1.0, valueChanged: { newValue, finished in + if finished && newValue.isZero { + let updatedMuteState = strongSelf.call.updateMuteState(peerId: peer.id, isMuted: true) + muteStatePromise.set(.single(updatedMuteState)) + } else { + strongSelf.call.setVolume(peerId: peer.id, volume: Int32(newValue * 10000), sync: finished) + } + }), true)) + } + } + + if entry.isMyPeer && !hasVolumeSlider && ((entry.about?.isEmpty ?? true) || entry.peer.smallProfileImage == nil) { + items.append(.custom(VoiceChatInfoContextItem(text: strongSelf.presentationData.strings.VoiceChat_ImproveYourProfileText, icon: { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Tip"), color: theme.actionSheet.primaryTextColor) }), true)) } @@ -1378,11 +1333,18 @@ public final class VoiceChatController: ViewController { maxBioLength = 100 } let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_EditBioTitle, text: presentationData.strings.VoiceChat_EditBioText, placeholder: presentationData.strings.VoiceChat_EditBioPlaceholder, doneButtonTitle: presentationData.strings.VoiceChat_EditBioSave, value: entry.about, maxLength: maxBioLength, apply: { bio in - if let strongSelf = self { - let _ = (updateAbout(account: strongSelf.context.account, about: bio) - |> `catch` { _ -> Signal in - return .complete() - }).start() + if let strongSelf = self, let bio = bio { + if peer.id.namespace == Namespaces.Peer.CloudUser { + let _ = (updateAbout(account: strongSelf.context.account, about: bio) + |> `catch` { _ -> Signal in + return .complete() + }).start() + } else { + let _ = (updatePeerDescription(account: strongSelf.context.account, peerId: peer.id, description: bio) + |> `catch` { _ -> Signal in + return .complete() + }).start() + } strongSelf.presentUndoOverlay(content: .info(text: strongSelf.presentationData.strings.VoiceChat_EditBioSuccess), action: { _ in return false }) } @@ -1401,8 +1363,8 @@ public final class VoiceChatController: ViewController { f(.default) Queue.mainQueue().after(0.1) { - let controller = voiceChatUserNameController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_ChangeNameTitle, firstNamePlaceholder: presentationData.strings.UserInfo_FirstNamePlaceholder, lastNamePlaceholder: presentationData.strings.UserInfo_LastNamePlaceholder, doneButtonTitle: presentationData.strings.VoiceChat_EditBioSave, firstName: peer.firstName, lastName: peer.lastName, maxLength: 128, apply: { firstName, lastName in - if let strongSelf = self { + let controller = voiceChatUserNameController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_ChangeNameTitle, firstNamePlaceholder: presentationData.strings.UserInfo_FirstNamePlaceholder, lastNamePlaceholder: presentationData.strings.UserInfo_LastNamePlaceholder, doneButtonTitle: presentationData.strings.VoiceChat_EditBioSave, firstName: peer.firstName, lastName: peer.lastName, maxLength: 128, apply: { firstAndLastName in + if let strongSelf = self, let (firstName, lastName) = firstAndLastName { let _ = updateAccountPeerName(account: context.account, firstName: firstName, lastName: lastName).start() strongSelf.presentUndoOverlay(content: .info(text: strongSelf.presentationData.strings.VoiceChat_EditNameSuccess), action: { _ in return false }) @@ -1570,6 +1532,7 @@ public final class VoiceChatController: ViewController { } let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData.withUpdated(theme: strongSelf.darkTheme), source: .extracted(source), items: items, reactionItems: [], gesture: gesture) + contextController.useComplexItemsTransitionAnimation = true strongSelf.controller?.presentInGlobalOverlay(contextController) }, setPeerIdWithRevealedOptions: { peerId, _ in updateState { state in @@ -1615,6 +1578,7 @@ public final class VoiceChatController: ViewController { } self.bottomPanelNode.addSubnode(self.leaveButton) self.bottomPanelNode.addSubnode(self.actionButton) + self.bottomPanelNode.addSubnode(self.scheduleCancelButton) self.addSubnode(self.dimNode) self.addSubnode(self.contentContainer) @@ -1629,6 +1593,8 @@ public final class VoiceChatController: ViewController { self.contentContainer.addSubnode(self.leftBorderNode) self.contentContainer.addSubnode(self.rightBorderNode) self.contentContainer.addSubnode(self.bottomPanelNode) + self.contentContainer.addSubnode(self.timerNode) + self.contentContainer.addSubnode(self.scheduleTextNode) self.contentContainer.addSubnode(self.horizontalListNode) @@ -1687,7 +1653,13 @@ public final class VoiceChatController: ViewController { let subtitle = strongSelf.presentationData.strings.VoiceChat_Panel_Members(Int32(max(1, callMembers?.totalCount ?? 0))) strongSelf.currentSubtitle = subtitle - if let callState = strongSelf.callState, callState.canManageCall { + if strongSelf.isScheduling { + strongSelf.optionsButtonIsAvatar = false + strongSelf.optionsButton.isUserInteractionEnabled = false + strongSelf.optionsButton.alpha = 0.0 + strongSelf.closeButton.isUserInteractionEnabled = false + strongSelf.closeButton.alpha = 0.0 + } else if let callState = strongSelf.callState, callState.canManageCall { strongSelf.optionsButtonIsAvatar = false strongSelf.optionsButton.isUserInteractionEnabled = true } else if displayAsPeers.count > 1 { @@ -1728,9 +1700,10 @@ public final class VoiceChatController: ViewController { strongSelf.titleNode.isRecording = isRecording } if !strongSelf.didSetDataReady { + strongSelf.didSetDataReady = true + strongSelf.updateMembers(muteState: strongSelf.effectiveMuteState, callMembers: strongSelf.currentCallMembers ?? ([], nil), invitedPeers: strongSelf.currentInvitedPeers ?? [], speakingPeers: strongSelf.currentSpeakingPeers ?? Set()) - strongSelf.didSetDataReady = true strongSelf.controller?.dataReady.set(true) } }) @@ -1822,7 +1795,7 @@ public final class VoiceChatController: ViewController { self.listNode.updateFloatingHeaderOffset = { [weak self] offset, transition in if let strongSelf = self { strongSelf.currentContentOffset = offset - if strongSelf.expandAnimation == nil && !strongSelf.animatingExpansion { + if !strongSelf.animatingExpansion && !strongSelf.animatingInsertion && strongSelf.panGestureArguments == nil && !strongSelf.animatingAppearance { strongSelf.updateFloatingHeaderOffset(offset: offset, transition: transition) } } @@ -1840,16 +1813,6 @@ public final class VoiceChatController: ViewController { } } -// self.memberEventsDisposable.set((self.call.memberEvents -// |> deliverOnMainQueue).start(next: { [weak self] event in -// guard let strongSelf = self else { -// return -// } -// if event.joined { -// strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: event.peer, text: strongSelf.presentationData.strings.VoiceChat_PeerJoinedText(event.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false }) -// } -// })) - self.reconnectedAsEventsDisposable.set((self.call.reconnectedAsEvents |> deliverOnMainQueue).start(next: { [weak self] peer in guard let strongSelf = self else { @@ -1942,19 +1905,23 @@ public final class VoiceChatController: ViewController { })) self.titleNode.tapped = { [weak self] in - if let strongSelf = self, !strongSelf.titleNode.recordingIconNode.isHidden { - var hasTooltipAlready = false - strongSelf.controller?.forEachController { controller -> Bool in - if controller is TooltipScreen { - hasTooltipAlready = true + if let strongSelf = self { + if strongSelf.callState?.canManageCall ?? false { + strongSelf.openTitleEditing() + } else if !strongSelf.titleNode.recordingIconNode.isHidden { + var hasTooltipAlready = false + strongSelf.controller?.forEachController { controller -> Bool in + if controller is TooltipScreen { + hasTooltipAlready = true + } + return true + } + if !hasTooltipAlready { + let location = strongSelf.titleNode.recordingIconNode.convert(strongSelf.titleNode.recordingIconNode.bounds, to: nil) + strongSelf.controller?.present(TooltipScreen(text: presentationData.strings.VoiceChat_RecordingInProgress, icon: nil, location: .point(location.offsetBy(dx: 1.0, dy: 0.0), .top), displayDuration: .custom(3.0), shouldDismissOnTouch: { _ in + return .dismiss(consume: true) + }), in: .window(.root)) } - return true - } - if !hasTooltipAlready { - let location = strongSelf.titleNode.recordingIconNode.convert(strongSelf.titleNode.recordingIconNode.bounds, to: nil) - strongSelf.controller?.present(TooltipScreen(text: presentationData.strings.VoiceChat_RecordingInProgress, icon: nil, location: .point(location.offsetBy(dx: 1.0, dy: 0.0), .top), displayDuration: .custom(3.0), shouldDismissOnTouch: { _ in - return .dismiss(consume: true) - }), in: .window(.root)) } } } @@ -2020,6 +1987,12 @@ public final class VoiceChatController: ViewController { } } } + + self.scheduleCancelButton.pressed = { [weak self] in + if let strongSelf = self { + strongSelf.dismissScheduled() + } + } } deinit { @@ -2038,6 +2011,7 @@ public final class VoiceChatController: ViewController { self.reconnectedAsEventsDisposable.dispose() self.voiceSourcesDisposable.dispose() self.updateAvatarDisposable.dispose() + self.ignoreConnectingTimer?.invalidate() } private func openContextMenu(sourceNode: ASDisplayNode, gesture: ContextGesture?) { @@ -2061,7 +2035,7 @@ public final class VoiceChatController: ViewController { let avatarSize = CGSize(width: 28.0, height: 28.0) - return combineLatest(self.displayAsPeersPromise.get(), self.context.account.postbox.loadedPeerWithId(call.peerId), self.inviteLinksPromise.get()) + return combineLatest(self.displayAsPeersPromise.get(), self.context.account.postbox.loadedPeerWithId(self.call.peerId), self.inviteLinksPromise.get()) |> take(1) |> deliverOnMainQueue |> map { [weak self] peers, chatPeer, inviteLinks -> [ContextMenuItem] in @@ -2095,15 +2069,7 @@ public final class VoiceChatController: ViewController { guard let strongSelf = self else { return } - - let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_EditTitleTitle, text: presentationData.strings.VoiceChat_EditTitleText, placeholder: chatPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), value: strongSelf.callState?.title, maxLength: 40, apply: { title in - if let strongSelf = self, let title = title { - strongSelf.call.updateTitle(title) - - strongSelf.presentUndoOverlay(content: .voiceChatFlag(text: title.isEmpty ? strongSelf.presentationData.strings.VoiceChat_EditTitleRemoveSuccess : strongSelf.presentationData.strings.VoiceChat_EditTitleSuccess(title).0), action: { _ in return false }) - } - }) - self?.controller?.present(controller, in: .window(.root)) + strongSelf.openTitleEditing() }))) var hasPermissions = true @@ -2124,7 +2090,7 @@ public final class VoiceChatController: ViewController { c.setItems(strongSelf.contextMenuPermissionItems()) }))) } - + if let inviteLinks = inviteLinks { items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_Share, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Link"), color: theme.actionSheet.primaryTextColor) @@ -2165,28 +2131,30 @@ public final class VoiceChatController: ViewController { self?.controller?.present(alertController, in: .window(.root)) }), false)) } else { - items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_StartRecording, icon: { theme -> UIImage? in - return generateStartRecordingIcon(color: theme.actionSheet.primaryTextColor) - }, action: { _, f in - f(.dismissWithoutContent) + if strongSelf.callState?.scheduleTimestamp == nil { + items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_StartRecording, icon: { theme -> UIImage? in + return generateStartRecordingIcon(color: theme.actionSheet.primaryTextColor) + }, action: { _, f in + f(.dismissWithoutContent) - guard let strongSelf = self else { - return - } - - let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_StartRecordingTitle, text: presentationData.strings.VoiceChat_StartRecordingText, placeholder: presentationData.strings.VoiceChat_RecordingTitlePlaceholder, value: nil, maxLength: 40, apply: { title in - if let strongSelf = self, let title = title { - strongSelf.call.setShouldBeRecording(true, title: title) - - strongSelf.presentUndoOverlay(content: .voiceChatRecording(text: strongSelf.presentationData.strings.VoiceChat_RecordingStarted), action: { _ in return false }) - strongSelf.call.playTone(.recordingStarted) + guard let strongSelf = self else { + return } - }) - self?.controller?.present(controller, in: .window(.root)) - }))) + + let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_StartRecordingTitle, text: presentationData.strings.VoiceChat_StartRecordingText, placeholder: presentationData.strings.VoiceChat_RecordingTitlePlaceholder, value: nil, maxLength: 40, apply: { title in + if let strongSelf = self, let title = title { + strongSelf.call.setShouldBeRecording(true, title: title) + + strongSelf.presentUndoOverlay(content: .voiceChatRecording(text: strongSelf.presentationData.strings.VoiceChat_RecordingStarted), action: { _ in return false }) + strongSelf.call.playTone(.recordingStarted) + } + }) + self?.controller?.present(controller, in: .window(.root)) + }))) + } } - items.append(.action(ContextMenuActionItem(text: strongSelf.isNoiseSuppressionEnabled ? "Disable Noise Suppression" : "Enable Noise Suppression", textColor: .primary, icon: { theme in + /*items.append(.action(ContextMenuActionItem(text: strongSelf.isNoiseSuppressionEnabled ? "Disable Noise Suppression" : "Enable Noise Suppression", textColor: .primary, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Unmute"), color: theme.actionSheet.primaryTextColor) }, action: { _, f in f(.dismissWithoutContent) @@ -2196,10 +2164,11 @@ public final class VoiceChatController: ViewController { } strongSelf.call.setIsNoiseSuppressionEnabled(!strongSelf.isNoiseSuppressionEnabled) - }))) + })))*/ if let callState = strongSelf.callState, callState.canManageCall { - items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_EndVoiceChat, textColor: .destructive, icon: { theme in + let isScheduled = strongSelf.callState?.scheduleTimestamp != nil + items.append(.action(ContextMenuActionItem(text: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelVoiceChat : strongSelf.presentationData.strings.VoiceChat_EndVoiceChat, textColor: .destructive, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.actionSheet.destructiveActionTextColor) }, action: { _, f in f(.dismissWithoutContent) @@ -2221,7 +2190,7 @@ public final class VoiceChatController: ViewController { }) } - let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: strongSelf.presentationData.strings.VoiceChat_EndConfirmationTitle, text: strongSelf.presentationData.strings.VoiceChat_EndConfirmationText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.VoiceChat_EndConfirmationEnd, action: { + let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationTitle : strongSelf.presentationData.strings.VoiceChat_EndConfirmationTitle, text: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationText : strongSelf.presentationData.strings.VoiceChat_EndConfirmationText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationEnd : strongSelf.presentationData.strings.VoiceChat_EndConfirmationEnd, action: { action() })]) strongSelf.controller?.present(alertController, in: .window(.root)) @@ -2396,6 +2365,203 @@ public final class VoiceChatController: ViewController { panRecognizer.delaysTouchesBegan = false panRecognizer.cancelsTouchesInView = true self.view.addGestureRecognizer(panRecognizer) + + if self.isScheduling { + self.setupSchedulePickerView() + self.updateScheduleButtonTitle() + } + } + + private func updateSchedulePickerLimits() { + let timeZone = TimeZone(secondsFromGMT: 0)! + var calendar = Calendar(identifier: .gregorian) + calendar.timeZone = timeZone + let currentDate = Date() + var components = calendar.dateComponents(Set([.era, .year, .month, .day, .hour, .minute, .second]), from: currentDate) + components.second = 0 + + let roundedDate = calendar.date(from: components)! + let next1MinDate = calendar.date(byAdding: .minute, value: 1, to: roundedDate) + + let minute = components.minute ?? 0 + components.minute = 0 + let roundedToHourDate = calendar.date(from: components)! + + components.hour = 0 + let roundedToMidnightDate = calendar.date(from: components)! + + let nextTwoHourDate = calendar.date(byAdding: .hour, value: minute > 30 ? 4 : 3, to: roundedToHourDate) + + let maxDate = calendar.date(byAdding: .day, value: 8, to: roundedToMidnightDate) + + if let date = calendar.date(byAdding: .day, value: 365, to: currentDate) { + self.pickerView?.maximumDate = date + } + + if let next1MinDate = next1MinDate, let nextTwoHourDate = nextTwoHourDate { + self.pickerView?.minimumDate = next1MinDate + self.pickerView?.maximumDate = maxDate + self.pickerView?.date = nextTwoHourDate + } + } + + private func setupSchedulePickerView() { + var currentDate: Date? + if let pickerView = self.pickerView { + currentDate = pickerView.date + pickerView.removeFromSuperview() + } + + let textColor = UIColor.white + UILabel.setDateLabel(textColor) + + let pickerView = UIDatePicker() + pickerView.timeZone = TimeZone(secondsFromGMT: 0) + pickerView.datePickerMode = .countDownTimer + pickerView.datePickerMode = .dateAndTime + pickerView.locale = Locale.current + pickerView.timeZone = TimeZone.current + pickerView.minuteInterval = 1 + self.contentContainer.view.addSubview(pickerView) + pickerView.addTarget(self, action: #selector(self.datePickerUpdated), for: .valueChanged) + if #available(iOS 13.4, *) { + pickerView.preferredDatePickerStyle = .wheels + } + pickerView.setValue(textColor, forKey: "textColor") + self.pickerView = pickerView + + self.updateSchedulePickerLimits() + if let currentDate = currentDate { + pickerView.date = currentDate + } + } + + private let calendar = Calendar(identifier: .gregorian) + private func updateScheduleButtonTitle() { + guard let date = self.pickerView?.date else { + return + } + + let calendar = Calendar(identifier: .gregorian) + let currentTimestamp = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970) + let timestamp = Int32(date.timeIntervalSince1970) + let time = stringForMessageTimestamp(timestamp: timestamp, dateTimeFormat: self.presentationData.dateTimeFormat) + let buttonTitle: String + if calendar.isDateInToday(date) { + buttonTitle = self.presentationData.strings.ScheduleVoiceChat_ScheduleToday(time).0 + } else if calendar.isDateInTomorrow(date) { + buttonTitle = self.presentationData.strings.ScheduleVoiceChat_ScheduleTomorrow(time).0 + } else { + buttonTitle = self.presentationData.strings.ScheduleVoiceChat_ScheduleOn(self.dateFormatter.string(from: date), time).0 + } + self.scheduleButtonTitle = buttonTitle + + let delta = timestamp - currentTimestamp + + var isGroup = true + if let peer = self.peer as? TelegramChannel, case .broadcast = peer.info { + isGroup = false + } + let intervalString = scheduledTimeIntervalString(strings: self.presentationData.strings, value: max(60, delta)) + self.scheduleTextNode.attributedText = NSAttributedString(string: isGroup ? self.presentationData.strings.ScheduleVoiceChat_GroupText(intervalString).0 : self.presentationData.strings.ScheduleVoiceChat_ChannelText(intervalString).0, font: Font.regular(14.0), textColor: UIColor(rgb: 0x8e8e93)) + + if let (layout, navigationHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring)) + } + } + + @objc private func datePickerUpdated() { + self.updateScheduleButtonTitle() + } + + private func schedule() { + if let date = self.pickerView?.date, date > Date() { + self.call.schedule(timestamp: Int32(date.timeIntervalSince1970)) + + self.isScheduling = false + self.transitionToScheduled() + if let (layout, navigationHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring)) + } + } + } + + private func dismissScheduled() { + self.leaveDisposable.set((self.call.leave(terminateIfPossible: true) + |> deliverOnMainQueue).start(completed: { [weak self] in + self?.controller?.dismiss(closing: true) + })) + } + + private func transitionToScheduled() { + let springDuration: Double = 0.6 + let springDamping: CGFloat = 100.0 + + self.optionsButton.alpha = 1.0 + self.optionsButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + self.optionsButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping) + self.optionsButton.isUserInteractionEnabled = true + + self.closeButton.alpha = 1.0 + self.closeButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + self.closeButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping) + self.closeButton.isUserInteractionEnabled = true + + self.audioButton.alpha = 1.0 + self.audioButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + self.audioButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping) + self.audioButton.isUserInteractionEnabled = true + + self.leaveButton.alpha = 1.0 + self.leaveButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + self.leaveButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping) + self.leaveButton.isUserInteractionEnabled = true + + self.scheduleCancelButton.alpha = 0.0 + self.scheduleCancelButton.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15) + self.scheduleCancelButton.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: 26.0), duration: 0.2, removeOnCompletion: false, additive: true) + + self.actionButton.titleLabel.layer.animatePosition(from: CGPoint(x: 0.0, y: -26.0), to: CGPoint(), duration: 0.2, additive: true) + + if let pickerView = self.pickerView { + self.pickerView = nil + pickerView.alpha = 0.0 + pickerView.layer.animateScale(from: 1.0, to: 0.25, duration: 0.15, removeOnCompletion: false) + pickerView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak pickerView] _ in + pickerView?.removeFromSuperview() + }) + pickerView.isUserInteractionEnabled = false + } + + self.timerNode.isHidden = false + self.timerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25) + self.timerNode.animateIn() + + self.scheduleTextNode.alpha = 0.0 + self.scheduleTextNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25) + + self.updateTitle(slide: true, transition: .animated(duration: 0.2, curve: .easeInOut)) + } + + private func transitionToCall() { + self.updateIsFullscreen(false, force: true) + + self.listNode.alpha = 1.0 + self.listNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + self.listNode.isUserInteractionEnabled = true + + self.timerNode.alpha = 0.0 + self.timerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, completion: { [weak self] _ in + self?.timerNode.isHidden = true + }) + + if self.audioButton.isHidden { + self.audioButton.isHidden = false + self.audioButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + self.audioButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.6, damping: 100.0) + } + + self.updateTitle(transition: .animated(duration: 0.2, curve: .easeInOut)) } @objc private func optionsPressed() { @@ -2414,6 +2580,7 @@ public final class VoiceChatController: ViewController { self.controller?.dismissAllTooltips() if let callState = self.callState, callState.canManageCall { + let isScheduled = callState.scheduleTimestamp != nil let action: () -> Void = { [weak self] in guard let strongSelf = self else { return @@ -2429,12 +2596,12 @@ public final class VoiceChatController: ViewController { var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: self.presentationData.strings.VoiceChat_LeaveConfirmation)) - items.append(ActionSheetButtonItem(title: self.presentationData.strings.VoiceChat_LeaveAndEndVoiceChat, color: .destructive, action: { [weak self, weak actionSheet] in + items.append(ActionSheetButtonItem(title: isScheduled ? self.presentationData.strings.VoiceChat_LeaveAndCancelVoiceChat : self.presentationData.strings.VoiceChat_LeaveAndEndVoiceChat, color: .destructive, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() if let strongSelf = self { if let (members, _) = strongSelf.currentCallMembers, members.count >= 10 || true { - let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: strongSelf.presentationData.strings.VoiceChat_EndConfirmationTitle, text: strongSelf.presentationData.strings.VoiceChat_EndConfirmationText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.VoiceChat_EndConfirmationEnd, action: { + let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationTitle : strongSelf.presentationData.strings.VoiceChat_EndConfirmationTitle, text: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationText : strongSelf.presentationData.strings.VoiceChat_EndConfirmationText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationEnd : strongSelf.presentationData.strings.VoiceChat_EndConfirmationEnd, action: { action() })]) strongSelf.controller?.present(alertController, in: .window(.root)) @@ -2475,8 +2642,12 @@ public final class VoiceChatController: ViewController { @objc func dimTapGesture(_ recognizer: UITapGestureRecognizer) { if case .ended = recognizer.state { - self.controller?.dismiss(closing: false) - self.controller?.dismissAllTooltips() + if self.isScheduling { + self.dismissScheduled() + } else { + self.controller?.dismiss(closing: false) + self.controller?.dismissAllTooltips() + } } } @@ -2612,7 +2783,37 @@ public final class VoiceChatController: ViewController { guard let callState = self.callState else { return } - if case .connecting = callState.networkState { + if case .connecting = callState.networkState, callState.scheduleTimestamp == nil && !self.isScheduling { + return + } + if callState.scheduleTimestamp != nil || self.isScheduling { + switch gestureRecognizer.state { + case .began: + self.actionButton.pressing = true + self.hapticFeedback.impact(.light) + case .ended, .cancelled: + self.actionButton.pressing = false + + let location = gestureRecognizer.location(in: self.actionButton.view) + if self.actionButton.hitTest(location, with: nil) != nil { + if self.isScheduling { + self.schedule() + } else if callState.canManageCall { + self.call.startScheduled() + } else { + if !callState.subscribedToScheduled { + let location = self.actionButton.view.convert(self.actionButton.bounds, to: self.view).center + let point = CGRect(origin: CGPoint(x: location.x - 5.0, y: location.y - 5.0 - 68.0), size: CGSize(width: 10.0, height: 10.0)) + self.controller?.present(TooltipScreen(text: self.presentationData.strings.VoiceChat_ReminderNotify, style: .gradient(UIColor(rgb: 0x262c5a), UIColor(rgb: 0x5d2835)), icon: nil, location: .point(point, .bottom), displayDuration: .custom(3.0), shouldDismissOnTouch: { _ in + return .dismiss(consume: false) + }), in: .window(.root)) + } + self.call.toggleScheduledSubscription(!callState.subscribedToScheduled) + } + } + default: + break + } return } if let muteState = callState.muteState { @@ -2669,10 +2870,53 @@ public final class VoiceChatController: ViewController { } @objc private func actionButtonPressed() { + if self.isScheduling { + self.schedule() + } } @objc private func audioOutputPressed() { self.hapticFeedback.impact(.light) + + if let _ = self.callState?.scheduleTimestamp { + if let callState = self.callState, let peer = self.peer, !callState.canManageCall && (peer.addressName?.isEmpty ?? true) { + return + } + + let _ = (self.inviteLinksPromise.get() + |> take(1) + |> deliverOnMainQueue).start(next: { [weak self] inviteLinks in + guard let strongSelf = self else { + return + } + + let callPeerId = strongSelf.call.peerId + let _ = (strongSelf.context.account.postbox.transaction { transaction -> GroupCallInviteLinks? in + if let inviteLinks = inviteLinks { + return inviteLinks + } else if let peer = transaction.getPeer(callPeerId), let addressName = peer.addressName, !addressName.isEmpty { + return GroupCallInviteLinks(listenerLink: "https://t.me/\(addressName)?voicechat", speakerLink: nil) + } else if let cachedData = transaction.getPeerCachedData(peerId: callPeerId) { + if let cachedData = cachedData as? CachedChannelData, let link = cachedData.exportedInvitation?.link { + return GroupCallInviteLinks(listenerLink: link, speakerLink: nil) + } else if let cachedData = cachedData as? CachedGroupData, let link = cachedData.exportedInvitation?.link { + return GroupCallInviteLinks(listenerLink: link, speakerLink: nil) + } + } + return nil + } + |> deliverOnMainQueue).start(next: { links in + guard let strongSelf = self else { + return + } + + if let links = links { + strongSelf.presentShare(links) + } + }) + }) + return + } guard let (availableOutputs, currentOutput) = self.audioOutputState else { return @@ -2690,7 +2934,7 @@ public final class VoiceChatController: ViewController { } } } else { - let actionSheet = ActionSheetController(presentationData: self.presentationData) + let actionSheet = ActionSheetController(presentationData: self.presentationData.withUpdated(theme: self.darkTheme)) var items: [ActionSheetItem] = [] for output in availableOutputs { if hasMute, case .builtin = output { @@ -2789,17 +3033,30 @@ public final class VoiceChatController: ViewController { } else { topInset = max(0.0, panInitialTopInset + min(0.0, panOffset)) } - } else if let _ = self.expandAnimation { - topInset = self.listNode.frame.minY - listTopInset } else if let currentTopInset = self.topInset { topInset = self.isExpanded ? 0.0 : currentTopInset } else { - topInset = listSize.height + topInset = listSize.height - 46.0 - floor(56.0 * 3.5) } - let offset = offset + topInset + var bottomEdge: CGFloat = 0.0 + self.listNode.forEachItemNode { itemNode in + if let itemNode = itemNode as? ListViewItemNode { + let convertedFrame = self.listNode.view.convert(itemNode.frame, to: self.contentContainer.view) + if convertedFrame.maxY > bottomEdge { + bottomEdge = convertedFrame.maxY + } + } + } + + + let offset = (bottomEdge.isZero ? 0.0 : offset) + topInset self.floatingHeaderOffset = offset - + + if bottomEdge.isZero { + bottomEdge = self.listNode.frame.minY + 46.0 + 56.0 + } + let rawPanelOffset = offset + listTopInset - topPanelHeight let panelOffset = max(layoutTopInset, rawPanelOffset) let topPanelFrame: CGRect @@ -2881,28 +3138,12 @@ public final class VoiceChatController: ViewController { } else { completion?() } + self.topPanelBackgroundNode.frame = CGRect(x: 0.0, y: topPanelHeight - 24.0, width: size.width, height: min(topPanelFrame.height, 24.0)) - - var bottomEdge: CGFloat = 0.0 - self.listNode.forEachItemNode { itemNode in - if let itemNode = itemNode as? ListViewItemNode { - let convertedFrame = self.listNode.view.convert(itemNode.frame, to: self.view) - if convertedFrame.maxY > bottomEdge { - bottomEdge = convertedFrame.maxY - } - } - } - - let listMaxY = listTopInset + listSize.height - if bottomEdge.isZero { - bottomEdge = listMaxY - } - var bottomOffset: CGFloat = 0.0 - if bottomEdge < listMaxY && (self.panGestureArguments != nil || self.isExpanded) { - bottomOffset = bottomEdge - listMaxY - } - + let listMaxY = listTopInset + listSize.height + let bottomOffset: CGFloat = min(0.0, bottomEdge - listMaxY) + let bottomCornersFrame = CGRect(origin: CGPoint(x: sideInset, y: -50.0 + bottomOffset), size: CGSize(width: size.width - sideInset * 2.0, height: 50.0)) let previousBottomCornersFrame = self.bottomCornersNode.frame if !bottomCornersFrame.equalTo(previousBottomCornersFrame) { @@ -2916,8 +3157,8 @@ public final class VoiceChatController: ViewController { } var isFullscreen = false - func updateIsFullscreen(_ isFullscreen: Bool) { - guard self.isFullscreen != isFullscreen, let (layout, _) = self.validLayout else { + func updateIsFullscreen(_ isFullscreen: Bool, force: Bool = false) { + guard self.isFullscreen != isFullscreen || force, let (layout, _) = self.validLayout else { return } self.isFullscreen = isFullscreen @@ -2942,12 +3183,17 @@ public final class VoiceChatController: ViewController { topEdgeFrame = CGRect(x: 0.0, y: 0.0, width: size.width, height: topPanelHeight) } + var isScheduled = false + if self.isScheduling || self.callState?.scheduleTimestamp != nil { + isScheduled = true + } + let transition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: .linear) transition.updateFrame(node: self.topPanelEdgeNode, frame: topEdgeFrame) transition.updateCornerRadius(node: self.topPanelEdgeNode, cornerRadius: isFullscreen ? layout.deviceMetrics.screenCornerRadius - 0.5 : 12.0) transition.updateBackgroundColor(node: self.topPanelBackgroundNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor) transition.updateBackgroundColor(node: self.topPanelEdgeNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor) - transition.updateBackgroundColor(node: self.backgroundNode, color: isFullscreen ? panelBackgroundColor : secondaryPanelBackgroundColor) + transition.updateBackgroundColor(node: self.backgroundNode, color: isFullscreen || isScheduled ? panelBackgroundColor : secondaryPanelBackgroundColor) transition.updateBackgroundColor(node: self.bottomPanelBackgroundNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor) transition.updateBackgroundColor(node: self.leftBorderNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor) transition.updateBackgroundColor(node: self.rightBorderNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor) @@ -2980,12 +3226,14 @@ public final class VoiceChatController: ViewController { self.updateTitle(transition: transition) } - private func updateTitle(transition: ContainedViewLayoutTransition) { + private func updateTitle(slide: Bool = false, transition: ContainedViewLayoutTransition) { guard let (layout, _) = self.validLayout else { return } var title = self.currentTitle - if !self.isFullscreen && !self.currentTitleIsCustom { + if self.isScheduling { + title = self.presentationData.strings.ScheduleVoiceChat_Title + } else if !self.isFullscreen && !self.currentTitleIsCustom { if let navigationController = self.controller?.navigationController as? NavigationController { for controller in navigationController.viewControllers.reversed() { if let controller = controller as? ChatController, case let .peer(peerId) = controller.chatLocation, peerId == self.call.peerId { @@ -2995,12 +3243,23 @@ public final class VoiceChatController: ViewController { } } + var subtitle = self.currentSubtitle + if self.isScheduling { + subtitle = "" + } else if self.callState?.scheduleTimestamp != nil { + if self.callState?.canManageCall ?? false { + subtitle = self.presentationData.strings.VoiceChat_TapToEditTitle + } else { + subtitle = self.presentationData.strings.VoiceChat_Scheduled + } + } + var size = layout.size if case .regular = layout.metrics.widthClass { size.width = floor(min(size.width, size.height) * 0.5) } - self.titleNode.update(size: CGSize(width: size.width, height: 44.0), title: title, subtitle: self.currentSubtitle, transition: transition) + self.titleNode.update(size: CGSize(width: size.width, height: 44.0), title: title, subtitle: subtitle, slide: slide, transition: transition) } private func updateButtons(animated: Bool) { @@ -3042,8 +3301,8 @@ public final class VoiceChatController: ViewController { } else { activeButtonAppearance = .color(.custom(self.isFullscreen ? 0x1c1c1e : 0x2c2c2e, 1.0)) } - - let soundImage: CallControllerButtonItemNode.Content.Image + + var soundImage: CallControllerButtonItemNode.Content.Image var soundAppearance: CallControllerButtonItemNode.Content.Appearance = normalButtonAppearance var soundTitle: String = self.presentationData.strings.Call_Speaker switch audioMode { @@ -3066,6 +3325,19 @@ public final class VoiceChatController: ViewController { } soundTitle = self.presentationData.strings.Call_Audio } + + let isScheduled = self.isScheduling || self.callState?.scheduleTimestamp != nil + + var soundEnabled = true + if isScheduled { + if let callState = self.callState, let peer = self.peer, !callState.canManageCall && (peer.addressName?.isEmpty ?? true) { + soundEnabled = false + } else { + soundImage = .share + soundTitle = self.presentationData.strings.VoiceChat_ShareShort + soundAppearance = normalButtonAppearance + } + } let videoButtonSize: CGSize var buttonsTitleAlpha: CGFloat @@ -3091,7 +3363,8 @@ public final class VoiceChatController: ViewController { self.switchCameraButton.update(size: videoButtonSize, content: CallControllerButtonItemNode.Content(appearance: normalButtonAppearance, image: .flipCamera), text: "", transition: transition) - self.audioButton.update(size: sideButtonSize, content: CallControllerButtonItemNode.Content(appearance: soundAppearance, image: soundImage), text: soundTitle, transition: transition) + self.audioButton.update(size: sideButtonSize, content: CallControllerButtonItemNode.Content(appearance: soundAppearance, image: soundImage, isEnabled: soundEnabled), text: soundTitle, transition: transition) + self.audioButton.isUserInteractionEnabled = soundEnabled self.leaveButton.update(size: sideButtonSize, content: CallControllerButtonItemNode.Content(appearance: .color(.custom(0xff3b30, 0.3)), image: .cancel), text: self.presentationData.strings.VoiceChat_Leave, transition: .immediate) @@ -3194,12 +3467,10 @@ public final class VoiceChatController: ViewController { } else if let currentTopInset = self.topInset { topInset = self.isExpanded ? 0.0 : currentTopInset } else { - topInset = listSize.height + topInset = listSize.height - 46.0 - floor(56.0 * 3.5) } - if self.expandAnimation == nil { - transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(x: 0.0, y: listTopInset + topInset), size: listSize)) - } + transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(x: 0.0, y: listTopInset + topInset), size: listSize)) let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition) self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: listSize, insets: insets, duration: duration, curve: curve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) @@ -3226,7 +3497,19 @@ public final class VoiceChatController: ViewController { } transition.updateFrame(node: self.bottomPanelNode, frame: bottomPanelFrame) - let centralButtonSize = CGSize(width: 300.0, height: 300.0) + if let pickerView = self.pickerView { + transition.updateFrame(view: pickerView, frame: CGRect(x: 0.0, y: layout.size.height - bottomPanelHeight - 216.0, width: size.width, height: 216.0)) + } + + let timerFrame = CGRect(x: 0.0, y: layout.size.height - bottomPanelHeight - 216.0, width: size.width, height: 216.0) + transition.updateFrame(node: self.timerNode, frame: timerFrame) + self.timerNode.update(size: timerFrame.size, scheduleTime: self.callState?.scheduleTimestamp, transition: .immediate) + + let scheduleTextSize = self.scheduleTextNode.updateLayout(CGSize(width: size.width - sideInset * 2.0, height: CGFloat.greatestFiniteMagnitude)) + self.scheduleTextNode.frame = CGRect(origin: CGPoint(x: floor((size.width - scheduleTextSize.width) / 2.0), y: layout.size.height - layout.intrinsicInsets.bottom - scheduleTextSize.height - 145.0), size: scheduleTextSize) + + let centralButtonSide = min(size.width, size.height) - 32.0 + let centralButtonSize = CGSize(width: centralButtonSide, height: centralButtonSide) let cameraButtonSize = CGSize(width: 36.0, height: 36.0) let sideButtonMinimalInset: CGFloat = 16.0 let sideButtonOffset = min(42.0, floor((((size.width - 112.0) / 2.0) - sideButtonSize.width) / 2.0)) @@ -3252,7 +3535,7 @@ public final class VoiceChatController: ViewController { smallButtons = false firstButtonFrame = CGRect(origin: CGPoint(x: floor(leftButtonFrame.midX - cameraButtonSize.width / 2.0), y: leftButtonFrame.minY - upperButtonDistance - cameraButtonSize.height), size: cameraButtonSize) secondButtonFrame = leftButtonFrame - thirdButtonFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - centralButtonSize.width) / 2.0), y: floorToScreenPixels((self.effectiveBottomAreaHeight - centralButtonSize.height) / 2.0)), size: centralButtonSize) + thirdButtonFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - centralButtonSize.width) / 2.0), y: floor((self.effectiveBottomAreaHeight - centralButtonSize.height) / 2.0) - 3.0), size: centralButtonSize) forthButtonFrame = rightButtonFrame case let .fullscreen(controlsHidden): smallButtons = true @@ -3280,48 +3563,98 @@ public final class VoiceChatController: ViewController { let actionButtonTitle: String let actionButtonSubtitle: String var actionButtonEnabled = true - if let callState = self.callState { - switch callState.networkState { - case .connecting: + if let callState = self.callState, !self.isScheduling { + if callState.scheduleTimestamp != nil { + self.ignoreConnecting = true + if callState.canManageCall { + actionButtonState = .scheduled(state: .start) + actionButtonTitle = self.presentationData.strings.VoiceChat_StartNow + actionButtonSubtitle = "" + } else { + if callState.subscribedToScheduled { + actionButtonState = .scheduled(state: .unsubscribe) + actionButtonTitle = self.presentationData.strings.VoiceChat_CancelReminder + } else { + actionButtonState = .scheduled(state: .subscribe) + actionButtonTitle = self.presentationData.strings.VoiceChat_SetReminder + } + actionButtonSubtitle = "" + } + } else { + let connected = self.ignoreConnecting || callState.networkState == .connected + if case .connected = callState.networkState { + self.ignoreConnecting = false + self.ignoreConnectingTimer?.invalidate() + self.ignoreConnectingTimer = nil + } else if self.ignoreConnecting { + if self.ignoreConnectingTimer == nil { + let timer = SwiftSignalKit.Timer(timeout: 3.0, repeat: false, completion: { [weak self] in + if let strongSelf = self { + strongSelf.ignoreConnecting = false + strongSelf.ignoreConnectingTimer?.invalidate() + strongSelf.ignoreConnectingTimer = nil + + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate) + } + } + }, queue: Queue.mainQueue()) + self.ignoreConnectingTimer = timer + timer.start() + } + } + + if connected { + if let muteState = callState.muteState, !self.pushingToTalk { + if muteState.canUnmute { + actionButtonState = .active(state: .muted) + + actionButtonTitle = self.presentationData.strings.VoiceChat_Unmute + actionButtonSubtitle = "" + } else { + actionButtonState = .active(state: .cantSpeak) + + if callState.raisedHand { + actionButtonTitle = self.presentationData.strings.VoiceChat_AskedToSpeak + actionButtonSubtitle = self.presentationData.strings.VoiceChat_AskedToSpeakHelp + } else { + actionButtonTitle = self.presentationData.strings.VoiceChat_MutedByAdmin + actionButtonSubtitle = self.presentationData.strings.VoiceChat_MutedByAdminHelp + } + } + } else { + actionButtonState = .active(state: .on) + + actionButtonTitle = self.pushingToTalk ? self.presentationData.strings.VoiceChat_Live : self.presentationData.strings.VoiceChat_Mute + actionButtonSubtitle = "" + } + } else { + actionButtonState = .connecting + actionButtonTitle = self.presentationData.strings.VoiceChat_Connecting + actionButtonSubtitle = "" + actionButtonEnabled = false + } + } + } else { + if self.isScheduling { + actionButtonState = .button(text: self.scheduleButtonTitle) + actionButtonTitle = "" + actionButtonSubtitle = "" + actionButtonEnabled = true + } else { actionButtonState = .connecting actionButtonTitle = self.presentationData.strings.VoiceChat_Connecting actionButtonSubtitle = "" actionButtonEnabled = false - case .connected: - if let muteState = callState.muteState, !self.pushingToTalk { - if muteState.canUnmute { - actionButtonState = .active(state: .muted) - - actionButtonTitle = self.presentationData.strings.VoiceChat_Unmute - actionButtonSubtitle = "" - } else { - actionButtonState = .active(state: .cantSpeak) - - if callState.raisedHand { - actionButtonTitle = self.presentationData.strings.VoiceChat_AskedToSpeak - actionButtonSubtitle = self.presentationData.strings.VoiceChat_AskedToSpeakHelp - } else { - actionButtonTitle = self.presentationData.strings.VoiceChat_MutedByAdmin - actionButtonSubtitle = self.presentationData.strings.VoiceChat_MutedByAdminHelp - } - } - } else { - actionButtonState = .active(state: .on) - - actionButtonTitle = self.pushingToTalk ? self.presentationData.strings.VoiceChat_Live : self.presentationData.strings.VoiceChat_Mute - actionButtonSubtitle = "" - } } - } else { - actionButtonState = .connecting - actionButtonTitle = self.presentationData.strings.VoiceChat_Connecting - actionButtonSubtitle = "" - actionButtonEnabled = false } self.actionButton.isDisabled = !actionButtonEnabled self.actionButton.update(size: centralButtonSize, buttonSize: CGSize(width: 112.0, height: 112.0), state: actionButtonState, title: actionButtonTitle, subtitle: actionButtonSubtitle, dark: self.isFullscreen, small: smallButtons, animated: true) + let buttonHeight = self.scheduleCancelButton.updateLayout(width: size.width - 32.0, transition: .immediate) + self.scheduleCancelButton.frame = CGRect(x: 16.0, y: 137.0, width: size.width - 32.0, height: buttonHeight) + if self.actionButton.supernode === self.bottomPanelNode { transition.updateFrame(node: self.actionButton, frame: thirdButtonFrame) } @@ -3365,16 +3698,20 @@ public final class VoiceChatController: ViewController { guard let (layout, navigationHeight) = self.validLayout else { return } - let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring) + self.updateFloatingHeaderOffset(offset: 0.0, transition: .immediate) + + self.animatingAppearance = true - let topPanelFrame = self.topPanelNode.view.convert(self.topPanelNode.bounds, to: self.view) - let initialBounds = self.contentContainer.bounds + let topPanelFrame = self.topPanelNode.view.convert(self.topPanelNode.bounds, to: self.view) self.contentContainer.bounds = initialBounds.offsetBy(dx: 0.0, dy: -(layout.size.height - topPanelFrame.minY)) self.contentContainer.isHidden = false + + let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring) transition.animateView({ self.contentContainer.view.bounds = initialBounds }, completion: { _ in + self.animatingAppearance = false if self.actionButton.supernode !== self.bottomPanelNode { self.actionButton.ignoreHierarchyChanges = true self.audioButton.isHidden = false @@ -3387,7 +3724,7 @@ public final class VoiceChatController: ViewController { //self.bottomPanelNode.addSubnode(self.cameraButtonNode) self.bottomPanelNode.addSubnode(self.leaveButton) self.bottomPanelNode.addSubnode(self.actionButton) - self.containerLayoutUpdated(layout, navigationHeight :navigationHeight, transition: .immediate) + self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate) self.actionButton.ignoreHierarchyChanges = false } @@ -3443,15 +3780,25 @@ public final class VoiceChatController: ViewController { } } } - - private var topInset: CGFloat? - private var isFirstTime = true + private func dequeueTransition() { guard let (layout, _) = self.validLayout, let transition = self.enqueuedTransitions.first else { return } self.enqueuedTransitions.remove(at: 0) + if let callState = self.callState { + if callState.scheduleTimestamp != nil && self.listNode.alpha > 0.0 { + self.timerNode.isHidden = false + self.listNode.alpha = 0.0 + self.listNode.isUserInteractionEnabled = false + self.backgroundNode.backgroundColor = panelBackgroundColor + self.updateIsFullscreen(false) + } else if callState.scheduleTimestamp == nil && !self.isScheduling && self.listNode.alpha == 0.0 { + self.transitionToCall() + } + } + var options = ListViewDeleteAndInsertOptions() let isFirstTime = self.isFirstTime if isFirstTime { @@ -3460,7 +3807,7 @@ public final class VoiceChatController: ViewController { if transition.crossFade { options.insert(.AnimateCrossfade) } - if transition.animated && self.expandAnimation == nil { + if transition.animated { options.insert(.AnimateInsertion) } } @@ -3491,7 +3838,7 @@ public final class VoiceChatController: ViewController { let listTopInset = layoutTopInset + topPanelHeight let listSize = CGSize(width: size.width, height: layout.size.height - listTopInset - bottomPanelHeight) - self.topInset = max(0.0, max(listSize.height - itemsHeight, listSize.height - 46.0 - floor(56.0 * 3.5))) + self.topInset = listSize.height - 46.0 - floor(56.0 * 3.5) let targetY = listTopInset + (self.topInset ?? listSize.height) @@ -3499,32 +3846,28 @@ public final class VoiceChatController: ViewController { var frame = self.listNode.frame frame.origin.y = targetY self.listNode.frame = frame - } else if !self.isExpanded { - if self.listNode.frame.minY != targetY && !self.animatingExpansion && self.panGestureArguments == nil { - self.expandAnimation = ListViewAnimation(from: self.listNode.frame.minY, to: targetY, duration: 0.4, curve: listViewAnimationCurveSystem, beginAt: CACurrentMediaTime(), update: { [weak self] _, currentValue in - if let strongSelf = self { - var frame = strongSelf.listNode.frame - frame.origin.y = currentValue - strongSelf.listNode.frame = frame - strongSelf.updateFloatingHeaderOffset(offset: strongSelf.currentContentOffset ?? 0.0, transition: .immediate) - } - }) - self.updateAnimation() - } } - + + if transition.animated { + self.animatingInsertion = true + } self.listNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, scrollToItem: nil, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { [weak self] _ in guard let strongSelf = self else { return } + if isFirstTime { + strongSelf.updateFloatingHeaderOffset(offset: strongSelf.currentContentOffset ?? 0.0, transition: .immediate) + } else if strongSelf.animatingInsertion { + strongSelf.updateFloatingHeaderOffset(offset: strongSelf.currentContentOffset ?? 0.0, transition: .animated(duration: 0.2, curve: .easeInOut)) + } + strongSelf.animatingInsertion = false if !strongSelf.didSetContentsReady { strongSelf.didSetContentsReady = true strongSelf.controller?.contentsReady.set(true) } }) } - - + private func dequeueHorizontalTransition() { guard let _ = self.validLayout, let transition = self.enqueuedHorizontalTransitions.first else { return @@ -3548,38 +3891,6 @@ public final class VoiceChatController: ViewController { }) } - private var animator: ConstantDisplayLinkAnimator? - private var expandAnimation: ListViewAnimation? - private func updateAnimation() { - var animate = false - let timestamp = CACurrentMediaTime() - - if let animation = self.expandAnimation { - animation.applyAt(timestamp) - - if animation.completeAt(timestamp) { - self.expandAnimation = nil - } else { - animate = true - } - } - - if animate { - let animator: ConstantDisplayLinkAnimator - if let current = self.animator { - animator = current - } else { - animator = ConstantDisplayLinkAnimator(update: { [weak self] in - self?.updateAnimation() - }) - self.animator = animator - } - animator.isPaused = false - } else { - self.animator?.isPaused = true - } - } - private func updateMembers(muteState: GroupCallParticipantsContext.Participant.MuteState?, callMembers: ([GroupCallParticipantsContext.Participant], String?), invitedPeers: [Peer], speakingPeers: Set) { var disableAnimation = false if self.currentCallMembers?.1 != callMembers.1 { @@ -3590,14 +3901,13 @@ public final class VoiceChatController: ViewController { self.currentSpeakingPeers = speakingPeers self.currentInvitedPeers = invitedPeers - let previousEntries = self.currentEntries + var entries: [ListEntry] = [] - var index: Int32 = 0 - var processedPeerIds = Set() var canInvite = true + var inviteIsLink = false if let peer = self.peer as? TelegramChannel { if peer.flags.contains(.isGigagroup) || (peer.addressName?.isEmpty ?? true) { if peer.flags.contains(.isCreator) || peer.adminRights != nil { @@ -3605,9 +3915,13 @@ public final class VoiceChatController: ViewController { canInvite = false } } + if case .broadcast = peer.info, !(peer.addressName?.isEmpty ?? true) { + inviteIsLink = true + } } + if false, canInvite { - entries.append(.invite(self.presentationData.theme, self.presentationData.strings, self.presentationData.strings.VoiceChat_InviteMember)) + entries.append(.invite(self.presentationData.theme, self.presentationData.strings, inviteIsLink ? self.presentationData.strings.VoiceChat_Share : self.presentationData.strings.VoiceChat_InviteMember, inviteIsLink)) } for member in callMembers.0 { @@ -3702,6 +4016,11 @@ public final class VoiceChatController: ViewController { index += 1 } + guard self.didSetDataReady else { + return + } + + let previousEntries = self.currentEntries self.currentEntries = entries if previousEntries.count == entries.count { @@ -3725,7 +4044,7 @@ public final class VoiceChatController: ViewController { } else if abs(previousEntries.count - entries.count) > 10 { disableAnimation = true } - + let presentationData = self.presentationData.withUpdated(theme: self.darkTheme) let transition = preparedTransition(from: previousEntries, to: entries, isLoading: false, isEmpty: false, canInvite: canInvite, crossFade: false, animated: !disableAnimation, context: self.context, presentationData: presentationData, interaction: self.itemInteraction!, style: .list) self.enqueueTransition(transition) @@ -3735,15 +4054,19 @@ public final class VoiceChatController: ViewController { } override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { - if gestureRecognizer is DirectionalPanGestureRecognizer { + if gestureRecognizer is UILongPressGestureRecognizer { + return !self.isScheduling + } else if gestureRecognizer is DirectionalPanGestureRecognizer { if let (layout, _) = self.validLayout, layout.size.width > layout.size.height, case .compact = layout.metrics.widthClass { return false } if case .fullscreen = self.displayMode { return false } + let location = gestureRecognizer.location(in: self.bottomPanelNode.view) - if self.audioButton.frame.contains(location) || (!self.cameraButton.isHidden && self.cameraButton.frame.contains(location)) || self.leaveButton.frame.contains(location) { + let containerLocation = gestureRecognizer.location(in: self.contentContainer.view) + if self.audioButton.frame.contains(location) || (!self.cameraButton.isHidden && self.cameraButton.frame.contains(location)) || self.leaveButton.frame.contains(location) || self.pickerView?.frame.contains(containerLocation) == true { return false } } @@ -3762,11 +4085,15 @@ public final class VoiceChatController: ViewController { self.itemInteraction?.isExpanded = self.isExpanded } } + + private var animatingInsertion = false private var animatingExpansion = false + private var animatingAppearance = false private var panGestureArguments: (topInset: CGFloat, offset: CGFloat)? @objc func panGesture(_ recognizer: UIPanGestureRecognizer) { let contentOffset = self.listNode.visibleContentOffset() + let isScheduling = self.isScheduling || self.callState?.scheduleTimestamp != nil switch recognizer.state { case .began: let topInset: CGFloat @@ -3782,6 +4109,9 @@ public final class VoiceChatController: ViewController { self.controller?.dismissAllTooltips() case .changed: var translation = recognizer.translation(in: self.contentContainer.view).y + if isScheduling && translation < 0.0 { + return + } var topInset: CGFloat = 0.0 if let (currentTopInset, currentPanOffset) = self.panGestureArguments { topInset = currentTopInset @@ -3879,9 +4209,13 @@ public final class VoiceChatController: ViewController { self.panGestureArguments = nil var dismissing = false if bounds.minY < -60 || (bounds.minY < 0.0 && velocity.y > 300.0) { - self.controller?.dismiss(closing: false, manual: true) + if self.isScheduling { + self.dismissScheduled() + } else { + self.controller?.dismiss(closing: false, manual: true) + } dismissing = true - } else if velocity.y < -300.0 || offset < topInset / 2.0 { + } else if !isScheduling && (velocity.y < -300.0 || offset < topInset / 2.0) { if velocity.y > -1500.0 && !self.isFullscreen { DispatchQueue.main.async { self.listNode.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 }) @@ -3898,7 +4232,7 @@ public final class VoiceChatController: ViewController { self.updateFloatingHeaderOffset(offset: self.currentContentOffset ?? 0.0, transition: .animated(duration: 0.3, curve: .easeInOut), completion: { self.animatingExpansion = false }) - } else { + } else if !isScheduling { self.updateIsFullscreen(false) self.animatingExpansion = true self.listNode.scroller.setContentOffset(CGPoint(), animated: false) @@ -3972,6 +4306,25 @@ public final class VoiceChatController: ViewController { } } + private func openTitleEditing() { + let _ = (self.context.account.postbox.loadedPeerWithId(self.call.peerId) + |> deliverOnMainQueue).start(next: { [weak self] chatPeer in + guard let strongSelf = self else { + return + } + + let initialTitle = strongSelf.callState?.title ?? "" + let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: strongSelf.presentationData.strings.VoiceChat_EditTitleTitle, text: strongSelf.presentationData.strings.VoiceChat_EditTitleText, placeholder: chatPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), value: initialTitle, maxLength: 40, apply: { title in + if let strongSelf = self, let title = title, title != initialTitle { + strongSelf.call.updateTitle(title) + + strongSelf.presentUndoOverlay(content: .voiceChatFlag(text: title.isEmpty ? strongSelf.presentationData.strings.VoiceChat_EditTitleRemoveSuccess : strongSelf.presentationData.strings.VoiceChat_EditTitleSuccess(title).0), action: { _ in return false }) + } + }) + strongSelf.controller?.present(controller, in: .window(.root)) + }) + } + private func openAvatarForEditing(fromGallery: Bool = false, completion: @escaping () -> Void = {}) { guard let peerId = self.callState?.myPeerId else { return @@ -4045,7 +4398,7 @@ public final class VoiceChatController: ViewController { mixin.didFinishWithVideo = { [weak self] image, asset, adjustments in if let image = image, let asset = asset { completion() -// self?.updateProfileVideo(image, asset: asset, adjustments: adjustments) + self?.updateProfileVideo(image, asset: asset, adjustments: adjustments) } } mixin.didFinishWithDelete = { @@ -4053,55 +4406,32 @@ public final class VoiceChatController: ViewController { return } -// let proceed = { -// if let item = item { -// strongSelf.deleteAvatar(item, remove: false) -// } -// -// let _ = strongSelf.currentAvatarMixin.swap(nil) -// if let _ = peer.smallProfileImage { -// strongSelf.state = strongSelf.state.withUpdatingAvatar(nil) -// 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 -// } -// })) -// } -// -// let actionSheet = ActionSheetController(presentationData: presentationData) -// let items: [ActionSheetItem] = [ -// ActionSheetButtonItem(title: presentationData.strings.Settings_RemoveConfirmation, color: .destructive, action: { [weak actionSheet] in -// actionSheet?.dismissAnimated() -// proceed() -// }) -// ] -// -// actionSheet.setItemGroups([ -// ActionSheetItemGroup(items: items), -// ActionSheetItemGroup(items: [ -// ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in -// actionSheet?.dismissAnimated() -// }) -// ]) -// ]) -// strongSelf.controller?.present(actionSheet, in: .window(.root)) + let proceed = { + let _ = strongSelf.currentAvatarMixin.swap(nil) + 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: peerId, photo: nil, mapResourceToAvatarSizes: { resource, representations in + return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations) + }) + |> deliverOnMainQueue).start()) + } + + let actionSheet = ActionSheetController(presentationData: presentationData.withUpdated(theme: strongSelf.darkTheme)) + let items: [ActionSheetItem] = [ + ActionSheetButtonItem(title: presentationData.strings.Settings_RemoveConfirmation, color: .destructive, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + proceed() + }) + ] + + actionSheet.setItemGroups([ + ActionSheetItemGroup(items: items), + ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + }) + ]) + ]) + strongSelf.controller?.present(actionSheet, in: .window(.root)) } mixin.didDismiss = { [weak legacyController] in guard let strongSelf = self else { @@ -4153,6 +4483,125 @@ public final class VoiceChatController: ViewController { self.updateMembers(muteState: self.effectiveMuteState, callMembers: self.currentCallMembers ?? ([], nil), invitedPeers: self.currentInvitedPeers ?? [], speakingPeers: self.currentSpeakingPeers ?? Set()) } + + private func updateProfileVideo(_ image: UIImage, asset: Any?, adjustments: TGVideoEditAdjustments?) { + guard let data = image.jpegData(compressionQuality: 0.6), let peerId = self.callState?.myPeerId else { + return + } + + let photoResource = LocalFileMediaResource(fileId: arc4random64()) + self.context.account.postbox.mediaBox.storeResourceData(photoResource.id, data: data) + let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [], immediateThumbnailData: nil) + + self.currentUpdatingAvatar = representation + self.updateAvatarPromise.set(.single((representation, 0.0))) + + var videoStartTimestamp: Double? = nil + if let adjustments = adjustments, adjustments.videoStartValue > 0.0 { + videoStartTimestamp = adjustments.videoStartValue - adjustments.trimStartValue + } + + let account = self.context.account + let signal = Signal { [weak self] subscriber in + let entityRenderer: LegacyPaintEntityRenderer? = adjustments.flatMap { adjustments in + if let paintingData = adjustments.paintingData, paintingData.hasAnimation { + return LegacyPaintEntityRenderer(account: account, adjustments: adjustments) + } else { + return nil + } + } + let uploadInterface = LegacyLiveUploadInterface(account: account) + let signal: SSignal + if let asset = asset as? AVAsset { + signal = TGMediaVideoConverter.convert(asset, adjustments: adjustments, watcher: uploadInterface, entityRenderer: entityRenderer)! + } else if let url = asset as? URL, let data = try? Data(contentsOf: url, options: [.mappedRead]), let image = UIImage(data: data), let entityRenderer = entityRenderer { + let durationSignal: SSignal = SSignal(generator: { subscriber in + let disposable = (entityRenderer.duration()).start(next: { duration in + subscriber?.putNext(duration) + subscriber?.putCompletion() + }) + + return SBlockDisposable(block: { + disposable.dispose() + }) + }) + signal = durationSignal.map(toSignal: { duration -> SSignal? in + if let duration = duration as? Double { + return TGMediaVideoConverter.renderUIImage(image, duration: duration, adjustments: adjustments, watcher: nil, entityRenderer: entityRenderer)! + } else { + return SSignal.single(nil) + } + }) + + } else { + signal = SSignal.complete() + } + + let signalDisposable = signal.start(next: { next in + if let result = next as? TGMediaVideoConversionResult { + if let image = result.coverImage, let data = image.jpegData(compressionQuality: 0.7) { + account.postbox.mediaBox.storeResourceData(photoResource.id, data: data) + } + + if let timestamp = videoStartTimestamp { + videoStartTimestamp = max(0.0, min(timestamp, result.duration - 0.05)) + } + + var value = stat() + if stat(result.fileURL.path, &value) == 0 { + if let data = try? Data(contentsOf: result.fileURL) { + let resource: TelegramMediaResource + if let liveUploadData = result.liveUploadData as? LegacyLiveUploadInterfaceResult { + resource = LocalFileMediaResource(fileId: liveUploadData.id) + } else { + resource = LocalFileMediaResource(fileId: arc4random64()) + } + account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true) + subscriber.putNext(resource) + } + } + subscriber.putCompletion() + } else if let strongSelf = self, let progress = next as? NSNumber { + Queue.mainQueue().async { + strongSelf.updateAvatarPromise.set(.single((representation, Float(truncating: progress) * 0.25))) + } + } + }, error: { _ in + }, completed: nil) + + let disposable = ActionDisposable { + signalDisposable?.dispose() + } + + return ActionDisposable { + disposable.dispose() + } + } + + self.updateAvatarDisposable.set((signal + |> mapToSignal { videoResource -> Signal in + if peerId.namespace == Namespaces.Peer.CloudUser { + return updateAccountPhoto(account: account, resource: photoResource, videoResource: videoResource, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in + return mapResourceToAvatarSizes(postbox: account.postbox, resource: resource, representations: representations) + }) + } else { + return updatePeerPhoto(postbox: account.postbox, network: account.network, stateManager: account.stateManager, accountPeerId: account.peerId, peerId: peerId, photo: uploadedPeerPhoto(postbox: account.postbox, network: account.network, resource: photoResource), video: uploadedPeerVideo(postbox: account.postbox, network: account.network, messageMediaPreuploadManager: account.messageMediaPreuploadManager, resource: videoResource) |> map(Optional.init), videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in + return mapResourceToAvatarSizes(postbox: account.postbox, resource: resource, representations: representations) + }) + } + } + |> deliverOnMainQueue).start(next: { [weak self] result in + guard let strongSelf = self else { + return + } + switch result { + case .complete: + strongSelf.updateAvatarPromise.set(.single(nil)) + case let .progress(value): + strongSelf.updateAvatarPromise.set(.single((representation, 0.25 + value * 0.75))) + } + })) + } } private let sharedContext: SharedAccountContext @@ -4278,6 +4727,8 @@ public final class VoiceChatController: ViewController { let count = navigationController.viewControllers.count if count == 2 || navigationController.viewControllers[count - 2] is ChatController { if case .active(.cantSpeak) = self.controllerNode.actionButton.stateValue { + } else if case .button = self.controllerNode.actionButton.stateValue { + } else if case .scheduled = self.controllerNode.actionButton.stateValue { } else if let chatController = navigationController.viewControllers[count - 2] as? ChatController, chatController.isSendButtonVisible { } else if let tabBarController = navigationController.viewControllers[count - 2] as? TabBarController, let chatListController = tabBarController.controllers[tabBarController.selectedIndex] as? ChatListController, chatListController.isSearchActive { } else { diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift index 577f352ffb..e9af74911a 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift @@ -73,7 +73,7 @@ private final class VoiceChatInfoContextItemNode: ASDisplayNode, ContextMenuCust let standardIconWidth: CGFloat = 32.0 var rightTextInset: CGFloat = sideInset if !iconSize.width.isZero { - rightTextInset = max(iconSize.width, standardIconWidth) + iconSideInset + sideInset - 8.0 + rightTextInset = max(iconSize.width, standardIconWidth) + iconSideInset + sideInset - 12.0 } let textSize = self.textNode.updateLayout(CGSize(width: constrainedWidth - sideInset - rightTextInset, height: .greatestFiniteMagnitude)) diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift b/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift index b6086120ad..a0f81d690a 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift @@ -144,8 +144,8 @@ public final class VoiceChatJoinScreen: ViewController { } else if let cachedData = cachedData as? CachedGroupData { defaultJoinAsPeerId = cachedData.callJoinPeerId } - - let activeCall = CachedChannelData.ActiveCall(id: call.info.id, accessHash: call.info.accessHash, title: call.info.title) + + let activeCall = CachedChannelData.ActiveCall(id: call.info.id, accessHash: call.info.accessHash, title: call.info.title, scheduleTimestamp: call.info.scheduleTimestamp, subscribedToScheduled: call.info.subscribedToScheduled) if availablePeers.count > 0 && defaultJoinAsPeerId == nil { strongSelf.dismiss() strongSelf.join(activeCall) diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift index d97c234197..0edd0f7c02 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift @@ -158,12 +158,12 @@ final class VoiceChatMicrophoneNode: ASDisplayNode { context.setFillColor(parameters.color.cgColor) - var clearLineWidth: CGFloat = 4.0 + var clearLineWidth: CGFloat = 2.0 var lineWidth: CGFloat = 1.0 + UIScreenPixel if bounds.size.width > 36.0 { context.scaleBy(x: 2.0, y: 2.0) } else if bounds.size.width < 30.0 { - clearLineWidth = 3.0 + clearLineWidth = 2.0 lineWidth = 1.0 } @@ -207,18 +207,19 @@ final class VoiceChatMicrophoneNode: ASDisplayNode { } if parameters.reverse { - startPoint = CGPoint(x: origin.x + length * (1.0 - parameters.transition), y: origin.y + length * (1.0 - parameters.transition)) - endPoint = CGPoint(x: origin.x + length, y: origin.y + length) + startPoint = CGPoint(x: origin.x + length * (1.0 - parameters.transition), y: origin.y + length * (1.0 - parameters.transition)).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel) + endPoint = CGPoint(x: origin.x + length, y: origin.y + length).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel) } else { - startPoint = origin - endPoint = CGPoint(x: origin.x + length * parameters.transition, y: origin.y + length * parameters.transition) + startPoint = origin.offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel) + endPoint = CGPoint(x: origin.x + length * parameters.transition, y: origin.y + length * parameters.transition).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel) } + context.setBlendMode(.clear) context.setLineWidth(clearLineWidth) - context.move(to: startPoint) - context.addLine(to: endPoint) + context.move(to: startPoint.offsetBy(dx: 0.0, dy: 1.0 + UIScreenPixel)) + context.addLine(to: endPoint.offsetBy(dx: 0.0, dy: 1.0 + UIScreenPixel)) context.strokePath() context.setBlendMode(.normal) diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift index 73a578f66f..869dac20c9 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift @@ -169,7 +169,7 @@ public final class VoiceChatOverlayController: ViewController { if reclaim { self.dismissed = true - let targetPosition = CGPoint(x: layout.size.width / 2.0, y: layout.size.height - layout.intrinsicInsets.bottom - 205.0 / 2.0) + let targetPosition = CGPoint(x: layout.size.width / 2.0, y: layout.size.height - layout.intrinsicInsets.bottom - 205.0 / 2.0 - 2.0) if self.isSlidOffscreen { self.isSlidOffscreen = false self.isButtonHidden = true @@ -396,7 +396,7 @@ public final class VoiceChatOverlayController: ViewController { var slide = true var hidden = true var animated = true - var animateInsets = true + if controllers.count == 1 || controllers.last is ChatController { if let chatController = controllers.last as? ChatController { slide = false @@ -416,9 +416,13 @@ public final class VoiceChatOverlayController: ViewController { hidden = true } - if case .active(.cantSpeak) = state { - hidden = true + switch state { + case .active(.cantSpeak), .button, .scheduled: + hidden = true + default: + break } + if hasVoiceChatController { hidden = false animated = self.initiallyHidden @@ -429,7 +433,6 @@ public final class VoiceChatOverlayController: ViewController { let previousInsets = self.additionalSideInsets self.additionalSideInsets = hidden ? UIEdgeInsets() : UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 75.0) - if previousInsets != self.additionalSideInsets { self.parentNavigationController?.requestLayout(transition: .animated(duration: 0.3, curve: .easeInOut)) } diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift index 08a584e141..014224cc82 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift @@ -216,6 +216,8 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode { return self.layoutParams?.0 } + private var currentTitle: String? + init() { self.topStripeNode = ASDisplayNode() self.topStripeNode.isLayerBacked = true @@ -628,9 +630,11 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode { var currentDisabledOverlayNode = self.disabledOverlayNode let currentItem = self.layoutParams?.0 + let currentTitle = self.currentTitle return { item, params, first, last in var updatedTheme: PresentationTheme? + var updatedName = false if currentItem?.presentationData.theme !== item.presentationData.theme { updatedTheme = item.presentationData.theme } @@ -647,6 +651,7 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode { let titleColor = item.presentationData.theme.list.itemPrimaryTextColor let currentBoldFont: UIFont = titleFont + var updatedTitle = false if let user = item.peer as? TelegramUser { if let firstName = user.firstName, let lastName = user.lastName, !firstName.isEmpty, !lastName.isEmpty { if item.style == .tile { @@ -684,6 +689,9 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode { } else if let channel = item.peer as? TelegramChannel { titleAttributedString = NSAttributedString(string: channel.title, font: currentBoldFont, textColor: titleColor) } + if let currentTitle = currentTitle, currentTitle != titleAttributedString?.string { + updatedTitle = true + } var wavesColor = UIColor(rgb: 0x34c759) switch item.text { @@ -848,6 +856,7 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode { return (layout, { [weak self] synchronousLoad, animated in if let strongSelf = self { strongSelf.layoutParams = (item, params, first, last) + strongSelf.currentTitle = titleAttributedString?.string strongSelf.wavesColor = wavesColor @@ -957,6 +966,16 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode { strongSelf.disabledOverlayNode = nil } + if updatedTitle, let snapshotView = strongSelf.titleNode.view.snapshotContentTree() { + strongSelf.titleNode.view.superview?.insertSubview(snapshotView, aboveSubview: strongSelf.titleNode.view) + + snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in + snapshotView?.removeFromSuperview() + }) + + strongSelf.titleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } + if let animateStatusTransitionFromUp = animateStatusTransitionFromUp, !strongSelf.contextSourceNode.isExtractedToContextPreview { let offset: CGFloat = animateStatusTransitionFromUp ? -7.0 : 7.0 if let snapshotView = strongSelf.statusNode.view.snapshotContentTree() { diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTimerNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTimerNode.swift new file mode 100644 index 0000000000..4116e0d802 --- /dev/null +++ b/submodules/TelegramCallsUI/Sources/VoiceChatTimerNode.swift @@ -0,0 +1,182 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import SwiftSignalKit +import TelegramPresentationData +import TelegramStringFormatting + +private let purple = UIColor(rgb: 0x3252ef) +private let pink = UIColor(rgb: 0xef436c) + +private let latePurple = UIColor(rgb: 0x974aa9) +private let latePink = UIColor(rgb: 0xf0436c) + +final class VoiceChatTimerNode: ASDisplayNode { + private let strings: PresentationStrings + private let dateTimeFormat: PresentationDateTimeFormat + + private let titleNode: ImmediateTextNode + private let subtitleNode: ImmediateTextNode + + private let timerNode: ImmediateTextNode + + private let foregroundView = UIView() + private let foregroundGradientLayer = CAGradientLayer() + private let maskView = UIView() + + private var validLayout: CGSize? + + private var updateTimer: SwiftSignalKit.Timer? + + private let hierarchyTrackingNode: HierarchyTrackingNode + private var isCurrentlyInHierarchy = false + + private var isLate = false + + init(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat) { + self.strings = strings + self.dateTimeFormat = dateTimeFormat + + var updateInHierarchy: ((Bool) -> Void)? + self.hierarchyTrackingNode = HierarchyTrackingNode({ value in + updateInHierarchy?(value) + }) + + self.titleNode = ImmediateTextNode() + self.subtitleNode = ImmediateTextNode() + + self.timerNode = ImmediateTextNode() + + super.init() + + self.addSubnode(self.hierarchyTrackingNode) + + self.allowsGroupOpacity = true + self.isUserInteractionEnabled = false + + self.foregroundGradientLayer.type = .radial + self.foregroundGradientLayer.colors = [pink.cgColor, purple.cgColor, purple.cgColor] + self.foregroundGradientLayer.locations = [0.0, 0.85, 1.0] + self.foregroundGradientLayer.startPoint = CGPoint(x: 1.0, y: 0.0) + self.foregroundGradientLayer.endPoint = CGPoint(x: 0.0, y: 1.0) + + self.foregroundView.mask = self.maskView + self.foregroundView.layer.addSublayer(self.foregroundGradientLayer) + + self.view.addSubview(self.foregroundView) + self.addSubnode(self.titleNode) + self.addSubnode(self.subtitleNode) + + self.maskView.addSubnode(self.timerNode) + + updateInHierarchy = { [weak self] value in + if let strongSelf = self { + strongSelf.isCurrentlyInHierarchy = value + strongSelf.updateAnimations() + } + } + } + + deinit { + self.updateTimer?.invalidate() + } + + func animateIn() { + self.foregroundView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.6, damping: 100.0) + } + + private func updateAnimations() { + if self.isInHierarchy { + self.setupGradientAnimations() + } else { + self.foregroundGradientLayer.removeAllAnimations() + } + } + + private func setupGradientAnimations() { + if let _ = self.foregroundGradientLayer.animation(forKey: "movement") { + } else { + let previousValue = self.foregroundGradientLayer.startPoint + let newValue = CGPoint(x: CGFloat.random(in: 0.65 ..< 0.85), y: CGFloat.random(in: 0.1 ..< 0.45)) + self.foregroundGradientLayer.startPoint = newValue + + CATransaction.begin() + + let animation = CABasicAnimation(keyPath: "startPoint") + animation.duration = Double.random(in: 0.8 ..< 1.4) + animation.fromValue = previousValue + animation.toValue = newValue + + CATransaction.setCompletionBlock { [weak self] in + if let isCurrentlyInHierarchy = self?.isCurrentlyInHierarchy, isCurrentlyInHierarchy { + self?.setupGradientAnimations() + } + } + + self.foregroundGradientLayer.add(animation, forKey: "movement") + CATransaction.commit() + } + } + + func update(size: CGSize, scheduleTime: Int32?, transition: ContainedViewLayoutTransition) { + if self.validLayout == nil { + self.updateAnimations() + } + self.validLayout = size + + guard let scheduleTime = scheduleTime else { + return + } + + self.foregroundView.frame = CGRect(origin: CGPoint(), size: size) + self.foregroundGradientLayer.frame = self.foregroundView.bounds + self.maskView.frame = self.foregroundView.bounds + + let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970) + let elapsedTime = scheduleTime - currentTime + let timerText: String + if elapsedTime >= 86400 { + timerText = scheduledTimeIntervalString(strings: self.strings, value: elapsedTime) + } else { + timerText = textForTimeout(value: abs(elapsedTime)) + if elapsedTime < 0 && !self.isLate { + self.isLate = true + self.foregroundGradientLayer.colors = [latePink.cgColor, latePurple.cgColor, latePurple.cgColor] + } + } + + if self.updateTimer == nil { + let timer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in + if let strongSelf = self, let size = strongSelf.validLayout { + strongSelf.update(size: size, scheduleTime: scheduleTime, transition: .immediate) + } + }, queue: Queue.mainQueue()) + self.updateTimer = timer + timer.start() + } + + let subtitle = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: scheduleTime, alwaysShowTime: true) + + self.titleNode.attributedText = NSAttributedString(string: elapsedTime < 0 ? self.strings.VoiceChat_LateBy : self.strings.VoiceChat_StartsIn, font: Font.with(size: 23.0, design: .round, weight: .semibold, traits: []), textColor: .white) + let titleSize = self.titleNode.updateLayout(size) + self.titleNode.frame = CGRect(x: floor((size.width - titleSize.width) / 2.0), y: 48.0, width: titleSize.width, height: titleSize.height) + + + self.timerNode.attributedText = NSAttributedString(string: timerText, font: Font.with(size: 68.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: .white) + + var timerSize = self.timerNode.updateLayout(CGSize(width: size.width + 100.0, height: size.height)) + if timerSize.width > size.width - 32.0 { + self.timerNode.attributedText = NSAttributedString(string: timerText, font: Font.with(size: 60.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: .white) + timerSize = self.timerNode.updateLayout(CGSize(width: size.width + 100.0, height: size.height)) + } + + self.timerNode.frame = CGRect(x: floor((size.width - timerSize.width) / 2.0), y: 78.0, width: timerSize.width, height: timerSize.height) + + self.subtitleNode.attributedText = NSAttributedString(string: subtitle, font: Font.with(size: 21.0, design: .round, weight: .semibold, traits: []), textColor: .white) + let subtitleSize = self.subtitleNode.updateLayout(size) + self.subtitleNode.frame = CGRect(x: floor((size.width - subtitleSize.width) / 2.0), y: 164.0, width: subtitleSize.width, height: subtitleSize.height) + + self.foregroundView.frame = CGRect(origin: CGPoint(), size: size) + } +} diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift index dc6b2e2254..0f4f27e534 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift @@ -47,7 +47,7 @@ private final class VoiceChatTitleEditInputFieldNode: ASDisplayNode, ASEditableT private let maxLength: Int - init(theme: PresentationTheme, placeholder: String, maxLength: Int) { + init(theme: PresentationTheme, placeholder: String, maxLength: Int, returnKeyType: UIReturnKeyType = .done) { self.theme = theme self.maxLength = maxLength @@ -65,7 +65,7 @@ private final class VoiceChatTitleEditInputFieldNode: ASDisplayNode, ASEditableT self.textInputNode.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance self.textInputNode.keyboardType = .default self.textInputNode.autocapitalizationType = .sentences - self.textInputNode.returnKeyType = .done + self.textInputNode.returnKeyType = returnKeyType self.textInputNode.autocorrectionType = .default self.textInputNode.tintColor = theme.actionSheet.controlAccentColor @@ -510,7 +510,7 @@ private final class VoiceChatUserNameEditAlertContentNode: AlertContentNode { self.titleNode = ASTextNode() self.titleNode.maximumNumberOfLines = 2 - self.firstNameInputFieldNode = VoiceChatTitleEditInputFieldNode(theme: ptheme, placeholder: firstNamePlaceholder, maxLength: maxLength) + self.firstNameInputFieldNode = VoiceChatTitleEditInputFieldNode(theme: ptheme, placeholder: firstNamePlaceholder, maxLength: maxLength, returnKeyType: .next) self.firstNameInputFieldNode.text = firstNameValue ?? "" self.lastNameInputFieldNode = VoiceChatTitleEditInputFieldNode(theme: ptheme, placeholder: lastNamePlaceholder, maxLength: maxLength) @@ -550,15 +550,11 @@ private final class VoiceChatUserNameEditAlertContentNode: AlertContentNode { self.addSubnode(separatorNode) } - self.firstNameInputFieldNode.updateHeight = { [weak self] in - if let strongSelf = self { - if let _ = strongSelf.validLayout { - strongSelf.requestLayout?(.animated(duration: 0.15, curve: .spring)) - } - } - } - self.updateTheme(theme) + + self.firstNameInputFieldNode.complete = { [weak self] in + self?.lastNameInputFieldNode.activateInput() + } } deinit { @@ -710,7 +706,7 @@ private final class VoiceChatUserNameEditAlertContentNode: AlertContentNode { } } -func voiceChatUserNameController(sharedContext: SharedAccountContext, account: Account, forceTheme: PresentationTheme?, title: String, firstNamePlaceholder: String, lastNamePlaceholder: String, doneButtonTitle: String? = nil, firstName: String?, lastName: String?, maxLength: Int, apply: @escaping (String, String) -> Void) -> AlertController { +func voiceChatUserNameController(sharedContext: SharedAccountContext, account: Account, forceTheme: PresentationTheme?, title: String, firstNamePlaceholder: String, lastNamePlaceholder: String, doneButtonTitle: String? = nil, firstName: String?, lastName: String?, maxLength: Int, apply: @escaping ((String, String)?) -> Void) -> AlertController { var presentationData = sharedContext.currentPresentationData.with { $0 } if let forceTheme = forceTheme { presentationData = presentationData.withUpdated(theme: forceTheme) @@ -733,14 +729,24 @@ func voiceChatUserNameController(sharedContext: SharedAccountContext, account: A guard let contentNode = contentNode else { return } - dismissImpl?(true) let previousFirstName = firstName ?? "" - let previousLastName = firstName ?? "" - + let previousLastName = lastName ?? "" let newFirstName = contentNode.firstName.trimmingCharacters(in: .whitespacesAndNewlines) let newLastName = contentNode.lastName.trimmingCharacters(in: .whitespacesAndNewlines) - apply(newFirstName, newLastName) + + if newFirstName.isEmpty { + contentNode.animateError() + return + } + + dismissImpl?(true) + + if previousFirstName != newFirstName || previousLastName != newLastName { + apply((newFirstName, newLastName)) + } else { + apply(nil) + } } let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: contentNode) diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTitleNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTitleNode.swift new file mode 100644 index 0000000000..853a0128e5 --- /dev/null +++ b/submodules/TelegramCallsUI/Sources/VoiceChatTitleNode.swift @@ -0,0 +1,111 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Display +import TelegramPresentationData + +final class VoiceChatTitleNode: ASDisplayNode { + private var theme: PresentationTheme + + private let titleNode: ASTextNode + private let infoNode: ASTextNode + let recordingIconNode: VoiceChatRecordingIconNode + + public var isRecording: Bool = false { + didSet { + self.recordingIconNode.isHidden = !self.isRecording + } + } + + var tapped: (() -> Void)? + + init(theme: PresentationTheme) { + self.theme = theme + + self.titleNode = ASTextNode() + self.titleNode.displaysAsynchronously = false + self.titleNode.maximumNumberOfLines = 1 + self.titleNode.truncationMode = .byTruncatingTail + self.titleNode.isOpaque = false + + self.infoNode = ASTextNode() + self.infoNode.displaysAsynchronously = false + self.infoNode.maximumNumberOfLines = 1 + self.infoNode.truncationMode = .byTruncatingTail + self.infoNode.isOpaque = false + + self.recordingIconNode = VoiceChatRecordingIconNode(hasBackground: false) + + super.init() + + self.addSubnode(self.titleNode) + self.addSubnode(self.infoNode) + self.addSubnode(self.recordingIconNode) + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func didLoad() { + super.didLoad() + + self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tap))) + } + + override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { + if point.y > 0.0 && point.y < self.frame.size.height && point.x > min(self.titleNode.frame.minX, self.infoNode.frame.minX) && point.x < max(self.recordingIconNode.frame.maxX, self.infoNode.frame.maxX) { + return true + } else { + return false + } + } + + @objc private func tap() { + self.tapped?() + } + + func update(size: CGSize, title: String, subtitle: String, slide: Bool, transition: ContainedViewLayoutTransition) { + var titleUpdated = false + if let previousTitle = self.titleNode.attributedText?.string { + titleUpdated = previousTitle != title + } + + if titleUpdated, let snapshotView = self.titleNode.view.snapshotContentTree() { + snapshotView.frame = self.titleNode.frame + self.view.addSubview(snapshotView) + + snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in + snapshotView?.removeFromSuperview() + }) + + self.titleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + + if slide { + self.infoNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + let offset: CGFloat = 16.0 + snapshotView.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: -offset), duration: 0.2, removeOnCompletion: false, additive: true) + self.titleNode.layer.animatePosition(from: CGPoint(x: 0.0, y: offset), to: CGPoint(), duration: 0.2, additive: true) + self.infoNode.layer.animatePosition(from: CGPoint(x: 0.0, y: offset), to: CGPoint(), duration: 0.2, additive: true) + } + } + + self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(17.0), textColor: UIColor(rgb: 0xffffff)) + self.infoNode.attributedText = NSAttributedString(string: subtitle, font: Font.regular(13.0), textColor: UIColor(rgb: 0xffffff, alpha: 0.5)) + + let constrainedSize = CGSize(width: size.width - 140.0, height: size.height) + let titleSize = self.titleNode.measure(constrainedSize) + let infoSize = self.infoNode.measure(constrainedSize) + let titleInfoSpacing: CGFloat = 0.0 + + let combinedHeight = titleSize.height + infoSize.height + titleInfoSpacing + + let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0)), size: titleSize) + self.titleNode.frame = titleFrame + self.infoNode.frame = CGRect(origin: CGPoint(x: floor((size.width - infoSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0) + titleSize.height + titleInfoSpacing), size: infoSize) + + let iconSide = 16.0 + (1.0 + UIScreenPixel) * 2.0 + let iconSize: CGSize = CGSize(width: iconSide, height: iconSide) + self.recordingIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX + 1.0, y: titleFrame.minY + 1.0), size: iconSize) + } +} diff --git a/submodules/TelegramCore/Sources/BotPaymentForm.swift b/submodules/TelegramCore/Sources/BotPaymentForm.swift index 772fbe852a..df130abd8f 100644 --- a/submodules/TelegramCore/Sources/BotPaymentForm.swift +++ b/submodules/TelegramCore/Sources/BotPaymentForm.swift @@ -38,9 +38,8 @@ public struct BotPaymentPrice : Equatable { public struct BotPaymentInvoice : Equatable { public struct Tip: Equatable { - public var min: Int64 public var max: Int64 - public var `default`: Int64 + public var suggested: [Int64] } public let isTest: Bool @@ -107,6 +106,7 @@ public struct BotPaymentForm : Equatable { public let canSaveCredentials: Bool public let passwordMissing: Bool public let invoice: BotPaymentInvoice + public let paymentBotId: PeerId public let providerId: PeerId public let url: String public let nativeProvider: BotPaymentNativeProvider? @@ -145,9 +145,9 @@ extension BotPaymentInvoice { fields.insert(.emailAvailableToProvider) } var parsedTip: BotPaymentInvoice.Tip? -// if let minTipAmount = minTipAmount, let maxTipAmount = maxTipAmount, let defaultTipAmount = defaultTipAmount { -// parsedTip = BotPaymentInvoice.Tip(min: minTipAmount, max: maxTipAmount, default: defaultTipAmount) -// } + if let maxTipAmount = maxTipAmount, let suggestedTipAmounts = suggestedTipAmounts { + parsedTip = BotPaymentInvoice.Tip(max: maxTipAmount, suggested: suggestedTipAmounts) + } self.init(isTest: (flags & (1 << 0)) != 0, requestedFields: fields, currency: currency, prices: prices.map { switch $0 { case let .labeledPrice(label, amount): @@ -174,7 +174,7 @@ extension BotPaymentRequestedInfo { } } -public func fetchBotPaymentForm(postbox: Postbox, network: Network, messageId: MessageId) -> Signal { +public func fetchBotPaymentForm(postbox: Postbox, network: Network, messageId: MessageId, themeParams: [String: Any]?) -> Signal { return postbox.transaction { transaction -> Api.InputPeer? in return transaction.getPeer(messageId.peerId).flatMap(apiInputPeer) } @@ -183,14 +183,23 @@ public func fetchBotPaymentForm(postbox: Postbox, network: Network, messageId: M guard let inputPeer = inputPeer else { return .fail(.generic) } - return network.request(Api.functions.payments.getPaymentForm(flags: 0, peer: inputPeer, msgId: messageId.id, themeParams: nil)) + var flags: Int32 = 0 + var serializedThemeParams: Api.DataJSON? + if let themeParams = themeParams, let data = try? JSONSerialization.data(withJSONObject: themeParams, options: []), let dataString = String(data: data, encoding: .utf8) { + serializedThemeParams = Api.DataJSON.dataJSON(data: dataString) + } + if serializedThemeParams != nil { + flags |= 1 << 0 + } + + return network.request(Api.functions.payments.getPaymentForm(flags: flags, peer: inputPeer, msgId: messageId.id, themeParams: serializedThemeParams)) |> `catch` { _ -> Signal in return .fail(.generic) } |> mapToSignal { result -> Signal in return postbox.transaction { transaction -> BotPaymentForm in switch result { - case let .paymentForm(flags, id, _, invoice, providerId, url, nativeProvider, nativeParams, savedInfo, savedCredentials, apiUsers): + case let .paymentForm(flags, id, botId, invoice, providerId, url, nativeProvider, nativeParams, savedInfo, savedCredentials, apiUsers): var peers: [Peer] = [] for user in apiUsers { let parsed = TelegramUser(user: user) @@ -216,7 +225,7 @@ public func fetchBotPaymentForm(postbox: Postbox, network: Network, messageId: M parsedSavedCredentials = .card(id: id, title: title) } } - return BotPaymentForm(id: id, canSaveCredentials: (flags & (1 << 2)) != 0, passwordMissing: (flags & (1 << 3)) != 0, invoice: parsedInvoice, providerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(providerId)), url: url, nativeProvider: parsedNativeProvider, savedInfo: parsedSavedInfo, savedCredentials: parsedSavedCredentials) + return BotPaymentForm(id: id, canSaveCredentials: (flags & (1 << 2)) != 0, passwordMissing: (flags & (1 << 3)) != 0, invoice: parsedInvoice, paymentBotId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId)), providerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(providerId)), url: url, nativeProvider: parsedNativeProvider, savedInfo: parsedSavedInfo, savedCredentials: parsedSavedCredentials) } } |> mapError { _ -> BotPaymentFormRequestError in } @@ -334,7 +343,7 @@ public enum SendBotPaymentFormError { } public enum SendBotPaymentResult { - case done + case done(receiptMessageId: MessageId?) case externalVerificationRequired(url: String) } @@ -376,7 +385,27 @@ public func sendBotPaymentForm(account: Account, messageId: MessageId, formId: I switch result { case let .paymentResult(updates): account.stateManager.addUpdates(updates) - return .done + var receiptMessageId: MessageId? + for apiMessage in updates.messages { + if let message = StoreMessage(apiMessage: apiMessage) { + for media in message.media { + if let action = media as? TelegramMediaAction { + if case .paymentSent = action.action { + for attribute in message.attributes { + if let reply = attribute as? ReplyMessageAttribute { + if reply.messageId == messageId { + if case let .Id(id) = message.id { + receiptMessageId = id + } + } + } + } + } + } + } + } + } + return .done(receiptMessageId: receiptMessageId) case let .paymentVerificationNeeded(url): return .externalVerificationRequired(url: url) } @@ -399,6 +428,33 @@ public struct BotPaymentReceipt : Equatable { public let info: BotPaymentRequestedInfo? public let shippingOption: BotPaymentShippingOption? public let credentialsTitle: String + public let invoiceMedia: TelegramMediaInvoice + public let tipAmount: Int64? + public let botPaymentId: PeerId + public static func ==(lhs: BotPaymentReceipt, rhs: BotPaymentReceipt) -> Bool { + if lhs.invoice != rhs.invoice { + return false + } + if lhs.info != rhs.info { + return false + } + if lhs.shippingOption != rhs.shippingOption { + return false + } + if lhs.credentialsTitle != rhs.credentialsTitle { + return false + } + if !lhs.invoiceMedia.isEqual(to: rhs.invoiceMedia) { + return false + } + if lhs.tipAmount != rhs.tipAmount { + return false + } + if lhs.botPaymentId != rhs.botPaymentId { + return false + } + return true + } } public enum RequestBotPaymentReceiptError { @@ -419,14 +475,57 @@ public func requestBotPaymentReceipt(account: Account, messageId: MessageId) -> |> mapError { _ -> RequestBotPaymentReceiptError in return .generic } - |> map { result -> BotPaymentReceipt in - switch result { - case let .paymentReceipt(flags, date, botId, providerId, title, description, photo, invoice, info, shipping, tipAmount, currency, totalAmount, credentialsTitle, users): - let parsedInvoice = BotPaymentInvoice(apiInvoice: invoice) - let parsedInfo = info.flatMap(BotPaymentRequestedInfo.init) - let shippingOption = shipping.flatMap(BotPaymentShippingOption.init) - return BotPaymentReceipt(invoice: parsedInvoice, info: parsedInfo, shippingOption: shippingOption, credentialsTitle: credentialsTitle) + |> mapToSignal { result -> Signal in + return account.postbox.transaction { transaction -> BotPaymentReceipt in + switch result { + case let .paymentReceipt(flags, date, botId, providerId, title, description, photo, invoice, info, shipping, tipAmount, currency, totalAmount, credentialsTitle, users): + var peers: [Peer] = [] + for user in users { + peers.append(TelegramUser(user: user)) + } + updatePeers(transaction: transaction, peers: peers, update: { _, updated in return updated }) + + let parsedInvoice = BotPaymentInvoice(apiInvoice: invoice) + let parsedInfo = info.flatMap(BotPaymentRequestedInfo.init) + let shippingOption = shipping.flatMap(BotPaymentShippingOption.init) + + /*let fields = BotPaymentInvoiceFields() + + let form = BotPaymentForm( + id: 0, + canSaveCredentials: false, + passwordMissing: false, + invoice: BotPaymentInvoice( + isTest: false, + requestedFields: fields, + currency: currency, + prices: [], + tip: nil + ), + providerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(providerId)), + url: "", + nativeProvider: nil, + savedInfo: nil, + savedCredentials: nil + )*/ + + let invoiceMedia = TelegramMediaInvoice( + title: title, + description: description, + photo: photo.flatMap(TelegramMediaWebFile.init), + receiptMessageId: nil, + currency: currency, + totalAmount: totalAmount, + startParam: "", + flags: [] + ) + + let botPaymentId = PeerId.init(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId)) + + return BotPaymentReceipt(invoice: parsedInvoice, info: parsedInfo, shippingOption: shippingOption, credentialsTitle: credentialsTitle, invoiceMedia: invoiceMedia, tipAmount: tipAmount, botPaymentId: botPaymentId) + } } + |> castError(RequestBotPaymentReceiptError.self) } } } diff --git a/submodules/TelegramCore/Sources/CallSessionManager.swift b/submodules/TelegramCore/Sources/CallSessionManager.swift index e4d8ff16a0..7ac37066ab 100644 --- a/submodules/TelegramCore/Sources/CallSessionManager.swift +++ b/submodules/TelegramCore/Sources/CallSessionManager.swift @@ -894,7 +894,7 @@ private final class CallSessionManagerContext { let randomStatus = SecRandomCopyBytes(nil, 256, aBytes.assumingMemoryBound(to: UInt8.self)) let a = Data(bytesNoCopy: aBytes, count: 256, deallocator: .free) if randomStatus == 0 { - self.contexts[internalId] = CallSessionContext(peerId: peerId, isOutgoing: true, type: isVideo ? .video : .audio, isVideoPossible: enableVideo || isVideo, state: .requesting(a: a, disposable: (requestCallSession(postbox: self.postbox, network: self.network, peerId: peerId, a: a, maxLayer: self.maxLayer, versions: self.filteredVersions(enableVideo: enableVideo), isVideo: isVideo) |> deliverOn(queue)).start(next: { [weak self] result in + self.contexts[internalId] = CallSessionContext(peerId: peerId, isOutgoing: true, type: isVideo ? .video : .audio, isVideoPossible: enableVideo || isVideo, state: .requesting(a: a, disposable: (requestCallSession(postbox: self.postbox, network: self.network, peerId: peerId, a: a, maxLayer: self.maxLayer, versions: self.filteredVersions(enableVideo: true), isVideo: isVideo) |> deliverOn(queue)).start(next: { [weak self] result in if let strongSelf = self, let context = strongSelf.contexts[internalId] { if case .requesting = context.state { switch result { diff --git a/submodules/TelegramCore/Sources/ChangeAccountPhoneNumber.swift b/submodules/TelegramCore/Sources/ChangeAccountPhoneNumber.swift index b4fcc97cd6..73fb23a566 100644 --- a/submodules/TelegramCore/Sources/ChangeAccountPhoneNumber.swift +++ b/submodules/TelegramCore/Sources/ChangeAccountPhoneNumber.swift @@ -33,6 +33,7 @@ public enum RequestChangeAccountPhoneNumberVerificationError { case invalidPhoneNumber case limitExceeded case phoneNumberOccupied + case phoneBanned case generic } @@ -45,6 +46,8 @@ public func requestChangeAccountPhoneNumberVerification(account: Account, phoneN return .invalidPhoneNumber } else if error.errorDescription == "PHONE_NUMBER_OCCUPIED" { return .phoneNumberOccupied + } else if error.errorDescription == "PHONE_NUMBER_BANNED" { + return .phoneBanned } else { return .generic } diff --git a/submodules/TelegramCore/Sources/GroupCalls.swift b/submodules/TelegramCore/Sources/GroupCalls.swift index 93374cf163..7d33fcefbc 100644 --- a/submodules/TelegramCore/Sources/GroupCalls.swift +++ b/submodules/TelegramCore/Sources/GroupCalls.swift @@ -11,8 +11,11 @@ public struct GroupCallInfo: Equatable { public var clientParams: String? public var streamDcId: Int32? public var title: String? + public var scheduleTimestamp: Int32? + public var subscribedToScheduled: Bool public var recordingStartTimestamp: Int32? public var sortAscending: Bool + public var defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted? public init( id: Int64, @@ -21,8 +24,11 @@ public struct GroupCallInfo: Equatable { clientParams: String?, streamDcId: Int32?, title: String?, + scheduleTimestamp: Int32?, + subscribedToScheduled: Bool, recordingStartTimestamp: Int32?, - sortAscending: Bool + sortAscending: Bool, + defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted? ) { self.id = id self.accessHash = accessHash @@ -30,8 +36,11 @@ public struct GroupCallInfo: Equatable { self.clientParams = clientParams self.streamDcId = streamDcId self.title = title + self.scheduleTimestamp = scheduleTimestamp + self.subscribedToScheduled = subscribedToScheduled self.recordingStartTimestamp = recordingStartTimestamp self.sortAscending = sortAscending + self.defaultParticipantsAreMuted = defaultParticipantsAreMuted } } @@ -58,8 +67,11 @@ extension GroupCallInfo { clientParams: clientParams, streamDcId: streamDcId, title: title, + scheduleTimestamp: scheduleDate, + subscribedToScheduled: (flags & (1 << 8)) != 0, recordingStartTimestamp: recordStartDate, - sortAscending: (flags & (1 << 6)) != 0 + sortAscending: (flags & (1 << 6)) != 0, + defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: (flags & (1 << 1)) != 0, canChange: (flags & (1 << 2)) != 0) ) case .groupCallDiscarded: return nil @@ -71,7 +83,7 @@ public enum GetCurrentGroupCallError { case generic } -public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int64) -> Signal { +public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int64, peerId: PeerId? = nil) -> Signal { return account.network.request(Api.functions.phone.getGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash))) |> mapError { _ -> GetCurrentGroupCallError in return .generic @@ -100,6 +112,17 @@ public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int peers.append(peer) } } + if let peerId = peerId { + transaction.updatePeerCachedData(peerIds: [peerId], update: { _, current in + if let cachedData = current as? CachedChannelData { + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall.init(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: cachedData.activeCall?.subscribedToScheduled ?? false)) + } else if let cachedData = current as? CachedGroupData { + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: cachedData.activeCall?.subscribedToScheduled ?? false)) + } else { + return current + } + }) + } updatePeers(transaction: transaction, peers: peers, update: { _, updated -> Peer in return updated @@ -164,9 +187,10 @@ public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int public enum CreateGroupCallError { case generic case anonymousNotAllowed + case scheduledTooLate } -public func createGroupCall(account: Account, peerId: PeerId) -> Signal { +public func createGroupCall(account: Account, peerId: PeerId, title: String?, scheduleDate: Int32?) -> Signal { return account.postbox.transaction { transaction -> Api.InputPeer? in let callPeer = transaction.getPeer(peerId).flatMap(apiInputPeer) return callPeer @@ -176,11 +200,19 @@ public func createGroupCall(account: Account, peerId: PeerId) -> Signal mapError { error -> CreateGroupCallError in if error.errorDescription == "ANONYMOUS_CALLS_DISABLED" { return .anonymousNotAllowed + } else if error.errorDescription == "SCHEDULE_DATE_TOO_LATE" { + return .scheduledTooLate } return .generic } @@ -203,9 +235,9 @@ public func createGroupCall(account: Account, peerId: PeerId) -> Signal GroupCallInfo in transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in if let cachedData = cachedData as? CachedChannelData { - return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title)) + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled)) } else if let cachedData = cachedData as? CachedGroupData { - return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title)) + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled)) } else { return cachedData } @@ -220,24 +252,149 @@ public func createGroupCall(account: Account, peerId: PeerId) -> Signal Signal { + return account.network.request(Api.functions.phone.startScheduledGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash))) + |> mapError { error -> StartScheduledGroupCallError in + return .generic + } + |> mapToSignal { result -> Signal in + var parsedCall: GroupCallInfo? + loop: for update in result.allUpdates { + switch update { + case let .updateGroupCall(_, call): + parsedCall = GroupCallInfo(call) + break loop + default: + break + } + } + + guard let callInfo = parsedCall else { + return .fail(.generic) + } + + return account.postbox.transaction { transaction -> GroupCallInfo in + transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in + if let cachedData = cachedData as? CachedChannelData { + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: nil, subscribedToScheduled: false)) + } else if let cachedData = cachedData as? CachedGroupData { + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: nil, subscribedToScheduled: false)) + } else { + return cachedData + } + }) + + account.stateManager.addUpdates(result) + + return callInfo + } + |> castError(StartScheduledGroupCallError.self) + } +} + +public enum ToggleScheduledGroupCallSubscriptionError { + case generic +} + +public func toggleScheduledGroupCallSubscription(account: Account, peerId: PeerId, callId: Int64, accessHash: Int64, subscribe: Bool) -> Signal { + return account.network.request(Api.functions.phone.toggleGroupCallStartSubscription(call: .inputGroupCall(id: callId, accessHash: accessHash), subscribed: subscribe ? .boolTrue : .boolFalse)) + |> mapError { error -> ToggleScheduledGroupCallSubscriptionError in + return .generic + } + |> mapToSignal { result -> Signal in + var parsedCall: GroupCallInfo? + loop: for update in result.allUpdates { + switch update { + case let .updateGroupCall(_, call): + parsedCall = GroupCallInfo(call) + break loop + default: + break + } + } + + guard let callInfo = parsedCall else { + return .fail(.generic) + } + + return account.postbox.transaction { transaction in + transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in + if let cachedData = cachedData as? CachedChannelData { + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled)) + } else if let cachedData = cachedData as? CachedGroupData { + return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled)) + } else { + return cachedData + } + }) + + account.stateManager.addUpdates(result) + } + |> castError(ToggleScheduledGroupCallSubscriptionError.self) + } +} + +public enum UpdateGroupCallJoinAsPeerError { + case generic +} + +public func updateGroupCallJoinAsPeer(account: Account, peerId: PeerId, joinAs: PeerId) -> Signal { + return account.postbox.transaction { transaction -> (Api.InputPeer, Api.InputPeer)? in + if let peer = transaction.getPeer(peerId), let joinAsPeer = transaction.getPeer(joinAs), let inputPeer = apiInputPeer(peer), let joinInputPeer = apiInputPeer(joinAsPeer) { + return (inputPeer, joinInputPeer) + } else { + return nil + } + } + |> castError(UpdateGroupCallJoinAsPeerError.self) + |> mapToSignal { result in + guard let (inputPeer, joinInputPeer) = result else { + return .fail(.generic) + } + return account.network.request(Api.functions.phone.saveDefaultGroupCallJoinAs(peer: inputPeer, joinAs: joinInputPeer)) + |> mapError { _ -> UpdateGroupCallJoinAsPeerError in + return .generic + } + |> mapToSignal { result -> Signal in + return account.postbox.transaction { transaction in + transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in + if let cachedData = cachedData as? CachedChannelData { + return cachedData.withUpdatedCallJoinPeerId(joinAs) + } else if let cachedData = cachedData as? CachedGroupData { + return cachedData.withUpdatedCallJoinPeerId(joinAs) + } else { + return cachedData + } + }) + } + |> castError(UpdateGroupCallJoinAsPeerError.self) + |> ignoreValues + } + } +} + public enum GetGroupCallParticipantsError { case generic } public func getGroupCallParticipants(account: Account, callId: Int64, accessHash: Int64, offset: String, ssrcs: [UInt32], limit: Int32, sortAscending: Bool?) -> Signal { - let sortAscendingValue: Signal + let sortAscendingValue: Signal<(Bool, Int32?, Bool, GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?), GetGroupCallParticipantsError> if let sortAscending = sortAscending { - sortAscendingValue = .single(sortAscending) + sortAscendingValue = .single((sortAscending, nil, false, nil)) } else { sortAscendingValue = getCurrentGroupCall(account: account, callId: callId, accessHash: accessHash) |> mapError { _ -> GetGroupCallParticipantsError in return .generic } - |> mapToSignal { result -> Signal in + |> mapToSignal { result -> Signal<(Bool, Int32?, Bool, GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?), GetGroupCallParticipantsError> in guard let result = result else { return .fail(.generic) } - return .single(result.info.sortAscending) + return .single((result.info.sortAscending, result.info.scheduleTimestamp, result.info.subscribedToScheduled, result.info.defaultParticipantsAreMuted)) } } @@ -248,13 +405,15 @@ public func getGroupCallParticipants(account: Account, callId: Int64, accessHash }, sortAscendingValue ) - |> mapToSignal { result, sortAscendingValue -> Signal in + |> mapToSignal { result, sortAscendingAndScheduleTimestamp -> Signal in return account.postbox.transaction { transaction -> GroupCallParticipantsContext.State in var parsedParticipants: [GroupCallParticipantsContext.Participant] = [] let totalCount: Int let version: Int32 let nextParticipantsFetchOffset: String? + let (sortAscendingValue, scheduleTimestamp, subscribedToScheduled, defaultParticipantsAreMuted) = sortAscendingAndScheduleTimestamp + switch result { case let .groupParticipants(count, participants, nextOffset, chats, users, apiVersion): totalCount = Int(count) @@ -337,10 +496,12 @@ public func getGroupCallParticipants(account: Account, callId: Int64, accessHash nextParticipantsFetchOffset: nextParticipantsFetchOffset, adminIds: Set(), isCreator: false, - defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false), + defaultParticipantsAreMuted: defaultParticipantsAreMuted ?? GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false), sortAscending: sortAscendingValue, recordingStartTimestamp: nil, title: nil, + scheduleTimestamp: scheduleTimestamp, + subscribedToScheduled: subscribedToScheduled, totalCount: totalCount, version: version ) @@ -471,6 +632,7 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal state.defaultParticipantsAreMuted = GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: isMuted, canChange: canChange) state.title = title state.recordingStartTimestamp = recordStartDate + state.scheduleTimestamp = scheduleDate default: break } @@ -516,9 +678,9 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal return account.postbox.transaction { transaction -> JoinGroupCallResult in transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in if let cachedData = cachedData as? CachedChannelData { - return cachedData.withUpdatedCallJoinPeerId(joinAs) + return cachedData.withUpdatedCallJoinPeerId(joinAs).withUpdatedActiveCall(CachedChannelData.ActiveCall(id: parsedCall.id, accessHash: parsedCall.accessHash, title: parsedCall.title, scheduleTimestamp: nil, subscribedToScheduled: false)) } else if let cachedData = cachedData as? CachedGroupData { - return cachedData.withUpdatedCallJoinPeerId(joinAs) + return cachedData.withUpdatedCallJoinPeerId(joinAs).withUpdatedActiveCall(CachedChannelData.ActiveCall(id: parsedCall.id, accessHash: parsedCall.accessHash, title: parsedCall.title, scheduleTimestamp: nil, subscribedToScheduled: false)) } else { return cachedData } @@ -848,6 +1010,11 @@ public final class GroupCallParticipantsContext { public struct DefaultParticipantsAreMuted: Equatable { public var isMuted: Bool public var canChange: Bool + + public init(isMuted: Bool, canChange: Bool) { + self.isMuted = isMuted + self.canChange = canChange + } } public var participants: [Participant] @@ -858,6 +1025,8 @@ public final class GroupCallParticipantsContext { public var sortAscending: Bool public var recordingStartTimestamp: Int32? public var title: String? + public var scheduleTimestamp: Int32? + public var subscribedToScheduled: Bool public var totalCount: Int public var version: Int32 @@ -878,6 +1047,34 @@ public final class GroupCallParticipantsContext { self.participants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: self.sortAscending) }) } + + public init( + participants: [Participant], + nextParticipantsFetchOffset: String?, + adminIds: Set, + isCreator: Bool, + defaultParticipantsAreMuted: DefaultParticipantsAreMuted, + sortAscending: Bool, + recordingStartTimestamp: Int32?, + title: String?, + scheduleTimestamp: Int32?, + subscribedToScheduled: Bool, + totalCount: Int, + version: Int32 + ) { + self.participants = participants + self.nextParticipantsFetchOffset = nextParticipantsFetchOffset + self.adminIds = adminIds + self.isCreator = isCreator + self.defaultParticipantsAreMuted = defaultParticipantsAreMuted + self.sortAscending = sortAscending + self.recordingStartTimestamp = recordingStartTimestamp + self.title = title + self.scheduleTimestamp = scheduleTimestamp + self.subscribedToScheduled = subscribedToScheduled + self.totalCount = totalCount + self.version = version + } } private struct OverlayState: Equatable { @@ -970,7 +1167,7 @@ public final class GroupCallParticipantsContext { } case state(update: StateUpdate) - case call(isTerminated: Bool, defaultParticipantsAreMuted: State.DefaultParticipantsAreMuted, title: String?, recordingStartTimestamp: Int32?) + case call(isTerminated: Bool, defaultParticipantsAreMuted: State.DefaultParticipantsAreMuted, title: String?, recordingStartTimestamp: Int32?, scheduleTimestamp: Int32?) } public final class MemberEvent { @@ -1003,11 +1200,24 @@ public final class GroupCallParticipantsContext { public var state: Signal { let accountPeerId = self.account.peerId + let myPeerId = self.myPeerId return self.statePromise.get() |> map { state -> State in var publicState = state.state var sortAgain = false - let canSeeHands = state.state.isCreator || state.state.adminIds.contains(accountPeerId) + var canSeeHands = state.state.isCreator || state.state.adminIds.contains(accountPeerId) + for participant in publicState.participants { + if participant.peer.id == myPeerId { + if let muteState = participant.muteState { + if muteState.canUnmute { + canSeeHands = true + } + } else { + canSeeHands = true + } + break + } + } for i in 0 ..< publicState.participants.count { if let pendingMuteState = state.overlayState.pendingMuteStateChanges[publicState.participants[i].peer.id] { publicState.participants[i].muteState = pendingMuteState.state @@ -1146,6 +1356,8 @@ public final class GroupCallParticipantsContext { sortAscending: strongSelf.stateValue.state.sortAscending, recordingStartTimestamp: strongSelf.stateValue.state.recordingStartTimestamp, title: strongSelf.stateValue.state.title, + scheduleTimestamp: strongSelf.stateValue.state.scheduleTimestamp, + subscribedToScheduled: strongSelf.stateValue.state.subscribedToScheduled, totalCount: strongSelf.stateValue.state.totalCount, version: strongSelf.stateValue.state.version ), @@ -1201,11 +1413,12 @@ public final class GroupCallParticipantsContext { for update in updates { if case let .state(update) = update { stateUpdates.append(update) - } else if case let .call(_, defaultParticipantsAreMuted, title, recordingStartTimestamp) = update { + } else if case let .call(_, defaultParticipantsAreMuted, title, recordingStartTimestamp, scheduleTimestamp) = update { var state = self.stateValue.state state.defaultParticipantsAreMuted = defaultParticipantsAreMuted state.recordingStartTimestamp = recordingStartTimestamp state.title = title + state.scheduleTimestamp = scheduleTimestamp self.stateValue.state = state } @@ -1278,6 +1491,8 @@ public final class GroupCallParticipantsContext { sortAscending: strongSelf.stateValue.state.sortAscending, recordingStartTimestamp: strongSelf.stateValue.state.recordingStartTimestamp, title: strongSelf.stateValue.state.title, + scheduleTimestamp: strongSelf.stateValue.state.scheduleTimestamp, + subscribedToScheduled: strongSelf.stateValue.state.subscribedToScheduled, totalCount: strongSelf.stateValue.state.totalCount, version: strongSelf.stateValue.state.version ), @@ -1493,6 +1708,8 @@ public final class GroupCallParticipantsContext { let defaultParticipantsAreMuted = strongSelf.stateValue.state.defaultParticipantsAreMuted let recordingStartTimestamp = strongSelf.stateValue.state.recordingStartTimestamp let title = strongSelf.stateValue.state.title + let scheduleTimestamp = strongSelf.stateValue.state.scheduleTimestamp + let subscribedToScheduled = strongSelf.stateValue.state.subscribedToScheduled updatedParticipants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: strongSelf.stateValue.state.sortAscending) }) @@ -1506,6 +1723,8 @@ public final class GroupCallParticipantsContext { sortAscending: strongSelf.stateValue.state.sortAscending, recordingStartTimestamp: recordingStartTimestamp, title: title, + scheduleTimestamp: scheduleTimestamp, + subscribedToScheduled: subscribedToScheduled, totalCount: updatedTotalCount, version: update.version ), @@ -1539,6 +1758,7 @@ public final class GroupCallParticipantsContext { state.defaultParticipantsAreMuted = strongSelf.stateValue.state.defaultParticipantsAreMuted state.title = strongSelf.stateValue.state.title state.recordingStartTimestamp = strongSelf.stateValue.state.recordingStartTimestamp + state.scheduleTimestamp = strongSelf.stateValue.state.scheduleTimestamp state.mergeActivity(from: strongSelf.stateValue.state, myPeerId: nil, previousMyPeerId: nil, mergeActivityTimestamps: false) strongSelf.stateValue.state = state strongSelf.endedProcessingUpdate() diff --git a/submodules/TelegramCore/Sources/Holes.swift b/submodules/TelegramCore/Sources/Holes.swift index 61e04b1d14..946a9faea0 100644 --- a/submodules/TelegramCore/Sources/Holes.swift +++ b/submodules/TelegramCore/Sources/Holes.swift @@ -698,7 +698,7 @@ func fetchCallListHole(network: Network, postbox: Postbox, accountPeerId: PeerId var updatedIndex: MessageIndex? if let topIndex = topIndex { - updatedIndex = topIndex.predecessor() + updatedIndex = topIndex.globalPredecessor() } transaction.replaceGlobalMessageTagsHole(globalTags: [.Calls, .MissedCalls], index: holeIndex, with: updatedIndex, messages: storeMessages) diff --git a/submodules/TelegramCore/Sources/MessageUtils.swift b/submodules/TelegramCore/Sources/MessageUtils.swift index ee98a74694..80f922b68b 100644 --- a/submodules/TelegramCore/Sources/MessageUtils.swift +++ b/submodules/TelegramCore/Sources/MessageUtils.swift @@ -188,8 +188,11 @@ func locallyRenderedMessage(message: StoreMessage, peers: [PeerId: Peer]) -> Mes var hasher = Hasher() hasher.combine(id.id) hasher.combine(id.peerId) - - let stableId = UInt32(clamping: hasher.finalize()) + + let hashValue = Int64(hasher.finalize()) + let first = UInt32((hashValue >> 32) & 0xffffffff) + let second = UInt32(hashValue & 0xffffffff) + let stableId = first &+ second return Message(stableId: stableId, stableVersion: 0, id: id, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: message.threadId, timestamp: message.timestamp, flags: MessageFlags(message.flags), tags: message.tags, globalTags: message.globalTags, localTags: message.localTags, forwardInfo: forwardInfo, author: author, text: message.text, attributes: message.attributes, media: message.media, peers: messagePeers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) } diff --git a/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift b/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift index 96684a8838..e57096a47b 100644 --- a/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift +++ b/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift @@ -2982,22 +2982,22 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP if let info = GroupCallInfo(call) { transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in if let current = current as? CachedChannelData { - return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title)) + return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: info.subscribedToScheduled)) } else if let current = current as? CachedGroupData { - return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title)) + return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: info.subscribedToScheduled)) } else { return current } }) switch call { - case let .groupCall(flags, _, _, _, _, title, streamDcId, recordStartDate, _, _): + case let .groupCall(flags, _, _, _, _, title, _, recordStartDate, scheduleDate, _): let isMuted = (flags & (1 << 1)) != 0 let canChange = (flags & (1 << 2)) != 0 let defaultParticipantsAreMuted = GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: isMuted, canChange: canChange) updatedGroupCallParticipants.append(( info.id, - .call(isTerminated: false, defaultParticipantsAreMuted: defaultParticipantsAreMuted, title: title, recordingStartTimestamp: recordStartDate) + .call(isTerminated: false, defaultParticipantsAreMuted: defaultParticipantsAreMuted, title: title, recordingStartTimestamp: recordStartDate, scheduleTimestamp: scheduleDate) )) default: break @@ -3006,7 +3006,7 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP case let .groupCallDiscarded(callId, _, _): updatedGroupCallParticipants.append(( callId, - .call(isTerminated: true, defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false), title: nil, recordingStartTimestamp: nil) + .call(isTerminated: true, defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false), title: nil, recordingStartTimestamp: nil, scheduleTimestamp: nil) )) transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in diff --git a/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift b/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift index 9e74ccb9ff..7e0c426020 100644 --- a/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift +++ b/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift @@ -306,7 +306,7 @@ public func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId if let inputCall = chatFull.call { switch inputCall { case let .inputGroupCall(id, accessHash): - updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title) + updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title, scheduleTimestamp: previous.activeCall?.scheduleTimestamp, subscribedToScheduled: previous.activeCall?.subscribedToScheduled ?? false) } } @@ -516,7 +516,7 @@ public func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId if let inputCall = inputCall { switch inputCall { case let .inputGroupCall(id, accessHash): - updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title) + updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title, scheduleTimestamp: previous.activeCall?.scheduleTimestamp, subscribedToScheduled: previous.activeCall?.subscribedToScheduled ?? false) } } diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index f81fe6f02d..38173cc8d0 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -359,7 +359,13 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati pageIndicatorInactiveColor: UIColor(white: 1.0, alpha: 0.3), inputClearButtonColor: UIColor(rgb: 0x8b9197), itemBarChart: PresentationThemeItemBarChart(color1: UIColor(rgb: 0xffffff), color2: UIColor(rgb: 0x929196), color3: UIColor(rgb: 0x333333)), - itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0x0f0f0f), strokeColor: UIColor(rgb: 0x0f0f0f), placeholderColor: UIColor(rgb: 0x8f8f8f), primaryColor: UIColor(rgb: 0xffffff), controlColor: UIColor(rgb: 0x8f8f8f)) + itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0x0f0f0f), strokeColor: UIColor(rgb: 0x0f0f0f), placeholderColor: UIColor(rgb: 0x8f8f8f), primaryColor: UIColor(rgb: 0xffffff), controlColor: UIColor(rgb: 0x8f8f8f)), + paymentOption: PresentationThemeList.PaymentOption( + inactiveFillColor: UIColor(rgb: 0x00A650).withMultipliedAlpha(0.3), + inactiveForegroundColor: UIColor(rgb: 0x00A650), + activeFillColor: UIColor(rgb: 0x00A650), + activeForegroundColor: UIColor(rgb: 0xffffff) + ) ) let chatList = PresentationThemeChatList( diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift index 9a9326fe19..b6e84f35f3 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift @@ -612,7 +612,13 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres pageIndicatorInactiveColor: mainSecondaryTextColor.withAlphaComponent(0.4), inputClearButtonColor: mainSecondaryColor, itemBarChart: PresentationThemeItemBarChart(color1: accentColor, color2: mainSecondaryTextColor.withAlphaComponent(0.5), color3: accentColor.withMultiplied(hue: 1.038, saturation: 0.329, brightness: 0.33)), - itemInputField: PresentationInputFieldTheme(backgroundColor: mainInputColor, strokeColor: mainInputColor, placeholderColor: mainSecondaryColor, primaryColor: UIColor(rgb: 0xffffff), controlColor: mainSecondaryColor) + itemInputField: PresentationInputFieldTheme(backgroundColor: mainInputColor, strokeColor: mainInputColor, placeholderColor: mainSecondaryColor, primaryColor: UIColor(rgb: 0xffffff), controlColor: mainSecondaryColor), + paymentOption: PresentationThemeList.PaymentOption( + inactiveFillColor: UIColor(rgb: 0x00A650).withMultipliedAlpha(0.3), + inactiveForegroundColor: UIColor(rgb: 0x00A650), + activeFillColor: UIColor(rgb: 0x00A650), + activeForegroundColor: UIColor(rgb: 0xffffff) + ) ) let chatList = PresentationThemeChatList( diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index a980bbbb11..52b547bb3a 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -448,7 +448,13 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio pageIndicatorInactiveColor: UIColor(rgb: 0xe3e3e7), inputClearButtonColor: UIColor(rgb: 0xcccccc), itemBarChart: PresentationThemeItemBarChart(color1: UIColor(rgb: 0x007ee5), color2: UIColor(rgb: 0xc8c7cc), color3: UIColor(rgb: 0xf2f1f7)), - itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0xf2f2f7), strokeColor: UIColor(rgb: 0xf2f2f7), placeholderColor: UIColor(rgb: 0xb6b6bb), primaryColor: UIColor(rgb: 0x000000), controlColor: UIColor(rgb: 0xb6b6bb)) + itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0xf2f2f7), strokeColor: UIColor(rgb: 0xf2f2f7), placeholderColor: UIColor(rgb: 0xb6b6bb), primaryColor: UIColor(rgb: 0x000000), controlColor: UIColor(rgb: 0xb6b6bb)), + paymentOption: PresentationThemeList.PaymentOption( + inactiveFillColor: UIColor(rgb: 0x00A650).withMultipliedAlpha(0.1), + inactiveForegroundColor: UIColor(rgb: 0x00A650), + activeFillColor: UIColor(rgb: 0x00A650), + activeForegroundColor: UIColor(rgb: 0xffffff) + ) ) let chatList = PresentationThemeChatList( diff --git a/submodules/TelegramPresentationData/Sources/NumericFormat.swift b/submodules/TelegramPresentationData/Sources/NumericFormat.swift index 0dc29280e3..0b67ddc0db 100644 --- a/submodules/TelegramPresentationData/Sources/NumericFormat.swift +++ b/submodules/TelegramPresentationData/Sources/NumericFormat.swift @@ -37,7 +37,7 @@ public func presentationStringsFormattedNumber(_ count: Int32, _ groupingSeparat } } -public func timeIntervalString(strings: PresentationStrings, value: Int32, preferLowerValue: Bool = false, roundToNearest: Bool = false) -> String { +public func timeIntervalString(strings: PresentationStrings, value: Int32, preferLowerValue: Bool = false) -> String { if preferLowerValue { if value <= 60 { return strings.MessageTimer_Seconds(max(1, value)) @@ -69,6 +69,38 @@ public func timeIntervalString(strings: PresentationStrings, value: Int32, prefe } } +public func scheduledTimeIntervalString(strings: PresentationStrings, value: Int32, preferLowerValue: Bool = false) -> String { + if preferLowerValue { + if value <= 60 { + return strings.ScheduledIn_Seconds(max(1, value)) + } else if value <= 60 * 60 { + return strings.ScheduledIn_Minutes(max(1, value / 60)) + } else if value <= 60 * 60 * 24 { + return strings.ScheduledIn_Hours(max(1, value / (60 * 60))) + } else if value <= 60 * 60 * 24 * 7 { + return strings.ScheduledIn_Days(max(1, value / (60 * 60 * 24))) + } else if value <= 60 * 60 * 24 * 30 { + return strings.ScheduledIn_Weeks(max(1, value / (60 * 60 * 24 * 7))) + } else { + return strings.ScheduledIn_Months(max(1, value / (60 * 60 * 24 * 30))) + } + } else { + if value < 60 { + return strings.ScheduledIn_Seconds(max(1, value)) + } else if value < 60 * 60 { + return strings.ScheduledIn_Minutes(max(1, value / 60)) + } else if value < 60 * 60 * 24 { + return strings.ScheduledIn_Hours(max(1, value / (60 * 60))) + } else if value < 60 * 60 * 24 * 7 { + return strings.ScheduledIn_Days(max(1, value / (60 * 60 * 24))) + } else if value < 60 * 60 * 24 * 30 { + return strings.ScheduledIn_Weeks(max(1, value / (60 * 60 * 24 * 7))) + } else { + return strings.ScheduledIn_Months(max(1, value / (60 * 60 * 24 * 30))) + } + } +} + public func shortTimeIntervalString(strings: PresentationStrings, value: Int32) -> String { if value < 60 { return strings.MessageTimer_ShortSeconds(max(1, value)) diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 882632781b..75cf53d719 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -208,6118 +208,6245 @@ public final class PresentationStrings: Equatable { public var ChatListFolder_CategoryNonContacts: String { return self._s[18]! } public var Gif_NoGifsPlaceholder: String { return self._s[19]! } public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[20]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[21]! } - public var Map_LiveLocationTitle: String { return self._s[22]! } - public var Passport_PasswordCreate: String { return self._s[23]! } - public var Settings_ProxyConnected: String { return self._s[24]! } + public func VoiceChat_StatusLateBy(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[21]!, self._r[21]!, [_0]) + } + public var AutoNightTheme_ScheduleSection: String { return self._s[22]! } + public var Map_LiveLocationTitle: String { return self._s[23]! } + public var Passport_PasswordCreate: String { return self._s[24]! } + public var Settings_ProxyConnected: String { return self._s[25]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[25]!, self._r[25]!, [_1, _2]) + return formatWithArgumentRanges(self._s[26]!, self._r[26]!, [_1, _2]) } - public var Channel_Management_LabelOwner: String { return self._s[26]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[27]! } - public var Group_Setup_HistoryHidden: String { return self._s[28]! } - public var Month_ShortNovember: String { return self._s[29]! } - public var Call_ReportIncludeLog: String { return self._s[30]! } - public var ChatList_RemoveFolder: String { return self._s[31]! } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[32]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[33]! } - public var Checkout_Receipt_Title: String { return self._s[34]! } + public var Channel_Management_LabelOwner: String { return self._s[27]! } + public var ApplyLanguage_ApplySuccess: String { return self._s[28]! } + public var Group_Setup_HistoryHidden: String { return self._s[29]! } + public var Month_ShortNovember: String { return self._s[30]! } + public var Call_ReportIncludeLog: String { return self._s[31]! } + public var ChatList_RemoveFolder: String { return self._s[32]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[33]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[34]! } + public var Checkout_Receipt_Title: String { return self._s[35]! } public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[35]!, self._r[35]!, [_0]) + return formatWithArgumentRanges(self._s[36]!, self._r[36]!, [_0]) } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[36]! } - public var SearchImages_Title: String { return self._s[37]! } - public var Notification_PaymentSent: String { return self._s[38]! } - public var Appearance_TintAllColors: String { return self._s[39]! } - public var Group_Setup_TypePublicHelp: String { return self._s[40]! } - public var ChatSettings_Cache: String { return self._s[41]! } - public var InviteLink_RevokedLinks: String { return self._s[42]! } - public var Login_InvalidLastNameError: String { return self._s[43]! } - public var PeerInfo_PaneMedia: String { return self._s[44]! } - public var InviteLink_Revoked: String { return self._s[45]! } - public var StickerPacks_ActionShare: String { return self._s[46]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[47]! } - public var LiveLocationUpdated_JustNow: String { return self._s[48]! } + public var AuthSessions_LogOutApplicationsHelp: String { return self._s[37]! } + public var SearchImages_Title: String { return self._s[38]! } + public var Notification_PaymentSent: String { return self._s[39]! } + public var Appearance_TintAllColors: String { return self._s[40]! } + public var Group_Setup_TypePublicHelp: String { return self._s[41]! } + public var ChatSettings_Cache: String { return self._s[42]! } + public var InviteLink_RevokedLinks: String { return self._s[43]! } + public var Login_InvalidLastNameError: String { return self._s[44]! } + public var PeerInfo_PaneMedia: String { return self._s[45]! } + public var InviteLink_Revoked: String { return self._s[46]! } + public var StickerPacks_ActionShare: String { return self._s[47]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[48]! } + public var LiveLocationUpdated_JustNow: String { return self._s[49]! } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[49]!, self._r[49]!, [_0]) + return formatWithArgumentRanges(self._s[50]!, self._r[50]!, [_0]) } - public var Channel_Info_Members: String { return self._s[50]! } + public var Channel_Info_Members: String { return self._s[51]! } public func Channel_CommentsGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[51]!, self._r[51]!, [_0]) + return formatWithArgumentRanges(self._s[52]!, self._r[52]!, [_0]) } - public var Common_edit: String { return self._s[52]! } - public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[54]! } - public var OldChannels_GroupEmptyFormat: String { return self._s[55]! } + public var Common_edit: String { return self._s[53]! } + public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[55]! } + public var OldChannels_GroupEmptyFormat: String { return self._s[56]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[56]!, self._r[56]!, [_1]) + return formatWithArgumentRanges(self._s[57]!, self._r[57]!, [_1]) } - public var Passport_DiscardMessageAction: String { return self._s[57]! } - public var VoiceChat_StopRecordingTitle: String { return self._s[58]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[59]! } - public var Stickers_SuggestNone: String { return self._s[60]! } + public var Passport_DiscardMessageAction: String { return self._s[58]! } + public var VoiceChat_StopRecordingTitle: String { return self._s[59]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[60]! } + public var Stickers_SuggestNone: String { return self._s[61]! } public func Channel_AdminLog_JoinedViaInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[61]!, self._r[61]!, [_1, _2]) + return formatWithArgumentRanges(self._s[62]!, self._r[62]!, [_1, _2]) } - public var Channel_AdminLog_CanPinMessages: String { return self._s[62]! } - public var Stickers_Search: String { return self._s[64]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[65]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[66]! } - public var Login_ContinueWithLocalization: String { return self._s[67]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[68]! } - public var TextFormat_Italic: String { return self._s[70]! } - public var ChatList_Search_NoResultsFitlerLinks: String { return self._s[72]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[73]! } - public var Notification_MessageLifetime1w: String { return self._s[74]! } - public var Channel_Management_AddModerator: String { return self._s[75]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[76]! } - public var Gif_Search: String { return self._s[77]! } - public var Checkout_ErrorGeneric: String { return self._s[78]! } - public var Conversation_ContextMenuSendMessage: String { return self._s[79]! } - public var Map_SetThisLocation: String { return self._s[80]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[81]! } - public var PrivacySettings_AutoArchiveInfo: String { return self._s[82]! } - public var Stats_NotificationsTitle: String { return self._s[83]! } - public var Conversation_ClearSecretHistory: String { return self._s[85]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[63]! } + public var Stickers_Search: String { return self._s[65]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[66]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[67]! } + public var Login_ContinueWithLocalization: String { return self._s[68]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[69]! } + public var TextFormat_Italic: String { return self._s[71]! } + public var ChatList_Search_NoResultsFitlerLinks: String { return self._s[73]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[74]! } + public var Notification_MessageLifetime1w: String { return self._s[75]! } + public var Channel_Management_AddModerator: String { return self._s[76]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[77]! } + public var Gif_Search: String { return self._s[78]! } + public var Checkout_ErrorGeneric: String { return self._s[79]! } + public var Conversation_ContextMenuSendMessage: String { return self._s[80]! } + public var Map_SetThisLocation: String { return self._s[81]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[82]! } + public var PrivacySettings_AutoArchiveInfo: String { return self._s[83]! } + public var Stats_NotificationsTitle: String { return self._s[84]! } + public var Conversation_ClearSecretHistory: String { return self._s[86]! } public func Conversation_DeleteAllMessagesInChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[86]!, self._r[86]!, [_0]) + return formatWithArgumentRanges(self._s[87]!, self._r[87]!, [_0]) } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[87]!, self._r[87]!, [_1, _2]) + return formatWithArgumentRanges(self._s[88]!, self._r[88]!, [_1, _2]) } - public var ChatListFolder_DiscardDiscard: String { return self._s[88]! } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[89]! } - public var Contacts_InviteFriends: String { return self._s[90]! } - public var Group_LinkedChannel: String { return self._s[91]! } - public var ChatList_DeleteForAllMembers: String { return self._s[92]! } - public var Notification_PassportValuePhone: String { return self._s[94]! } + public var ChatListFolder_DiscardDiscard: String { return self._s[89]! } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[90]! } + public var Contacts_InviteFriends: String { return self._s[91]! } + public var Group_LinkedChannel: String { return self._s[92]! } + public var ChatList_DeleteForAllMembers: String { return self._s[93]! } + public var Notification_PassportValuePhone: String { return self._s[95]! } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[95]!, self._r[95]!, [_0]) + return formatWithArgumentRanges(self._s[96]!, self._r[96]!, [_0]) } - public var UserInfo_BotHelp: String { return self._s[97]! } - public var Passport_Identity_MainPage: String { return self._s[99]! } - public var LogoutOptions_ContactSupportText: String { return self._s[100]! } + public var UserInfo_BotHelp: String { return self._s[98]! } + public var Passport_Identity_MainPage: String { return self._s[100]! } + public var LogoutOptions_ContactSupportText: String { return self._s[101]! } public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[101]!, self._r[101]!, [_0]) + return formatWithArgumentRanges(self._s[102]!, self._r[102]!, [_0]) } - public var StickerPack_ShowStickers: String { return self._s[103]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[104]! } - public var Map_Satellite: String { return self._s[105]! } - public var Passport_Identity_MainPageHelp: String { return self._s[106]! } - public var Profile_About: String { return self._s[108]! } - public var Group_Setup_TypePrivate: String { return self._s[109]! } - public var Notifications_ChannelNotifications: String { return self._s[110]! } - public var Call_VoiceOver_VoiceCallIncoming: String { return self._s[111]! } + public var StickerPack_ShowStickers: String { return self._s[104]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[105]! } + public var Map_Satellite: String { return self._s[106]! } + public var Passport_Identity_MainPageHelp: String { return self._s[107]! } + public var Profile_About: String { return self._s[109]! } + public var Group_Setup_TypePrivate: String { return self._s[110]! } + public func ScheduleVoiceChat_ChannelText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[111]!, self._r[111]!, [_0]) + } + public var Notifications_ChannelNotifications: String { return self._s[112]! } + public var Call_VoiceOver_VoiceCallIncoming: String { return self._s[113]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[112]!, self._r[112]!, [_0]) + return formatWithArgumentRanges(self._s[114]!, self._r[114]!, [_0]) } - public var WallpaperPreview_Motion: String { return self._s[113]! } - public var Message_VideoMessage: String { return self._s[114]! } - public var SharedMedia_CategoryOther: String { return self._s[115]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[116]! } - public var PUSH_REMINDER_TITLE: String { return self._s[117]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[119]! } - public var Login_ResetAccountProtected_Reset: String { return self._s[121]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[122]! } + public var WallpaperPreview_Motion: String { return self._s[115]! } + public var Message_VideoMessage: String { return self._s[116]! } + public var SharedMedia_CategoryOther: String { return self._s[118]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[119]! } + public var PUSH_REMINDER_TITLE: String { return self._s[120]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[122]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[124]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[125]! } public func Location_ProximityNotification_Notify(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[123]!, self._r[123]!, [_0]) + return formatWithArgumentRanges(self._s[126]!, self._r[126]!, [_0]) } - public var ChatList_PeerTypeContact: String { return self._s[124]! } - public var Stickers_SuggestAll: String { return self._s[126]! } - public var EmptyGroupInfo_Line3: String { return self._s[127]! } - public var Login_InvalidPhoneError: String { return self._s[128]! } - public var MediaPicker_GroupDescription: String { return self._s[129]! } + public var ChatList_PeerTypeContact: String { return self._s[127]! } + public var Stickers_SuggestAll: String { return self._s[129]! } + public var EmptyGroupInfo_Line3: String { return self._s[130]! } + public var Login_InvalidPhoneError: String { return self._s[131]! } + public var MediaPicker_GroupDescription: String { return self._s[132]! } public func UserInfo_LinkForwardTooltip_Chat_One(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[130]!, self._r[130]!, [_0]) + return formatWithArgumentRanges(self._s[133]!, self._r[133]!, [_0]) } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[131]! } - public var Conversation_PrivateChannelTimeLimitedAlertText: String { return self._s[132]! } - public var PrivateDataSettings_Title: String { return self._s[133]! } - public var SecretChat_Title: String { return self._s[134]! } - public var Privacy_ChatsTitle: String { return self._s[135]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[136]! } - public var Watch_MessageView_Forward: String { return self._s[138]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[139]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[134]! } + public var Conversation_PrivateChannelTimeLimitedAlertText: String { return self._s[135]! } + public var PrivateDataSettings_Title: String { return self._s[136]! } + public var SecretChat_Title: String { return self._s[137]! } + public var Privacy_ChatsTitle: String { return self._s[138]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[139]! } + public var Watch_MessageView_Forward: String { return self._s[141]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[142]! } public func PUSH_PINNED_QUIZ(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[140]!, self._r[140]!, [_1, _2]) + return formatWithArgumentRanges(self._s[143]!, self._r[143]!, [_1, _2]) } public func Channel_AdminLog_EndedVoiceChat(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[141]!, self._r[141]!, [_1]) + return formatWithArgumentRanges(self._s[144]!, self._r[144]!, [_1]) } - public var InviteLink_ExpiredLink: String { return self._s[142]! } - public var PhotoEditor_DiscardChanges: String { return self._s[143]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[144]! } - public var Date_DialogDateFormat: String { return self._s[145]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[146]! } - public var Notifications_AlertTones: String { return self._s[147]! } - public var Permissions_SiriAllow_v0: String { return self._s[148]! } - public var Tour_StartButton: String { return self._s[149]! } - public var Stats_InstantViewInteractionsTitle: String { return self._s[150]! } - public var UserInfo_ScamUserWarning: String { return self._s[153]! } - public var NotificationsSound_Chime: String { return self._s[154]! } - public var Update_Skip: String { return self._s[155]! } + public var InviteLink_ExpiredLink: String { return self._s[145]! } + public var PhotoEditor_DiscardChanges: String { return self._s[146]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[147]! } + public var Date_DialogDateFormat: String { return self._s[148]! } + public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[149]! } + public var Notifications_AlertTones: String { return self._s[150]! } + public var Permissions_SiriAllow_v0: String { return self._s[151]! } + public var Tour_StartButton: String { return self._s[152]! } + public var Stats_InstantViewInteractionsTitle: String { return self._s[153]! } + public var UserInfo_ScamUserWarning: String { return self._s[156]! } + public var NotificationsSound_Chime: String { return self._s[157]! } + public var Update_Skip: String { return self._s[158]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[156]!, self._r[156]!, [_0]) + return formatWithArgumentRanges(self._s[159]!, self._r[159]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[157]! } - public var Notifications_PermissionsTitle: String { return self._s[158]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[159]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[160]! } - public var Appearance_AppIcon: String { return self._s[161]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[162]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[160]! } + public var Notifications_PermissionsTitle: String { return self._s[161]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[162]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[163]! } + public var Appearance_AppIcon: String { return self._s[164]! } + public var Passport_Identity_FilesUploadNew: String { return self._s[165]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[163]!, self._r[163]!, [_0]) + return formatWithArgumentRanges(self._s[166]!, self._r[166]!, [_0]) } - public var CreatePoll_QuizTitle: String { return self._s[164]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[165]! } - public var NotificationsSound_Calypso: String { return self._s[166]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[167]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[168]! } - public var Wallpaper_SetCustomBackground: String { return self._s[170]! } - public var Conversation_ContextMenuOpenProfile: String { return self._s[171]! } + public var CreatePoll_QuizTitle: String { return self._s[167]! } + public var DialogList_DeleteConversationConfirmation: String { return self._s[168]! } + public var NotificationsSound_Calypso: String { return self._s[169]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[171]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[172]! } + public var Wallpaper_SetCustomBackground: String { return self._s[174]! } + public var Conversation_ContextMenuOpenProfile: String { return self._s[175]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[173]!, self._r[173]!, [_1]) + return formatWithArgumentRanges(self._s[177]!, self._r[177]!, [_1]) } - public var AuthSessions_Terminate: String { return self._s[174]! } - public var ShareFileTip_CloseTip: String { return self._s[175]! } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[176]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[177]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[178]! } - public var Passport_Language_fr: String { return self._s[179]! } + public var AuthSessions_Terminate: String { return self._s[178]! } + public var ShareFileTip_CloseTip: String { return self._s[179]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[180]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[181]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[182]! } + public var Passport_Language_fr: String { return self._s[183]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[181]!, self._r[181]!, [_0]) + return formatWithArgumentRanges(self._s[185]!, self._r[185]!, [_0]) } - public var Passport_Identity_TypeIdentityCard: String { return self._s[182]! } - public var VoiceChat_MuteForMe: String { return self._s[183]! } + public var Passport_Identity_TypeIdentityCard: String { return self._s[186]! } + public var VoiceChat_MuteForMe: String { return self._s[187]! } public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[184]!, self._r[184]!, [_0]) + return formatWithArgumentRanges(self._s[188]!, self._r[188]!, [_0]) } - public var ReportPeer_ReasonCopyright: String { return self._s[185]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[187]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[188]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[189]! } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[190]! } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[191]! } + public var ReportPeer_ReasonCopyright: String { return self._s[189]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[191]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[192]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[193]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[194]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[195]! } public func Conversation_ForwardTooltip_ManyChats_Many(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[192]!, self._r[192]!, [_0, _1]) + return formatWithArgumentRanges(self._s[196]!, self._r[196]!, [_0, _1]) } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[193]! } - public var Map_LocatingError: String { return self._s[195]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[196]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[197]! } + public var Map_LocatingError: String { return self._s[199]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[200]! } public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[198]!, self._r[198]!, [_0]) + return formatWithArgumentRanges(self._s[202]!, self._r[202]!, [_0]) } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[199]!, self._r[199]!, [_0]) + return formatWithArgumentRanges(self._s[203]!, self._r[203]!, [_0]) } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[200]! } - public var Login_SmsRequestState2: String { return self._s[201]! } - public var Conversation_Unmute: String { return self._s[203]! } - public var TwoFactorSetup_Intro_Text: String { return self._s[204]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[205]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[204]! } + public var Login_SmsRequestState2: String { return self._s[205]! } + public var Conversation_Unmute: String { return self._s[207]! } + public var TwoFactorSetup_Intro_Text: String { return self._s[208]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[209]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[206]!, self._r[206]!, [_0]) - } - public var AccessDenied_LocationDenied: String { return self._s[207]! } - public var Share_AuthTitle: String { return self._s[208]! } - public var Month_ShortAugust: String { return self._s[209]! } - public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[210]!, self._r[210]!, [_0]) } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[211]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[212]! } + public var AccessDenied_LocationDenied: String { return self._s[211]! } + public var Share_AuthTitle: String { return self._s[212]! } + public var Month_ShortAugust: String { return self._s[213]! } + public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[214]!, self._r[214]!, [_0]) + } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[215]! } + public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[216]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[213]!, self._r[213]!, [_1]) + return formatWithArgumentRanges(self._s[217]!, self._r[217]!, [_1]) } - public var WallpaperSearch_ColorTitle: String { return self._s[215]! } - public var Wallpaper_Search: String { return self._s[216]! } - public var ClearCache_StorageUsage: String { return self._s[217]! } - public var CreatePoll_TextPlaceholder: String { return self._s[218]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[219]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[220]! } - public var OldChannels_NoticeCreateText: String { return self._s[221]! } - public var ProfilePhoto_MainVideo: String { return self._s[222]! } - public var VoiceChat_StatusListening: String { return self._s[223]! } - public var InviteLink_DeleteLinkAlert_Text: String { return self._s[224]! } - public var UserInfo_NotificationsDisabled: String { return self._s[225]! } - public var Map_Unknown: String { return self._s[226]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[227]! } - public var Conversation_StopQuiz: String { return self._s[228]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[229]! } + public var WallpaperSearch_ColorTitle: String { return self._s[219]! } + public var Wallpaper_Search: String { return self._s[220]! } + public var ClearCache_StorageUsage: String { return self._s[221]! } + public var CreatePoll_TextPlaceholder: String { return self._s[222]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[223]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[224]! } + public var OldChannels_NoticeCreateText: String { return self._s[225]! } + public var ProfilePhoto_MainVideo: String { return self._s[226]! } + public var VoiceChat_StatusListening: String { return self._s[227]! } + public var InviteLink_DeleteLinkAlert_Text: String { return self._s[228]! } + public var UserInfo_NotificationsDisabled: String { return self._s[229]! } + public var Map_Unknown: String { return self._s[230]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[231]! } + public var Conversation_StopQuiz: String { return self._s[232]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[233]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[230]!, self._r[230]!, [_0]) + return formatWithArgumentRanges(self._s[234]!, self._r[234]!, [_0]) } - public var CreatePoll_OptionPlaceholder: String { return self._s[231]! } - public var Conversation_RestrictedStickers: String { return self._s[232]! } - public var MemberSearch_BotSection: String { return self._s[234]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[236]! } - public var Widget_ShortcutsGalleryDescription: String { return self._s[237]! } - public var MaskStickerSettings_Title: String { return self._s[238]! } - public var ShareMenu_Comment: String { return self._s[239]! } - public var GroupInfo_Notifications: String { return self._s[240]! } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[241]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[235]! } + public var Conversation_RestrictedStickers: String { return self._s[236]! } + public var MemberSearch_BotSection: String { return self._s[238]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[240]! } + public var Widget_ShortcutsGalleryDescription: String { return self._s[241]! } + public var MaskStickerSettings_Title: String { return self._s[242]! } + public var ShareMenu_Comment: String { return self._s[243]! } + public var GroupInfo_Notifications: String { return self._s[244]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[245]! } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[242]!, self._r[242]!, [_0]) + return formatWithArgumentRanges(self._s[246]!, self._r[246]!, [_0]) } - public var Conversation_ContextMenuCopyLink: String { return self._s[243]! } - public var VoiceChat_MutedHelp: String { return self._s[246]! } - public var ChatListFolder_CategoryMuted: String { return self._s[247]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[248]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[247]! } + public var VoiceChat_MutedHelp: String { return self._s[250]! } + public var ChatListFolder_CategoryMuted: String { return self._s[251]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[252]! } public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[249]!, self._r[249]!, [_0]) + return formatWithArgumentRanges(self._s[253]!, self._r[253]!, [_0]) } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[250]! } - public var BroadcastGroups_LimitAlert_SettingsTip: String { return self._s[251]! } - public var Contacts_SortByPresence: String { return self._s[252]! } - public var Watch_Location_Access: String { return self._s[253]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[254]! } - public var Passport_Address_TypeBankStatement: String { return self._s[255]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[256]! } - public var Conversation_ClearPrivateHistory: String { return self._s[257]! } - public var ChatList_Mute: String { return self._s[260]! } - public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[261]! } - public var Stats_PostsTitle: String { return self._s[262]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[254]! } + public var BroadcastGroups_LimitAlert_SettingsTip: String { return self._s[255]! } + public var Contacts_SortByPresence: String { return self._s[256]! } + public var Watch_Location_Access: String { return self._s[257]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[258]! } + public var Passport_Address_TypeBankStatement: String { return self._s[259]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[260]! } + public var Conversation_ClearPrivateHistory: String { return self._s[261]! } + public var ChatList_Mute: String { return self._s[264]! } + public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[265]! } + public var Stats_PostsTitle: String { return self._s[266]! } public func Conversation_AutoremoveTimerSetGroup(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[263]!, self._r[263]!, [_1]) + return formatWithArgumentRanges(self._s[267]!, self._r[267]!, [_1]) } - public var Paint_Masks: String { return self._s[265]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[267]! } - public var Chat_AttachmentLimitReached: String { return self._s[268]! } - public var StickerPackActionInfo_ArchivedTitle: String { return self._s[269]! } - public var Watch_Stickers_StickerPacks: String { return self._s[271]! } - public var Channel_Setup_Title: String { return self._s[272]! } - public var GroupInfo_Administrators: String { return self._s[273]! } - public var InviteLink_PublicLink: String { return self._s[274]! } - public var InviteLink_DeleteLinkAlert_Action: String { return self._s[276]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[277]! } - public var Conversation_ContextMenuDiscuss: String { return self._s[278]! } - public var StickerPack_BuiltinPackName: String { return self._s[279]! } - public var Conversation_GreetingText: String { return self._s[281]! } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[283]! } - public var Checkout_ShippingMethod: String { return self._s[285]! } - public var ClearCache_FreeSpace: String { return self._s[286]! } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[287]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[290]! } + public var Paint_Masks: String { return self._s[269]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[272]! } + public var Chat_AttachmentLimitReached: String { return self._s[273]! } + public var StickerPackActionInfo_ArchivedTitle: String { return self._s[274]! } + public var Watch_Stickers_StickerPacks: String { return self._s[276]! } + public var Channel_Setup_Title: String { return self._s[277]! } + public var GroupInfo_Administrators: String { return self._s[278]! } + public var InviteLink_PublicLink: String { return self._s[279]! } + public var InviteLink_DeleteLinkAlert_Action: String { return self._s[281]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[282]! } + public var Conversation_ContextMenuDiscuss: String { return self._s[283]! } + public var StickerPack_BuiltinPackName: String { return self._s[284]! } + public var Conversation_GreetingText: String { return self._s[286]! } + public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[288]! } + public var Checkout_ShippingMethod: String { return self._s[290]! } + public var ClearCache_FreeSpace: String { return self._s[291]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[292]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[295]! } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[291]!, self._r[291]!, [_1]) + return formatWithArgumentRanges(self._s[296]!, self._r[296]!, [_1]) } - public var Conversation_typing: String { return self._s[292]! } + public var Conversation_typing: String { return self._s[297]! } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[294]!, self._r[294]!, [_0]) + return formatWithArgumentRanges(self._s[299]!, self._r[299]!, [_0]) } - public var WebSearch_RecentSectionTitle: String { return self._s[295]! } - public var VoiceChat_EndConfirmationTitle: String { return self._s[296]! } - public var VoiceChat_TapToAddPhoto: String { return self._s[297]! } - public var ChatList_UnhideAction: String { return self._s[299]! } - public var PasscodeSettings_6DigitCode: String { return self._s[300]! } - public var CallFeedback_AddComment: String { return self._s[301]! } - public var LoginPassword_PasswordHelp: String { return self._s[302]! } - public var Call_Flip: String { return self._s[303]! } - public var Weekday_ShortWednesday: String { return self._s[305]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[306]! } - public var PeerInfo_ButtonAddMember: String { return self._s[307]! } - public var Call_Decline: String { return self._s[309]! } - public var VoiceChat_InviteMemberToGroupFirstAdd: String { return self._s[310]! } - public var Join_ChannelsTooMuch: String { return self._s[312]! } + public var WebSearch_RecentSectionTitle: String { return self._s[300]! } + public var VoiceChat_EndConfirmationTitle: String { return self._s[301]! } + public var VoiceChat_TapToAddPhoto: String { return self._s[302]! } + public var ChatList_UnhideAction: String { return self._s[304]! } + public var PasscodeSettings_6DigitCode: String { return self._s[305]! } + public var CallFeedback_AddComment: String { return self._s[306]! } + public var LoginPassword_PasswordHelp: String { return self._s[307]! } + public var Call_Flip: String { return self._s[308]! } + public var Weekday_ShortWednesday: String { return self._s[310]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[311]! } + public var ScheduleVoiceChat_Title: String { return self._s[312]! } + public var PeerInfo_ButtonAddMember: String { return self._s[313]! } + public var Call_Decline: String { return self._s[315]! } + public var VoiceChat_InviteMemberToGroupFirstAdd: String { return self._s[316]! } + public var Join_ChannelsTooMuch: String { return self._s[318]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[313]!, self._r[313]!, [_1]) + return formatWithArgumentRanges(self._s[319]!, self._r[319]!, [_1]) } - public var Passport_Identity_Selfie: String { return self._s[314]! } - public var Privacy_ContactsTitle: String { return self._s[315]! } - public var GroupInfo_InviteLink_Title: String { return self._s[317]! } - public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[318]! } + public var Passport_Identity_Selfie: String { return self._s[320]! } + public var Privacy_ContactsTitle: String { return self._s[321]! } + public var GroupInfo_InviteLink_Title: String { return self._s[323]! } + public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[324]! } public func Channel_AdminLog_UpdatedParticipantVolume(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[319]!, self._r[319]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[325]!, self._r[325]!, [_1, _2, _3]) } - public var Conversation_OpenFile: String { return self._s[320]! } - public var Map_SetThisPlace: String { return self._s[321]! } - public var Channel_Info_Management: String { return self._s[322]! } - public var Passport_Language_hr: String { return self._s[323]! } - public var VoiceChat_Title: String { return self._s[324]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[327]! } - public var VoiceChat_EditBioSave: String { return self._s[328]! } - public var OpenFile_Proceed: String { return self._s[329]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[331]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[332]! } - public var Privacy_Calls_P2PContacts: String { return self._s[333]! } - public var Appearance_PickAccentColor: String { return self._s[334]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[335]! } - public var Localization_EnglishLanguageName: String { return self._s[336]! } - public var Stickers_SuggestStickers: String { return self._s[337]! } - public var Passport_Language_ko: String { return self._s[338]! } - public var Settings_ProxyDisabled: String { return self._s[339]! } - public var PrivacySettings_PasscodeOff: String { return self._s[340]! } - public var Undo_LeftChannel: String { return self._s[341]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[342]! } - public var TextFormat_Bold: String { return self._s[343]! } - public var Login_InfoTitle: String { return self._s[344]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[345]! } - public var Settings_AddAnotherAccount: String { return self._s[346]! } - public var GroupPermission_NewTitle: String { return self._s[347]! } - public var Login_SelectCountry_Title: String { return self._s[348]! } - public var Cache_ServiceFiles: String { return self._s[349]! } + public var Conversation_OpenFile: String { return self._s[327]! } + public var Map_SetThisPlace: String { return self._s[328]! } + public var Channel_Info_Management: String { return self._s[329]! } + public var Passport_Language_hr: String { return self._s[330]! } + public var VoiceChat_Title: String { return self._s[331]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[335]! } + public var VoiceChat_EditBioSave: String { return self._s[336]! } + public var OpenFile_Proceed: String { return self._s[337]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[339]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[340]! } + public var Privacy_Calls_P2PContacts: String { return self._s[341]! } + public var Appearance_PickAccentColor: String { return self._s[342]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[343]! } + public var Localization_EnglishLanguageName: String { return self._s[344]! } + public var Stickers_SuggestStickers: String { return self._s[345]! } + public var Passport_Language_ko: String { return self._s[346]! } + public var Settings_ProxyDisabled: String { return self._s[347]! } + public var PrivacySettings_PasscodeOff: String { return self._s[348]! } + public var Undo_LeftChannel: String { return self._s[349]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[350]! } + public var TextFormat_Bold: String { return self._s[351]! } + public var Login_InfoTitle: String { return self._s[352]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[353]! } + public var Settings_AddAnotherAccount: String { return self._s[354]! } + public var GroupPermission_NewTitle: String { return self._s[355]! } + public var Login_SelectCountry_Title: String { return self._s[356]! } + public var Cache_ServiceFiles: String { return self._s[357]! } public func AutoremoveSetup_TimerValueAfter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[350]!, self._r[350]!, [_0]) + return formatWithArgumentRanges(self._s[358]!, self._r[358]!, [_0]) } - public var Passport_Language_nl: String { return self._s[351]! } - public var Contacts_TopSection: String { return self._s[352]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[353]! } - public var VoiceChat_StatusInvited: String { return self._s[355]! } - public var Conversation_ContextMenuReport: String { return self._s[356]! } + public var Passport_Language_nl: String { return self._s[359]! } + public var Contacts_TopSection: String { return self._s[360]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[361]! } + public var VoiceChat_StatusInvited: String { return self._s[363]! } + public var Conversation_ContextMenuReport: String { return self._s[364]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[357]!, self._r[357]!, [_0]) + return formatWithArgumentRanges(self._s[365]!, self._r[365]!, [_0]) } - public var Conversation_Search: String { return self._s[358]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[360]! } - public var ReportPeer_AlertSuccess: String { return self._s[362]! } - public var AutoNightTheme_Title: String { return self._s[364]! } + public var Conversation_Search: String { return self._s[366]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[368]! } + public var ReportPeer_AlertSuccess: String { return self._s[370]! } + public var AutoNightTheme_Title: String { return self._s[372]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[366]!, self._r[366]!, [_0, _1]) + return formatWithArgumentRanges(self._s[374]!, self._r[374]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[367]!, self._r[367]!, [_0]) + return formatWithArgumentRanges(self._s[375]!, self._r[375]!, [_0]) } - public var Conversation_ShareBotContactConfirmation: String { return self._s[368]! } - public var TwoStepAuth_RecoveryCode: String { return self._s[369]! } - public var GroupInfo_Permissions_BroadcastTitle: String { return self._s[370]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[371]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[376]! } + public var TwoStepAuth_RecoveryCode: String { return self._s[377]! } + public var GroupInfo_Permissions_BroadcastTitle: String { return self._s[378]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[379]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[372]!, self._r[372]!, [_1, _2]) + return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_1, _2]) } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[373]!, self._r[373]!, [_0]) - } - public func BroadcastGroups_LimitAlert_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[374]!, self._r[374]!, [_0]) - } - public var Replies_BlockAndDeleteRepliesActionTitle: String { return self._s[376]! } - public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[377]!, self._r[377]!, [_0]) - } - public var VoiceChat_CopyInviteLink: String { return self._s[378]! } - public var Conversation_InfoGroup: String { return self._s[379]! } - public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[381]!, self._r[381]!, [_0]) } - public var Conversation_ChatBackground: String { return self._s[382]! } - public var PhotoEditor_Set: String { return self._s[383]! } - public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { + public func BroadcastGroups_LimitAlert_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[382]!, self._r[382]!, [_0]) + } + public var Replies_BlockAndDeleteRepliesActionTitle: String { return self._s[384]! } + public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[385]!, self._r[385]!, [_0]) } - public var IntentsSettings_SuggestedChatsContacts: String { return self._s[386]! } - public var Passport_Phone_Title: String { return self._s[388]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[389]! } - public var Channel_LinkItem: String { return self._s[390]! } - public var VoiceChat_EndConfirmationText: String { return self._s[391]! } + public var VoiceChat_CopyInviteLink: String { return self._s[386]! } + public var Conversation_InfoGroup: String { return self._s[387]! } + public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[389]!, self._r[389]!, [_0]) + } + public var Conversation_ChatBackground: String { return self._s[390]! } + public var PhotoEditor_Set: String { return self._s[391]! } + public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[393]!, self._r[393]!, [_0]) + } + public var IntentsSettings_SuggestedChatsContacts: String { return self._s[394]! } + public var Passport_Phone_Title: String { return self._s[396]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[397]! } + public var Channel_LinkItem: String { return self._s[398]! } + public var VoiceChat_EndConfirmationText: String { return self._s[399]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[392]!, self._r[392]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[400]!, self._r[400]!, [_1, _2, _3]) } - public var Conversation_DeleteManyMessages: String { return self._s[394]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[395]! } - public var Channel_AddUserLeftError: String { return self._s[397]! } - public var AuthSessions_AddedDeviceTitle: String { return self._s[399]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[400]! } - public var Settings_ProxyConnecting: String { return self._s[401]! } - public var Theme_Colors_Accent: String { return self._s[402]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[403]! } + public var Conversation_DeleteManyMessages: String { return self._s[402]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[403]! } + public var Channel_AddUserLeftError: String { return self._s[405]! } + public var AuthSessions_AddedDeviceTitle: String { return self._s[407]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[408]! } + public var Settings_ProxyConnecting: String { return self._s[409]! } + public var Theme_Colors_Accent: String { return self._s[411]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[412]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[405]!, self._r[405]!, [_1]) + return formatWithArgumentRanges(self._s[414]!, self._r[414]!, [_1]) } - public var Passport_Language_lo: String { return self._s[406]! } + public var Passport_Language_lo: String { return self._s[415]! } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[408]!, self._r[408]!, [_1, _2]) + return formatWithArgumentRanges(self._s[417]!, self._r[417]!, [_1, _2]) } - public var Permissions_NotificationsText_v0: String { return self._s[409]! } - public var BroadcastGroups_LimitAlert_Title: String { return self._s[410]! } - public var ChatList_Context_RemoveFromRecents: String { return self._s[411]! } - public var Watch_GroupInfo_Title: String { return self._s[412]! } - public var Settings_AddDevice: String { return self._s[414]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[415]! } + public var Permissions_NotificationsText_v0: String { return self._s[418]! } + public var BroadcastGroups_LimitAlert_Title: String { return self._s[419]! } + public var ChatList_Context_RemoveFromRecents: String { return self._s[420]! } + public var Watch_GroupInfo_Title: String { return self._s[421]! } + public var Settings_AddDevice: String { return self._s[423]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[424]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[416]!, self._r[416]!, [_1]) + return formatWithArgumentRanges(self._s[425]!, self._r[425]!, [_1]) } - public var Conversation_AutoremoveActionEdit: String { return self._s[417]! } - public var TwoStepAuth_Disable: String { return self._s[419]! } + public var Conversation_AutoremoveActionEdit: String { return self._s[426]! } + public var TwoStepAuth_Disable: String { return self._s[428]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[420]!, self._r[420]!, [_0]) + return formatWithArgumentRanges(self._s[429]!, self._r[429]!, [_0]) } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[421]!, self._r[421]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[430]!, self._r[430]!, [_1, _2, _3]) } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[422]!, self._r[422]!, [_0]) + return formatWithArgumentRanges(self._s[431]!, self._r[431]!, [_0]) } - public var Channel_AdminLog_BanReadMessages: String { return self._s[423]! } - public var Undo_ChatDeleted: String { return self._s[424]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[425]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[432]! } + public var Undo_ChatDeleted: String { return self._s[433]! } + public var ContactInfo_URLLabelHomepage: String { return self._s[434]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[426]!, self._r[426]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[435]!, self._r[435]!, [_1, _2, _3]) } - public var FastTwoStepSetup_EmailHelp: String { return self._s[427]! } - public var Contacts_SelectAll: String { return self._s[428]! } - public var Privacy_ContactsReset: String { return self._s[429]! } - public var AttachmentMenu_File: String { return self._s[431]! } - public var PasscodeSettings_EncryptData: String { return self._s[432]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[433]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[436]! } + public var Contacts_SelectAll: String { return self._s[437]! } + public var Privacy_ContactsReset: String { return self._s[438]! } + public var AttachmentMenu_File: String { return self._s[440]! } + public var PasscodeSettings_EncryptData: String { return self._s[441]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[442]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[435]!, self._r[435]!, [_0, _1]) + return formatWithArgumentRanges(self._s[444]!, self._r[444]!, [_0, _1]) } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[436]!, self._r[436]!, [_0, _1]) + return formatWithArgumentRanges(self._s[445]!, self._r[445]!, [_0, _1]) } - public var PhotoEditor_ShadowsTint: String { return self._s[438]! } - public var GroupInfo_ChatAdmins: String { return self._s[439]! } - public var ArchivedChats_IntroTitle2: String { return self._s[440]! } - public var Cache_LowDiskSpaceText: String { return self._s[441]! } - public var CreatePoll_Anonymous: String { return self._s[442]! } - public var Report_AdditionalDetailsText: String { return self._s[443]! } - public var Checkout_PaymentMethod_New: String { return self._s[444]! } - public var Invitation_JoinGroup: String { return self._s[445]! } + public var PhotoEditor_ShadowsTint: String { return self._s[447]! } + public var GroupInfo_ChatAdmins: String { return self._s[448]! } + public var ArchivedChats_IntroTitle2: String { return self._s[449]! } + public var Cache_LowDiskSpaceText: String { return self._s[450]! } + public var CreatePoll_Anonymous: String { return self._s[451]! } + public var Report_AdditionalDetailsText: String { return self._s[452]! } + public var Checkout_PaymentMethod_New: String { return self._s[453]! } + public var Invitation_JoinGroup: String { return self._s[454]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[448]!, self._r[448]!, [_0]) + return formatWithArgumentRanges(self._s[457]!, self._r[457]!, [_0]) } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[449]! } - public var Notification_Reply: String { return self._s[451]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[458]! } + public var Notification_Reply: String { return self._s[460]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[452]!, self._r[452]!, [_0]) + return formatWithArgumentRanges(self._s[461]!, self._r[461]!, [_0]) } - public var Login_PhoneTitle: String { return self._s[453]! } - public var VoiceChat_UnmuteHelp: String { return self._s[454]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[455]! } + public var Login_PhoneTitle: String { return self._s[462]! } + public var VoiceChat_UnmuteHelp: String { return self._s[463]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[464]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[456]!, self._r[456]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[465]!, self._r[465]!, [_1, _2, _3]) } - public var Appearance_TextSize_Title: String { return self._s[457]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[459]! } - public var VoiceOver_Navigation_Compose: String { return self._s[460]! } + public var Appearance_TextSize_Title: String { return self._s[466]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[468]! } + public var VoiceOver_Navigation_Compose: String { return self._s[469]! } public func Channel_AdminLog_MessageChangedAutoremoveTimeoutRemove(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[461]!, self._r[461]!, [_1]) + return formatWithArgumentRanges(self._s[470]!, self._r[470]!, [_1]) } - public var Passport_InfoText: String { return self._s[462]! } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[463]! } - public var MessagePoll_LabelClosed: String { return self._s[465]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[466]! } - public var KeyCommand_FocusOnInputField: String { return self._s[467]! } - public var Conversation_ContextViewThread: String { return self._s[468]! } - public var ChatImport_SelectionErrorGroupGeneric: String { return self._s[469]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[471]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[472]! } - public var Conversation_ContextMenuMention: String { return self._s[474]! } - public var CreatePoll_QuizInfo: String { return self._s[475]! } - public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[476]! } - public var Username_LinkCopied: String { return self._s[477]! } - public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[478]! } - public var TwoStepAuth_ChangePassword: String { return self._s[479]! } - public var Watch_Suggestion_Thanks: String { return self._s[480]! } - public var Channel_TitleInfo: String { return self._s[481]! } - public var ChatList_ChatTypesSection: String { return self._s[482]! } + public var Passport_InfoText: String { return self._s[471]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[472]! } + public var MessagePoll_LabelClosed: String { return self._s[474]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[475]! } + public var KeyCommand_FocusOnInputField: String { return self._s[476]! } + public var Conversation_ContextViewThread: String { return self._s[477]! } + public var ChatImport_SelectionErrorGroupGeneric: String { return self._s[478]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[480]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[481]! } + public var Conversation_ContextMenuMention: String { return self._s[483]! } + public var CreatePoll_QuizInfo: String { return self._s[484]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[485]! } + public var Username_LinkCopied: String { return self._s[486]! } + public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[487]! } + public var TwoStepAuth_ChangePassword: String { return self._s[488]! } + public var Watch_Suggestion_Thanks: String { return self._s[489]! } + public var Channel_TitleInfo: String { return self._s[490]! } + public var ChatList_ChatTypesSection: String { return self._s[491]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[483]!, self._r[483]!, [_0]) + return formatWithArgumentRanges(self._s[492]!, self._r[492]!, [_0]) } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_0]) + return formatWithArgumentRanges(self._s[493]!, self._r[493]!, [_0]) } public func Channel_AdminLog_MessageRemovedAdminNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[485]!, self._r[485]!, [_1, _2]) + return formatWithArgumentRanges(self._s[494]!, self._r[494]!, [_1, _2]) } - public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[486]! } + public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[495]! } public func Call_MicrophoneOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[487]!, self._r[487]!, [_0]) + return formatWithArgumentRanges(self._s[496]!, self._r[496]!, [_0]) } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[488]! } - public var Profile_MessageLifetimeForever: String { return self._s[489]! } - public var ArchivedChats_IntroText1: String { return self._s[490]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[491]! } - public var Map_PullUpForPlaces: String { return self._s[493]! } - public var UserInfo_TelegramCall: String { return self._s[494]! } - public var Conversation_ShareMyContactInfo: String { return self._s[495]! } - public var ChatList_Tabs_All: String { return self._s[496]! } - public var Notification_PassportValueEmail: String { return self._s[497]! } - public var Notification_VideoCallIncoming: String { return self._s[498]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[499]! } - public var Channel_Username_InvalidTaken: String { return self._s[500]! } - public var GroupPermission_EditingDisabled: String { return self._s[501]! } - public var InviteLink_PeopleJoinedShortNone: String { return self._s[502]! } - public var ChatContextMenu_TextSelectionTip: String { return self._s[503]! } - public var Passport_Language_pl: String { return self._s[505]! } - public var Call_Accept: String { return self._s[506]! } - public var ChatListFolder_NameSectionHeader: String { return self._s[507]! } - public var InviteLink_ExpiredLinkStatus: String { return self._s[508]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[497]! } + public var Profile_MessageLifetimeForever: String { return self._s[498]! } + public var ArchivedChats_IntroText1: String { return self._s[499]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[500]! } + public var Map_PullUpForPlaces: String { return self._s[502]! } + public var UserInfo_TelegramCall: String { return self._s[503]! } + public var Conversation_ShareMyContactInfo: String { return self._s[504]! } + public var ChatList_Tabs_All: String { return self._s[505]! } + public var Notification_PassportValueEmail: String { return self._s[506]! } + public var Notification_VideoCallIncoming: String { return self._s[507]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[508]! } + public var Channel_Username_InvalidTaken: String { return self._s[509]! } + public var GroupPermission_EditingDisabled: String { return self._s[510]! } + public var InviteLink_PeopleJoinedShortNone: String { return self._s[511]! } + public var ChatContextMenu_TextSelectionTip: String { return self._s[512]! } + public var Passport_Language_pl: String { return self._s[514]! } + public var Call_Accept: String { return self._s[515]! } + public var ChatListFolder_NameSectionHeader: String { return self._s[516]! } + public var InviteLink_ExpiredLinkStatus: String { return self._s[517]! } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[509]!, self._r[509]!, [_0]) + return formatWithArgumentRanges(self._s[518]!, self._r[518]!, [_0]) } - public var ClearCache_Forever: String { return self._s[510]! } + public var ClearCache_Forever: String { return self._s[519]! } + public var VoiceChat_TapToEditTitle: String { return self._s[521]! } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[512]!, self._r[512]!, [_0]) + return formatWithArgumentRanges(self._s[522]!, self._r[522]!, [_0]) } - public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[513]! } - public var Calls_SubmitRating: String { return self._s[514]! } - public var Location_LiveLocationRequired_ShareLocation: String { return self._s[515]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[523]! } + public var Calls_SubmitRating: String { return self._s[524]! } + public var Location_LiveLocationRequired_ShareLocation: String { return self._s[525]! } public func ChatList_AddedToFolderTooltip(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[516]!, self._r[516]!, [_1, _2]) + return formatWithArgumentRanges(self._s[526]!, self._r[526]!, [_1, _2]) } - public var IntentsSettings_MainAccountInfo: String { return self._s[517]! } - public var Map_Hybrid: String { return self._s[519]! } - public var ChatList_Context_Archive: String { return self._s[520]! } - public var Message_PinnedDocumentMessage: String { return self._s[521]! } - public var State_ConnectingToProxyInfo: String { return self._s[522]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[524]! } - public var Settings_AppLanguage: String { return self._s[525]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[527]! } + public var Map_Hybrid: String { return self._s[529]! } + public var ChatList_Context_Archive: String { return self._s[530]! } + public var Message_PinnedDocumentMessage: String { return self._s[531]! } + public var State_ConnectingToProxyInfo: String { return self._s[532]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[534]! } + public var Settings_AppLanguage: String { return self._s[535]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[526]!, self._r[526]!, [_0]) + return formatWithArgumentRanges(self._s[536]!, self._r[536]!, [_0]) } - public var Notifications_PermissionsEnable: String { return self._s[528]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[529]! } + public var Notifications_PermissionsEnable: String { return self._s[538]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[539]! } public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[530]!, self._r[530]!, [_0]) + return formatWithArgumentRanges(self._s[540]!, self._r[540]!, [_0]) } public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[531]!, self._r[531]!, [_0]) + return formatWithArgumentRanges(self._s[541]!, self._r[541]!, [_0]) } - public var NotificationsSound_Aurora: String { return self._s[534]! } - public var ScheduledMessages_ClearAll: String { return self._s[537]! } + public var NotificationsSound_Aurora: String { return self._s[544]! } + public var ScheduledMessages_ClearAll: String { return self._s[547]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[538]!, self._r[538]!, [_0]) + return formatWithArgumentRanges(self._s[548]!, self._r[548]!, [_0]) } - public var Settings_BlockedUsers: String { return self._s[540]! } - public var VoiceOver_Keyboard: String { return self._s[542]! } + public var Settings_BlockedUsers: String { return self._s[550]! } + public var Checkout_TipItem: String { return self._s[551]! } + public var VoiceOver_Keyboard: String { return self._s[553]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[543]!, self._r[543]!, [_0]) + return formatWithArgumentRanges(self._s[554]!, self._r[554]!, [_0]) } - public var Passport_Language_hu: String { return self._s[544]! } + public var Passport_Language_hu: String { return self._s[555]! } public func Conversation_ScheduleMessage_SendTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[545]!, self._r[545]!, [_0]) + return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_0]) } - public var StickerPack_Share: String { return self._s[546]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[547]! } + public var StickerPack_Share: String { return self._s[557]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[558]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[548]!, self._r[548]!, [_0, _1]) + return formatWithArgumentRanges(self._s[559]!, self._r[559]!, [_0, _1]) } - public var Privacy_ContactsResetConfirmation: String { return self._s[549]! } - public var VoiceChat_EditTitle: String { return self._s[550]! } - public var AppleWatch_ReplyPresets: String { return self._s[551]! } - public var Bot_GenericBotStatus: String { return self._s[552]! } - public var Appearance_ShareThemeColor: String { return self._s[553]! } - public var AuthSessions_AddDevice_UrlLoginHint: String { return self._s[554]! } - public var ReportGroupLocation_Title: String { return self._s[555]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[560]! } + public var VoiceChat_EditTitle: String { return self._s[561]! } + public var AppleWatch_ReplyPresets: String { return self._s[562]! } + public var Bot_GenericBotStatus: String { return self._s[563]! } + public var Appearance_ShareThemeColor: String { return self._s[564]! } + public var AuthSessions_AddDevice_UrlLoginHint: String { return self._s[566]! } + public var ReportGroupLocation_Title: String { return self._s[567]! } public func Conversation_AutoremoveTimerSetUserYou(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_1]) + return formatWithArgumentRanges(self._s[568]!, self._r[568]!, [_1]) } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[557]!, self._r[557]!, [_0]) + return formatWithArgumentRanges(self._s[569]!, self._r[569]!, [_0]) } - public var Profile_CreateEncryptedChatError: String { return self._s[558]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[559]! } - public var Wallpaper_ErrorNotFound: String { return self._s[560]! } - public var Bot_GenericSupportStatus: String { return self._s[561]! } - public var Activity_UploadingPhoto: String { return self._s[563]! } - public var Intents_ErrorLockedTitle: String { return self._s[564]! } - public var Watch_UserInfo_Title: String { return self._s[566]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[567]! } - public var Appearance_ThemeDay: String { return self._s[568]! } + public var Profile_CreateEncryptedChatError: String { return self._s[570]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[571]! } + public var Wallpaper_ErrorNotFound: String { return self._s[572]! } + public var Bot_GenericSupportStatus: String { return self._s[573]! } + public var Activity_UploadingPhoto: String { return self._s[575]! } + public var Intents_ErrorLockedTitle: String { return self._s[576]! } + public var Watch_UserInfo_Title: String { return self._s[578]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[579]! } + public var Appearance_ThemeDay: String { return self._s[580]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[569]!, self._r[569]!, [_1]) + return formatWithArgumentRanges(self._s[581]!, self._r[581]!, [_1]) } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[570]!, self._r[570]!, [_0]) + return formatWithArgumentRanges(self._s[582]!, self._r[582]!, [_0]) } - public var InviteLink_AdditionalLinks: String { return self._s[571]! } - public var Passport_Title: String { return self._s[574]! } + public var InviteLink_AdditionalLinks: String { return self._s[583]! } + public var Passport_Title: String { return self._s[587]! } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[576]!, self._r[576]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[589]!, self._r[589]!, [_1, _2, _3]) } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[577]! } - public var SocksProxySetup_ShareLink: String { return self._s[580]! } - public var AuthSessions_OtherDevices: String { return self._s[581]! } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[582]! } - public var Watch_MessageView_Reply: String { return self._s[583]! } - public var Camera_FlashOn: String { return self._s[585]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[590]! } + public var SocksProxySetup_ShareLink: String { return self._s[593]! } + public var AuthSessions_OtherDevices: String { return self._s[594]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[595]! } + public var Watch_MessageView_Reply: String { return self._s[596]! } + public var Camera_FlashOn: String { return self._s[598]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[586]!, self._r[586]!, [_1, _2]) + return formatWithArgumentRanges(self._s[599]!, self._r[599]!, [_1, _2]) } - public var Conversation_ContextMenuBlock: String { return self._s[587]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[589]! } - public var Privacy_Calls_NeverAllow: String { return self._s[590]! } - public var BroadcastGroups_Cancel: String { return self._s[591]! } - public var SharedMedia_CategoryLinks: String { return self._s[592]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[595]! } - public var Passport_Identity_ScansHelp: String { return self._s[597]! } - public var ShareMenu_CopyShareLink: String { return self._s[598]! } - public var StickerSettings_MaskContextInfo: String { return self._s[599]! } - public var InviteLink_Create_EditTitle: String { return self._s[600]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[601]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[604]! } - public var ChatImportActivity_Success: String { return self._s[606]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[607]! } - public var NotificationsSound_Popcorn: String { return self._s[608]! } - public var FeatureDisabled_Oops: String { return self._s[609]! } + public var Conversation_ContextMenuBlock: String { return self._s[600]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[602]! } + public var Privacy_Calls_NeverAllow: String { return self._s[603]! } + public var BroadcastGroups_Cancel: String { return self._s[604]! } + public var SharedMedia_CategoryLinks: String { return self._s[605]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[608]! } + public var Passport_Identity_ScansHelp: String { return self._s[610]! } + public var ShareMenu_CopyShareLink: String { return self._s[611]! } + public var StickerSettings_MaskContextInfo: String { return self._s[612]! } + public var InviteLink_Create_EditTitle: String { return self._s[613]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[614]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[617]! } + public var ChatImportActivity_Success: String { return self._s[619]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[620]! } + public var NotificationsSound_Popcorn: String { return self._s[621]! } + public var FeatureDisabled_Oops: String { return self._s[622]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[610]!, self._r[610]!, [_0]) + return formatWithArgumentRanges(self._s[623]!, self._r[623]!, [_0]) } - public var Notification_PinnedMessage: String { return self._s[611]! } - public var Tour_Title4: String { return self._s[612]! } + public var Notification_PinnedMessage: String { return self._s[624]! } + public var Tour_Title4: String { return self._s[625]! } public func Notification_VoiceChatInvitationForYou(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[613]!, self._r[613]!, [_1]) + return formatWithArgumentRanges(self._s[626]!, self._r[626]!, [_1]) } - public var Watch_Suggestion_OK: String { return self._s[614]! } - public var Compose_TokenListPlaceholder: String { return self._s[615]! } - public var InviteLink_PermanentLink: String { return self._s[616]! } - public var EditTheme_Edit_TopInfo: String { return self._s[617]! } - public var Gif_NoGifsFound: String { return self._s[618]! } - public var Login_InvalidCountryCode: String { return self._s[619]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[620]! } - public var Call_VoiceOver_VideoCallMissed: String { return self._s[621]! } - public var VoiceChat_ChangeNameTitle: String { return self._s[623]! } + public var Watch_Suggestion_OK: String { return self._s[627]! } + public var Compose_TokenListPlaceholder: String { return self._s[628]! } + public var InviteLink_PermanentLink: String { return self._s[629]! } + public var EditTheme_Edit_TopInfo: String { return self._s[630]! } + public var Gif_NoGifsFound: String { return self._s[631]! } + public var Login_InvalidCountryCode: String { return self._s[632]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[633]! } + public var Call_VoiceOver_VideoCallMissed: String { return self._s[634]! } + public var VoiceChat_ChangeNameTitle: String { return self._s[636]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[624]!, self._r[624]!, [_1]) + return formatWithArgumentRanges(self._s[637]!, self._r[637]!, [_1]) } - public var Profile_CreateNewContact: String { return self._s[625]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[626]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[627]! } - public var Group_Setup_TypePublic: String { return self._s[628]! } - public var Weekday_ShortSaturday: String { return self._s[629]! } + public var Profile_CreateNewContact: String { return self._s[638]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[639]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[640]! } + public var Group_Setup_TypePublic: String { return self._s[641]! } + public var Weekday_ShortSaturday: String { return self._s[642]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[630]!, self._r[630]!, [_0]) + return formatWithArgumentRanges(self._s[643]!, self._r[643]!, [_0]) } - public var LiveLocation_MenuStopAll: String { return self._s[631]! } + public var LiveLocation_MenuStopAll: String { return self._s[644]! } public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[632]!, self._r[632]!, [_0]) + return formatWithArgumentRanges(self._s[645]!, self._r[645]!, [_0]) } - public var ChatListFolder_NamePlaceholder: String { return self._s[633]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[634]! } + public var ChatListFolder_NamePlaceholder: String { return self._s[646]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[647]! } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[635]!, self._r[635]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[648]!, self._r[648]!, [_1, _2, _3]) } - public var VoiceChat_ChatFullAlertText: String { return self._s[636]! } - public var Chat_GenericPsaTooltip: String { return self._s[638]! } - public var ChannelInfo_CreateVoiceChat: String { return self._s[639]! } + public var VoiceChat_ChatFullAlertText: String { return self._s[649]! } + public var Chat_GenericPsaTooltip: String { return self._s[651]! } + public var ChannelInfo_CreateVoiceChat: String { return self._s[652]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[640]!, self._r[640]!, [_0]) + return formatWithArgumentRanges(self._s[653]!, self._r[653]!, [_0]) } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[641]! } - public var Login_PhoneAndCountryHelp: String { return self._s[642]! } - public var SaveIncomingPhotosSettings_From: String { return self._s[644]! } - public var Conversation_JumpToDate: String { return self._s[645]! } - public var AuthSessions_AddDevice: String { return self._s[646]! } - public var Settings_FAQ: String { return self._s[648]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[654]! } + public var Login_PhoneAndCountryHelp: String { return self._s[655]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[657]! } + public var Conversation_JumpToDate: String { return self._s[658]! } + public var AuthSessions_AddDevice: String { return self._s[659]! } + public var Settings_FAQ: String { return self._s[661]! } public func ChatImport_CreateGroupAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[649]!, self._r[649]!, [_0]) + return formatWithArgumentRanges(self._s[662]!, self._r[662]!, [_0]) } - public var Username_Title: String { return self._s[650]! } - public var DialogList_Read: String { return self._s[651]! } - public var Conversation_InstantPagePreview: String { return self._s[652]! } - public var Report_Succeed: String { return self._s[654]! } - public var Login_ResetAccountProtected_Title: String { return self._s[655]! } - public var CallFeedback_ReasonDistortedSpeech: String { return self._s[656]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[657]! } + public var Username_Title: String { return self._s[663]! } + public var DialogList_Read: String { return self._s[664]! } + public var Conversation_InstantPagePreview: String { return self._s[665]! } + public var Report_Succeed: String { return self._s[667]! } + public var Login_ResetAccountProtected_Title: String { return self._s[668]! } + public var CallFeedback_ReasonDistortedSpeech: String { return self._s[669]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[670]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[658]!, self._r[658]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[671]!, self._r[671]!, [_1, _2, _3]) } - public var WallpaperPreview_PreviewBottomText: String { return self._s[660]! } - public var Privacy_SecretChatsTitle: String { return self._s[663]! } + public var WallpaperPreview_PreviewBottomText: String { return self._s[673]! } + public var Privacy_SecretChatsTitle: String { return self._s[676]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[664]!, self._r[664]!, [_1, _2]) + return formatWithArgumentRanges(self._s[677]!, self._r[677]!, [_1, _2]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[665]! } - public var Conversation_ClousStorageInfo_Description4: String { return self._s[666]! } - public var PasscodeSettings_TurnPasscodeOn: String { return self._s[667]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[668]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[678]! } + public var Conversation_ClousStorageInfo_Description4: String { return self._s[679]! } + public var PasscodeSettings_TurnPasscodeOn: String { return self._s[680]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[681]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[669]!, self._r[669]!, [_0]) + return formatWithArgumentRanges(self._s[682]!, self._r[682]!, [_0]) } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[671]! } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[672]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[673]! } - public var CallFeedback_ReasonDropped: String { return self._s[674]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[684]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[685]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[686]! } + public var CallFeedback_ReasonDropped: String { return self._s[687]! } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[675]!, self._r[675]!, [_0]) + return formatWithArgumentRanges(self._s[688]!, self._r[688]!, [_0]) } - public var WebSearch_Images: String { return self._s[676]! } - public var Passport_Identity_Surname: String { return self._s[677]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[678]! } - public var TwoFactorSetup_Email_Title: String { return self._s[679]! } - public var Cache_ClearEmpty: String { return self._s[680]! } - public var AuthSessions_AddDeviceIntro_Action: String { return self._s[681]! } - public var Theme_Context_Apply: String { return self._s[682]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[683]! } - public var CallList_DeleteAllForEveryone: String { return self._s[684]! } + public var WebSearch_Images: String { return self._s[689]! } + public var Passport_Identity_Surname: String { return self._s[690]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[691]! } + public var TwoFactorSetup_Email_Title: String { return self._s[692]! } + public var Cache_ClearEmpty: String { return self._s[693]! } + public var AuthSessions_AddDeviceIntro_Action: String { return self._s[694]! } + public var Theme_Context_Apply: String { return self._s[695]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[696]! } + public var CallList_DeleteAllForEveryone: String { return self._s[697]! } public func BroadcastGroups_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[685]!, self._r[685]!, [_0]) + return formatWithArgumentRanges(self._s[698]!, self._r[698]!, [_0]) } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[686]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[699]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[687]!, self._r[687]!, [_0]) + return formatWithArgumentRanges(self._s[700]!, self._r[700]!, [_0]) } - public var Call_StatusRinging: String { return self._s[688]! } + public var Call_StatusRinging: String { return self._s[701]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[689]!, self._r[689]!, [_0]) + return formatWithArgumentRanges(self._s[702]!, self._r[702]!, [_0]) } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[690]!, self._r[690]!, [_0]) + return formatWithArgumentRanges(self._s[703]!, self._r[703]!, [_0]) } - public var Cache_ClearNone: String { return self._s[691]! } - public var PrivacyPolicy_Accept: String { return self._s[692]! } - public var Contacts_PhoneNumber: String { return self._s[693]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[694]! } - public var PhotoEditor_HighlightsTint: String { return self._s[696]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[697]! } - public var Checkout_PaymentMethod_Title: String { return self._s[700]! } - public var Month_GenAugust: String { return self._s[702]! } - public var DialogList_Draft: String { return self._s[703]! } - public var ChatList_EmptyChatListFilterText: String { return self._s[704]! } - public var PeopleNearby_Description: String { return self._s[705]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[706]! } - public var VoiceChat_InviteLink_CopyListenerLink: String { return self._s[707]! } - public var VoiceChat_EditTitleRemoveSuccess: String { return self._s[708]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[710]! } - public var Watch_Message_ForwardedFrom: String { return self._s[711]! } - public var Notification_Mute1h: String { return self._s[712]! } - public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[713]! } - public var SettingsSearch_Synonyms_Privacy_AuthSessions: String { return self._s[715]! } - public var Channel_Edit_LinkItem: String { return self._s[716]! } - public var Presence_online: String { return self._s[717]! } - public var AutoDownloadSettings_Title: String { return self._s[718]! } - public var Conversation_MessageDialogRetry: String { return self._s[719]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[721]! } - public var Channel_About_Placeholder: String { return self._s[723]! } - public var Passport_Language_sl: String { return self._s[724]! } - public var AppleWatch_Title: String { return self._s[726]! } - public var RepliesChat_DescriptionText: String { return self._s[728]! } - public var Stats_Message_PrivateShares: String { return self._s[729]! } - public var Settings_ViewPhoto: String { return self._s[730]! } - public var Conversation_ForwardTooltip_SavedMessages_One: String { return self._s[731]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[732]! } - public var Cache_ClearProgress: String { return self._s[733]! } - public var Cache_Music: String { return self._s[734]! } - public var Conversation_ContextMenuShare: String { return self._s[736]! } - public var AutoDownloadSettings_Unlimited: String { return self._s[737]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[738]! } - public var Contacts_PermissionsAllow: String { return self._s[739]! } - public var Passport_Language_vi: String { return self._s[741]! } + public var Cache_ClearNone: String { return self._s[704]! } + public var PrivacyPolicy_Accept: String { return self._s[705]! } + public var Contacts_PhoneNumber: String { return self._s[706]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[707]! } + public var PhotoEditor_HighlightsTint: String { return self._s[709]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[710]! } + public var Checkout_PaymentMethod_Title: String { return self._s[713]! } + public var Month_GenAugust: String { return self._s[715]! } + public var DialogList_Draft: String { return self._s[716]! } + public var ChatList_EmptyChatListFilterText: String { return self._s[717]! } + public var PeopleNearby_Description: String { return self._s[718]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[719]! } + public var VoiceChat_InviteLink_CopyListenerLink: String { return self._s[720]! } + public var VoiceChat_EditTitleRemoveSuccess: String { return self._s[721]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[723]! } + public var Watch_Message_ForwardedFrom: String { return self._s[724]! } + public var Notification_Mute1h: String { return self._s[725]! } + public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[726]! } + public var SettingsSearch_Synonyms_Privacy_AuthSessions: String { return self._s[728]! } + public var Channel_Edit_LinkItem: String { return self._s[729]! } + public var Presence_online: String { return self._s[730]! } + public var AutoDownloadSettings_Title: String { return self._s[731]! } + public var Conversation_MessageDialogRetry: String { return self._s[732]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[734]! } + public var Channel_About_Placeholder: String { return self._s[736]! } + public var Passport_Language_sl: String { return self._s[737]! } + public var AppleWatch_Title: String { return self._s[739]! } + public var RepliesChat_DescriptionText: String { return self._s[741]! } + public var Stats_Message_PrivateShares: String { return self._s[742]! } + public var Settings_ViewPhoto: String { return self._s[743]! } + public var Conversation_ForwardTooltip_SavedMessages_One: String { return self._s[744]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[745]! } + public var Cache_ClearProgress: String { return self._s[746]! } + public var Cache_Music: String { return self._s[747]! } + public var Conversation_ContextMenuShare: String { return self._s[749]! } + public var AutoDownloadSettings_Unlimited: String { return self._s[750]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[751]! } + public var Contacts_PermissionsAllow: String { return self._s[752]! } + public var Passport_Language_vi: String { return self._s[754]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[744]!, self._r[744]!, [_1, _2]) + return formatWithArgumentRanges(self._s[757]!, self._r[757]!, [_1, _2]) } - public var Passport_Language_de: String { return self._s[745]! } - public var Notifications_PermissionsText: String { return self._s[747]! } - public var GroupRemoved_AddToGroup: String { return self._s[748]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[749]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[750]! } - public var Login_TermsOfServiceAgree: String { return self._s[751]! } - public var VoiceOver_Navigation_ProxySettings: String { return self._s[752]! } + public var Passport_Language_de: String { return self._s[758]! } + public var Notifications_PermissionsText: String { return self._s[760]! } + public var GroupRemoved_AddToGroup: String { return self._s[761]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[762]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[763]! } + public var Login_TermsOfServiceAgree: String { return self._s[764]! } + public var VoiceOver_Navigation_ProxySettings: String { return self._s[765]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[753]!, self._r[753]!, [_1, _2]) + return formatWithArgumentRanges(self._s[766]!, self._r[766]!, [_1, _2]) } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[755]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[768]! } public func PUSH_CHAT_VOICECHAT_START(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[756]!, self._r[756]!, [_1, _2]) + return formatWithArgumentRanges(self._s[769]!, self._r[769]!, [_1, _2]) } - public var ChatListFolder_NameGroups: String { return self._s[757]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[758]! } + public var ChatListFolder_NameGroups: String { return self._s[770]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[771]! } + public var VoiceChat_EditDescriptionSave: String { return self._s[772]! } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[759]!, self._r[759]!, [_1, _2]) + return formatWithArgumentRanges(self._s[773]!, self._r[773]!, [_1, _2]) } - public var Watch_Suggestion_TalkLater: String { return self._s[760]! } - public var Checkout_ShippingOption_Title: String { return self._s[761]! } - public var Conversation_TitleRepliesEmpty: String { return self._s[762]! } - public var CreatePoll_TextHeader: String { return self._s[763]! } - public var VoiceOver_Chat_Message: String { return self._s[765]! } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[766]! } - public var ContactInfo_Note: String { return self._s[768]! } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[769]! } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[770]! } - public var AutoDownloadSettings_Photos: String { return self._s[771]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[772]! } + public var Watch_Suggestion_TalkLater: String { return self._s[774]! } + public var Checkout_ShippingOption_Title: String { return self._s[775]! } + public var Conversation_TitleRepliesEmpty: String { return self._s[776]! } + public var CreatePoll_TextHeader: String { return self._s[777]! } + public var VoiceOver_Chat_Message: String { return self._s[779]! } + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[780]! } + public var ContactInfo_Note: String { return self._s[782]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[783]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[784]! } + public var AutoDownloadSettings_Photos: String { return self._s[785]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[786]! } public func Conversation_ForwardTooltip_Chat_One(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[773]!, self._r[773]!, [_0]) + return formatWithArgumentRanges(self._s[787]!, self._r[787]!, [_0]) } - public var Channel_Info_Subscribers: String { return self._s[774]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[775]! } - public var ChatListFolderSettings_FoldersSection: String { return self._s[776]! } - public var VoiceOver_ChatList_OutgoingMessage: String { return self._s[777]! } + public var Channel_Info_Subscribers: String { return self._s[788]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[789]! } + public var ChatListFolderSettings_FoldersSection: String { return self._s[790]! } + public var ChannelInfo_ScheduleVoiceChat: String { return self._s[791]! } + public var VoiceOver_ChatList_OutgoingMessage: String { return self._s[792]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[781]!, self._r[781]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[796]!, self._r[796]!, [_1, _2, _3]) } - public var AutoNightTheme_System: String { return self._s[782]! } - public var Call_StatusWaiting: String { return self._s[783]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[784]! } + public var AutoNightTheme_System: String { return self._s[797]! } + public var Call_StatusWaiting: String { return self._s[798]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[799]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[785]!, self._r[785]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[800]!, self._r[800]!, [_1, _2, _3]) } - public var Conversation_ContextMenuCopy: String { return self._s[787]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[788]! } - public var Notifications_InAppNotificationsVibrate: String { return self._s[789]! } + public var Conversation_ContextMenuCopy: String { return self._s[802]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[803]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[804]! } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[790]!, self._r[790]!, [_0]) + return formatWithArgumentRanges(self._s[805]!, self._r[805]!, [_0]) } - public var Group_Status: String { return self._s[792]! } - public var Group_Setup_HistoryVisible: String { return self._s[793]! } - public var Conversation_UploadFileTooLarge: String { return self._s[794]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[795]! } - public var Paint_Edit: String { return self._s[796]! } - public var PeerInfo_AutoremoveMessages: String { return self._s[797]! } + public var Group_Status: String { return self._s[807]! } + public var Group_Setup_HistoryVisible: String { return self._s[808]! } + public var Conversation_UploadFileTooLarge: String { return self._s[809]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[810]! } + public var Paint_Edit: String { return self._s[811]! } + public var PeerInfo_AutoremoveMessages: String { return self._s[812]! } public func ChatImport_SelectionConfirmationGroupWithoutTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[799]!, self._r[799]!, [_0]) + return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_0]) } - public var Channel_EditAdmin_CannotEdit: String { return self._s[800]! } - public var Username_InvalidTooShort: String { return self._s[801]! } - public var ClearCache_StorageOtherApps: String { return self._s[802]! } - public var Conversation_ViewMessage: String { return self._s[803]! } - public var GroupInfo_PublicLinkAdd: String { return self._s[805]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[815]! } + public var Username_InvalidTooShort: String { return self._s[816]! } + public var ClearCache_StorageOtherApps: String { return self._s[818]! } + public var Conversation_ViewMessage: String { return self._s[819]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[821]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[806]!, self._r[806]!, [_0]) + return formatWithArgumentRanges(self._s[822]!, self._r[822]!, [_0]) } - public var CallSettings_Title: String { return self._s[807]! } + public var CallSettings_Title: String { return self._s[823]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[808]!, self._r[808]!, [_0]) + return formatWithArgumentRanges(self._s[824]!, self._r[824]!, [_0]) } public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[811]!, self._r[811]!, [_0]) + return formatWithArgumentRanges(self._s[827]!, self._r[827]!, [_0]) } - public var PUSH_SENDER_YOU: String { return self._s[814]! } + public var PUSH_SENDER_YOU: String { return self._s[830]! } public func Conversation_DeletedFromContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[815]!, self._r[815]!, [_0]) + return formatWithArgumentRanges(self._s[831]!, self._r[831]!, [_0]) } - public var Profile_ShareContactButton: String { return self._s[816]! } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[817]! } + public var Profile_ShareContactButton: String { return self._s[832]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[833]! } public func VoiceOver_Chat_StickerFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[818]!, self._r[818]!, [_0]) + return formatWithArgumentRanges(self._s[834]!, self._r[834]!, [_0]) } - public var Map_ShareLiveLocation: String { return self._s[819]! } - public var ChatListFolder_TitleEdit: String { return self._s[820]! } + public var Map_ShareLiveLocation: String { return self._s[835]! } + public var ChatListFolder_TitleEdit: String { return self._s[836]! } public func VoiceOver_Chat_AnimatedStickerFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[821]!, self._r[821]!, [_0]) + return formatWithArgumentRanges(self._s[837]!, self._r[837]!, [_0]) } - public var Passport_Address_Address: String { return self._s[823]! } - public var LastSeen_JustNow: String { return self._s[825]! } + public var Passport_Address_Address: String { return self._s[839]! } + public var LastSeen_JustNow: String { return self._s[841]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[826]!, self._r[826]!, [_0]) + return formatWithArgumentRanges(self._s[842]!, self._r[842]!, [_0]) } - public var ContactInfo_PhoneLabelOther: String { return self._s[827]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[828]! } - public var Weekday_Today: String { return self._s[831]! } - public var DialogList_Title: String { return self._s[832]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[833]! } - public var Cache_ClearCache: String { return self._s[834]! } - public var CreatePoll_ExplanationInfo: String { return self._s[835]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[837]! } - public var Stats_MessageTitle: String { return self._s[838]! } - public var Passport_Address_Street: String { return self._s[840]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[843]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[844]! } + public var Weekday_Today: String { return self._s[847]! } + public var DialogList_Title: String { return self._s[848]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[849]! } + public var Cache_ClearCache: String { return self._s[850]! } + public var CreatePoll_ExplanationInfo: String { return self._s[851]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[853]! } + public var Stats_MessageTitle: String { return self._s[854]! } + public var Passport_Address_Street: String { return self._s[856]! } public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[841]!, self._r[841]!, [_0]) + return formatWithArgumentRanges(self._s[857]!, self._r[857]!, [_0]) } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[842]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[858]! } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[843]!, self._r[843]!, [_0]) + return formatWithArgumentRanges(self._s[859]!, self._r[859]!, [_0]) } - public var TwoStepAuth_Email: String { return self._s[845]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[846]! } - public var PrivacySettings_PasscodeOn: String { return self._s[847]! } - public var Camera_SquareMode: String { return self._s[849]! } - public var SocksProxySetup_Port: String { return self._s[850]! } - public var Watch_LastSeen_JustNow: String { return self._s[852]! } + public var TwoStepAuth_Email: String { return self._s[861]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[862]! } + public var PrivacySettings_PasscodeOn: String { return self._s[863]! } + public var Camera_SquareMode: String { return self._s[865]! } + public var SocksProxySetup_Port: String { return self._s[866]! } + public var Watch_LastSeen_JustNow: String { return self._s[868]! } public func Location_ProximityAlertSetText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[853]!, self._r[853]!, [_1, _2]) + return formatWithArgumentRanges(self._s[869]!, self._r[869]!, [_1, _2]) } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[854]!, self._r[854]!, [_1, _2]) + return formatWithArgumentRanges(self._s[870]!, self._r[870]!, [_1, _2]) } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[855]!, self._r[855]!, [_0]) + return formatWithArgumentRanges(self._s[871]!, self._r[871]!, [_0]) } - public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[856]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[857]! } - public var Watch_Suggestion_HoldOn: String { return self._s[860]! } + public var VoiceChat_CancelVoiceChat: String { return self._s[872]! } + public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[873]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[874]! } + public var Watch_Suggestion_HoldOn: String { return self._s[877]! } public func PUSH_CHANNEL_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[861]!, self._r[861]!, [_1]) + return formatWithArgumentRanges(self._s[878]!, self._r[878]!, [_1]) } - public var CallSettings_TabIcon: String { return self._s[862]! } - public var ScheduledMessages_SendNow: String { return self._s[863]! } - public var Stats_GroupTopWeekdaysTitle: String { return self._s[864]! } - public var UserInfo_PhoneCall: String { return self._s[865]! } - public var Month_GenMarch: String { return self._s[866]! } - public var Camera_Discard: String { return self._s[867]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[868]! } - public var Passport_RequestedInformation: String { return self._s[869]! } - public var VoiceChat_RecordingTitlePlaceholder: String { return self._s[871]! } + public var CallSettings_TabIcon: String { return self._s[879]! } + public var ScheduledMessages_SendNow: String { return self._s[880]! } + public var Stats_GroupTopWeekdaysTitle: String { return self._s[881]! } + public var UserInfo_PhoneCall: String { return self._s[882]! } + public var Month_GenMarch: String { return self._s[883]! } + public var Camera_Discard: String { return self._s[884]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[885]! } + public var Passport_RequestedInformation: String { return self._s[886]! } + public var VoiceChat_RecordingTitlePlaceholder: String { return self._s[888]! } public func Notification_ProximityYouReached(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[872]!, self._r[872]!, [_1, _2]) + return formatWithArgumentRanges(self._s[889]!, self._r[889]!, [_1, _2]) } - public var Passport_Language_ro: String { return self._s[873]! } + public var Passport_Language_ro: String { return self._s[890]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[874]!, self._r[874]!, [_1, _2]) + return formatWithArgumentRanges(self._s[891]!, self._r[891]!, [_1, _2]) } - public var AutoDownloadSettings_ResetHelp: String { return self._s[875]! } - public var Passport_Identity_DocumentDetails: String { return self._s[877]! } - public var Passport_Address_ScansHelp: String { return self._s[878]! } - public var Location_LiveLocationRequired_Title: String { return self._s[879]! } - public var ClearCache_StorageCache: String { return self._s[880]! } - public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[881]! } - public var Conversation_RestrictedText: String { return self._s[882]! } - public var Notifications_MessageNotifications: String { return self._s[884]! } - public var Passport_Scans: String { return self._s[885]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[887]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[888]! } - public var Passport_Identity_SelfieHelp: String { return self._s[889]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[890]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[891]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[892]! } - public var PeerInfo_ButtonSearch: String { return self._s[893]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[892]! } + public var Passport_Identity_DocumentDetails: String { return self._s[894]! } + public var Passport_Address_ScansHelp: String { return self._s[895]! } + public var Location_LiveLocationRequired_Title: String { return self._s[896]! } + public var ClearCache_StorageCache: String { return self._s[897]! } + public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[898]! } + public var Conversation_RestrictedText: String { return self._s[899]! } + public var Notifications_MessageNotifications: String { return self._s[901]! } + public var Passport_Scans: String { return self._s[902]! } + public func VoiceChat_StatusStartsIn(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[904]!, self._r[904]!, [_0]) + } + public var TwoStepAuth_SetupHintTitle: String { return self._s[905]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[906]! } + public var Passport_Identity_SelfieHelp: String { return self._s[907]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[908]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[909]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[910]! } + public var PeerInfo_ButtonSearch: String { return self._s[911]! } public func Notification_ProximityReachedYou(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[896]!, self._r[896]!, [_1, _2]) + return formatWithArgumentRanges(self._s[914]!, self._r[914]!, [_1, _2]) } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[897]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[899]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[900]! } - public var Month_GenSeptember: String { return self._s[901]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[915]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[917]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[918]! } + public var Month_GenSeptember: String { return self._s[919]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[903]!, self._r[903]!, [_1, _2]) + return formatWithArgumentRanges(self._s[921]!, self._r[921]!, [_1, _2]) } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[904]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[922]! } public func Notification_VoiceChatInvitation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[906]!, self._r[906]!, [_1, _2]) + return formatWithArgumentRanges(self._s[924]!, self._r[924]!, [_1, _2]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[907]!, self._r[907]!, [_0]) + return formatWithArgumentRanges(self._s[925]!, self._r[925]!, [_0]) } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[909]!, self._r[909]!, [_1, _2]) + return formatWithArgumentRanges(self._s[927]!, self._r[927]!, [_1, _2]) } public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[910]!, self._r[910]!, [_1, _2]) + return formatWithArgumentRanges(self._s[928]!, self._r[928]!, [_1, _2]) } - public var Calls_NotNow: String { return self._s[912]! } - public var Settings_ChatFolders: String { return self._s[916]! } - public var Login_PadPhoneHelpTitle: String { return self._s[917]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[918]! } - public var Widget_MessageAutoremoveTimerRemoved: String { return self._s[919]! } - public var VoiceChat_RecordingSaved: String { return self._s[920]! } - public var Settings_ChatBackground: String { return self._s[921]! } + public var Calls_NotNow: String { return self._s[930]! } + public var Settings_ChatFolders: String { return self._s[935]! } + public var Login_PadPhoneHelpTitle: String { return self._s[936]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[937]! } + public var Widget_MessageAutoremoveTimerRemoved: String { return self._s[938]! } + public var VoiceChat_RecordingSaved: String { return self._s[939]! } + public var Settings_ChatBackground: String { return self._s[940]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[923]!, self._r[923]!, [_1, _2]) + return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_1, _2]) } - public var ProxyServer_VoiceOver_Active: String { return self._s[924]! } - public var Call_StatusBusy: String { return self._s[925]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[926]! } - public var Login_NetworkError: String { return self._s[928]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[929]! } - public var Privacy_Calls_Integration: String { return self._s[930]! } - public var DialogList_SearchSectionMessages: String { return self._s[931]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[932]! } - public var Preview_DeletePhoto: String { return self._s[933]! } - public var VoiceChat_Video: String { return self._s[934]! } - public var PrivacySettings_PhoneNumber: String { return self._s[936]! } - public var Forward_ErrorDisabledForChat: String { return self._s[937]! } - public var Watch_Compose_CurrentLocation: String { return self._s[938]! } - public var Settings_CallSettings: String { return self._s[939]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[940]! } - public var Conversation_StickerRemovedFromFavorites: String { return self._s[941]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[942]! } - public var ChatSettings_AutoPlayAnimations: String { return self._s[943]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[944]! } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[945]! } - public var Map_LiveLocationFor1Hour: String { return self._s[946]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[943]! } + public var Call_StatusBusy: String { return self._s[944]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[945]! } + public var Login_NetworkError: String { return self._s[947]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[948]! } + public var Privacy_Calls_Integration: String { return self._s[949]! } + public var DialogList_SearchSectionMessages: String { return self._s[950]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[951]! } + public var Preview_DeletePhoto: String { return self._s[952]! } + public var VoiceChat_Video: String { return self._s[953]! } + public var PrivacySettings_PhoneNumber: String { return self._s[955]! } + public var Forward_ErrorDisabledForChat: String { return self._s[956]! } + public var Watch_Compose_CurrentLocation: String { return self._s[957]! } + public var Settings_CallSettings: String { return self._s[958]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[959]! } + public var Conversation_StickerRemovedFromFavorites: String { return self._s[960]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[961]! } + public var ChatSettings_AutoPlayAnimations: String { return self._s[962]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[963]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[964]! } + public var Map_LiveLocationFor1Hour: String { return self._s[965]! } public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[947]!, self._r[947]!, [_0, _1]) + return formatWithArgumentRanges(self._s[966]!, self._r[966]!, [_0, _1]) } - public var VoiceChat_MutedByAdmin: String { return self._s[948]! } + public var VoiceChat_MutedByAdmin: String { return self._s[967]! } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[949]!, self._r[949]!, [_0]) + return formatWithArgumentRanges(self._s[968]!, self._r[968]!, [_0]) } - public var Conversation_UnvotePoll: String { return self._s[950]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[951]! } + public var Conversation_UnvotePoll: String { return self._s[969]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[970]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[971]!, self._r[971]!, [_1, "\(_2)"]) } - public var Passport_InfoTitle: String { return self._s[953]! } + public var Passport_InfoTitle: String { return self._s[972]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[954]!, self._r[954]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[973]!, self._r[973]!, ["\(_0)"]) } - public var AccentColor_Title: String { return self._s[955]! } + public var AccentColor_Title: String { return self._s[974]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[956]!, self._r[956]!, [_1, _2]) + return formatWithArgumentRanges(self._s[975]!, self._r[975]!, [_1, _2]) } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[959]!, self._r[959]!, [_0]) + return formatWithArgumentRanges(self._s[978]!, self._r[978]!, [_0]) } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[960]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[961]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[962]! } - public var VoiceOver_Editing_ClearText: String { return self._s[963]! } - public var Conversation_Unarchive: String { return self._s[964]! } - public var Notification_CallOutgoing: String { return self._s[965]! } - public var Channel_Setup_PublicNoLink: String { return self._s[966]! } - public var Passport_Identity_GenderPlaceholder: String { return self._s[967]! } - public var Message_Animation: String { return self._s[968]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[969]! } - public var ChatSettings_ConnectionType_Title: String { return self._s[970]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[979]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[980]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[981]! } + public var VoiceOver_Editing_ClearText: String { return self._s[982]! } + public var Conversation_Unarchive: String { return self._s[983]! } + public var Notification_CallOutgoing: String { return self._s[984]! } + public var Channel_Setup_PublicNoLink: String { return self._s[985]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[986]! } + public var Message_Animation: String { return self._s[987]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[988]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[989]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[971]!, self._r[971]!, [_1, _2]) + return formatWithArgumentRanges(self._s[990]!, self._r[990]!, [_1, _2]) } public func VoiceChat_StatusSpeakingVolume(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[972]!, self._r[972]!, [_0]) + return formatWithArgumentRanges(self._s[991]!, self._r[991]!, [_0]) } - public var Notification_CallBack: String { return self._s[973]! } - public var Appearance_Title: String { return self._s[976]! } - public var NotificationsSound_Glass: String { return self._s[978]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[980]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[982]! } - public var ChatSearch_SearchPlaceholder: String { return self._s[983]! } - public var Passport_Identity_AddPassport: String { return self._s[984]! } - public var GroupPermission_NoAddMembers: String { return self._s[986]! } - public var ContactList_Context_SendMessage: String { return self._s[987]! } - public var PhotoEditor_GrainTool: String { return self._s[988]! } - public var Settings_CopyPhoneNumber: String { return self._s[989]! } - public var Passport_Address_City: String { return self._s[990]! } - public var ChannelRemoved_RemoveInfo: String { return self._s[991]! } - public var SocksProxySetup_Password: String { return self._s[993]! } - public var Settings_Passport: String { return self._s[994]! } - public var Channel_MessagePhotoUpdated: String { return self._s[996]! } - public var Stats_LanguagesTitle: String { return self._s[997]! } - public var ChatList_PeerTypeGroup: String { return self._s[998]! } - public var Privacy_Calls_P2PHelp: String { return self._s[999]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[1000]! } - public var Embed_PlayingInPIP: String { return self._s[1001]! } - public var BlockedUsers_BlockUser: String { return self._s[1004]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[1005]! } + public var Notification_CallBack: String { return self._s[992]! } + public var Appearance_Title: String { return self._s[995]! } + public var NotificationsSound_Glass: String { return self._s[997]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[999]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[1001]! } + public var ChatSearch_SearchPlaceholder: String { return self._s[1002]! } + public var Passport_Identity_AddPassport: String { return self._s[1003]! } + public var GroupPermission_NoAddMembers: String { return self._s[1005]! } + public var ContactList_Context_SendMessage: String { return self._s[1006]! } + public var PhotoEditor_GrainTool: String { return self._s[1007]! } + public var Settings_CopyPhoneNumber: String { return self._s[1008]! } + public var Passport_Address_City: String { return self._s[1009]! } + public var VoiceChat_LeaveAndCancelVoiceChat: String { return self._s[1010]! } + public var ChannelRemoved_RemoveInfo: String { return self._s[1011]! } + public var SocksProxySetup_Password: String { return self._s[1013]! } + public var Settings_Passport: String { return self._s[1014]! } + public var Channel_MessagePhotoUpdated: String { return self._s[1016]! } + public var Stats_LanguagesTitle: String { return self._s[1017]! } + public var ChatList_PeerTypeGroup: String { return self._s[1018]! } + public var Privacy_Calls_P2PHelp: String { return self._s[1019]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[1020]! } + public var Embed_PlayingInPIP: String { return self._s[1021]! } + public var BlockedUsers_BlockUser: String { return self._s[1024]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[1025]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1006]!, self._r[1006]!, [_1]) + return formatWithArgumentRanges(self._s[1026]!, self._r[1026]!, [_1]) } - public var AuthSessions_LoggedIn: String { return self._s[1007]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[1008]! } - public var Activity_UploadingDocument: String { return self._s[1009]! } - public var PeopleNearby_NoMembers: String { return self._s[1010]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1013]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[1014]! } - public var VoiceOver_Chat_OpenLinkHint: String { return self._s[1015]! } - public var InstantPage_VoiceOver_IncreaseFontSize: String { return self._s[1016]! } - public var Settings_ViewVideo: String { return self._s[1017]! } - public var Map_ShowPlaces: String { return self._s[1019]! } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1020]! } - public var InviteLink_Create_Title: String { return self._s[1021]! } - public var Notification_CreatedGroup: String { return self._s[1022]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[1023]! } + public var AuthSessions_LoggedIn: String { return self._s[1027]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[1028]! } + public var Activity_UploadingDocument: String { return self._s[1029]! } + public var PeopleNearby_NoMembers: String { return self._s[1030]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1033]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[1034]! } + public var VoiceOver_Chat_OpenLinkHint: String { return self._s[1035]! } + public var InstantPage_VoiceOver_IncreaseFontSize: String { return self._s[1036]! } + public var Settings_ViewVideo: String { return self._s[1037]! } + public var Map_ShowPlaces: String { return self._s[1039]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1040]! } + public var InviteLink_Create_Title: String { return self._s[1041]! } + public var Notification_CreatedGroup: String { return self._s[1042]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[1043]! } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1024]!, self._r[1024]!, [_0]) + return formatWithArgumentRanges(self._s[1044]!, self._r[1044]!, [_0]) } - public var Conversation_StatusLeftGroup: String { return self._s[1025]! } - public var Theme_Colors_Messages: String { return self._s[1026]! } - public var AuthSessions_EmptyText: String { return self._s[1027]! } + public var Conversation_StatusLeftGroup: String { return self._s[1045]! } + public var Theme_Colors_Messages: String { return self._s[1046]! } + public var AuthSessions_EmptyText: String { return self._s[1047]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1028]!, self._r[1028]!, [_1]) + return formatWithArgumentRanges(self._s[1048]!, self._r[1048]!, [_1]) } - public var UserInfo_StartSecretChat: String { return self._s[1029]! } - public var ChatListFolderSettings_EditFoldersInfo: String { return self._s[1030]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[1031]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1032]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[1034]! } - public var PeerInfo_PaneFiles: String { return self._s[1035]! } - public var VoiceChat_DisplayAs: String { return self._s[1036]! } - public var PrivacySettings_AutoArchive: String { return self._s[1037]! } - public var Camera_VideoMode: String { return self._s[1038]! } - public var NotificationsSound_Alert: String { return self._s[1039]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1040]! } - public var Appearance_AutoNightTheme: String { return self._s[1041]! } - public var Passport_Language_he: String { return self._s[1042]! } - public var Passport_InvalidPasswordError: String { return self._s[1043]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1044]! } - public var UserInfo_InviteBotToGroup: String { return self._s[1045]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[1046]! } - public var Common_TakePhoto: String { return self._s[1047]! } + public var UserInfo_StartSecretChat: String { return self._s[1049]! } + public var ChatListFolderSettings_EditFoldersInfo: String { return self._s[1050]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[1051]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1052]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[1054]! } + public var PeerInfo_PaneFiles: String { return self._s[1055]! } + public var VoiceChat_DisplayAs: String { return self._s[1056]! } + public var PrivacySettings_AutoArchive: String { return self._s[1057]! } + public var Camera_VideoMode: String { return self._s[1058]! } + public var NotificationsSound_Alert: String { return self._s[1059]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1060]! } + public var Appearance_AutoNightTheme: String { return self._s[1061]! } + public var Passport_Language_he: String { return self._s[1062]! } + public var Passport_InvalidPasswordError: String { return self._s[1063]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1064]! } + public var UserInfo_InviteBotToGroup: String { return self._s[1065]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[1066]! } + public var Common_TakePhoto: String { return self._s[1067]! } public func Channel_AdminLog_RevokedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1048]!, self._r[1048]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1068]!, self._r[1068]!, [_1, _2]) } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[1049]! } - public var ChatList_Context_JoinChannel: String { return self._s[1050]! } - public var MediaPlayer_UnknownArtist: String { return self._s[1051]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[1054]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[1055]! } - public var EditTheme_UploadEditedTheme: String { return self._s[1056]! } - public var Settings_SetProfilePhotoOrVideo: String { return self._s[1058]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[1059]! } - public var MessagePoll_ViewResults: String { return self._s[1060]! } - public var Group_Setup_TypePrivateHelp: String { return self._s[1061]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[1069]! } + public var ChatList_Context_JoinChannel: String { return self._s[1070]! } + public var MediaPlayer_UnknownArtist: String { return self._s[1071]! } + public var VoiceChat_EditDescriptionText: String { return self._s[1072]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[1075]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[1076]! } + public var EditTheme_UploadEditedTheme: String { return self._s[1077]! } + public var Settings_SetProfilePhotoOrVideo: String { return self._s[1079]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[1080]! } + public var MessagePoll_ViewResults: String { return self._s[1081]! } + public var Group_Setup_TypePrivateHelp: String { return self._s[1082]! } public func UserInfo_ContactForwardTooltip_Chat_One(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1062]!, self._r[1062]!, [_0]) + return formatWithArgumentRanges(self._s[1083]!, self._r[1083]!, [_0]) } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1063]! } - public var ChatList_Search_ShowLess: String { return self._s[1064]! } - public var InviteLink_Create_UsersLimitNoLimit: String { return self._s[1065]! } - public var UserInfo_ShareBot: String { return self._s[1066]! } - public var Privacy_Calls_P2P: String { return self._s[1068]! } - public var WebBrowser_InAppSafari: String { return self._s[1069]! } - public var SharedMedia_EmptyFilesText: String { return self._s[1072]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[1073]! } - public var GroupInfo_SetSound: String { return self._s[1074]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1075]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1084]! } + public var Privacy_PaymentsClear_ShippingInfoCleared: String { return self._s[1085]! } + public var ChatList_Search_ShowLess: String { return self._s[1086]! } + public var InviteLink_Create_UsersLimitNoLimit: String { return self._s[1087]! } + public var UserInfo_ShareBot: String { return self._s[1088]! } + public var Privacy_Calls_P2P: String { return self._s[1090]! } + public var WebBrowser_InAppSafari: String { return self._s[1091]! } + public var SharedMedia_EmptyFilesText: String { return self._s[1094]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[1095]! } + public var GroupInfo_SetSound: String { return self._s[1096]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1097]! } public func Conversation_AutoremoveRemainingTime(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1076]!, self._r[1076]!, [_0]) + return formatWithArgumentRanges(self._s[1098]!, self._r[1098]!, [_0]) } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1077]! } - public var Channel_AdminLogFilter_EventsAll: String { return self._s[1078]! } - public var CallSettings_UseLessData: String { return self._s[1079]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[1080]! } - public var NotificationsSound_Chord: String { return self._s[1081]! } - public var PhotoEditor_CurvesTool: String { return self._s[1082]! } - public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1083]! } - public var Resolve_ErrorNotFound: String { return self._s[1084]! } - public var Activity_PlayingGame: String { return self._s[1085]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1099]! } + public var Channel_AdminLogFilter_EventsAll: String { return self._s[1100]! } + public var CallSettings_UseLessData: String { return self._s[1101]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[1102]! } + public var NotificationsSound_Chord: String { return self._s[1103]! } + public var PhotoEditor_CurvesTool: String { return self._s[1104]! } + public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1105]! } + public var Resolve_ErrorNotFound: String { return self._s[1106]! } + public var Activity_PlayingGame: String { return self._s[1107]! } public func VoiceChat_InvitedPeerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1088]!, self._r[1088]!, [_0]) + return formatWithArgumentRanges(self._s[1111]!, self._r[1111]!, [_0]) } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1089]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1112]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1090]!, self._r[1090]!, [_1]) + return formatWithArgumentRanges(self._s[1113]!, self._r[1113]!, [_1]) } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[1091]! } - public var Notification_CallIncoming: String { return self._s[1092]! } - public var Stats_EnabledNotifications: String { return self._s[1093]! } - public var Notification_VoiceChatStartedChannel: String { return self._s[1094]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[1095]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1096]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[1114]! } + public var Notification_CallIncoming: String { return self._s[1115]! } + public var Stats_EnabledNotifications: String { return self._s[1116]! } + public var Notification_VoiceChatStartedChannel: String { return self._s[1117]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[1118]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1119]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1097]!, self._r[1097]!, [_0]) + return formatWithArgumentRanges(self._s[1120]!, self._r[1120]!, [_0]) } - public var VoiceChat_StatusMutedYou: String { return self._s[1098]! } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[1099]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[1100]! } - public var StickerPacksSettings_Title: String { return self._s[1101]! } + public var VoiceChat_StatusMutedYou: String { return self._s[1121]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[1122]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[1123]! } + public var StickerPacksSettings_Title: String { return self._s[1124]! } public func Channel_AdminLog_MessageGroupPreHistoryVisible(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1102]!, self._r[1102]!, [_0]) + return formatWithArgumentRanges(self._s[1125]!, self._r[1125]!, [_0]) } - public var Watch_NoConnection: String { return self._s[1103]! } - public var EncryptionKey_Title: String { return self._s[1104]! } - public var Widget_AuthRequired: String { return self._s[1105]! } + public var Watch_NoConnection: String { return self._s[1126]! } + public var EncryptionKey_Title: String { return self._s[1127]! } + public var Widget_AuthRequired: String { return self._s[1128]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1106]!, self._r[1106]!, [_1]) + return formatWithArgumentRanges(self._s[1129]!, self._r[1129]!, [_1]) } - public var Notifications_ExceptionsTitle: String { return self._s[1107]! } - public var EditTheme_Expand_TopInfo: String { return self._s[1108]! } + public var Notifications_ExceptionsTitle: String { return self._s[1130]! } + public var EditTheme_Expand_TopInfo: String { return self._s[1131]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1109]!, self._r[1109]!, [_0]) + return formatWithArgumentRanges(self._s[1132]!, self._r[1132]!, [_0]) } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[1111]! } - public var Notifications_GroupNotificationsSound: String { return self._s[1112]! } - public var VoiceChat_SpeakPermissionAdmin: String { return self._s[1113]! } - public var Passport_Email_EnterOtherEmail: String { return self._s[1114]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[1134]! } + public var Notifications_GroupNotificationsSound: String { return self._s[1135]! } + public var VoiceChat_SpeakPermissionAdmin: String { return self._s[1136]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[1137]! } public func VoiceChat_RemovePeerConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1117]!, self._r[1117]!, [_0]) + return formatWithArgumentRanges(self._s[1140]!, self._r[1140]!, [_0]) + } + public var Conversation_AddToContacts: String { return self._s[1141]! } + public var AutoDownloadSettings_DataUsageMedium: String { return self._s[1142]! } + public var AuthSessions_LogOutApplications: String { return self._s[1144]! } + public var VoiceChat_LeaveVoiceChat: String { return self._s[1145]! } + public var ChatList_Context_Unpin: String { return self._s[1146]! } + public var PeopleNearby_DiscoverDescription: String { return self._s[1147]! } + public var UserInfo_FakeBotWarning: String { return self._s[1148]! } + public var Notification_MessageLifetime1d: String { return self._s[1149]! } + public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[1150]! } + public var ChatListFolder_CategoryChannels: String { return self._s[1151]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[1152]! } + public var Notifications_PermissionsAllow: String { return self._s[1153]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[1154]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1156]! } + public var VoiceChat_ImproveYourProfileText: String { return self._s[1157]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1158]! } + public var ChatImportActivity_ErrorInvalidChatType: String { return self._s[1159]! } + public func Conversation_ScheduledVoiceChatStartsToday(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1160]!, self._r[1160]!, [_0]) } - public var Conversation_AddToContacts: String { return self._s[1118]! } - public var AutoDownloadSettings_DataUsageMedium: String { return self._s[1119]! } - public var AuthSessions_LogOutApplications: String { return self._s[1121]! } - public var VoiceChat_LeaveVoiceChat: String { return self._s[1122]! } - public var ChatList_Context_Unpin: String { return self._s[1123]! } - public var PeopleNearby_DiscoverDescription: String { return self._s[1124]! } - public var UserInfo_FakeBotWarning: String { return self._s[1125]! } - public var Notification_MessageLifetime1d: String { return self._s[1126]! } - public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[1127]! } - public var ChatListFolder_CategoryChannels: String { return self._s[1128]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[1129]! } - public var Notifications_PermissionsAllow: String { return self._s[1130]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[1131]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1133]! } - public var VoiceChat_ImproveYourProfileText: String { return self._s[1134]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1135]! } - public var ChatImportActivity_ErrorInvalidChatType: String { return self._s[1136]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1137]!, self._r[1137]!, [_0]) - } - public var Conversation_AutoremoveTimerRemovedChannel: String { return self._s[1139]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[1141]! } - public var WallpaperSearch_ColorPink: String { return self._s[1142]! } - public var ContactInfo_PhoneNumberHidden: String { return self._s[1143]! } - public var Passport_Identity_IssueDate: String { return self._s[1145]! } - public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1146]!, self._r[1146]!, [_1, _2]) - } - public var ChatList_DeleteForAllSubscribersConfirmationText: String { return self._s[1147]! } - public var Channel_Info_Description: String { return self._s[1148]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1149]! } - public var Weekday_ShortTuesday: String { return self._s[1150]! } - public var Common_Back: String { return self._s[1151]! } - public var Chat_PinnedMessagesHiddenTitle: String { return self._s[1153]! } - public var ChatListFolder_AddChats: String { return self._s[1154]! } - public var Common_Close: String { return self._s[1156]! } - public var Map_OpenIn: String { return self._s[1157]! } - public var Group_Setup_HistoryTitle: String { return self._s[1158]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[1159]! } - public var Notification_MessageLifetime1h: String { return self._s[1160]! } - public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1161]!, self._r[1161]!, [_0]) } - public var Watch_Contacts_NoResults: String { return self._s[1163]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1164]! } - public var Checkout_Phone: String { return self._s[1165]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[1166]! } + public var Conversation_AutoremoveTimerRemovedChannel: String { return self._s[1163]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[1165]! } + public var WallpaperSearch_ColorPink: String { return self._s[1166]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[1167]! } + public var Passport_Identity_IssueDate: String { return self._s[1169]! } + public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1170]!, self._r[1170]!, [_1, _2]) + } + public var ChatList_DeleteForAllSubscribersConfirmationText: String { return self._s[1171]! } + public var Channel_Info_Description: String { return self._s[1172]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1173]! } + public var Weekday_ShortTuesday: String { return self._s[1174]! } + public var Common_Back: String { return self._s[1175]! } + public var Chat_PinnedMessagesHiddenTitle: String { return self._s[1177]! } + public var ChatListFolder_AddChats: String { return self._s[1178]! } + public var Common_Close: String { return self._s[1180]! } + public var Map_OpenIn: String { return self._s[1181]! } + public var Group_Setup_HistoryTitle: String { return self._s[1182]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[1183]! } + public var Notification_MessageLifetime1h: String { return self._s[1184]! } + public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1185]!, self._r[1185]!, [_0]) + } + public var Watch_Contacts_NoResults: String { return self._s[1187]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1188]! } + public var Checkout_Phone: String { return self._s[1189]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[1190]! } public func Channel_CommentsGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1167]!, self._r[1167]!, [_0]) + return formatWithArgumentRanges(self._s[1191]!, self._r[1191]!, [_0]) } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1168]!, self._r[1168]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1192]!, self._r[1192]!, ["\(_0)"]) } - public var Conversation_AudioRateTooltipSpeedUp: String { return self._s[1169]! } - public var ChatAdmins_Title: String { return self._s[1170]! } - public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[1171]! } + public var Conversation_AudioRateTooltipSpeedUp: String { return self._s[1193]! } + public var ChatAdmins_Title: String { return self._s[1194]! } + public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[1195]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1172]!, self._r[1172]!, [_1]) + return formatWithArgumentRanges(self._s[1196]!, self._r[1196]!, [_1]) } - public var Common_Done: String { return self._s[1173]! } - public var ChatList_HeaderImportIntoAnExistingGroup: String { return self._s[1174]! } - public var Appearance_ThemeCarouselNight: String { return self._s[1177]! } + public var Common_Done: String { return self._s[1197]! } + public var ChatList_HeaderImportIntoAnExistingGroup: String { return self._s[1198]! } + public var Appearance_ThemeCarouselNight: String { return self._s[1201]! } public func PUSH_PINNED_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1179]!, self._r[1179]!, [_1]) + return formatWithArgumentRanges(self._s[1203]!, self._r[1203]!, [_1]) } - public var InviteLink_Expired: String { return self._s[1181]! } - public var Preview_OpenInInstagram: String { return self._s[1182]! } - public var Wallpaper_SetColor: String { return self._s[1186]! } - public var VoiceOver_Media_PlaybackRate: String { return self._s[1187]! } - public var ChatSettings_Groups: String { return self._s[1188]! } + public var InviteLink_Expired: String { return self._s[1205]! } + public var Preview_OpenInInstagram: String { return self._s[1206]! } + public var Wallpaper_SetColor: String { return self._s[1211]! } + public var VoiceOver_Media_PlaybackRate: String { return self._s[1212]! } + public var ChatSettings_Groups: String { return self._s[1213]! } public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1189]!, self._r[1189]!, [_0]) + return formatWithArgumentRanges(self._s[1214]!, self._r[1214]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[1190]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1191]! } - public var Channel_Management_LabelCreator: String { return self._s[1192]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1193]! } + public var Contacts_SortedByName: String { return self._s[1215]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1216]! } + public var Channel_Management_LabelCreator: String { return self._s[1217]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1218]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1194]!, self._r[1194]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1219]!, self._r[1219]!, [_0, _1]) } - public var Group_GroupMembersHeader: String { return self._s[1195]! } - public var Group_PublicLink_Title: String { return self._s[1196]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1197]! } - public var VoiceOver_Chat_Photo: String { return self._s[1198]! } - public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[1199]! } - public var IntentsSettings_SuggestBy: String { return self._s[1200]! } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[1201]! } - public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1202]! } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[1203]! } - public var LogoutOptions_SetPasscodeText: String { return self._s[1204]! } - public var Map_OpenInMaps: String { return self._s[1205]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[1206]! } - public var BlockedUsers_Unblock: String { return self._s[1207]! } + public var Group_GroupMembersHeader: String { return self._s[1220]! } + public var Group_PublicLink_Title: String { return self._s[1221]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1222]! } + public var VoiceOver_Chat_Photo: String { return self._s[1223]! } + public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[1224]! } + public var IntentsSettings_SuggestBy: String { return self._s[1225]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[1226]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1227]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[1228]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[1229]! } + public var Map_OpenInMaps: String { return self._s[1230]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[1231]! } + public var BlockedUsers_Unblock: String { return self._s[1232]! } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1208]!, self._r[1208]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1233]!, self._r[1233]!, [_1, _2]) } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1209]!, self._r[1209]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1234]!, self._r[1234]!, [_1, _2]) } - public var ChatImport_CreateGroupAlertTitle: String { return self._s[1211]! } - public var Conversation_Block: String { return self._s[1212]! } - public var VoiceChat_PersonalAccount: String { return self._s[1213]! } - public var Passport_Scans_UploadNew: String { return self._s[1214]! } - public var Share_Title: String { return self._s[1215]! } - public var Conversation_ApplyLocalization: String { return self._s[1216]! } - public var SharedMedia_EmptyLinksText: String { return self._s[1217]! } - public var Settings_NotificationsAndSounds: String { return self._s[1218]! } - public var Stats_ViewsByHoursTitle: String { return self._s[1219]! } - public var PhotoEditor_QualityMedium: String { return self._s[1220]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[1221]! } + public var ChatImport_CreateGroupAlertTitle: String { return self._s[1236]! } + public var Conversation_Block: String { return self._s[1237]! } + public var VoiceChat_PersonalAccount: String { return self._s[1238]! } + public var Passport_Scans_UploadNew: String { return self._s[1239]! } + public var Share_Title: String { return self._s[1240]! } + public var Conversation_ApplyLocalization: String { return self._s[1241]! } + public var SharedMedia_EmptyLinksText: String { return self._s[1242]! } + public var Settings_NotificationsAndSounds: String { return self._s[1243]! } + public var Stats_ViewsByHoursTitle: String { return self._s[1244]! } + public var PhotoEditor_QualityMedium: String { return self._s[1245]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[1246]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1222]!, self._r[1222]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1247]!, self._r[1247]!, [_1, _2]) } - public var Conversation_RestrictedInline: String { return self._s[1223]! } - public var Passport_Language_tr: String { return self._s[1224]! } - public var Call_Mute: String { return self._s[1225]! } + public var Conversation_RestrictedInline: String { return self._s[1248]! } + public var Passport_Language_tr: String { return self._s[1249]! } + public var Call_Mute: String { return self._s[1250]! } public func Conversation_NoticeInvitedByInGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1226]!, self._r[1226]!, [_0]) + return formatWithArgumentRanges(self._s[1251]!, self._r[1251]!, [_0]) } - public var Passport_Language_bn: String { return self._s[1227]! } - public var Common_Save: String { return self._s[1229]! } - public var AccessDenied_LocationTracking: String { return self._s[1231]! } - public var Month_ShortOctober: String { return self._s[1232]! } - public var AutoDownloadSettings_WiFi: String { return self._s[1233]! } - public var ProfilePhoto_SetMainPhoto: String { return self._s[1235]! } - public var ChangePhoneNumberNumber_NewNumber: String { return self._s[1236]! } + public var Passport_Language_bn: String { return self._s[1252]! } + public var Common_Save: String { return self._s[1254]! } + public var AccessDenied_LocationTracking: String { return self._s[1256]! } + public var Month_ShortOctober: String { return self._s[1257]! } + public var AutoDownloadSettings_WiFi: String { return self._s[1258]! } + public var ProfilePhoto_SetMainPhoto: String { return self._s[1260]! } + public var ChangePhoneNumberNumber_NewNumber: String { return self._s[1261]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1237]!, self._r[1237]!, [_0]) + return formatWithArgumentRanges(self._s[1262]!, self._r[1262]!, [_0]) } - public var Watch_ChannelInfo_Title: String { return self._s[1238]! } - public var State_Updating: String { return self._s[1239]! } - public var Conversation_UnblockUser: String { return self._s[1240]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1241]! } - public var Map_GetDirections: String { return self._s[1242]! } - public var Watch_Compose_AddContact: String { return self._s[1244]! } - public var Conversation_Dice_u26BD: String { return self._s[1245]! } - public var AccessDenied_PhotosRestricted: String { return self._s[1246]! } + public var Watch_ChannelInfo_Title: String { return self._s[1263]! } + public var State_Updating: String { return self._s[1264]! } + public var Conversation_UnblockUser: String { return self._s[1265]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1266]! } + public var Map_GetDirections: String { return self._s[1267]! } + public var Watch_Compose_AddContact: String { return self._s[1269]! } + public var Conversation_Dice_u26BD: String { return self._s[1270]! } + public var AccessDenied_PhotosRestricted: String { return self._s[1271]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1247]!, self._r[1247]!, [_1]) + return formatWithArgumentRanges(self._s[1272]!, self._r[1272]!, [_1]) } - public var Map_LoadError: String { return self._s[1249]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[1250]! } - public var PhotoEditor_CropAuto: String { return self._s[1251]! } + public var Map_LoadError: String { return self._s[1274]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[1275]! } + public var PhotoEditor_CropAuto: String { return self._s[1276]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1254]!, self._r[1254]!, [_0]) + return formatWithArgumentRanges(self._s[1279]!, self._r[1279]!, [_0]) } - public var Username_TooManyPublicUsernamesError: String { return self._s[1256]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[1281]! } public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1257]!, self._r[1257]!, [_1]) + return formatWithArgumentRanges(self._s[1282]!, self._r[1282]!, [_1]) } - public var Settings_PhoneNumber: String { return self._s[1258]! } + public var Settings_PhoneNumber: String { return self._s[1283]! } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1259]!, self._r[1259]!, [_1]) + return formatWithArgumentRanges(self._s[1284]!, self._r[1284]!, [_1]) } - public var Month_GenJune: String { return self._s[1261]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[1262]! } - public var ChatListFolder_CategoryRead: String { return self._s[1263]! } - public var LoginPassword_ResetAccount: String { return self._s[1264]! } + public var Month_GenJune: String { return self._s[1286]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[1287]! } + public var ChatListFolder_CategoryRead: String { return self._s[1288]! } + public var LoginPassword_ResetAccount: String { return self._s[1289]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1265]!, self._r[1265]!, [_0]) + return formatWithArgumentRanges(self._s[1290]!, self._r[1290]!, [_0]) } - public var Call_CameraConfirmationConfirm: String { return self._s[1266]! } - public var Notification_RenamedChannel: String { return self._s[1267]! } + public var Call_CameraConfirmationConfirm: String { return self._s[1291]! } + public var Notification_RenamedChannel: String { return self._s[1292]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1268]!, self._r[1268]!, [_0]) + return formatWithArgumentRanges(self._s[1293]!, self._r[1293]!, [_0]) } - public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[1269]! } - public var IntentsSettings_Title: String { return self._s[1271]! } - public var CallList_DeleteAllForMe: String { return self._s[1272]! } - public var Settings_AppleWatch: String { return self._s[1273]! } - public var Conversation_LinkCopied: String { return self._s[1274]! } - public var DialogList_NoMessagesText: String { return self._s[1275]! } + public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[1294]! } + public var IntentsSettings_Title: String { return self._s[1296]! } + public var CallList_DeleteAllForMe: String { return self._s[1297]! } + public var Settings_AppleWatch: String { return self._s[1298]! } + public var Conversation_LinkCopied: String { return self._s[1299]! } + public var DialogList_NoMessagesText: String { return self._s[1300]! } public func VoiceChat_SendPublicLinkText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1276]!, self._r[1276]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1301]!, self._r[1301]!, [_1, _2]) } - public var GroupPermission_NoChangeInfo: String { return self._s[1277]! } - public var Channel_ErrorAccessDenied: String { return self._s[1279]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1280]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1302]! } + public var Channel_ErrorAccessDenied: String { return self._s[1304]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1305]! } public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1281]!, self._r[1281]!, [_0]) + return formatWithArgumentRanges(self._s[1306]!, self._r[1306]!, [_0]) } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1282]! } - public var StickerPacksSettings_AnimatedStickers: String { return self._s[1283]! } - public var Month_ShortJanuary: String { return self._s[1284]! } - public var Conversation_UnreadMessages: String { return self._s[1285]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[1287]! } - public var Call_VoiceOver_VideoCallCanceled: String { return self._s[1288]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[1290]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1291]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1307]! } + public var StickerPacksSettings_AnimatedStickers: String { return self._s[1308]! } + public var Month_ShortJanuary: String { return self._s[1309]! } + public var Conversation_UnreadMessages: String { return self._s[1310]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[1312]! } + public var Call_VoiceOver_VideoCallCanceled: String { return self._s[1313]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[1315]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1316]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1295]!, self._r[1295]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1320]!, self._r[1320]!, [_1, _2]) } - public var Widget_ApplicationLocked: String { return self._s[1296]! } + public var Widget_ApplicationLocked: String { return self._s[1321]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1297]!, self._r[1297]!, [_0]) - } - public var Common_TakePhotoOrVideo: String { return self._s[1298]! } - public var Passport_Language_ru: String { return self._s[1299]! } - public var MediaPicker_VideoMuteDescription: String { return self._s[1300]! } - public var EditTheme_ErrorLinkTaken: String { return self._s[1301]! } - public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1303]!, self._r[1303]!, [_0]) - } - public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[1304]! } - public var Conversation_Owner: String { return self._s[1306]! } - public var Settings_FAQ_Intro: String { return self._s[1307]! } - public var PhotoEditor_QualityLow: String { return self._s[1309]! } - public var Widget_GalleryTitle: String { return self._s[1310]! } - public var Call_End: String { return self._s[1311]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1313]! } - public var Privacy_ContactsSyncHelp: String { return self._s[1314]! } - public var OldChannels_NoticeUpgradeText: String { return self._s[1318]! } - public var Conversation_Call: String { return self._s[1320]! } - public var Watch_MessageView_Title: String { return self._s[1321]! } - public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1322]!, self._r[1322]!, [_0]) } - public var Passport_PasswordCompleteSetup: String { return self._s[1323]! } + public var Common_TakePhotoOrVideo: String { return self._s[1323]! } + public var Passport_Language_ru: String { return self._s[1325]! } + public var MediaPicker_VideoMuteDescription: String { return self._s[1326]! } + public var EditTheme_ErrorLinkTaken: String { return self._s[1327]! } + public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1329]!, self._r[1329]!, [_0]) + } + public var VoiceChat_ShareShort: String { return self._s[1330]! } + public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[1331]! } + public var Conversation_Owner: String { return self._s[1333]! } + public var Settings_FAQ_Intro: String { return self._s[1334]! } + public var PhotoEditor_QualityLow: String { return self._s[1336]! } + public var Widget_GalleryTitle: String { return self._s[1337]! } + public var Call_End: String { return self._s[1338]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1340]! } + public var Privacy_ContactsSyncHelp: String { return self._s[1341]! } + public var OldChannels_NoticeUpgradeText: String { return self._s[1345]! } + public var Conversation_Call: String { return self._s[1347]! } + public var Watch_MessageView_Title: String { return self._s[1348]! } + public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1349]!, self._r[1349]!, [_0]) + } + public var Passport_PasswordCompleteSetup: String { return self._s[1350]! } public func Notification_ChangedGroupVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1324]!, self._r[1324]!, [_0]) + return formatWithArgumentRanges(self._s[1351]!, self._r[1351]!, [_0]) } public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1326]!, self._r[1326]!, [_0]) + return formatWithArgumentRanges(self._s[1353]!, self._r[1353]!, [_0]) } - public var Map_Location: String { return self._s[1327]! } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1328]! } - public var Login_CountryCode: String { return self._s[1329]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[1331]! } - public var ChatState_ConnectingToProxy: String { return self._s[1332]! } - public var Login_CallRequestState3: String { return self._s[1333]! } - public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[1336]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1337]! } - public var Widget_ChatsGalleryDescription: String { return self._s[1339]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[1341]! } - public var InstantPage_FontSanFrancisco: String { return self._s[1342]! } - public var Call_StatusEnded: String { return self._s[1343]! } - public var MusicPlayer_VoiceNote: String { return self._s[1346]! } - public var ChatImportActivity_ErrorUserBlocked: String { return self._s[1347]! } + public var Map_Location: String { return self._s[1354]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1355]! } + public var Login_CountryCode: String { return self._s[1356]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[1358]! } + public var ChatState_ConnectingToProxy: String { return self._s[1359]! } + public var Login_CallRequestState3: String { return self._s[1360]! } + public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[1363]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1364]! } + public var Widget_ChatsGalleryDescription: String { return self._s[1366]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[1368]! } + public var InstantPage_FontSanFrancisco: String { return self._s[1369]! } + public var Call_StatusEnded: String { return self._s[1370]! } + public func Checkout_SuccessfulTooltip(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1373]!, self._r[1373]!, [_1, _2]) + } + public var MusicPlayer_VoiceNote: String { return self._s[1374]! } + public var ChatImportActivity_ErrorUserBlocked: String { return self._s[1375]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1348]!, self._r[1348]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1376]!, self._r[1376]!, [_1, _2]) } - public var VoiceOver_MessageContextShare: String { return self._s[1349]! } - public var ProfilePhoto_SearchWeb: String { return self._s[1350]! } - public var EditProfile_Title: String { return self._s[1351]! } + public var VoiceOver_MessageContextShare: String { return self._s[1377]! } + public var ProfilePhoto_SearchWeb: String { return self._s[1378]! } + public var EditProfile_Title: String { return self._s[1379]! } public func Notification_PinnedQuizMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1352]!, self._r[1352]!, [_0]) + return formatWithArgumentRanges(self._s[1380]!, self._r[1380]!, [_0]) } - public var VoiceChat_Unmute: String { return self._s[1353]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[1354]! } - public var NetworkUsageSettings_ResetStats: String { return self._s[1356]! } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[1357]! } - public var StickerPackActionInfo_AddedTitle: String { return self._s[1358]! } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[1359]! } + public var VoiceChat_Unmute: String { return self._s[1381]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[1382]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[1384]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[1385]! } + public var StickerPackActionInfo_AddedTitle: String { return self._s[1386]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[1387]! } public func Call_ParticipantVideoVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1360]!, self._r[1360]!, [_0]) + return formatWithArgumentRanges(self._s[1388]!, self._r[1388]!, [_0]) } - public var Location_ProximityNotification_Title: String { return self._s[1361]! } - public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[1362]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1365]! } - public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[1366]! } - public var Stats_GroupMembersTitle: String { return self._s[1367]! } - public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[1368]! } - public var InviteLink_InviteLinkRevoked: String { return self._s[1369]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1370]! } - public var OpenFile_PotentiallyDangerousContentAlert: String { return self._s[1371]! } - public var Settings_SetUsername: String { return self._s[1372]! } - public var GroupInfo_ActionRestrict: String { return self._s[1373]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1374]! } + public var Location_ProximityNotification_Title: String { return self._s[1389]! } + public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[1390]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1393]! } + public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[1394]! } + public var Stats_GroupMembersTitle: String { return self._s[1395]! } + public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[1396]! } + public var InviteLink_InviteLinkRevoked: String { return self._s[1397]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1398]! } + public var OpenFile_PotentiallyDangerousContentAlert: String { return self._s[1399]! } + public var Settings_SetUsername: String { return self._s[1400]! } + public var GroupInfo_ActionRestrict: String { return self._s[1401]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1402]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1375]!, self._r[1375]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1403]!, self._r[1403]!, [_1, _2, _3]) } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1377]! } - public var Notification_Exceptions_AlwaysOff: String { return self._s[1378]! } - public var Conversation_ContextMenuDelete: String { return self._s[1379]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[1380]! } - public var ChatList_PsaAlert_covid: String { return self._s[1383]! } - public var VoiceOver_SilentPostOn: String { return self._s[1384]! } - public var DialogList_Pin: String { return self._s[1385]! } - public var Channel_AdminLog_CanInviteUsersViaLink: String { return self._s[1386]! } - public var PrivacySettings_SecurityTitle: String { return self._s[1387]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[1388]! } - public var PeopleNearby_Groups: String { return self._s[1389]! } - public var Message_File: String { return self._s[1390]! } - public var Calls_NoCallsPlaceholder: String { return self._s[1391]! } - public var ChatList_GenericPsaLabel: String { return self._s[1393]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[1394]! } - public var IntentsSettings_Reset: String { return self._s[1396]! } - public var Call_ConnectionErrorTitle: String { return self._s[1397]! } - public var PhotoEditor_SaturationTool: String { return self._s[1398]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[1399]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1400]! } - public var Conversation_SearchNoResults: String { return self._s[1401]! } - public var Channel_DiscussionGroup_PrivateChannel: String { return self._s[1402]! } - public var Map_OpenInWaze: String { return self._s[1403]! } - public var InviteLink_PeopleJoinedNone: String { return self._s[1404]! } - public var WallpaperPreview_Title: String { return self._s[1405]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1405]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[1406]! } + public var Conversation_ContextMenuDelete: String { return self._s[1407]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[1408]! } + public var ChatList_PsaAlert_covid: String { return self._s[1411]! } + public var VoiceOver_SilentPostOn: String { return self._s[1412]! } + public var DialogList_Pin: String { return self._s[1413]! } + public var Channel_AdminLog_CanInviteUsersViaLink: String { return self._s[1414]! } + public var PrivacySettings_SecurityTitle: String { return self._s[1415]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[1416]! } + public var PeopleNearby_Groups: String { return self._s[1417]! } + public var Message_File: String { return self._s[1418]! } + public var Calls_NoCallsPlaceholder: String { return self._s[1419]! } + public var ChatList_GenericPsaLabel: String { return self._s[1422]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[1423]! } + public var IntentsSettings_Reset: String { return self._s[1425]! } + public var Call_ConnectionErrorTitle: String { return self._s[1426]! } + public var PhotoEditor_SaturationTool: String { return self._s[1427]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[1428]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1429]! } + public var Conversation_SearchNoResults: String { return self._s[1430]! } + public var Channel_DiscussionGroup_PrivateChannel: String { return self._s[1431]! } + public var Map_OpenInWaze: String { return self._s[1432]! } + public var InviteLink_PeopleJoinedNone: String { return self._s[1433]! } + public var WallpaperPreview_Title: String { return self._s[1434]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1407]!, self._r[1407]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1436]!, self._r[1436]!, [_1, _2]) } - public var AuthSessions_AddDeviceIntro_Title: String { return self._s[1408]! } - public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[1409]! } - public var VoiceOver_Chat_ChannelInfo: String { return self._s[1410]! } - public var Conversation_ImageCopied: String { return self._s[1411]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[1412]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[1414]! } - public var Stats_Total: String { return self._s[1417]! } - public var Stats_GroupMessages: String { return self._s[1418]! } - public var TwoFactorSetup_Email_SkipAction: String { return self._s[1419]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[1420]! } - public var VoiceChat_You: String { return self._s[1421]! } - public var VoiceChat_DisplayAsInfoGroup: String { return self._s[1422]! } - public var Passport_Identity_Translation: String { return self._s[1423]! } - public var Notifications_TextTone: String { return self._s[1426]! } - public var Settings_RemoveConfirmation: String { return self._s[1428]! } - public var ScheduledMessages_Delete: String { return self._s[1429]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[1430]! } - public var Passport_PasswordNext: String { return self._s[1431]! } + public var AuthSessions_AddDeviceIntro_Title: String { return self._s[1437]! } + public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[1438]! } + public var VoiceOver_Chat_ChannelInfo: String { return self._s[1439]! } + public var Conversation_ImageCopied: String { return self._s[1440]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[1441]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[1443]! } + public var Stats_Total: String { return self._s[1446]! } + public var Stats_GroupMessages: String { return self._s[1447]! } + public var TwoFactorSetup_Email_SkipAction: String { return self._s[1448]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[1449]! } + public var VoiceChat_You: String { return self._s[1450]! } + public var VoiceChat_DisplayAsInfoGroup: String { return self._s[1451]! } + public var Passport_Identity_Translation: String { return self._s[1452]! } + public var Notifications_TextTone: String { return self._s[1455]! } + public var Settings_RemoveConfirmation: String { return self._s[1457]! } + public var ScheduledMessages_Delete: String { return self._s[1458]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[1459]! } + public var Passport_PasswordNext: String { return self._s[1460]! } public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1432]!, self._r[1432]!, [_1]) + return formatWithArgumentRanges(self._s[1461]!, self._r[1461]!, [_1]) } - public var Passport_Address_EditBankStatement: String { return self._s[1433]! } - public var PhotoEditor_ShadowsTool: String { return self._s[1434]! } - public var Notification_VideoCallMissed: String { return self._s[1435]! } - public var AccessDenied_CameraDisabled: String { return self._s[1436]! } - public var AuthSessions_AddDevice_ScanInfo: String { return self._s[1437]! } - public var Notifications_ExceptionsMuted: String { return self._s[1438]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[1439]! } - public var Channel_BlackList_Title: String { return self._s[1440]! } - public var PasscodeSettings_4DigitCode: String { return self._s[1441]! } - public var NotificationsSound_Bamboo: String { return self._s[1442]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[1443]! } - public var Passport_Address_TypeUtilityBill: String { return self._s[1444]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[1445]! } - public var GroupPermission_SectionTitle: String { return self._s[1446]! } - public var InviteLink_ContextRevoke: String { return self._s[1447]! } + public var Passport_Address_EditBankStatement: String { return self._s[1462]! } + public var PhotoEditor_ShadowsTool: String { return self._s[1463]! } + public var Notification_VideoCallMissed: String { return self._s[1464]! } + public var AccessDenied_CameraDisabled: String { return self._s[1466]! } + public var AuthSessions_AddDevice_ScanInfo: String { return self._s[1467]! } + public var Notifications_ExceptionsMuted: String { return self._s[1468]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[1469]! } + public var Channel_BlackList_Title: String { return self._s[1470]! } + public var PasscodeSettings_4DigitCode: String { return self._s[1471]! } + public var NotificationsSound_Bamboo: String { return self._s[1472]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[1473]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[1474]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[1475]! } + public var GroupPermission_SectionTitle: String { return self._s[1476]! } + public var InviteLink_ContextRevoke: String { return self._s[1477]! } public func Notification_InvitedMultiple(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1448]!, self._r[1448]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1478]!, self._r[1478]!, [_0, _1]) } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1449]! } - public var Channel_LeaveChannel: String { return self._s[1450]! } - public var Watch_Notification_Joined: String { return self._s[1451]! } - public var PeerInfo_ButtonMore: String { return self._s[1452]! } - public var Passport_FieldEmailHelp: String { return self._s[1453]! } - public var ChatList_Context_Pin: String { return self._s[1454]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1479]! } + public var Channel_LeaveChannel: String { return self._s[1480]! } + public var Watch_Notification_Joined: String { return self._s[1481]! } + public var PeerInfo_ButtonMore: String { return self._s[1482]! } + public var Passport_FieldEmailHelp: String { return self._s[1483]! } + public var ChatList_Context_Pin: String { return self._s[1484]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1455]!, self._r[1455]!, [_0]) + return formatWithArgumentRanges(self._s[1485]!, self._r[1485]!, [_0]) } - public var Group_Location_CreateInThisPlace: String { return self._s[1456]! } - public var PhotoEditor_QualityVeryHigh: String { return self._s[1457]! } - public var Tour_Title5: String { return self._s[1458]! } + public var Group_Location_CreateInThisPlace: String { return self._s[1486]! } + public var PhotoEditor_QualityVeryHigh: String { return self._s[1487]! } + public var Tour_Title5: String { return self._s[1488]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1459]!, self._r[1459]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1489]!, self._r[1489]!, [_1, _2]) } - public var Passport_Language_en: String { return self._s[1460]! } - public var Checkout_Name: String { return self._s[1461]! } - public var ChatImport_Title: String { return self._s[1462]! } + public var Passport_Language_en: String { return self._s[1490]! } + public var Checkout_Name: String { return self._s[1491]! } + public var ChatImport_Title: String { return self._s[1492]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1463]!, self._r[1463]!, [_0]) + return formatWithArgumentRanges(self._s[1493]!, self._r[1493]!, [_0]) } - public var PhotoEditor_EnhanceTool: String { return self._s[1464]! } + public var PhotoEditor_EnhanceTool: String { return self._s[1494]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1465]!, self._r[1465]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1495]!, self._r[1495]!, [_1, _2]) } public func VoiceChat_UserCanNowSpeak(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1466]!, self._r[1466]!, [_0]) + return formatWithArgumentRanges(self._s[1496]!, self._r[1496]!, [_0]) } - public var PeerInfo_CustomizeNotifications: String { return self._s[1467]! } + public var PeerInfo_CustomizeNotifications: String { return self._s[1497]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1468]!, self._r[1468]!, [_0]) + return formatWithArgumentRanges(self._s[1498]!, self._r[1498]!, [_0]) } - public var Group_ErrorSendRestrictedMedia: String { return self._s[1469]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[1499]! } public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1470]!, self._r[1470]!, [_0]) - } - public var Login_UnknownError: String { return self._s[1471]! } - public var Conversation_ImportedMessageHint: String { return self._s[1473]! } - public func VoiceChat_ForwardTooltip_Chat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1474]!, self._r[1474]!, [_0]) - } - public var Passport_Identity_TypeDriversLicense: String { return self._s[1476]! } - public var ChatList_AutoarchiveSuggestion_Title: String { return self._s[1477]! } - public var Watch_PhotoView_Title: String { return self._s[1478]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[1479]! } - public var Checkout_TotalAmount: String { return self._s[1480]! } - public var ChatList_RemoveFolderAction: String { return self._s[1481]! } - public func GroupInfo_Permissions_BroadcastConvertInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1482]!, self._r[1482]!, [_0]) - } - public var GroupInfo_SetGroupPhoto: String { return self._s[1483]! } - public var Watch_AppName: String { return self._s[1484]! } - public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1485]!, self._r[1485]!, [_1]) - } - public var Channel_Username_CheckingUsername: String { return self._s[1486]! } - public var ContactList_Context_Call: String { return self._s[1487]! } - public var ChatList_ReorderTabs: String { return self._s[1488]! } - public var Watch_ChatList_Compose: String { return self._s[1489]! } - public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1490]!, self._r[1490]!, [_0]) - } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[1491]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1492]! } - public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1493]!, self._r[1493]!, [_1]) - } - public var Call_StatusRequesting: String { return self._s[1495]! } - public var Checkout_TotalPaidAmount: String { return self._s[1496]! } - public var Weekday_Friday: String { return self._s[1498]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[1499]! } - public func ChatImport_SelectionConfirmationUserWithoutTitle(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1500]!, self._r[1500]!, [_0]) } - public var Watch_ChatList_NoConversationsText: String { return self._s[1501]! } - public var Group_Members_AddMembersHelp: String { return self._s[1502]! } - public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1503]!, self._r[1503]!, [_0]) + public var Login_UnknownError: String { return self._s[1501]! } + public var Conversation_ImportedMessageHint: String { return self._s[1503]! } + public func VoiceChat_ForwardTooltip_Chat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1504]!, self._r[1504]!, [_0]) } - public var SecretVideo_Title: String { return self._s[1504]! } - public func Notification_PinnedStickerMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1507]!, self._r[1507]!, [_0]) - } - public var Undo_Undo: String { return self._s[1508]! } - public var Watch_Microphone_Access: String { return self._s[1509]! } - public func ChatImport_SelectionConfirmationGroupWithTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1510]!, self._r[1510]!, [_1, _2]) - } - public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1511]!, self._r[1511]!, [_1, _2]) - } - public func ChatList_Search_NoResultsQueryDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Passport_Identity_TypeDriversLicense: String { return self._s[1506]! } + public var ChatList_AutoarchiveSuggestion_Title: String { return self._s[1507]! } + public var Watch_PhotoView_Title: String { return self._s[1508]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[1509]! } + public var Checkout_TotalAmount: String { return self._s[1510]! } + public var ChatList_RemoveFolderAction: String { return self._s[1511]! } + public func GroupInfo_Permissions_BroadcastConvertInfo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1512]!, self._r[1512]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[1514]! } - public var TwoFactorSetup_Intro_Action: String { return self._s[1515]! } - public var Passport_Language_ne: String { return self._s[1516]! } - public var TwoStepAuth_EmailHelp: String { return self._s[1518]! } - public var Profile_MessageLifetime2s: String { return self._s[1519]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[1513]! } + public var Watch_AppName: String { return self._s[1514]! } + public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1515]!, self._r[1515]!, [_1]) + } + public var Channel_Username_CheckingUsername: String { return self._s[1516]! } + public var ContactList_Context_Call: String { return self._s[1517]! } + public var ChatList_ReorderTabs: String { return self._s[1518]! } + public var Watch_ChatList_Compose: String { return self._s[1519]! } + public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1520]!, self._r[1520]!, [_0]) + } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[1521]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1522]! } + public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1523]!, self._r[1523]!, [_1]) + } + public var Call_StatusRequesting: String { return self._s[1525]! } + public var Checkout_TotalPaidAmount: String { return self._s[1526]! } + public var Weekday_Friday: String { return self._s[1528]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[1529]! } + public func ChatImport_SelectionConfirmationUserWithoutTitle(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_0]) + } + public var Watch_ChatList_NoConversationsText: String { return self._s[1531]! } + public var Group_Members_AddMembersHelp: String { return self._s[1532]! } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1533]!, self._r[1533]!, [_0]) + } + public var SecretVideo_Title: String { return self._s[1534]! } + public func Notification_PinnedStickerMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1537]!, self._r[1537]!, [_0]) + } + public var Undo_Undo: String { return self._s[1538]! } + public var Watch_Microphone_Access: String { return self._s[1539]! } + public func ChatImport_SelectionConfirmationGroupWithTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1540]!, self._r[1540]!, [_1, _2]) + } + public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1541]!, self._r[1541]!, [_1, _2]) + } + public func ChatList_Search_NoResultsQueryDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_0]) + } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[1544]! } + public var TwoFactorSetup_Intro_Action: String { return self._s[1545]! } + public var Passport_Language_ne: String { return self._s[1546]! } + public var TwoStepAuth_EmailHelp: String { return self._s[1548]! } + public var Profile_MessageLifetime2s: String { return self._s[1549]! } public func Conversation_MessageDialogRetryAll(_ _1: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1520]!, self._r[1520]!, ["\(_1)"]) + return formatWithArgumentRanges(self._s[1551]!, self._r[1551]!, ["\(_1)"]) } public func Items_NOfM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1521]!, self._r[1521]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1552]!, self._r[1552]!, [_1, _2]) } - public var VoiceChat_SendPublicLinkSend: String { return self._s[1522]! } - public var Media_LimitedAccessText: String { return self._s[1523]! } + public var VoiceChat_SendPublicLinkSend: String { return self._s[1553]! } + public var Media_LimitedAccessText: String { return self._s[1554]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1524]!, self._r[1524]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1555]!, self._r[1555]!, [_1, _2]) } - public var GroupPermission_NoPinMessages: String { return self._s[1525]! } + public var GroupPermission_NoPinMessages: String { return self._s[1556]! } public func Notification_VoiceChatStarted(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1526]!, self._r[1526]!, [_1]) + return formatWithArgumentRanges(self._s[1557]!, self._r[1557]!, [_1]) } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1527]!, self._r[1527]!, [_0]) + return formatWithArgumentRanges(self._s[1558]!, self._r[1558]!, [_0]) } - public var FastTwoStepSetup_HintHelp: String { return self._s[1528]! } - public var VoiceOver_SilentPostOff: String { return self._s[1529]! } - public var WallpaperSearch_ColorRed: String { return self._s[1530]! } - public var Watch_ConnectionDescription: String { return self._s[1531]! } - public var Notification_Exceptions_AddException: String { return self._s[1532]! } - public var LocalGroup_IrrelevantWarning: String { return self._s[1533]! } - public var VoiceOver_MessageContextDelete: String { return self._s[1534]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1535]! } - public var Passport_PasswordPlaceholder: String { return self._s[1536]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[1537]! } - public var Stats_MessageInteractionsTitle: String { return self._s[1538]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[1539]! } - public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1541]! } - public var Channel_AdminLog_PinMessages: String { return self._s[1542]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[1544]! } - public var Watch_Message_Game: String { return self._s[1545]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1546]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[1547]! } - public var EditTheme_FileReadError: String { return self._s[1548]! } - public var Group_ErrorAddBlocked: String { return self._s[1549]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1550]! } + public var FastTwoStepSetup_HintHelp: String { return self._s[1559]! } + public var VoiceOver_SilentPostOff: String { return self._s[1560]! } + public var WallpaperSearch_ColorRed: String { return self._s[1561]! } + public var Watch_ConnectionDescription: String { return self._s[1562]! } + public var Notification_Exceptions_AddException: String { return self._s[1563]! } + public var LocalGroup_IrrelevantWarning: String { return self._s[1564]! } + public var VoiceOver_MessageContextDelete: String { return self._s[1565]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1566]! } + public var Passport_PasswordPlaceholder: String { return self._s[1567]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[1568]! } + public var Stats_MessageInteractionsTitle: String { return self._s[1569]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[1570]! } + public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1572]! } + public var Channel_AdminLog_PinMessages: String { return self._s[1573]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[1575]! } + public var Watch_Message_Game: String { return self._s[1576]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1577]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[1578]! } + public var EditTheme_FileReadError: String { return self._s[1579]! } + public var Group_ErrorAddBlocked: String { return self._s[1580]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1581]! } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1552]!, self._r[1552]!, [_1]) + return formatWithArgumentRanges(self._s[1583]!, self._r[1583]!, [_1]) } - public var GroupRemoved_ViewChannelInfo: String { return self._s[1553]! } + public var GroupRemoved_ViewChannelInfo: String { return self._s[1584]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1554]!, self._r[1554]!, [_0]) + return formatWithArgumentRanges(self._s[1585]!, self._r[1585]!, [_0]) } - public var CheckoutInfo_ShippingInfoAddress2Placeholder: String { return self._s[1555]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[1556]! } + public var CheckoutInfo_ShippingInfoAddress2Placeholder: String { return self._s[1586]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[1587]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1557]!, self._r[1557]!, [_0]) + return formatWithArgumentRanges(self._s[1588]!, self._r[1588]!, [_0]) } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[1558]! } - public var Bot_GroupStatusReadsHistory: String { return self._s[1559]! } - public var PhotoEditor_CurvesRed: String { return self._s[1560]! } - public var InstantPage_TapToOpenLink: String { return self._s[1561]! } - public var InviteLink_PeopleJoinedShortNoneExpired: String { return self._s[1562]! } - public var FastTwoStepSetup_PasswordHelp: String { return self._s[1563]! } - public var Conversation_DiscussionNotStarted: String { return self._s[1564]! } - public var Notification_CallMissedShort: String { return self._s[1565]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[1589]! } + public var Bot_GroupStatusReadsHistory: String { return self._s[1590]! } + public var PhotoEditor_CurvesRed: String { return self._s[1591]! } + public var InstantPage_TapToOpenLink: String { return self._s[1592]! } + public var InviteLink_PeopleJoinedShortNoneExpired: String { return self._s[1593]! } + public var FastTwoStepSetup_PasswordHelp: String { return self._s[1594]! } + public var Conversation_DiscussionNotStarted: String { return self._s[1595]! } + public var Notification_CallMissedShort: String { return self._s[1596]! } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1566]!, self._r[1566]!, [_0]) + return formatWithArgumentRanges(self._s[1597]!, self._r[1597]!, [_0]) } - public var Conversation_DeleteMessagesForEveryone: String { return self._s[1567]! } - public var VoiceChat_UnpinVideo: String { return self._s[1568]! } - public var Permissions_SiriTitle_v0: String { return self._s[1569]! } - public var GroupInfo_AddUserLeftError: String { return self._s[1570]! } - public var Conversation_SendMessage_SendSilently: String { return self._s[1571]! } - public var Paint_Duplicate: String { return self._s[1572]! } - public var AttachmentMenu_WebSearch: String { return self._s[1573]! } - public var Bot_Stop: String { return self._s[1575]! } - public var Conversation_PrivateChannelTimeLimitedAlertTitle: String { return self._s[1576]! } - public var ReportGroupLocation_Report: String { return self._s[1577]! } - public var Compose_Create: String { return self._s[1578]! } - public var Stats_GroupViewers: String { return self._s[1579]! } - public var AutoDownloadSettings_Channels: String { return self._s[1580]! } - public var PhotoEditor_QualityHigh: String { return self._s[1581]! } - public var VoiceChat_Leave: String { return self._s[1582]! } - public var Call_Speaker: String { return self._s[1583]! } + public var Conversation_DeleteMessagesForEveryone: String { return self._s[1598]! } + public var VoiceChat_UnpinVideo: String { return self._s[1599]! } + public var Permissions_SiriTitle_v0: String { return self._s[1600]! } + public var GroupInfo_AddUserLeftError: String { return self._s[1601]! } + public var Conversation_SendMessage_SendSilently: String { return self._s[1602]! } + public var Paint_Duplicate: String { return self._s[1603]! } + public var AttachmentMenu_WebSearch: String { return self._s[1604]! } + public var Bot_Stop: String { return self._s[1606]! } + public var Conversation_PrivateChannelTimeLimitedAlertTitle: String { return self._s[1607]! } + public var ReportGroupLocation_Report: String { return self._s[1608]! } + public var Compose_Create: String { return self._s[1609]! } + public var Stats_GroupViewers: String { return self._s[1610]! } + public var AutoDownloadSettings_Channels: String { return self._s[1611]! } + public var PhotoEditor_QualityHigh: String { return self._s[1612]! } + public var VoiceChat_Leave: String { return self._s[1613]! } + public var Call_Speaker: String { return self._s[1614]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1584]!, self._r[1584]!, [_0]) + return formatWithArgumentRanges(self._s[1615]!, self._r[1615]!, [_0]) } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[1585]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1586]! } - public var ChatList_Context_AddToFolder: String { return self._s[1587]! } - public var InviteLink_QRCode_Info: String { return self._s[1588]! } - public var AutoremoveSetup_Title: String { return self._s[1589]! } - public var ChatList_DeleteForAllMembersConfirmationText: String { return self._s[1590]! } - public var Conversation_Unblock: String { return self._s[1591]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[1592]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[1616]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1617]! } + public var ChatList_Context_AddToFolder: String { return self._s[1618]! } + public var InviteLink_QRCode_Info: String { return self._s[1619]! } + public var AutoremoveSetup_Title: String { return self._s[1620]! } + public var ChatList_DeleteForAllMembersConfirmationText: String { return self._s[1621]! } + public var Conversation_Unblock: String { return self._s[1622]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[1623]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1593]!, self._r[1593]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1624]!, self._r[1624]!, [_1, _2, _3]) } - public var Conversation_ContextMenuReply: String { return self._s[1594]! } - public var Contacts_SearchLabel: String { return self._s[1595]! } - public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[1596]! } - public var Stats_GroupMessagesTitle: String { return self._s[1598]! } - public var Notification_CallCanceled: String { return self._s[1599]! } - public var VoiceOver_Chat_Selected: String { return self._s[1600]! } - public var NotificationsSound_Tremolo: String { return self._s[1602]! } - public var VoiceOver_AuthSessions_CurrentSession: String { return self._s[1603]! } - public var ChatList_Search_NoResultsDescription: String { return self._s[1604]! } - public var AccessDenied_PhotosAndVideos: String { return self._s[1605]! } - public var LogoutOptions_ClearCacheText: String { return self._s[1606]! } + public var Conversation_ContextMenuReply: String { return self._s[1625]! } + public var Contacts_SearchLabel: String { return self._s[1626]! } + public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[1627]! } + public var Stats_GroupMessagesTitle: String { return self._s[1629]! } + public var Notification_CallCanceled: String { return self._s[1630]! } + public var VoiceOver_Chat_Selected: String { return self._s[1631]! } + public var NotificationsSound_Tremolo: String { return self._s[1633]! } + public var VoiceOver_AuthSessions_CurrentSession: String { return self._s[1634]! } + public var ChatList_Search_NoResultsDescription: String { return self._s[1635]! } + public var AccessDenied_PhotosAndVideos: String { return self._s[1636]! } + public var LogoutOptions_ClearCacheText: String { return self._s[1637]! } public func VoiceChat_DisplayAsSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1608]!, self._r[1608]!, [_0]) - } - public var VoiceOver_Chat_Sticker: String { return self._s[1609]! } - public var ChatListFolder_NameUnread: String { return self._s[1610]! } - public var PeerInfo_ButtonMessage: String { return self._s[1612]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[1613]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[1614]! } - public var ChatSettings_Other: String { return self._s[1615]! } - public var UserInfo_NotificationsEnabled: String { return self._s[1616]! } - public var CreatePoll_OptionsHeader: String { return self._s[1617]! } - public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1620]! } - public var Channel_Moderator_Title: String { return self._s[1621]! } - public func Conversation_ForwardTooltip_Chat_Many(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1622]!, self._r[1622]!, [_0]) - } - public func UserInfo_ContactForwardTooltip_ManyChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1623]!, self._r[1623]!, [_0, _1]) - } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[1624]! } - public var WallpaperColors_Title: String { return self._s[1625]! } - public var InviteLink_InviteLink: String { return self._s[1627]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[1628]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[1629]! } - public var Your_card_was_declined: String { return self._s[1630]! } - public var SettingsSearch_FAQ: String { return self._s[1632]! } - public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[1633]! } - public var Conversation_ReportSpamConfirmation: String { return self._s[1634]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[1636]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1637]! } - public var Settings_About_Help: String { return self._s[1638]! } - public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1639]!, self._r[1639]!, [_0]) } - public var Settings_Proxy: String { return self._s[1640]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1641]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[1643]! } - public var NotificationsSound_Bell: String { return self._s[1644]! } - public var PrivacySettings_Title: String { return self._s[1646]! } - public var PrivacySettings_DataSettings: String { return self._s[1647]! } - public var ConversationMedia_Title: String { return self._s[1648]! } + public var VoiceOver_Chat_Sticker: String { return self._s[1640]! } + public var ChatListFolder_NameUnread: String { return self._s[1641]! } + public var PeerInfo_ButtonMessage: String { return self._s[1643]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[1644]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[1645]! } + public var ChatSettings_Other: String { return self._s[1646]! } + public var UserInfo_NotificationsEnabled: String { return self._s[1647]! } + public var CreatePoll_OptionsHeader: String { return self._s[1648]! } + public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1651]! } + public var Channel_Moderator_Title: String { return self._s[1652]! } + public func Conversation_ForwardTooltip_Chat_Many(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1653]!, self._r[1653]!, [_0]) + } + public func UserInfo_ContactForwardTooltip_ManyChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1654]!, self._r[1654]!, [_0, _1]) + } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[1655]! } + public var WallpaperColors_Title: String { return self._s[1656]! } + public var InviteLink_InviteLink: String { return self._s[1658]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[1659]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[1660]! } + public var Your_card_was_declined: String { return self._s[1661]! } + public var SettingsSearch_FAQ: String { return self._s[1663]! } + public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[1664]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[1665]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[1667]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1668]! } + public var Settings_About_Help: String { return self._s[1669]! } + public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1670]!, self._r[1670]!, [_0]) + } + public var Settings_Proxy: String { return self._s[1671]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1672]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[1674]! } + public var NotificationsSound_Bell: String { return self._s[1675]! } + public var PrivacySettings_Title: String { return self._s[1677]! } + public var PrivacySettings_DataSettings: String { return self._s[1678]! } + public var ConversationMedia_Title: String { return self._s[1679]! } public func Channel_AdminLog_MessageAddedAdminName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1649]!, self._r[1649]!, [_1]) + return formatWithArgumentRanges(self._s[1680]!, self._r[1680]!, [_1]) } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1650]!, self._r[1650]!, [_0]) + return formatWithArgumentRanges(self._s[1681]!, self._r[1681]!, [_0]) } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[1651]! } - public var ReportPeer_ReasonPornography: String { return self._s[1653]! } - public var Privacy_Calls: String { return self._s[1654]! } - public var TwoFactorSetup_Email_Text: String { return self._s[1655]! } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1656]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[1682]! } + public var ReportPeer_ReasonPornography: String { return self._s[1684]! } + public var Privacy_Calls: String { return self._s[1686]! } + public var TwoFactorSetup_Email_Text: String { return self._s[1687]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1688]! } public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1657]!, self._r[1657]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1689]!, self._r[1689]!, [_1, _2]) } - public var Passport_Identity_FrontSideHelp: String { return self._s[1658]! } - public var InstantPage_VoiceOver_DecreaseFontSize: String { return self._s[1659]! } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1661]! } - public var ContactList_Context_VideoCall: String { return self._s[1662]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1663]! } - public var Passport_Identity_MiddleName: String { return self._s[1664]! } - public var MessagePoll_QuizNoUsers: String { return self._s[1665]! } + public var Passport_Identity_FrontSideHelp: String { return self._s[1690]! } + public var InstantPage_VoiceOver_DecreaseFontSize: String { return self._s[1691]! } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1693]! } + public var ContactList_Context_VideoCall: String { return self._s[1694]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1695]! } + public var Passport_Identity_MiddleName: String { return self._s[1696]! } + public var MessagePoll_QuizNoUsers: String { return self._s[1697]! } public func Channel_AdminLog_MutedParticipant(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1666]!, self._r[1666]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1698]!, self._r[1698]!, [_1, _2]) } - public var OldChannels_ChannelFormat: String { return self._s[1667]! } - public var Watch_Message_Call: String { return self._s[1668]! } - public var VoiceChat_OpenChannel: String { return self._s[1669]! } - public var Wallpaper_Title: String { return self._s[1670]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[1671]! } - public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1672]! } - public var ReportGroupLocation_Text: String { return self._s[1673]! } - public var InviteText_URL: String { return self._s[1674]! } - public var ClearCache_StorageServiceFiles: String { return self._s[1675]! } - public var MessageTimer_Custom: String { return self._s[1676]! } - public var Message_PinnedLocationMessage: String { return self._s[1677]! } + public var OldChannels_ChannelFormat: String { return self._s[1699]! } + public var Watch_Message_Call: String { return self._s[1700]! } + public var VoiceChat_OpenChannel: String { return self._s[1701]! } + public var Wallpaper_Title: String { return self._s[1702]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[1703]! } + public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1704]! } + public var ReportGroupLocation_Text: String { return self._s[1705]! } + public var InviteText_URL: String { return self._s[1706]! } + public var ClearCache_StorageServiceFiles: String { return self._s[1707]! } + public var MessageTimer_Custom: String { return self._s[1708]! } + public var Message_PinnedLocationMessage: String { return self._s[1709]! } public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1678]!, self._r[1678]!, [_0]) + return formatWithArgumentRanges(self._s[1710]!, self._r[1710]!, [_0]) } - public var EditTheme_UploadNewTheme: String { return self._s[1679]! } - public var ChatImportActivity_ErrorLimitExceeded: String { return self._s[1682]! } + public var EditTheme_UploadNewTheme: String { return self._s[1711]! } + public var ChatImportActivity_ErrorLimitExceeded: String { return self._s[1714]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1683]!, self._r[1683]!, [_0]) + return formatWithArgumentRanges(self._s[1715]!, self._r[1715]!, [_0]) } - public var Login_CodeSentCall: String { return self._s[1685]! } + public var Login_CodeSentCall: String { return self._s[1717]! } public func Conversation_AutoremoveTimerSetUser(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1686]!, self._r[1686]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1718]!, self._r[1718]!, [_1, _2]) } - public var Conversation_Report: String { return self._s[1687]! } - public var NotificationSettings_ContactJoined: String { return self._s[1688]! } + public var Conversation_Report: String { return self._s[1719]! } + public var NotificationSettings_ContactJoined: String { return self._s[1720]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1689]!, self._r[1689]!, [_1]) + return formatWithArgumentRanges(self._s[1721]!, self._r[1721]!, [_1]) } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[1690]! } - public var BroadcastGroups_IntroText: String { return self._s[1691]! } - public var IntentsSettings_SuggestByAll: String { return self._s[1693]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[1694]! } - public var AuthSessions_Title: String { return self._s[1695]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[1722]! } + public var BroadcastGroups_IntroText: String { return self._s[1723]! } + public var IntentsSettings_SuggestByAll: String { return self._s[1725]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[1726]! } + public var AuthSessions_Title: String { return self._s[1727]! } public func Notification_VoiceChatEnded(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1696]!, self._r[1696]!, [_0]) + return formatWithArgumentRanges(self._s[1728]!, self._r[1728]!, [_0]) } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1697]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1698]! } - public var VoiceChat_YouCanNowSpeak: String { return self._s[1701]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[1703]! } + public var Settings_Tips: String { return self._s[1729]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1730]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1731]! } + public var VoiceChat_YouCanNowSpeak: String { return self._s[1734]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[1736]! } public func UserInfo_LinkForwardTooltip_ManyChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1704]!, self._r[1704]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1737]!, self._r[1737]!, [_0, _1]) } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[1705]! } - public var ExplicitContent_AlertTitle: String { return self._s[1706]! } - public var Channel_UpdatePhotoItem: String { return self._s[1707]! } - public var ChatList_AutoarchiveSuggestion_Text: String { return self._s[1709]! } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[1710]! } + public var AutoDownloadSettings_MaxVideoSize: String { return self._s[1738]! } + public var ExplicitContent_AlertTitle: String { return self._s[1739]! } + public var Channel_UpdatePhotoItem: String { return self._s[1741]! } + public var ChatList_AutoarchiveSuggestion_Text: String { return self._s[1743]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[1744]! } public func Call_BatteryLow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1711]!, self._r[1711]!, [_0]) - } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[1712]! } - public var WallpaperPreview_PatternPaternApply: String { return self._s[1713]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1714]! } - public var CommentsGroup_ErrorAccessDenied: String { return self._s[1715]! } - public var Appearance_AccentColor: String { return self._s[1717]! } - public var GroupInfo_SharedMedia: String { return self._s[1718]! } - public var Login_PhonePlaceholder: String { return self._s[1719]! } - public var Appearance_TextSize_Automatic: String { return self._s[1720]! } - public var EmptyGroupInfo_Line2: String { return self._s[1721]! } - public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_1, _2]) - } - public var VoiceChat_TapToAddPhotoOrBio: String { return self._s[1723]! } - public var Conversation_ClearChannel: String { return self._s[1724]! } - public var Appearance_AppIconDefaultX: String { return self._s[1726]! } - public var EditProfile_NameAndPhotoOrVideoHelp: String { return self._s[1727]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[1728]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1729]! } - public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1730]!, self._r[1730]!, [_1, _2]) - } - public var ChatList_EmptyChatListEditFilter: String { return self._s[1731]! } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[1734]! } - public var Chat_PinnedMessagesHiddenText: String { return self._s[1735]! } - public func Message_PinnedGenericMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1736]!, self._r[1736]!, [_0]) - } - public func Location_ProximityTip(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1737]!, self._r[1737]!, [_0]) - } - public var UserInfo_NotificationsEnable: String { return self._s[1738]! } - public var Checkout_PayWithTouchId: String { return self._s[1739]! } - public var SharedMedia_ViewInChat: String { return self._s[1740]! } - public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1741]!, self._r[1741]!, [_0, _1]) - } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1742]! } - public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1743]!, self._r[1743]!, [_1, _2]) - } - public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1745]!, self._r[1745]!, [_0]) } - public var Conversation_PeerNearbyText: String { return self._s[1747]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[1748]! } - public var PhotoEditor_Skip: String { return self._s[1749]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[1750]! } - public var ChatList_EmptyChatList: String { return self._s[1751]! } - public var Channel_BanUser_Unban: String { return self._s[1752]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[1746]! } + public var WallpaperPreview_PatternPaternApply: String { return self._s[1747]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1748]! } + public var CommentsGroup_ErrorAccessDenied: String { return self._s[1749]! } + public var Appearance_AccentColor: String { return self._s[1751]! } + public var GroupInfo_SharedMedia: String { return self._s[1752]! } + public var Login_PhonePlaceholder: String { return self._s[1753]! } + public var Appearance_TextSize_Automatic: String { return self._s[1754]! } + public var EmptyGroupInfo_Line2: String { return self._s[1755]! } + public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1756]!, self._r[1756]!, [_1, _2]) + } + public var VoiceChat_TapToAddPhotoOrBio: String { return self._s[1757]! } + public var Conversation_ClearChannel: String { return self._s[1758]! } + public var Appearance_AppIconDefaultX: String { return self._s[1760]! } + public var EditProfile_NameAndPhotoOrVideoHelp: String { return self._s[1761]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[1762]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1763]! } + public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1764]!, self._r[1764]!, [_1, _2]) + } + public var ChatList_EmptyChatListEditFilter: String { return self._s[1765]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[1768]! } + public var Chat_PinnedMessagesHiddenText: String { return self._s[1769]! } + public func Message_PinnedGenericMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1770]!, self._r[1770]!, [_0]) + } + public func Location_ProximityTip(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1771]!, self._r[1771]!, [_0]) + } + public var UserInfo_NotificationsEnable: String { return self._s[1772]! } + public var Checkout_PayWithTouchId: String { return self._s[1773]! } + public var SharedMedia_ViewInChat: String { return self._s[1774]! } + public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1775]!, self._r[1775]!, [_0, _1]) + } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1776]! } + public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1777]!, self._r[1777]!, [_1, _2]) + } + public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1779]!, self._r[1779]!, [_0]) + } + public var Conversation_PeerNearbyText: String { return self._s[1781]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[1782]! } + public var PhotoEditor_Skip: String { return self._s[1783]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[1784]! } + public var ChatList_EmptyChatList: String { return self._s[1785]! } + public var Channel_BanUser_Unban: String { return self._s[1786]! } public func Message_GenericForwardedPsa(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1753]!, self._r[1753]!, [_0]) + return formatWithArgumentRanges(self._s[1787]!, self._r[1787]!, [_0]) } - public var Appearance_TextSize_Apply: String { return self._s[1754]! } + public var Appearance_TextSize_Apply: String { return self._s[1788]! } public func Conversation_MessageViewCommentsFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1755]!, self._r[1755]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1789]!, self._r[1789]!, [_1, _2]) } - public var Login_InfoFirstNamePlaceholder: String { return self._s[1756]! } - public var VoiceOver_Chat_YourSticker: String { return self._s[1757]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1758]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1760]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1761]! } - public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[1762]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[1790]! } + public var VoiceOver_Chat_YourSticker: String { return self._s[1791]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1792]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1794]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1795]! } + public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[1796]! } public func PUSH_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1763]!, self._r[1763]!, [_1]) + return formatWithArgumentRanges(self._s[1797]!, self._r[1797]!, [_1]) } - public var VoiceOver_Chat_GoToOriginalMessage: String { return self._s[1765]! } - public var State_WaitingForNetwork: String { return self._s[1766]! } - public var AccessDenied_CameraRestricted: String { return self._s[1767]! } - public var ChatSettings_Appearance: String { return self._s[1768]! } - public var ScheduledMessages_BotActionUnavailable: String { return self._s[1769]! } - public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[1770]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1771]! } - public var Conversation_SelectMessages: String { return self._s[1773]! } - public var Map_NoPlacesNearby: String { return self._s[1774]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1775]! } - public var GroupRemoved_Title: String { return self._s[1776]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1778]! } - public var VoiceChat_Mute: String { return self._s[1779]! } - public var Paint_Marker: String { return self._s[1780]! } - public var Widget_ChatsGalleryTitle: String { return self._s[1781]! } + public var VoiceOver_Chat_GoToOriginalMessage: String { return self._s[1799]! } + public var State_WaitingForNetwork: String { return self._s[1800]! } + public var AccessDenied_CameraRestricted: String { return self._s[1801]! } + public var ChatSettings_Appearance: String { return self._s[1802]! } + public var ScheduledMessages_BotActionUnavailable: String { return self._s[1803]! } + public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[1804]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1805]! } + public var Conversation_SelectMessages: String { return self._s[1807]! } + public var Map_NoPlacesNearby: String { return self._s[1808]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1809]! } + public var GroupRemoved_Title: String { return self._s[1810]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1812]! } + public var VoiceChat_Mute: String { return self._s[1813]! } + public var Paint_Marker: String { return self._s[1814]! } + public var Widget_ChatsGalleryTitle: String { return self._s[1815]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1782]!, self._r[1782]!, [_1]) + return formatWithArgumentRanges(self._s[1816]!, self._r[1816]!, [_1]) } - public var SocksProxySetup_ShareProxyList: String { return self._s[1783]! } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[1784]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[1817]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[1818]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1785]!, self._r[1785]!, [_0]) + return formatWithArgumentRanges(self._s[1819]!, self._r[1819]!, [_0]) } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[1786]! } - public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[1787]! } - public var Notifications_GroupNotificationsAlert: String { return self._s[1788]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[1789]! } - public var Compose_NewGroup: String { return self._s[1790]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[1820]! } + public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[1821]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[1822]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[1823]! } + public var Compose_NewGroup: String { return self._s[1824]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1791]!, self._r[1791]!, [_0]) + return formatWithArgumentRanges(self._s[1825]!, self._r[1825]!, [_0]) } - public var Location_LiveLocationRequired_Description: String { return self._s[1793]! } - public var Conversation_ClearGroupHistory: String { return self._s[1794]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1797]! } - public var VoiceOver_BotKeyboard: String { return self._s[1798]! } - public var Channel_BanUser_BlockFor: String { return self._s[1799]! } - public var Bot_Start: String { return self._s[1800]! } - public var Your_card_has_expired: String { return self._s[1801]! } - public var Channel_About_Title: String { return self._s[1802]! } - public var VoiceChat_EditTitleTitle: String { return self._s[1803]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1804]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[1806]! } - public var Conversation_FileDropbox: String { return self._s[1807]! } - public var ChatList_Search_NoResultsFitlerMusic: String { return self._s[1808]! } - public var Month_GenNovember: String { return self._s[1809]! } - public var IntentsSettings_SuggestByShare: String { return self._s[1810]! } + public var Location_LiveLocationRequired_Description: String { return self._s[1827]! } + public var Conversation_ClearGroupHistory: String { return self._s[1828]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1831]! } + public var VoiceOver_BotKeyboard: String { return self._s[1832]! } + public var Channel_BanUser_BlockFor: String { return self._s[1833]! } + public var Bot_Start: String { return self._s[1834]! } + public var Your_card_has_expired: String { return self._s[1835]! } + public var Channel_About_Title: String { return self._s[1836]! } + public var VoiceChat_EditTitleTitle: String { return self._s[1837]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1838]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[1840]! } + public var Conversation_FileDropbox: String { return self._s[1841]! } + public var ChatList_Search_NoResultsFitlerMusic: String { return self._s[1842]! } + public var Month_GenNovember: String { return self._s[1843]! } + public var IntentsSettings_SuggestByShare: String { return self._s[1844]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1811]!, self._r[1811]!, [_0]) + return formatWithArgumentRanges(self._s[1845]!, self._r[1845]!, [_0]) } - public var StickerPack_Add: String { return self._s[1812]! } - public var Theme_ErrorNotFound: String { return self._s[1813]! } - public var Wallpaper_SearchShort: String { return self._s[1815]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1816]! } - public var ConversationProfile_UsersTooMuchError: String { return self._s[1817]! } - public var ChatList_FolderAllChats: String { return self._s[1818]! } - public var VoiceChat_EndConfirmationEnd: String { return self._s[1819]! } - public var Passport_Authorize: String { return self._s[1820]! } + public var StickerPack_Add: String { return self._s[1846]! } + public var Theme_ErrorNotFound: String { return self._s[1847]! } + public var Wallpaper_SearchShort: String { return self._s[1849]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1850]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[1851]! } + public var ChatList_FolderAllChats: String { return self._s[1852]! } + public var VoiceChat_EndConfirmationEnd: String { return self._s[1853]! } + public var Passport_Authorize: String { return self._s[1854]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1821]!, self._r[1821]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1855]!, self._r[1855]!, [_1, _2]) } - public var GroupInfo_GroupHistoryVisible: String { return self._s[1822]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[1856]! } public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1823]!, self._r[1823]!, [_1]) + return formatWithArgumentRanges(self._s[1857]!, self._r[1857]!, [_1]) } - public var LocalGroup_ButtonTitle: String { return self._s[1824]! } - public var VoiceOver_Stickers: String { return self._s[1826]! } - public var UserInfo_GroupsInCommon: String { return self._s[1827]! } - public var LoginPassword_Title: String { return self._s[1829]! } - public var Wallpaper_Set: String { return self._s[1830]! } - public var Stats_InteractionsTitle: String { return self._s[1831]! } + public var LocalGroup_ButtonTitle: String { return self._s[1858]! } + public var VoiceOver_Stickers: String { return self._s[1860]! } + public var UserInfo_GroupsInCommon: String { return self._s[1861]! } + public var LoginPassword_Title: String { return self._s[1863]! } + public var Wallpaper_Set: String { return self._s[1864]! } + public var Stats_InteractionsTitle: String { return self._s[1865]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1833]!, self._r[1833]!, [_0]) + return formatWithArgumentRanges(self._s[1867]!, self._r[1867]!, [_0]) } - public var Conversation_MessageDialogEdit: String { return self._s[1834]! } - public var Paint_Outlined: String { return self._s[1835]! } + public var Conversation_MessageDialogEdit: String { return self._s[1868]! } + public var Paint_Outlined: String { return self._s[1869]! } public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1836]!, self._r[1836]!, [_0]) + return formatWithArgumentRanges(self._s[1870]!, self._r[1870]!, [_0]) } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1837]!, self._r[1837]!, [_0]) + return formatWithArgumentRanges(self._s[1871]!, self._r[1871]!, [_0]) } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1838]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1839]! } - public var Appearance_ColorThemeNight: String { return self._s[1840]! } - public var ChannelInfo_Stats: String { return self._s[1841]! } - public var Widget_ShortcutsGalleryTitle: String { return self._s[1842]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1843]! } - public var MediaPicker_TimerTooltip: String { return self._s[1844]! } - public var ChatImportActivity_ErrorNotAdmin: String { return self._s[1845]! } - public var Common_ChoosePhoto: String { return self._s[1846]! } - public var Media_LimitedAccessTitle: String { return self._s[1847]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[1848]! } - public var PeerInfo_PaneGroups: String { return self._s[1849]! } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[1851]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1852]! } - public var ContactInfo_PhoneLabelMobile: String { return self._s[1853]! } - public var OldChannels_ChannelsHeader: String { return self._s[1854]! } - public var MuteFor_Forever: String { return self._s[1855]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[1856]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[1857]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1858]! } - public var ContactInfo_Job: String { return self._s[1859]! } - public var Passport_Language_mk: String { return self._s[1860]! } - public var EditTheme_ShortLink: String { return self._s[1861]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1864]! } - public var Month_GenApril: String { return self._s[1866]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[1868]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1869]! } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[1870]! } - public var EditTheme_Title: String { return self._s[1871]! } - public var Conversation_LinkDialogCopy: String { return self._s[1872]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1872]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1873]! } + public var Appearance_ColorThemeNight: String { return self._s[1874]! } + public var ChannelInfo_Stats: String { return self._s[1875]! } + public var Widget_ShortcutsGalleryTitle: String { return self._s[1876]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1877]! } + public var MediaPicker_TimerTooltip: String { return self._s[1878]! } + public var ChatImportActivity_ErrorNotAdmin: String { return self._s[1879]! } + public var Common_ChoosePhoto: String { return self._s[1880]! } + public var Media_LimitedAccessTitle: String { return self._s[1881]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[1882]! } + public var PeerInfo_PaneGroups: String { return self._s[1883]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[1885]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1886]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[1887]! } + public var OldChannels_ChannelsHeader: String { return self._s[1888]! } + public var MuteFor_Forever: String { return self._s[1889]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[1890]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[1892]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1893]! } + public var ContactInfo_Job: String { return self._s[1894]! } + public var Passport_Language_mk: String { return self._s[1895]! } + public var EditTheme_ShortLink: String { return self._s[1896]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1899]! } + public var Month_GenApril: String { return self._s[1901]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[1903]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1904]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[1905]! } + public var EditTheme_Title: String { return self._s[1906]! } + public var Conversation_LinkDialogCopy: String { return self._s[1907]! } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1873]!, self._r[1873]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1908]!, self._r[1908]!, [_1, _2]) } - public var Passport_ForgottenPassword: String { return self._s[1874]! } - public var WallpaperSearch_Recent: String { return self._s[1875]! } - public var ChatSettings_Title: String { return self._s[1880]! } - public var Appearance_ReduceMotionInfo: String { return self._s[1881]! } + public var Passport_ForgottenPassword: String { return self._s[1909]! } + public var WallpaperSearch_Recent: String { return self._s[1910]! } + public var ChatSettings_Title: String { return self._s[1915]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1916]! } public func StickerPackActionInfo_AddedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1882]!, self._r[1882]!, [_0]) + return formatWithArgumentRanges(self._s[1917]!, self._r[1917]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[1883]! } - public var LastSeen_WithinAMonth: String { return self._s[1884]! } - public var VoiceChat_Live: String { return self._s[1885]! } - public var PeerInfo_ButtonCall: String { return self._s[1886]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[1887]! } - public var Group_Username_InvalidStartsWithNumber: String { return self._s[1888]! } - public var Call_AudioRouteHide: String { return self._s[1889]! } - public var DialogList_SavedMessages: String { return self._s[1890]! } - public var ChatList_Context_Mute: String { return self._s[1891]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[1892]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[1918]! } + public var LastSeen_WithinAMonth: String { return self._s[1919]! } + public var VoiceChat_Live: String { return self._s[1920]! } + public var PeerInfo_ButtonCall: String { return self._s[1921]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[1922]! } + public var Group_Username_InvalidStartsWithNumber: String { return self._s[1923]! } + public var Call_AudioRouteHide: String { return self._s[1924]! } + public var DialogList_SavedMessages: String { return self._s[1925]! } + public var ChatList_Context_Mute: String { return self._s[1926]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[1927]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1893]!, self._r[1893]!, [_0]) + return formatWithArgumentRanges(self._s[1928]!, self._r[1928]!, [_0]) } - public var VoiceChat_StatusMutedForYou: String { return self._s[1894]! } - public var Passport_Language_et: String { return self._s[1895]! } - public var Conversation_MessageLeaveCommentShort: String { return self._s[1896]! } - public var PhotoEditor_CropReset: String { return self._s[1897]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[1898]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[1899]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[1900]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1903]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1905]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[1906]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[1908]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[1910]! } - public var Map_YouAreHere: String { return self._s[1912]! } - public var Core_ServiceUserStatus: String { return self._s[1913]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1916]! } - public var VoiceChat_StartRecording: String { return self._s[1917]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[1918]! } - public var MediaPicker_Videos: String { return self._s[1920]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[1922]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1923]! } - public var SharedMedia_CategoryMedia: String { return self._s[1924]! } + public var VoiceChat_StatusMutedForYou: String { return self._s[1929]! } + public var Passport_Language_et: String { return self._s[1930]! } + public var Conversation_MessageLeaveCommentShort: String { return self._s[1931]! } + public var PhotoEditor_CropReset: String { return self._s[1932]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[1933]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[1934]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[1935]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1938]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1940]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[1941]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[1943]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[1945]! } + public var Map_YouAreHere: String { return self._s[1947]! } + public var Core_ServiceUserStatus: String { return self._s[1948]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1951]! } + public var VoiceChat_StartRecording: String { return self._s[1952]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[1953]! } + public var MediaPicker_Videos: String { return self._s[1955]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[1957]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1958]! } + public var SharedMedia_CategoryMedia: String { return self._s[1959]! } public func MediaPicker_Nof(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1925]!, self._r[1925]!, [_0]) + return formatWithArgumentRanges(self._s[1960]!, self._r[1960]!, [_0]) } - public var ChatSettings_AutoPlayGifs: String { return self._s[1926]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[1927]! } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[1928]! } - public var Conversation_JoinVoiceChatAsListener: String { return self._s[1929]! } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1930]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[1961]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[1962]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[1963]! } + public var Conversation_JoinVoiceChatAsListener: String { return self._s[1964]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1965]! } public func Chat_SlowmodeTooltip(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1931]!, self._r[1931]!, [_0]) + return formatWithArgumentRanges(self._s[1966]!, self._r[1966]!, [_0]) } - public var Web_Error: String { return self._s[1932]! } - public var PhotoEditor_SkinTool: String { return self._s[1933]! } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[1934]! } - public var AutoremoveSetup_TimerInfoChat: String { return self._s[1935]! } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[1937]! } - public var PasscodeSettings_Help: String { return self._s[1938]! } - public var Appearance_ColorTheme: String { return self._s[1939]! } + public var Web_Error: String { return self._s[1967]! } + public var PhotoEditor_SkinTool: String { return self._s[1968]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[1969]! } + public var AutoremoveSetup_TimerInfoChat: String { return self._s[1970]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[1972]! } + public var PasscodeSettings_Help: String { return self._s[1973]! } + public var Appearance_ColorTheme: String { return self._s[1974]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1940]!, self._r[1940]!, [_0]) + return formatWithArgumentRanges(self._s[1975]!, self._r[1975]!, [_0]) } - public var InviteLink_DeleteAllRevokedLinks: String { return self._s[1941]! } + public var InviteLink_DeleteAllRevokedLinks: String { return self._s[1976]! } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1942]!, self._r[1942]!, [_1]) + return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_1]) } - public var InviteLink_QRCode_Title: String { return self._s[1943]! } - public var GroupInfo_LeftStatus: String { return self._s[1944]! } - public var EditTheme_Preview: String { return self._s[1945]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1946]! } + public var InviteLink_QRCode_Title: String { return self._s[1978]! } + public var GroupInfo_LeftStatus: String { return self._s[1979]! } + public var EditTheme_Preview: String { return self._s[1980]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1981]! } public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1947]!, self._r[1947]!, [_0]) + return formatWithArgumentRanges(self._s[1982]!, self._r[1982]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[1948]! } - public var VoiceChat_StatusWantsToSpeak: String { return self._s[1949]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1950]! } - public var ChatList_Context_MarkAsUnread: String { return self._s[1951]! } - public var DialogList_AdNoticeAlert: String { return self._s[1952]! } - public var UserInfo_Invite: String { return self._s[1953]! } - public var Checkout_Email: String { return self._s[1954]! } - public var Stats_GroupActionsTitle: String { return self._s[1955]! } - public var Coub_TapForSound: String { return self._s[1956]! } - public var Conversation_AutoremoveTimerRemovedUserYou: String { return self._s[1957]! } - public var Theme_ThemeChangedText: String { return self._s[1958]! } - public var Call_ExternalCallInProgressMessage: String { return self._s[1959]! } - public var AutoremoveSetup_TimerInfoChannel: String { return self._s[1960]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[1961]! } - public var ScheduledMessages_ScheduledToday: String { return self._s[1962]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1963]! } + public var NotificationsSound_Keys: String { return self._s[1983]! } + public var VoiceChat_StatusWantsToSpeak: String { return self._s[1984]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1985]! } + public var ChatList_Context_MarkAsUnread: String { return self._s[1986]! } + public var DialogList_AdNoticeAlert: String { return self._s[1987]! } + public var UserInfo_Invite: String { return self._s[1988]! } + public var Checkout_Email: String { return self._s[1989]! } + public var Stats_GroupActionsTitle: String { return self._s[1990]! } + public var Coub_TapForSound: String { return self._s[1991]! } + public var Conversation_AutoremoveTimerRemovedUserYou: String { return self._s[1992]! } + public var Theme_ThemeChangedText: String { return self._s[1993]! } + public var Call_ExternalCallInProgressMessage: String { return self._s[1994]! } + public var AutoremoveSetup_TimerInfoChannel: String { return self._s[1995]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[1996]! } + public var ScheduledMessages_ScheduledToday: String { return self._s[1997]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1998]! } public func VoiceChat_InviteMemberToChannelFirstText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1964]!, self._r[1964]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1999]!, self._r[1999]!, [_1, _2]) } - public var Call_ReportIncludeLogDescription: String { return self._s[1965]! } - public var Settings_FrequentlyAskedQuestions: String { return self._s[1967]! } - public var Call_VoiceOver_VoiceCallMissed: String { return self._s[1968]! } - public var Channel_MessagePhotoRemoved: String { return self._s[1969]! } - public var Passport_Email_Delete: String { return self._s[1970]! } + public var Call_ReportIncludeLogDescription: String { return self._s[2000]! } + public var Settings_FrequentlyAskedQuestions: String { return self._s[2002]! } + public var Call_VoiceOver_VoiceCallMissed: String { return self._s[2003]! } + public var Channel_MessagePhotoRemoved: String { return self._s[2004]! } + public var Passport_Email_Delete: String { return self._s[2005]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1971]!, self._r[1971]!, [_1]) + return formatWithArgumentRanges(self._s[2006]!, self._r[2006]!, [_1]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[1972]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2007]! } public func Conversation_AutoremoveTimerRemovedUser(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1973]!, self._r[1973]!, [_1]) + return formatWithArgumentRanges(self._s[2008]!, self._r[2008]!, [_1]) } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[1974]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[1976]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1977]! } - public var Common_of: String { return self._s[1978]! } - public var VoiceChat_CreateNewVoiceChatText: String { return self._s[1979]! } - public var VoiceChat_StartRecordingStart: String { return self._s[1980]! } - public var PeerInfo_ButtonUnmute: String { return self._s[1983]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[2009]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[2011]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[2012]! } + public var Common_of: String { return self._s[2013]! } + public var VoiceChat_CreateNewVoiceChatText: String { return self._s[2014]! } + public var VoiceChat_StartRecordingStart: String { return self._s[2015]! } + public var PeerInfo_ButtonUnmute: String { return self._s[2018]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1984]!, self._r[1984]!, [_0]) + return formatWithArgumentRanges(self._s[2019]!, self._r[2019]!, [_0]) } - public var ChatList_AddChatsToFolder: String { return self._s[1985]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[1986]! } - public var Settings_Title: String { return self._s[1988]! } - public var AutoDownloadSettings_Contacts: String { return self._s[1990]! } - public var Appearance_BubbleCornersSetting: String { return self._s[1991]! } - public var InviteLink_OtherAdminsLinks: String { return self._s[1992]! } - public var Privacy_Calls_AlwaysAllow: String { return self._s[1993]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1995]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1996]! } - public var SecretTimer_VideoDescription: String { return self._s[1997]! } - public var VoiceOver_Chat_AnimatedSticker: String { return self._s[1998]! } - public var WallpaperPreview_Blurred: String { return self._s[1999]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2000]! } - public var ChatListFolder_ExcludedSectionHeader: String { return self._s[2002]! } - public var Conversation_CancelForwardSelectChat: String { return self._s[2003]! } - public var DialogList_PasscodeLockHelp: String { return self._s[2004]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2005]! } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2006]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2007]! } - public var Passport_FieldAddressTranslationHelp: String { return self._s[2008]! } - public var SocksProxySetup_Connection: String { return self._s[2009]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[2010]! } - public var Contacts_PermissionsAllowInSettings: String { return self._s[2011]! } - public var Conversation_Unpin: String { return self._s[2012]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[2013]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[2014]! } - public var Call_ReportSkip: String { return self._s[2015]! } + public var Privacy_ContactsReset_ContactsDeleted: String { return self._s[2020]! } + public var ChatList_AddChatsToFolder: String { return self._s[2021]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2022]! } + public var Settings_Title: String { return self._s[2024]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2026]! } + public var Appearance_BubbleCornersSetting: String { return self._s[2027]! } + public var InviteLink_OtherAdminsLinks: String { return self._s[2028]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[2029]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2031]! } + public var WallpaperPreview_CropBottomText: String { return self._s[2032]! } + public var SecretTimer_VideoDescription: String { return self._s[2033]! } + public var VoiceOver_Chat_AnimatedSticker: String { return self._s[2034]! } + public var WallpaperPreview_Blurred: String { return self._s[2035]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2036]! } + public var ChatListFolder_ExcludedSectionHeader: String { return self._s[2038]! } + public var Conversation_CancelForwardSelectChat: String { return self._s[2039]! } + public var DialogList_PasscodeLockHelp: String { return self._s[2040]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2041]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2042]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2043]! } + public var Passport_FieldAddressTranslationHelp: String { return self._s[2044]! } + public var SocksProxySetup_Connection: String { return self._s[2045]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[2046]! } + public var Contacts_PermissionsAllowInSettings: String { return self._s[2047]! } + public var Conversation_Unpin: String { return self._s[2048]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[2049]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[2050]! } + public var Call_ReportSkip: String { return self._s[2051]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2016]!, self._r[2016]!, [_0]) - } - public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2018]!, self._r[2018]!, [_0]) - } - public var AutoNightTheme_Automatic: String { return self._s[2019]! } - public var Passport_Language_az: String { return self._s[2021]! } - public func Conversation_AutoremoveChanged(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2022]!, self._r[2022]!, [_0]) - } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[2023]! } - public var Watch_UserInfo_Unmute: String { return self._s[2024]! } - public var Channel_Stickers_YourStickers: String { return self._s[2025]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2026]! } - public var PeerInfo_AutoremoveMessagesDisabled: String { return self._s[2027]! } - public var Tour_Text1: String { return self._s[2028]! } - public var Common_Delete: String { return self._s[2029]! } - public var Settings_EditPhoto: String { return self._s[2030]! } - public var Common_Edit: String { return self._s[2031]! } - public var ShareMenu_ShareTo: String { return self._s[2033]! } - public var Passport_Identity_ExpiryDate: String { return self._s[2034]! } - public func Channel_AdminLog_MutedNewMembers(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2035]!, self._r[2035]!, [_1]) - } - public var Preview_DeleteGif: String { return self._s[2036]! } - public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2037]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2038]! } - public var Conversation_ViewReply: String { return self._s[2039]! } - public var Stats_LoadingText: String { return self._s[2040]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2041]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2042]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[2043]! } - public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2044]!, self._r[2044]!, [_0]) - } - public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2045]!, self._r[2045]!, [_0]) - } - public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, [_0]) - } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[2048]! } - public var InviteLink_Share: String { return self._s[2050]! } - public func Conversation_ImportProgress(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2052]!, self._r[2052]!, [_0]) } - public var IntentsSettings_MainAccount: String { return self._s[2053]! } - public var Group_MessagePhotoRemoved: String { return self._s[2056]! } - public var Conversation_ContextMenuSelect: String { return self._s[2057]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2059]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[2060]! } - public var Contacts_PermissionsEnable: String { return self._s[2061]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[2062]! } - public var Common_NotNow: String { return self._s[2063]! } - public var Notification_CreatedChannel: String { return self._s[2064]! } - public var Stats_ViewsBySourceTitle: String { return self._s[2066]! } - public var InviteLink_ContextShare: String { return self._s[2067]! } - public var Appearance_AppIconClassic: String { return self._s[2068]! } - public var PhotoEditor_QualityTool: String { return self._s[2069]! } - public var ClearCache_ClearCache: String { return self._s[2070]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[2071]! } - public var AutoDownloadSettings_Videos: String { return self._s[2072]! } - public var GroupPermission_Duration: String { return self._s[2073]! } - public var ChatList_Read: String { return self._s[2074]! } + public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2054]!, self._r[2054]!, [_0]) + } + public var AutoNightTheme_Automatic: String { return self._s[2055]! } + public var Passport_Language_az: String { return self._s[2057]! } + public func Conversation_AutoremoveChanged(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2058]!, self._r[2058]!, [_0]) + } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[2059]! } + public var Watch_UserInfo_Unmute: String { return self._s[2060]! } + public var Channel_Stickers_YourStickers: String { return self._s[2061]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2062]! } + public var PeerInfo_AutoremoveMessagesDisabled: String { return self._s[2063]! } + public var Tour_Text1: String { return self._s[2064]! } + public var Common_Delete: String { return self._s[2065]! } + public var Settings_EditPhoto: String { return self._s[2066]! } + public var Common_Edit: String { return self._s[2067]! } + public var ShareMenu_ShareTo: String { return self._s[2069]! } + public var Passport_Identity_ExpiryDate: String { return self._s[2070]! } + public func Channel_AdminLog_MutedNewMembers(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2071]!, self._r[2071]!, [_1]) + } + public var Preview_DeleteGif: String { return self._s[2072]! } + public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2073]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2074]! } + public var Conversation_ViewReply: String { return self._s[2075]! } + public var Stats_LoadingText: String { return self._s[2076]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2077]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2078]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[2079]! } + public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2080]!, self._r[2080]!, [_0]) + } + public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2081]!, self._r[2081]!, [_0]) + } + public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2083]!, self._r[2083]!, [_0]) + } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[2084]! } + public var InviteLink_Share: String { return self._s[2086]! } + public func Conversation_ImportProgress(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2088]!, self._r[2088]!, [_0]) + } + public var IntentsSettings_MainAccount: String { return self._s[2089]! } + public var Group_MessagePhotoRemoved: String { return self._s[2092]! } + public var Conversation_ContextMenuSelect: String { return self._s[2093]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2095]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[2096]! } + public var Contacts_PermissionsEnable: String { return self._s[2097]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[2098]! } + public var Common_NotNow: String { return self._s[2099]! } + public var Notification_CreatedChannel: String { return self._s[2100]! } + public var Stats_ViewsBySourceTitle: String { return self._s[2102]! } + public var InviteLink_ContextShare: String { return self._s[2103]! } + public var Appearance_AppIconClassic: String { return self._s[2104]! } + public var PhotoEditor_QualityTool: String { return self._s[2105]! } + public var ClearCache_ClearCache: String { return self._s[2106]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[2107]! } + public var AutoDownloadSettings_Videos: String { return self._s[2108]! } + public var GroupPermission_Duration: String { return self._s[2109]! } + public var ChatList_Read: String { return self._s[2110]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2075]!, self._r[2075]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, [_1, _2]) } - public var CallFeedback_Send: String { return self._s[2076]! } - public var Channel_Stickers_Searching: String { return self._s[2077]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[2078]! } - public var FastTwoStepSetup_HintSection: String { return self._s[2079]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2080]! } - public var EditTheme_CreateTitle: String { return self._s[2081]! } - public var Application_Name: String { return self._s[2082]! } - public var Paint_Stickers: String { return self._s[2083]! } - public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[2084]! } - public var Call_StatusFailed: String { return self._s[2085]! } - public var Stickers_FavoriteStickers: String { return self._s[2086]! } - public var ClearCache_Clear: String { return self._s[2087]! } - public var Passport_Language_mn: String { return self._s[2088]! } - public var WallpaperPreview_PreviewTopText: String { return self._s[2089]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[2090]! } - public var Call_VoiceOver_VideoCallOutgoing: String { return self._s[2092]! } - public var TwoFactorSetup_Hint_Text: String { return self._s[2094]! } - public var WallpaperPreview_PatternIntensity: String { return self._s[2095]! } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2096]! } - public var Passport_Address_AddBankStatement: String { return self._s[2097]! } + public func ScheduleVoiceChat_ScheduleTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2112]!, self._r[2112]!, [_0]) + } + public var CallFeedback_Send: String { return self._s[2113]! } + public var Channel_Stickers_Searching: String { return self._s[2114]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[2115]! } + public var FastTwoStepSetup_HintSection: String { return self._s[2116]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2117]! } + public var EditTheme_CreateTitle: String { return self._s[2119]! } + public var Application_Name: String { return self._s[2120]! } + public var Paint_Stickers: String { return self._s[2121]! } + public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[2122]! } + public var Call_StatusFailed: String { return self._s[2123]! } + public var Stickers_FavoriteStickers: String { return self._s[2124]! } + public var ClearCache_Clear: String { return self._s[2125]! } + public var Passport_Language_mn: String { return self._s[2126]! } + public var WallpaperPreview_PreviewTopText: String { return self._s[2127]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[2128]! } + public var Call_VoiceOver_VideoCallOutgoing: String { return self._s[2130]! } + public var TwoFactorSetup_Hint_Text: String { return self._s[2132]! } + public var WallpaperPreview_PatternIntensity: String { return self._s[2133]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2134]! } + public var Passport_Address_AddBankStatement: String { return self._s[2135]! } public func Conversation_TitleRepliesFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2100]!, self._r[2100]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2138]!, self._r[2138]!, [_1, _2]) } - public var ChatListFolderSettings_RecommendedNewFolder: String { return self._s[2101]! } - public var UserInfo_ShareContact: String { return self._s[2102]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[2103]! } - public var Channel_ErrorAdminsTooMuch: String { return self._s[2105]! } - public var Call_RateCall: String { return self._s[2106]! } - public var Contacts_AccessDeniedError: String { return self._s[2107]! } - public var Invite_ChannelsTooMuch: String { return self._s[2108]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[2109]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[2110]! } - public var InviteLink_Create_TimeLimitInfo: String { return self._s[2111]! } - public var Cache_NoLimit: String { return self._s[2113]! } - public var Conversation_EmptyPlaceholder: String { return self._s[2117]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2118]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2120]! } - public var Notification_Exceptions_MessagePreviewAlwaysOff: String { return self._s[2121]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[2122]! } + public var ChatListFolderSettings_RecommendedNewFolder: String { return self._s[2139]! } + public var UserInfo_ShareContact: String { return self._s[2140]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[2141]! } + public var Channel_ErrorAdminsTooMuch: String { return self._s[2143]! } + public var Call_RateCall: String { return self._s[2144]! } + public var Contacts_AccessDeniedError: String { return self._s[2145]! } + public var Invite_ChannelsTooMuch: String { return self._s[2146]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[2147]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[2148]! } + public var InviteLink_Create_TimeLimitInfo: String { return self._s[2149]! } + public var Cache_NoLimit: String { return self._s[2152]! } + public var Conversation_EmptyPlaceholder: String { return self._s[2153]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2157]! } + public var Notification_Exceptions_MessagePreviewAlwaysOff: String { return self._s[2158]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2159]! } + public var Privacy_PaymentsClear_AllInfoCleared: String { return self._s[2160]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[2161]! } public func PUSH_VIDEO_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2123]!, self._r[2123]!, [_1]) + return formatWithArgumentRanges(self._s[2162]!, self._r[2162]!, [_1]) } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[2124]! } - public var Theme_ThemeChanged: String { return self._s[2125]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2127]! } - public var AutoDownloadSettings_MediaTypes: String { return self._s[2128]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[2163]! } + public var Theme_ThemeChanged: String { return self._s[2164]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2166]! } + public var AutoDownloadSettings_MediaTypes: String { return self._s[2167]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2129]!, self._r[2129]!, [_0]) + return formatWithArgumentRanges(self._s[2168]!, self._r[2168]!, [_0]) } - public var Channel_AdminLog_InfoPanelTitle: String { return self._s[2130]! } - public var Passport_Language_da: String { return self._s[2132]! } - public var Chat_SlowmodeSendError: String { return self._s[2133]! } - public var Application_Update: String { return self._s[2135]! } - public var SocksProxySetup_SaveProxy: String { return self._s[2136]! } + public var Channel_AdminLog_InfoPanelTitle: String { return self._s[2169]! } + public var Passport_Language_da: String { return self._s[2171]! } + public var Chat_SlowmodeSendError: String { return self._s[2172]! } + public var Application_Update: String { return self._s[2174]! } + public var SocksProxySetup_SaveProxy: String { return self._s[2175]! } public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_1, _2]) } - public var Privacy_AddNewPeer: String { return self._s[2139]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[2141]! } - public var Channel_Members_Title: String { return self._s[2142]! } - public var StickerPacks_ActionDelete: String { return self._s[2143]! } - public var Settings_LogoutConfirmationText: String { return self._s[2144]! } - public var Chat_UnsendMyMessages: String { return self._s[2145]! } - public var PeerInfo_ReportProfilePhoto: String { return self._s[2146]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2148]! } - public var ChatListFilter_AddChatsTitle: String { return self._s[2149]! } - public var Passport_FloodError: String { return self._s[2150]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[2151]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2152]! } - public var CallSettings_TabIconDescription: String { return self._s[2153]! } - public var Group_Setup_HistoryHeader: String { return self._s[2155]! } + public var Privacy_AddNewPeer: String { return self._s[2178]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[2180]! } + public var Channel_Members_Title: String { return self._s[2181]! } + public var StickerPacks_ActionDelete: String { return self._s[2182]! } + public var Conversation_ScheduledVoiceChat: String { return self._s[2183]! } + public var Settings_LogoutConfirmationText: String { return self._s[2185]! } + public var Chat_UnsendMyMessages: String { return self._s[2186]! } + public var PeerInfo_ReportProfilePhoto: String { return self._s[2187]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2189]! } + public var ChatListFilter_AddChatsTitle: String { return self._s[2190]! } + public var Passport_FloodError: String { return self._s[2191]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[2192]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2193]! } + public var CallSettings_TabIconDescription: String { return self._s[2194]! } + public var Group_Setup_HistoryHeader: String { return self._s[2196]! } public func Channel_AdminLog_AllowedNewMembersToSpeak(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2156]!, self._r[2156]!, [_1]) + return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_1]) } - public var TwoStepAuth_EmailTitle: String { return self._s[2157]! } - public var GroupInfo_Permissions_Removed: String { return self._s[2158]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[2159]! } - public var Contacts_Title: String { return self._s[2161]! } + public var TwoStepAuth_EmailTitle: String { return self._s[2198]! } + public var GroupInfo_Permissions_Removed: String { return self._s[2199]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[2200]! } + public var Contacts_Title: String { return self._s[2202]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2162]!, self._r[2162]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2203]!, self._r[2203]!, [_0, _1]) } - public var ChatList_PeerTypeBot: String { return self._s[2165]! } + public var ChatList_PeerTypeBot: String { return self._s[2206]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2166]!, self._r[2166]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2207]!, self._r[2207]!, [_1, _2]) } - public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[2167]! } + public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[2208]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2168]!, self._r[2168]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2209]!, self._r[2209]!, [_1, _2, _3]) } - public var Camera_PhotoMode: String { return self._s[2170]! } + public var Camera_PhotoMode: String { return self._s[2211]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2171]!, self._r[2171]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2212]!, self._r[2212]!, [_1, _2, _3]) } - public var ContactInfo_PhoneLabelPager: String { return self._s[2172]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[2173]! } - public var Call_CallAgain: String { return self._s[2174]! } - public var TwoStepAuth_PasswordSet: String { return self._s[2175]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[2213]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[2214]! } + public var Call_CallAgain: String { return self._s[2215]! } + public var TwoStepAuth_PasswordSet: String { return self._s[2216]! } + public var VoiceChat_EditDescriptionPlaceholder: String { return self._s[2217]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_0]) + return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_0]) } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[2177]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2178]! } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2179]! } - public var Group_LeaveGroup: String { return self._s[2180]! } - public var Channel_Setup_LinkTypePrivate: String { return self._s[2182]! } - public var GroupInfo_LabelAdmin: String { return self._s[2184]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[2186]! } - public var Notification_PassportValuePersonalDetails: String { return self._s[2187]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[2219]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2220]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2221]! } + public var Group_LeaveGroup: String { return self._s[2222]! } + public var Channel_Setup_LinkTypePrivate: String { return self._s[2224]! } + public var GroupInfo_LabelAdmin: String { return self._s[2226]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[2228]! } + public var Notification_PassportValuePersonalDetails: String { return self._s[2229]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2188]!, self._r[2188]!, [_0]) + return formatWithArgumentRanges(self._s[2230]!, self._r[2230]!, [_0]) } - public var Stats_GroupNewMembersBySourceTitle: String { return self._s[2189]! } - public var Appearance_Preview: String { return self._s[2190]! } - public var VoiceOver_Chat_Contact: String { return self._s[2191]! } - public var Passport_Language_th: String { return self._s[2192]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2194]! } - public var LastSeen_Offline: String { return self._s[2197]! } - public var Map_OpenInHereMaps: String { return self._s[2198]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[2199]! } - public var InviteLink_ContextEdit: String { return self._s[2201]! } - public var AutoDownloadSettings_Reset: String { return self._s[2202]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[2203]! } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[2204]! } + public var Stats_GroupNewMembersBySourceTitle: String { return self._s[2231]! } + public var Appearance_Preview: String { return self._s[2232]! } + public var VoiceOver_Chat_Contact: String { return self._s[2233]! } + public var Passport_Language_th: String { return self._s[2234]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2236]! } + public var LastSeen_Offline: String { return self._s[2239]! } + public var Map_OpenInHereMaps: String { return self._s[2240]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[2241]! } + public var InviteLink_ContextEdit: String { return self._s[2243]! } + public var AutoDownloadSettings_Reset: String { return self._s[2244]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[2245]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[2246]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2205]!, self._r[2205]!, [_0]) + return formatWithArgumentRanges(self._s[2247]!, self._r[2247]!, [_0]) } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2206]!, self._r[2206]!, [_0]) + return formatWithArgumentRanges(self._s[2248]!, self._r[2248]!, [_0]) } - public var Passport_Identity_EditDriversLicense: String { return self._s[2207]! } - public var ChatListFolder_NameNonMuted: String { return self._s[2208]! } - public var Username_Placeholder: String { return self._s[2209]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[2249]! } + public var ChatListFolder_NameNonMuted: String { return self._s[2250]! } + public var Username_Placeholder: String { return self._s[2251]! } public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2210]!, self._r[2210]!, [_1]) + return formatWithArgumentRanges(self._s[2252]!, self._r[2252]!, [_1]) } - public var Passport_Language_it: String { return self._s[2211]! } - public var Checkout_NewCard_SaveInfo: String { return self._s[2212]! } + public var Passport_Language_it: String { return self._s[2253]! } + public var Checkout_NewCard_SaveInfo: String { return self._s[2254]! } public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2213]!, self._r[2213]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2255]!, self._r[2255]!, [_1, _2]) } - public var NotificationsSound_Pulse: String { return self._s[2214]! } - public var VoiceOver_DismissContextMenu: String { return self._s[2216]! } - public var MessagePoll_NoVotes: String { return self._s[2219]! } - public var Message_Wallpaper: String { return self._s[2220]! } - public var Conversation_JoinVoiceChat: String { return self._s[2221]! } - public var Appearance_Other: String { return self._s[2222]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[2224]! } - public var Group_PublicLink_Placeholder: String { return self._s[2228]! } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[2229]! } - public var VoiceOver_Recording_StopAndPreview: String { return self._s[2230]! } - public var ChatListFolder_NameBots: String { return self._s[2231]! } - public var Conversation_StopPollConfirmation: String { return self._s[2232]! } - public var UserInfo_DeleteContact: String { return self._s[2233]! } + public var NotificationsSound_Pulse: String { return self._s[2256]! } + public var VoiceOver_DismissContextMenu: String { return self._s[2258]! } + public var MessagePoll_NoVotes: String { return self._s[2261]! } + public var Message_Wallpaper: String { return self._s[2262]! } + public var Conversation_JoinVoiceChat: String { return self._s[2263]! } + public var Appearance_Other: String { return self._s[2264]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[2266]! } + public var Group_PublicLink_Placeholder: String { return self._s[2270]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[2271]! } + public var VoiceOver_Recording_StopAndPreview: String { return self._s[2272]! } + public var ChatListFolder_NameBots: String { return self._s[2273]! } + public var Conversation_StopPollConfirmation: String { return self._s[2274]! } + public var UserInfo_DeleteContact: String { return self._s[2275]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2234]!, self._r[2234]!, [_0]) + return formatWithArgumentRanges(self._s[2276]!, self._r[2276]!, [_0]) } - public var Wallpaper_Wallpaper: String { return self._s[2236]! } + public var Wallpaper_Wallpaper: String { return self._s[2278]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2237]!, self._r[2237]!, [_1]) + return formatWithArgumentRanges(self._s[2279]!, self._r[2279]!, [_1]) } - public var LoginPassword_ForgotPassword: String { return self._s[2238]! } - public var FeaturedStickerPacks_Title: String { return self._s[2239]! } - public var Paint_Pen: String { return self._s[2240]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2241]! } - public var ChatListFolderSettings_Info: String { return self._s[2242]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2243]! } - public var PhotoEditor_CurvesAll: String { return self._s[2245]! } + public var LoginPassword_ForgotPassword: String { return self._s[2280]! } + public var FeaturedStickerPacks_Title: String { return self._s[2281]! } + public var Paint_Pen: String { return self._s[2282]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2283]! } + public var ChatListFolderSettings_Info: String { return self._s[2284]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2285]! } + public var PhotoEditor_CurvesAll: String { return self._s[2287]! } public func Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2247]!, self._r[2247]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2289]!, self._r[2289]!, [_1, _2, _3]) } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2249]! } - public var Message_ImageExpired: String { return self._s[2250]! } - public var Call_ConnectionErrorMessage: String { return self._s[2251]! } - public var SearchImages_NoImagesFound: String { return self._s[2253]! } - public var PeerInfo_PaneGifs: String { return self._s[2254]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2255]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2256]! } - public var PhotoEditor_VignetteTool: String { return self._s[2257]! } - public var Passport_Language_dz: String { return self._s[2258]! } - public var Notifications_ChannelNotificationsHelp: String { return self._s[2259]! } - public var Conversation_BlockUser: String { return self._s[2260]! } - public var GroupPermission_PermissionDisabledByDefault: String { return self._s[2263]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2265]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2291]! } + public var Message_ImageExpired: String { return self._s[2292]! } + public var Call_ConnectionErrorMessage: String { return self._s[2293]! } + public var SearchImages_NoImagesFound: String { return self._s[2295]! } + public var PeerInfo_PaneGifs: String { return self._s[2296]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2297]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2298]! } + public var PhotoEditor_VignetteTool: String { return self._s[2299]! } + public var Passport_Language_dz: String { return self._s[2300]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[2301]! } + public var Conversation_BlockUser: String { return self._s[2302]! } + public var GroupPermission_PermissionDisabledByDefault: String { return self._s[2305]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2307]! } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2266]!, self._r[2266]!, [_0]) + return formatWithArgumentRanges(self._s[2308]!, self._r[2308]!, [_0]) } - public var KeyCommand_NewMessage: String { return self._s[2267]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[2270]! } + public var KeyCommand_NewMessage: String { return self._s[2309]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[2312]! } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2272]!, self._r[2272]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2314]!, self._r[2314]!, [_1, _2]) } - public var ContactList_Context_StartSecretChat: String { return self._s[2273]! } - public var VoiceOver_Chat_File: String { return self._s[2274]! } - public var ChatList_EditFolder: String { return self._s[2276]! } - public var Appearance_BubbleCorners_Title: String { return self._s[2277]! } - public var PeerInfo_PaneAudio: String { return self._s[2278]! } - public var ChatListFolder_CategoryContacts: String { return self._s[2280]! } - public var VoiceOver_ScheduledMessages: String { return self._s[2281]! } + public var ContactList_Context_StartSecretChat: String { return self._s[2315]! } + public var VoiceOver_Chat_File: String { return self._s[2316]! } + public var ChatList_EditFolder: String { return self._s[2318]! } + public var Appearance_BubbleCorners_Title: String { return self._s[2319]! } + public var PeerInfo_PaneAudio: String { return self._s[2320]! } + public var ChatListFolder_CategoryContacts: String { return self._s[2322]! } + public var VoiceOver_ScheduledMessages: String { return self._s[2323]! } public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2282]!, self._r[2282]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[2324]!, self._r[2324]!, [_1, _2, _3, _4, _5]) } - public var ChatList_PeerTypeChannel: String { return self._s[2283]! } - public var VoiceOver_Navigation_Search: String { return self._s[2284]! } - public var Settings_Search: String { return self._s[2285]! } - public var WallpaperSearch_ColorYellow: String { return self._s[2286]! } - public var Login_PhoneBannedError: String { return self._s[2287]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2288]! } - public var Passport_Language_fa: String { return self._s[2289]! } - public var Settings_About: String { return self._s[2290]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[2291]! } - public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[2292]! } - public var AutoDownloadSettings_DataUsageHigh: String { return self._s[2293]! } + public var ChatList_PeerTypeChannel: String { return self._s[2325]! } + public var VoiceOver_Navigation_Search: String { return self._s[2326]! } + public var Settings_Search: String { return self._s[2327]! } + public var WallpaperSearch_ColorYellow: String { return self._s[2328]! } + public var Login_PhoneBannedError: String { return self._s[2329]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2330]! } + public var Passport_Language_fa: String { return self._s[2331]! } + public var Settings_About: String { return self._s[2332]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[2333]! } + public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[2334]! } + public var AutoDownloadSettings_DataUsageHigh: String { return self._s[2335]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2294]!, self._r[2294]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2336]!, self._r[2336]!, [_1, _2, _3]) } - public var Common_OK: String { return self._s[2295]! } - public var Contacts_SortBy: String { return self._s[2296]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[2297]! } + public var Common_OK: String { return self._s[2337]! } + public var Contacts_SortBy: String { return self._s[2338]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[2339]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2299]!, self._r[2299]!, [_0]) + return formatWithArgumentRanges(self._s[2341]!, self._r[2341]!, [_0]) } - public var CallFeedback_IncludeLogs: String { return self._s[2302]! } + public var CallFeedback_IncludeLogs: String { return self._s[2344]! } public func External_OpenIn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2303]!, self._r[2303]!, [_0]) + return formatWithArgumentRanges(self._s[2345]!, self._r[2345]!, [_0]) } - public var Passcode_AppLockedAlert: String { return self._s[2305]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[2306]! } - public var Channel_NotificationLoading: String { return self._s[2308]! } - public var Passport_Identity_DocumentNumber: String { return self._s[2309]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2310]! } - public var VoiceOver_Chat_OpenHint: String { return self._s[2311]! } - public var Weekday_ShortFriday: String { return self._s[2312]! } - public var Conversation_TitleMute: String { return self._s[2313]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2314]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[2315]! } - public var DialogList_LanguageTooltip: String { return self._s[2317]! } - public var BroadcastGroups_IntroTitle: String { return self._s[2318]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[2319]! } + public var Passcode_AppLockedAlert: String { return self._s[2347]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[2348]! } + public var Channel_NotificationLoading: String { return self._s[2350]! } + public var Passport_Identity_DocumentNumber: String { return self._s[2351]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2352]! } + public var VoiceOver_Chat_OpenHint: String { return self._s[2353]! } + public var Weekday_ShortFriday: String { return self._s[2354]! } + public var Conversation_TitleMute: String { return self._s[2355]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2356]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[2357]! } + public var DialogList_LanguageTooltip: String { return self._s[2359]! } + public var BroadcastGroups_IntroTitle: String { return self._s[2360]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[2361]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2320]!, self._r[2320]!, [_0]) + return formatWithArgumentRanges(self._s[2362]!, self._r[2362]!, [_0]) } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[2322]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[2323]! } - public var Settings_EditVideo: String { return self._s[2324]! } - public var VoiceOver_Common_Off: String { return self._s[2325]! } - public var Stickers_FrequentlyUsed: String { return self._s[2326]! } - public var GroupPermission_Title: String { return self._s[2327]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[2328]! } - public var Appearance_ThemeCarouselDay: String { return self._s[2329]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[2364]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[2365]! } + public var Settings_EditVideo: String { return self._s[2366]! } + public var VoiceOver_Common_Off: String { return self._s[2367]! } + public var Stickers_FrequentlyUsed: String { return self._s[2368]! } + public var GroupPermission_Title: String { return self._s[2369]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[2370]! } + public var Appearance_ThemeCarouselDay: String { return self._s[2371]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2330]!, self._r[2330]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2372]!, self._r[2372]!, [_1, _2]) } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2331]! } - public var Tour_Title6: String { return self._s[2332]! } - public var EmptyGroupInfo_Title: String { return self._s[2333]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2373]! } + public var Tour_Title6: String { return self._s[2374]! } + public var EmptyGroupInfo_Title: String { return self._s[2375]! } public func Channel_AdminLog_MessageToggleSignaturesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2334]!, self._r[2334]!, [_0]) + return formatWithArgumentRanges(self._s[2376]!, self._r[2376]!, [_0]) } - public var Passport_Language_sk: String { return self._s[2335]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[2336]! } - public var Preview_SaveToCameraRoll: String { return self._s[2337]! } + public var Passport_Language_sk: String { return self._s[2377]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[2378]! } + public var Preview_SaveToCameraRoll: String { return self._s[2379]! } public func VoiceChat_YouCanNowSpeakIn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2338]!, self._r[2338]!, [_0]) + return formatWithArgumentRanges(self._s[2380]!, self._r[2380]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[2339]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[2340]! } - public var Conversation_ContextMenuMore: String { return self._s[2341]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[2342]! } - public var Channel_AdminLog_CanBeAnonymous: String { return self._s[2343]! } - public var CallFeedback_ReasonSilentLocal: String { return self._s[2345]! } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[2381]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[2382]! } + public var Conversation_ContextMenuMore: String { return self._s[2383]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[2384]! } + public var Channel_AdminLog_CanBeAnonymous: String { return self._s[2385]! } + public var CallFeedback_ReasonSilentLocal: String { return self._s[2387]! } public func Channel_AdminLog_UnmutedMutedParticipant(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2346]!, self._r[2346]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2388]!, self._r[2388]!, [_1, _2]) } - public var UserInfo_NotificationsDisable: String { return self._s[2347]! } + public var UserInfo_NotificationsDisable: String { return self._s[2389]! } public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2349]!, self._r[2349]!, [_0]) + return formatWithArgumentRanges(self._s[2391]!, self._r[2391]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[2350]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[2392]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2352]!, self._r[2352]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2394]!, self._r[2394]!, [_1, _2]) } - public var WallpaperSearch_ColorPrefix: String { return self._s[2353]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2395]! } public func Message_ForwardedPsa_covid(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_0]) + return formatWithArgumentRanges(self._s[2396]!, self._r[2396]!, [_0]) } - public var Conversation_RestrictedMedia: String { return self._s[2356]! } - public var Group_MessageVideoUpdated: String { return self._s[2357]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2358]! } - public var GroupInfo_DeleteAndExit: String { return self._s[2359]! } - public var TwoFactorSetup_Email_Action: String { return self._s[2360]! } - public var Media_ShareThisVideo: String { return self._s[2362]! } - public var DialogList_Replies: String { return self._s[2364]! } + public var Conversation_RestrictedMedia: String { return self._s[2398]! } + public var Group_MessageVideoUpdated: String { return self._s[2399]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2400]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2401]! } + public var TwoFactorSetup_Email_Action: String { return self._s[2402]! } + public var Media_ShareThisVideo: String { return self._s[2404]! } + public var DialogList_Replies: String { return self._s[2406]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2365]!, self._r[2365]!, [_0]) + return formatWithArgumentRanges(self._s[2407]!, self._r[2407]!, [_0]) } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2366]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[2367]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2368]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2408]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[2409]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2410]! } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2369]!, self._r[2369]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_1, _2]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2370]!, self._r[2370]!, [_0]) + return formatWithArgumentRanges(self._s[2412]!, self._r[2412]!, [_0]) } - public var Channel_EditAdmin_PermissinAddAdminOff: String { return self._s[2371]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2372]! } - public var ChatList_Search_NoResultsFitlerMedia: String { return self._s[2373]! } - public var Channel_Members_InviteLink: String { return self._s[2374]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[2375]! } - public var WatchRemote_AlertText: String { return self._s[2376]! } + public var Channel_EditAdmin_PermissinAddAdminOff: String { return self._s[2413]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2414]! } + public var ChatList_Search_NoResultsFitlerMedia: String { return self._s[2415]! } + public var Channel_Members_InviteLink: String { return self._s[2416]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[2417]! } + public var WatchRemote_AlertText: String { return self._s[2418]! } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2377]!, self._r[2377]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2419]!, self._r[2419]!, [_1, _2]) } - public var Conversation_Pin: String { return self._s[2378]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2379]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2380]! } - public var Conversation_CancelForwardTitle: String { return self._s[2381]! } + public var Conversation_Pin: String { return self._s[2420]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2421]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2422]! } + public var Conversation_CancelForwardTitle: String { return self._s[2423]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2382]!, self._r[2382]!, [_0]) + return formatWithArgumentRanges(self._s[2424]!, self._r[2424]!, [_0]) } - public var Appearance_AppIconFilled: String { return self._s[2383]! } - public var StickerPack_ErrorNotFound: String { return self._s[2384]! } + public var Appearance_AppIconFilled: String { return self._s[2425]! } + public var StickerPack_ErrorNotFound: String { return self._s[2426]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2385]!, self._r[2385]!, [_1]) - } - public var Passport_Identity_AddIdentityCard: String { return self._s[2386]! } - public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2388]!, self._r[2388]!, [_1]) - } - public var Call_Camera: String { return self._s[2389]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2390]! } - public var Group_Location_Info: String { return self._s[2391]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[2392]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[2393]! } - public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2394]!, self._r[2394]!, [_0]) - } - public var Weekday_Yesterday: String { return self._s[2395]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[2396]! } - public var InviteLink_Create_UsersLimit: String { return self._s[2397]! } - public var ArchivedPacksAlert_Title: String { return self._s[2398]! } - public var PeerInfo_PaneMembers: String { return self._s[2399]! } - public var PhotoEditor_SelectCoverFrame: String { return self._s[2400]! } - public func Location_ProximityAlertSetTextGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2401]!, self._r[2401]!, [_0]) - } - public var ContactInfo_PhoneLabelMain: String { return self._s[2402]! } - public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2403]!, self._r[2403]!, [_1, _2, _3]) - } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[2404]! } - public var Channel_DiscussionGroup: String { return self._s[2405]! } - public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[2406]! } - public var InviteLink_Create_TimeLimit: String { return self._s[2408]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[2409]! } - public var VoiceOver_MessageContextForward: String { return self._s[2410]! } - public var SocksProxySetup_TypeNone: String { return self._s[2411]! } - public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[2413]! } - public var ProfilePhoto_OpenInEditor: String { return self._s[2415]! } - public var WallpaperSearch_ColorPurple: String { return self._s[2416]! } - public var ChatListFolder_IncludeChatsTitle: String { return self._s[2417]! } - public var Group_Username_InvalidTooShort: String { return self._s[2418]! } - public var Location_ProximityNotification_DistanceM: String { return self._s[2419]! } - public var VoiceChat_EditTitleText: String { return self._s[2420]! } - public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2421]!, self._r[2421]!, [_0, _1, _2]) - } - public var Passport_Language_tk: String { return self._s[2422]! } - public var ConvertToSupergroup_Title: String { return self._s[2423]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[2424]! } - public var Cache_KeepMediaHelp: String { return self._s[2425]! } - public var Channel_Management_Title: String { return self._s[2426]! } - public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2427]!, self._r[2427]!, [_1]) } - public var Conversation_ForwardChats: String { return self._s[2428]! } - public var Passport_Language_bg: String { return self._s[2429]! } - public var SocksProxySetup_TypeSocks: String { return self._s[2430]! } - public var Permissions_PrivacyPolicy: String { return self._s[2431]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2432]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[2433]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2434]! } - public var Conversation_ContextMenuOpenChannel: String { return self._s[2435]! } - public var Report_AdditionalDetailsPlaceholder: String { return self._s[2436]! } - public var Activity_UploadingVideo: String { return self._s[2437]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[2439]! } - public var Widget_LongTapToEdit: String { return self._s[2440]! } - public var VoiceChat_InviteLink_Listener: String { return self._s[2442]! } - public var SocksProxySetup_Credentials: String { return self._s[2443]! } - public var Preview_SaveGif: String { return self._s[2444]! } - public var Cache_Photos: String { return self._s[2445]! } - public var Channel_AdminLogFilter_EventsCalls: String { return self._s[2446]! } - public var Conversation_ContextMenuCancelEditing: String { return self._s[2447]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[2448]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[2428]! } + public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2430]!, self._r[2430]!, [_1]) + } + public var Call_Camera: String { return self._s[2431]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2432]! } + public var Group_Location_Info: String { return self._s[2433]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[2434]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[2435]! } + public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2436]!, self._r[2436]!, [_0]) + } + public var Weekday_Yesterday: String { return self._s[2437]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[2438]! } + public var InviteLink_Create_UsersLimit: String { return self._s[2439]! } + public func Notification_VoiceChatScheduledTodayChannel(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2440]!, self._r[2440]!, [_0]) + } + public var ArchivedPacksAlert_Title: String { return self._s[2441]! } + public var PeerInfo_PaneMembers: String { return self._s[2442]! } + public var PhotoEditor_SelectCoverFrame: String { return self._s[2443]! } + public func Location_ProximityAlertSetTextGroup(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2444]!, self._r[2444]!, [_0]) + } + public var ContactInfo_PhoneLabelMain: String { return self._s[2445]! } + public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2446]!, self._r[2446]!, [_1, _2, _3]) + } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[2447]! } + public var Channel_DiscussionGroup: String { return self._s[2448]! } + public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[2449]! } + public var InviteLink_Create_TimeLimit: String { return self._s[2451]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[2452]! } + public var VoiceOver_MessageContextForward: String { return self._s[2453]! } + public var SocksProxySetup_TypeNone: String { return self._s[2454]! } + public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[2456]! } + public var ProfilePhoto_OpenInEditor: String { return self._s[2458]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2459]! } + public var ChatListFolder_IncludeChatsTitle: String { return self._s[2460]! } + public var Group_Username_InvalidTooShort: String { return self._s[2461]! } + public var Location_ProximityNotification_DistanceM: String { return self._s[2462]! } + public var VoiceChat_EditTitleText: String { return self._s[2463]! } + public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2464]!, self._r[2464]!, [_0, _1, _2]) + } + public var Passport_Language_tk: String { return self._s[2465]! } + public var ConvertToSupergroup_Title: String { return self._s[2466]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[2467]! } + public var Cache_KeepMediaHelp: String { return self._s[2468]! } + public var Channel_Management_Title: String { return self._s[2469]! } + public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2470]!, self._r[2470]!, [_1]) + } + public var Conversation_ForwardChats: String { return self._s[2471]! } + public var Passport_Language_bg: String { return self._s[2472]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2473]! } + public var Permissions_PrivacyPolicy: String { return self._s[2474]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2475]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[2476]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2477]! } + public var Conversation_ContextMenuOpenChannel: String { return self._s[2478]! } + public var Report_AdditionalDetailsPlaceholder: String { return self._s[2479]! } + public var Activity_UploadingVideo: String { return self._s[2480]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[2482]! } + public var Widget_LongTapToEdit: String { return self._s[2483]! } + public var VoiceChat_InviteLink_Listener: String { return self._s[2485]! } + public var SocksProxySetup_Credentials: String { return self._s[2486]! } + public var Preview_SaveGif: String { return self._s[2487]! } + public var Cache_Photos: String { return self._s[2488]! } + public var Channel_AdminLogFilter_EventsCalls: String { return self._s[2489]! } + public var Conversation_ContextMenuCancelEditing: String { return self._s[2490]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[2491]! } public func VoiceChat_RemoveAndBanPeerConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2449]!, self._r[2449]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2492]!, self._r[2492]!, [_1, _2]) } - public var Passport_Language_lt: String { return self._s[2450]! } - public var Passport_DeleteDocument: String { return self._s[2452]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2453]! } + public var Passport_Language_lt: String { return self._s[2493]! } + public var Passport_DeleteDocument: String { return self._s[2495]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2496]! } public func Location_ProximityNotification_NotifyLong(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2454]!, self._r[2454]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2497]!, self._r[2497]!, [_1, _2]) } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[2455]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[2498]! } public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2456]!, self._r[2456]!, [_0]) + return formatWithArgumentRanges(self._s[2499]!, self._r[2499]!, [_0]) } - public var AccessDenied_VideoCallCamera: String { return self._s[2457]! } + public var AccessDenied_VideoCallCamera: String { return self._s[2500]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2458]!, self._r[2458]!, [_0]) + return formatWithArgumentRanges(self._s[2501]!, self._r[2501]!, [_0]) } - public var PhotoEditor_SharpenTool: String { return self._s[2459]! } + public var PhotoEditor_SharpenTool: String { return self._s[2502]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2460]!, self._r[2460]!, [_1]) + return formatWithArgumentRanges(self._s[2503]!, self._r[2503]!, [_1]) } - public var DialogList_Unpin: String { return self._s[2461]! } - public var Stickers_NoStickersFound: String { return self._s[2462]! } - public var UserInfo_AddContact: String { return self._s[2464]! } + public var DialogList_Unpin: String { return self._s[2504]! } + public var Stickers_NoStickersFound: String { return self._s[2505]! } + public var UserInfo_AddContact: String { return self._s[2507]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2466]!, self._r[2466]!, [_0]) + return formatWithArgumentRanges(self._s[2509]!, self._r[2509]!, [_0]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2467]!, self._r[2467]!, [_0]) + return formatWithArgumentRanges(self._s[2510]!, self._r[2510]!, [_0]) } - public var CallFeedback_VideoReasonDistorted: String { return self._s[2468]! } - public var Tour_Text2: String { return self._s[2469]! } + public var CallFeedback_VideoReasonDistorted: String { return self._s[2511]! } + public var Tour_Text2: String { return self._s[2512]! } public func Conversation_TitleCommentsFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2471]!, self._r[2471]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2514]!, self._r[2514]!, [_1, _2]) } - public var InviteLink_DeleteAllRevokedLinksAlert_Text: String { return self._s[2473]! } - public var Paint_Delete: String { return self._s[2474]! } + public var InviteLink_DeleteAllRevokedLinksAlert_Text: String { return self._s[2516]! } + public var Paint_Delete: String { return self._s[2517]! } public func Call_VoiceChatInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2475]!, self._r[2475]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2518]!, self._r[2518]!, [_1, _2]) } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2476]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2519]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2478]!, self._r[2478]!, [_0]) + return formatWithArgumentRanges(self._s[2521]!, self._r[2521]!, [_0]) } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[2479]! } - public var Notification_CallOutgoingShort: String { return self._s[2480]! } - public var Checkout_PasswordEntry_Title: String { return self._s[2481]! } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[2482]! } - public var Notification_MessageLifetime1m: String { return self._s[2483]! } - public var BlockedUsers_AddNew: String { return self._s[2485]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[2486]! } - public var Settings_SaveEditedPhotos: String { return self._s[2487]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[2488]! } - public var Channel_AboutItem: String { return self._s[2489]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[2490]! } - public var Privacy_Calls_P2PNever: String { return self._s[2492]! } - public var Passport_Language_uk: String { return self._s[2493]! } - public var NetworkUsageSettings_Wifi: String { return self._s[2494]! } - public var Conversation_Moderate_Report: String { return self._s[2495]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2496]! } - public var VoiceOver_Chat_SeenByRecipients: String { return self._s[2497]! } - public var Permissions_SiriText_v0: String { return self._s[2498]! } - public var Theme_Colors_Background: String { return self._s[2499]! } - public var Notification_CallMissed: String { return self._s[2500]! } - public var Stats_ZoomOut: String { return self._s[2501]! } - public var Profile_AddToExisting: String { return self._s[2502]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2505]! } - public var VoiceChat_RemovePeerRemove: String { return self._s[2506]! } - public var Undo_DeletedChannel: String { return self._s[2507]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[2522]! } + public var Notification_CallOutgoingShort: String { return self._s[2523]! } + public var Checkout_PasswordEntry_Title: String { return self._s[2524]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[2525]! } + public var Notification_MessageLifetime1m: String { return self._s[2526]! } + public var BlockedUsers_AddNew: String { return self._s[2528]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[2529]! } + public var Settings_SaveEditedPhotos: String { return self._s[2530]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[2531]! } + public var Channel_AboutItem: String { return self._s[2532]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[2533]! } + public var Privacy_Calls_P2PNever: String { return self._s[2535]! } + public var Passport_Language_uk: String { return self._s[2536]! } + public var NetworkUsageSettings_Wifi: String { return self._s[2537]! } + public var Conversation_Moderate_Report: String { return self._s[2538]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2539]! } + public var VoiceOver_Chat_SeenByRecipients: String { return self._s[2540]! } + public var Permissions_SiriText_v0: String { return self._s[2541]! } + public var Theme_Colors_Background: String { return self._s[2542]! } + public var Notification_CallMissed: String { return self._s[2543]! } + public var Stats_ZoomOut: String { return self._s[2544]! } + public var Profile_AddToExisting: String { return self._s[2545]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2548]! } + public var VoiceChat_RemovePeerRemove: String { return self._s[2549]! } + public var Undo_DeletedChannel: String { return self._s[2550]! } public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2508]!, self._r[2508]!, [_0]) + return formatWithArgumentRanges(self._s[2551]!, self._r[2551]!, [_0]) } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2509]! } - public var Map_LiveLocationGroupDescription: String { return self._s[2510]! } - public var Passport_InfoFAQ_URL: String { return self._s[2511]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2514]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2552]! } + public var Map_LiveLocationGroupDescription: String { return self._s[2553]! } + public var Passport_InfoFAQ_URL: String { return self._s[2554]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2557]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2515]!, self._r[2515]!, [_1]) + return formatWithArgumentRanges(self._s[2558]!, self._r[2558]!, [_1]) } - public var State_connecting: String { return self._s[2516]! } - public var Passport_Identity_Country: String { return self._s[2517]! } - public var Passport_PasswordDescription: String { return self._s[2518]! } - public var ChatList_PsaLabel_covid: String { return self._s[2519]! } + public var State_connecting: String { return self._s[2559]! } + public var Passport_Identity_Country: String { return self._s[2560]! } + public var Passport_PasswordDescription: String { return self._s[2561]! } + public var ChatList_PsaLabel_covid: String { return self._s[2562]! } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2520]!, self._r[2520]!, [_1]) + return formatWithArgumentRanges(self._s[2563]!, self._r[2563]!, [_1]) } - public var Contacts_AddPeopleNearby: String { return self._s[2521]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[2522]! } - public var ClearCache_Description: String { return self._s[2523]! } - public var Localization_LanguageName: String { return self._s[2524]! } + public var Contacts_AddPeopleNearby: String { return self._s[2564]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[2565]! } + public var ClearCache_Description: String { return self._s[2566]! } + public var Localization_LanguageName: String { return self._s[2567]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2525]!, self._r[2525]!, [_0]) + return formatWithArgumentRanges(self._s[2568]!, self._r[2568]!, [_0]) } - public var Conversation_AddMembers: String { return self._s[2526]! } - public var ChatList_TabIconFoldersTooltipEmptyFolders: String { return self._s[2527]! } - public var UserInfo_CreateNewContact: String { return self._s[2528]! } - public var Channel_Stickers_NotFound: String { return self._s[2530]! } - public var Message_FakeAccount: String { return self._s[2531]! } - public var Watch_Message_Poll: String { return self._s[2532]! } - public var Group_Members_Title: String { return self._s[2533]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2534]! } + public var Conversation_AddMembers: String { return self._s[2569]! } + public var ChatList_TabIconFoldersTooltipEmptyFolders: String { return self._s[2570]! } + public var UserInfo_CreateNewContact: String { return self._s[2571]! } + public var Channel_Stickers_NotFound: String { return self._s[2573]! } + public var Message_FakeAccount: String { return self._s[2574]! } + public var Watch_Message_Poll: String { return self._s[2575]! } + public var Group_Members_Title: String { return self._s[2576]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2577]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2535]!, self._r[2535]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2578]!, self._r[2578]!, [_0, _1]) } - public var BroadcastGroups_Convert: String { return self._s[2536]! } - public var Login_InfoDeletePhoto: String { return self._s[2537]! } - public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[2538]! } - public var InstantPage_FeedbackButton: String { return self._s[2539]! } - public var Appearance_PreviewReplyText: String { return self._s[2540]! } - public var Passport_FieldPhoneHelp: String { return self._s[2541]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2542]! } - public var Media_SendingOptionsTooltip: String { return self._s[2543]! } - public var ScheduledMessages_ScheduledOnline: String { return self._s[2544]! } - public var Notifications_Badge: String { return self._s[2545]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[2546]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2547]! } + public var VoiceChat_CancelConfirmationText: String { return self._s[2579]! } + public var BroadcastGroups_Convert: String { return self._s[2580]! } + public var Login_InfoDeletePhoto: String { return self._s[2581]! } + public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[2582]! } + public var InstantPage_FeedbackButton: String { return self._s[2583]! } + public var Appearance_PreviewReplyText: String { return self._s[2584]! } + public var Passport_FieldPhoneHelp: String { return self._s[2585]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2586]! } + public var Media_SendingOptionsTooltip: String { return self._s[2587]! } + public var ScheduledMessages_ScheduledOnline: String { return self._s[2588]! } + public var Notifications_Badge: String { return self._s[2589]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[2590]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2591]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2549]!, self._r[2549]!, [_0]) + return formatWithArgumentRanges(self._s[2593]!, self._r[2593]!, [_0]) } - public var Passport_InfoLearnMore: String { return self._s[2550]! } - public var EnterPasscode_EnterTitle: String { return self._s[2551]! } - public var Appearance_EditTheme: String { return self._s[2552]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2553]! } - public var Stats_FollowersTitle: String { return self._s[2554]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[2555]! } - public var Channel_Subscribers_Title: String { return self._s[2556]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2557]! } - public var ChatImportActivity_ErrorGeneric: String { return self._s[2558]! } - public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[2559]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2560]! } - public var Conversation_AddToReadingList: String { return self._s[2561]! } - public var VoiceChat_EditBioPlaceholder: String { return self._s[2562]! } + public var Passport_InfoLearnMore: String { return self._s[2594]! } + public var EnterPasscode_EnterTitle: String { return self._s[2595]! } + public var Appearance_EditTheme: String { return self._s[2596]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[2597]! } + public var Stats_FollowersTitle: String { return self._s[2598]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[2599]! } + public var Channel_Subscribers_Title: String { return self._s[2600]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2601]! } + public var ChatImportActivity_ErrorGeneric: String { return self._s[2602]! } + public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[2603]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2604]! } + public var Conversation_AddToReadingList: String { return self._s[2605]! } + public var VoiceChat_EditBioPlaceholder: String { return self._s[2606]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2563]!, self._r[2563]!, [_0]) + return formatWithArgumentRanges(self._s[2607]!, self._r[2607]!, [_0]) } - public var Group_AdminLog_EmptyText: String { return self._s[2564]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[2565]! } - public var Watch_Location_Current: String { return self._s[2566]! } - public var PrivacyPolicy_Title: String { return self._s[2567]! } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2574]! } - public var Channel_TypeSetup_Title: String { return self._s[2578]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[2579]! } - public var Passport_Language_ja: String { return self._s[2580]! } - public var ReportPeer_ReasonSpam: String { return self._s[2581]! } - public var Widget_GalleryDescription: String { return self._s[2582]! } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[2583]! } - public var VoiceChat_ChangePhoto: String { return self._s[2585]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[2586]! } - public var Channel_AdminLog_ChangeInfo: String { return self._s[2587]! } - public var ChatListFolder_NameNonContacts: String { return self._s[2588]! } + public var Group_AdminLog_EmptyText: String { return self._s[2608]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[2609]! } + public var Watch_Location_Current: String { return self._s[2610]! } + public var PrivacyPolicy_Title: String { return self._s[2611]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2618]! } + public var Channel_TypeSetup_Title: String { return self._s[2622]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[2623]! } + public var Passport_Language_ja: String { return self._s[2624]! } + public var ReportPeer_ReasonSpam: String { return self._s[2625]! } + public var Widget_GalleryDescription: String { return self._s[2626]! } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[2627]! } + public var VoiceChat_ChangePhoto: String { return self._s[2629]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[2630]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[2631]! } + public var ChatListFolder_NameNonContacts: String { return self._s[2632]! } public func InviteLink_ExpiresIn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2589]!, self._r[2589]!, [_0]) + return formatWithArgumentRanges(self._s[2633]!, self._r[2633]!, [_0]) } - public var Call_Audio: String { return self._s[2590]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2591]! } - public var ChatList_Search_NoResultsFitlerFiles: String { return self._s[2592]! } - public var Settings_PrivacySettings: String { return self._s[2593]! } - public var InviteLink_UsageLimitReached: String { return self._s[2594]! } - public var Stats_Followers: String { return self._s[2595]! } - public var Notifications_AddExceptionTitle: String { return self._s[2596]! } - public var TwoFactorSetup_Password_Title: String { return self._s[2597]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2598]! } - public var OldChannels_NoticeText: String { return self._s[2599]! } - public var Conversation_SavedMessages: String { return self._s[2600]! } - public var Intents_ErrorLockedText: String { return self._s[2601]! } + public var Call_Audio: String { return self._s[2634]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2635]! } + public var ChatList_Search_NoResultsFitlerFiles: String { return self._s[2636]! } + public var Settings_PrivacySettings: String { return self._s[2637]! } + public var InviteLink_UsageLimitReached: String { return self._s[2638]! } + public var Stats_Followers: String { return self._s[2639]! } + public var Notifications_AddExceptionTitle: String { return self._s[2640]! } + public var TwoFactorSetup_Password_Title: String { return self._s[2641]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2642]! } + public var OldChannels_NoticeText: String { return self._s[2643]! } + public var Conversation_SavedMessages: String { return self._s[2644]! } + public var Intents_ErrorLockedText: String { return self._s[2645]! } public func Conversation_PeerNearbyTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2603]!, self._r[2603]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2647]!, self._r[2647]!, [_1, _2]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2604]! } - public var Appearance_ThemeNightBlue: String { return self._s[2605]! } - public var Notification_ChannelInviterSelf: String { return self._s[2606]! } - public var Conversation_ForwardTooltip_SavedMessages_Many: String { return self._s[2607]! } - public var InviteLink_Create_TimeLimitExpiryDateNever: String { return self._s[2609]! } - public var Watch_UserInfo_Service: String { return self._s[2610]! } - public var ChatList_Context_Back: String { return self._s[2611]! } - public var Passport_Email_Title: String { return self._s[2612]! } - public var Stats_GroupTopAdmin_Promote: String { return self._s[2613]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2648]! } + public var Appearance_ThemeNightBlue: String { return self._s[2649]! } + public var Notification_ChannelInviterSelf: String { return self._s[2650]! } + public var Conversation_ForwardTooltip_SavedMessages_Many: String { return self._s[2651]! } + public var InviteLink_Create_TimeLimitExpiryDateNever: String { return self._s[2653]! } + public var Watch_UserInfo_Service: String { return self._s[2654]! } + public var ChatList_Context_Back: String { return self._s[2655]! } + public var Passport_Email_Title: String { return self._s[2656]! } + public var Stats_GroupTopAdmin_Promote: String { return self._s[2657]! } public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2614]!, self._r[2614]!, [_1]) + return formatWithArgumentRanges(self._s[2658]!, self._r[2658]!, [_1]) } - public var Conversation_UnsupportedMedia: String { return self._s[2615]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2616]! } - public var Privacy_TopPeersHelp: String { return self._s[2618]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[2619]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2620]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[2621]! } + public var Conversation_UnsupportedMedia: String { return self._s[2659]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2660]! } + public var Privacy_TopPeersHelp: String { return self._s[2662]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[2663]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2664]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[2665]! } public func Location_ProximityNotification_AlreadyClose(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2622]!, self._r[2622]!, [_0]) + return formatWithArgumentRanges(self._s[2666]!, self._r[2666]!, [_0]) } - public var Notification_PassportValueProofOfAddress: String { return self._s[2623]! } - public var Map_Map: String { return self._s[2624]! } - public var WallpaperSearch_ColorBlue: String { return self._s[2625]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[2626]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2627]! } - public var ChatList_Search_FilterMusic: String { return self._s[2628]! } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[2629]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2630]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[2632]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[2667]! } + public var Map_Map: String { return self._s[2668]! } + public var WallpaperSearch_ColorBlue: String { return self._s[2669]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[2670]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2671]! } + public var ChatList_Search_FilterMusic: String { return self._s[2672]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[2673]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2674]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[2676]! } public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2633]!, self._r[2633]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2677]!, self._r[2677]!, [_1, _2]) } public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2634]!, self._r[2634]!, [_0]) + return formatWithArgumentRanges(self._s[2678]!, self._r[2678]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2635]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2636]! } - public var VoiceOver_ChatList_MessageEmpty: String { return self._s[2639]! } - public var GroupInfo_Location: String { return self._s[2640]! } - public var Passport_Language_ka: String { return self._s[2641]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2679]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2680]! } + public var VoiceOver_ChatList_MessageEmpty: String { return self._s[2682]! } + public var GroupInfo_Location: String { return self._s[2683]! } + public var Passport_Language_ka: String { return self._s[2684]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2642]!, self._r[2642]!, [_0]) + return formatWithArgumentRanges(self._s[2685]!, self._r[2685]!, [_0]) } - public var Conversation_ContextMenuOpenChannelProfile: String { return self._s[2643]! } - public var ChatImport_SelectionConfirmationAlertTitle: String { return self._s[2645]! } - public var ScheduledMessages_ClearAllConfirmation: String { return self._s[2647]! } - public var DialogList_SearchSectionRecent: String { return self._s[2648]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[2649]! } - public var Conversation_Timer_Send: String { return self._s[2650]! } + public var Conversation_ContextMenuOpenChannelProfile: String { return self._s[2686]! } + public var ChatImport_SelectionConfirmationAlertTitle: String { return self._s[2688]! } + public var ScheduledMessages_ClearAllConfirmation: String { return self._s[2690]! } + public var DialogList_SearchSectionRecent: String { return self._s[2691]! } + public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[2692]! } + public var Conversation_Timer_Send: String { return self._s[2693]! } public func VoiceOver_ScrollStatus(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2652]!, self._r[2652]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2695]!, self._r[2695]!, [_1, _2]) } - public var ChatState_Updating: String { return self._s[2653]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[2654]! } - public var ChannelInfo_DeleteGroup: String { return self._s[2655]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[2656]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2657]! } - public var InviteLink_Create_TimeLimitExpiryTime: String { return self._s[2658]! } - public var ChannelInfo_InviteLink_RevokeAlert_Text: String { return self._s[2659]! } - public var ChatList_Search_NoResults: String { return self._s[2660]! } - public var ChatListFolderSettings_AddRecommended: String { return self._s[2662]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2663]! } - public var PeerInfo_GroupAboutItem: String { return self._s[2664]! } - public var VoiceOver_SelfDestructTimerOff: String { return self._s[2666]! } + public var ChatState_Updating: String { return self._s[2696]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[2697]! } + public var ChannelInfo_DeleteGroup: String { return self._s[2698]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[2699]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2700]! } + public var InviteLink_Create_TimeLimitExpiryTime: String { return self._s[2701]! } + public var ChannelInfo_InviteLink_RevokeAlert_Text: String { return self._s[2702]! } + public var ChatList_Search_NoResults: String { return self._s[2703]! } + public var ChatListFolderSettings_AddRecommended: String { return self._s[2705]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2706]! } + public var PeerInfo_GroupAboutItem: String { return self._s[2707]! } + public var VoiceOver_SelfDestructTimerOff: String { return self._s[2709]! } public func Channel_AdminLog_DeletedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2667]!, self._r[2667]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2710]!, self._r[2710]!, [_1, _2]) } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2668]!, self._r[2668]!, [_0]) + return formatWithArgumentRanges(self._s[2711]!, self._r[2711]!, [_0]) } - public var PrivacySettings_AuthSessions: String { return self._s[2669]! } - public var Passport_Address_Postcode: String { return self._s[2670]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2671]! } + public var PrivacySettings_AuthSessions: String { return self._s[2712]! } + public var Passport_Address_Postcode: String { return self._s[2713]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2714]! } public func VoiceChat_ForwardTooltip_ManyChats(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2672]!, self._r[2672]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2715]!, self._r[2715]!, [_0, _1]) } - public var Passport_Address_Street2Placeholder: String { return self._s[2673]! } - public var Group_Location_Title: String { return self._s[2674]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[2675]! } - public var PeopleNearby_UsersEmpty: String { return self._s[2676]! } - public var Conversation_ContextMenuSpeak: String { return self._s[2678]! } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[2679]! } + public var Passport_Address_Street2Placeholder: String { return self._s[2716]! } + public var Group_Location_Title: String { return self._s[2717]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[2718]! } + public var PeopleNearby_UsersEmpty: String { return self._s[2719]! } + public var Conversation_ContextMenuSpeak: String { return self._s[2721]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[2722]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2681]!, self._r[2681]!, [_0]) + return formatWithArgumentRanges(self._s[2724]!, self._r[2724]!, [_0]) } - public var Proxy_TooltipUnavailable: String { return self._s[2682]! } - public var Map_Search: String { return self._s[2683]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[2684]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2685]! } + public var Proxy_TooltipUnavailable: String { return self._s[2725]! } + public var Map_Search: String { return self._s[2726]! } + public var VoiceChat_CancelConfirmationTitle: String { return self._s[2727]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[2728]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2729]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2686]!, self._r[2686]!, [_0]) + return formatWithArgumentRanges(self._s[2730]!, self._r[2730]!, [_0]) } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[2687]! } - public var ProfilePhoto_MainPhoto: String { return self._s[2688]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2689]! } - public var SharedMedia_EmptyMusicText: String { return self._s[2690]! } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[2691]! } - public var NetworkUsageSettings_BytesReceived: String { return self._s[2692]! } - public var Channel_AdminLog_EmptyText: String { return self._s[2693]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2694]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[2695]! } - public var Notifications_GroupNotifications: String { return self._s[2696]! } - public var AccessDenied_SaveMedia: String { return self._s[2697]! } - public var InviteLink_Create_Revoke: String { return self._s[2698]! } - public var GroupInfo_LabelOwner: String { return self._s[2699]! } - public var Passport_Language_id: String { return self._s[2700]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2701]! } - public var Conversation_UnpinMessageAlert: String { return self._s[2702]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[2731]! } + public var ProfilePhoto_MainPhoto: String { return self._s[2732]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2733]! } + public var SharedMedia_EmptyMusicText: String { return self._s[2734]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[2735]! } + public var NetworkUsageSettings_BytesReceived: String { return self._s[2736]! } + public var Channel_AdminLog_EmptyText: String { return self._s[2737]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2738]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[2739]! } + public var Notifications_GroupNotifications: String { return self._s[2740]! } + public var AccessDenied_SaveMedia: String { return self._s[2741]! } + public var InviteLink_Create_Revoke: String { return self._s[2742]! } + public var GroupInfo_LabelOwner: String { return self._s[2743]! } + public var Passport_Language_id: String { return self._s[2745]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2746]! } + public var Conversation_UnpinMessageAlert: String { return self._s[2747]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2703]!, self._r[2703]!, [_0]) + return formatWithArgumentRanges(self._s[2748]!, self._r[2748]!, [_0]) } public func Call_RemoteVideoPaused(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2704]!, self._r[2704]!, [_0]) + return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0]) } - public var TwoFactorSetup_Done_Text: String { return self._s[2705]! } + public var TwoFactorSetup_Done_Text: String { return self._s[2750]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2706]!, self._r[2706]!, [_0]) + return formatWithArgumentRanges(self._s[2751]!, self._r[2751]!, [_0]) } - public var NetworkUsageSettings_BytesSent: String { return self._s[2707]! } - public var Conversation_AudioRateTooltipNormal: String { return self._s[2708]! } - public var OwnershipTransfer_Transfer: String { return self._s[2709]! } + public var NetworkUsageSettings_BytesSent: String { return self._s[2752]! } + public var Conversation_AudioRateTooltipNormal: String { return self._s[2753]! } + public var VoiceChat_EditDescriptionSuccess: String { return self._s[2754]! } + public var OwnershipTransfer_Transfer: String { return self._s[2755]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2710]!, self._r[2710]!, [_0]) + return formatWithArgumentRanges(self._s[2756]!, self._r[2756]!, [_0]) } - public var Passport_Language_pt: String { return self._s[2711]! } - public var PrivacySettings_WebSessions: String { return self._s[2712]! } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[2714]! } - public var TwoFactorSetup_Hint_Title: String { return self._s[2715]! } + public var Passport_Language_pt: String { return self._s[2757]! } + public var PrivacySettings_WebSessions: String { return self._s[2758]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[2760]! } + public var TwoFactorSetup_Hint_Title: String { return self._s[2761]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2716]!, self._r[2716]!, [_0]) + return formatWithArgumentRanges(self._s[2762]!, self._r[2762]!, [_0]) } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2717]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2718]! } - public var AutoNightTheme_Scheduled: String { return self._s[2719]! } - public var CreatePoll_ExplanationHeader: String { return self._s[2720]! } - public var Calls_TabTitle: String { return self._s[2721]! } - public var VoiceChat_RecordingInProgress: String { return self._s[2722]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[2723]! } - public var Notification_VideoCallCanceled: String { return self._s[2724]! } - public var Login_CodeSentInternal: String { return self._s[2725]! } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[2726]! } - public var Call_RecordingDisabledMessage: String { return self._s[2728]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2763]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2764]! } + public var AutoNightTheme_Scheduled: String { return self._s[2765]! } + public var CreatePoll_ExplanationHeader: String { return self._s[2766]! } + public var Calls_TabTitle: String { return self._s[2767]! } + public var VoiceChat_RecordingInProgress: String { return self._s[2768]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[2769]! } + public var Notification_VideoCallCanceled: String { return self._s[2770]! } + public var Login_CodeSentInternal: String { return self._s[2771]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[2772]! } + public var Call_RecordingDisabledMessage: String { return self._s[2774]! } public func VoiceChat_RemovedPeerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2729]!, self._r[2729]!, [_0]) - } - public var Conversation_UsersTooMuchError: String { return self._s[2731]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[2732]! } - public var Channel_Info_Stickers: String { return self._s[2733]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[2734]! } - public func Conversation_PeerNearbyDistance(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2735]!, self._r[2735]!, [_1, _2]) - } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[2736]! } - public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2737]!, self._r[2737]!, [_0]) - } - public var Passport_DiscardMessageTitle: String { return self._s[2738]! } - public var Call_VoiceOver_VideoCallIncoming: String { return self._s[2739]! } - public var Localization_LanguageOther: String { return self._s[2740]! } - public var Conversation_EncryptionCanceled: String { return self._s[2741]! } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[2742]! } - public var ReportPeer_ReasonFake: String { return self._s[2744]! } - public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2745]!, self._r[2745]!, [_0]) - } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2747]! } - public var SocksProxySetup_SavedProxies: String { return self._s[2748]! } - public var InviteLink_Create_UsersLimitNumberOfUsers: String { return self._s[2749]! } - public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2750]!, self._r[2750]!, [_1]) - } - public var Conversation_ScamWarning: String { return self._s[2752]! } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[2753]! } - public var LocalGroup_Title: String { return self._s[2754]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[2756]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[2757]! } - public var VoiceChat_SelectAccount: String { return self._s[2758]! } - public var Login_PhoneFloodError: String { return self._s[2759]! } - public var Conversation_PinMessageAlert_PinAndNotifyMembers: String { return self._s[2760]! } - public var Username_InvalidTaken: String { return self._s[2762]! } - public var SocksProxySetup_AddProxy: String { return self._s[2764]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[2765]! } - public var MediaPicker_UngroupDescription: String { return self._s[2766]! } - public var Login_CodeExpired: String { return self._s[2767]! } - public var Localization_ChooseLanguage: String { return self._s[2768]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[2769]! } - public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2770]!, self._r[2770]!, [_0]) - } - public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2771]!, self._r[2771]!, [_0]) - } - public var ReportPeer_ReasonOther_Title: String { return self._s[2773]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[2774]! } - public func VoiceChat_UserInvited(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2775]!, self._r[2775]!, [_0]) } - public var PeerInfo_ButtonDiscuss: String { return self._s[2776]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[2777]! } - public var Call_StatusNoAnswer: String { return self._s[2778]! } - public var ScheduledMessages_DeleteMany: String { return self._s[2780]! } - public var Channel_DiscussionGroupInfo: String { return self._s[2781]! } - public var Conversation_UnarchiveDone: String { return self._s[2782]! } - public var LogoutOptions_AddAccountText: String { return self._s[2783]! } - public var Message_PinnedContactMessage: String { return self._s[2784]! } + public var Conversation_UsersTooMuchError: String { return self._s[2777]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[2778]! } + public var Channel_Info_Stickers: String { return self._s[2779]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[2780]! } + public func Conversation_PeerNearbyDistance(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2781]!, self._r[2781]!, [_1, _2]) + } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[2782]! } + public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2783]!, self._r[2783]!, [_0]) + } + public var Passport_DiscardMessageTitle: String { return self._s[2784]! } + public var Call_VoiceOver_VideoCallIncoming: String { return self._s[2785]! } + public var Localization_LanguageOther: String { return self._s[2786]! } + public var Conversation_EncryptionCanceled: String { return self._s[2787]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[2788]! } + public var ReportPeer_ReasonFake: String { return self._s[2790]! } + public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2791]!, self._r[2791]!, [_0]) + } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2793]! } + public var SocksProxySetup_SavedProxies: String { return self._s[2794]! } + public var InviteLink_Create_UsersLimitNumberOfUsers: String { return self._s[2795]! } + public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2796]!, self._r[2796]!, [_1]) + } + public var Conversation_ScamWarning: String { return self._s[2798]! } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[2799]! } + public var LocalGroup_Title: String { return self._s[2800]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[2802]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[2803]! } + public var VoiceChat_SelectAccount: String { return self._s[2804]! } + public var Login_PhoneFloodError: String { return self._s[2805]! } + public var Conversation_PinMessageAlert_PinAndNotifyMembers: String { return self._s[2806]! } + public var Username_InvalidTaken: String { return self._s[2808]! } + public var SocksProxySetup_AddProxy: String { return self._s[2810]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[2811]! } + public var MediaPicker_UngroupDescription: String { return self._s[2812]! } + public var Login_CodeExpired: String { return self._s[2813]! } + public var Localization_ChooseLanguage: String { return self._s[2814]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[2815]! } + public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2816]!, self._r[2816]!, [_0]) + } + public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2817]!, self._r[2817]!, [_0]) + } + public var ReportPeer_ReasonOther_Title: String { return self._s[2819]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[2820]! } + public func VoiceChat_UserInvited(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2821]!, self._r[2821]!, [_0]) + } + public var PeerInfo_ButtonDiscuss: String { return self._s[2822]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[2823]! } + public var Call_StatusNoAnswer: String { return self._s[2824]! } + public var ScheduledMessages_DeleteMany: String { return self._s[2826]! } + public var Channel_DiscussionGroupInfo: String { return self._s[2827]! } + public var Conversation_UnarchiveDone: String { return self._s[2828]! } + public var LogoutOptions_AddAccountText: String { return self._s[2829]! } + public var Message_PinnedContactMessage: String { return self._s[2830]! } public func ChatList_DeleteAndLeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2785]!, self._r[2785]!, [_0]) + return formatWithArgumentRanges(self._s[2831]!, self._r[2831]!, [_0]) } - public var VoiceChat_EditBioTitle: String { return self._s[2787]! } + public var VoiceChat_EditBioTitle: String { return self._s[2833]! } public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2788]!, self._r[2788]!, [_0]) + return formatWithArgumentRanges(self._s[2834]!, self._r[2834]!, [_0]) } - public var Stats_GroupLanguagesTitle: String { return self._s[2789]! } - public var Passport_FieldAddressHelp: String { return self._s[2790]! } + public var Stats_GroupLanguagesTitle: String { return self._s[2835]! } + public var Passport_FieldAddressHelp: String { return self._s[2836]! } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2791]!, self._r[2791]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2837]!, self._r[2837]!, [_1, _2]) } - public var ChatSettings_OpenLinksIn: String { return self._s[2793]! } - public var TwoFactorSetup_Hint_SkipAction: String { return self._s[2794]! } - public var Message_Photo: String { return self._s[2795]! } - public var Media_LimitedAccessManage: String { return self._s[2797]! } - public var MediaPicker_AddCaption: String { return self._s[2798]! } - public var LogoutOptions_Title: String { return self._s[2799]! } + public var ChatSettings_OpenLinksIn: String { return self._s[2839]! } + public var TwoFactorSetup_Hint_SkipAction: String { return self._s[2840]! } + public var Message_Photo: String { return self._s[2841]! } + public var Media_LimitedAccessManage: String { return self._s[2843]! } + public var MediaPicker_AddCaption: String { return self._s[2844]! } + public var LogoutOptions_Title: String { return self._s[2845]! } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2800]!, self._r[2800]!, [_1]) + return formatWithArgumentRanges(self._s[2846]!, self._r[2846]!, [_1]) } - public var Conversation_StatusKickedFromGroup: String { return self._s[2801]! } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[2802]! } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2803]! } - public var Channel_AdminLogFilter_Title: String { return self._s[2804]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[2805]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[2806]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2807]! } - public var ChannelIntro_Title: String { return self._s[2808]! } - public var Stats_Message_Views: String { return self._s[2809]! } - public var Stickers_Install: String { return self._s[2810]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[2847]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[2848]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2849]! } + public var Channel_AdminLogFilter_Title: String { return self._s[2850]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[2851]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[2852]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2853]! } + public var ChannelIntro_Title: String { return self._s[2854]! } + public var Stats_Message_Views: String { return self._s[2855]! } + public var Stickers_Install: String { return self._s[2856]! } public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2811]!, self._r[2811]!, [_0]) + return formatWithArgumentRanges(self._s[2857]!, self._r[2857]!, [_0]) } - public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[2812]! } - public var Conversation_SwipeToReplyHintTitle: String { return self._s[2814]! } - public var Settings_Username: String { return self._s[2817]! } - public var FastTwoStepSetup_Title: String { return self._s[2818]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2819]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[2820]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2822]! } - public var CallFeedback_ReasonEcho: String { return self._s[2823]! } + public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[2858]! } + public var Conversation_SwipeToReplyHintTitle: String { return self._s[2860]! } + public var Settings_Username: String { return self._s[2863]! } + public var FastTwoStepSetup_Title: String { return self._s[2864]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2865]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[2866]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2868]! } + public var CallFeedback_ReasonEcho: String { return self._s[2869]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2824]!, self._r[2824]!, [_0]) + return formatWithArgumentRanges(self._s[2870]!, self._r[2870]!, [_0]) } - public var Conversation_OpenBotLinkTitle: String { return self._s[2825]! } - public var SocksProxySetup_Title: String { return self._s[2826]! } - public var CallFeedback_Success: String { return self._s[2827]! } - public var WallpaperPreview_SwipeTopText: String { return self._s[2829]! } - public var InstantPage_AutoNightTheme: String { return self._s[2831]! } - public var Watch_Conversation_Reply: String { return self._s[2832]! } - public var VoiceChat_Share: String { return self._s[2834]! } - public var VoiceChat_AddPhoto: String { return self._s[2835]! } - public var Chat_PanelUnpinAllMessages: String { return self._s[2836]! } - public var WallpaperPreview_Pattern: String { return self._s[2837]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[2838]! } + public var Conversation_OpenBotLinkTitle: String { return self._s[2871]! } + public var SocksProxySetup_Title: String { return self._s[2872]! } + public var CallFeedback_Success: String { return self._s[2873]! } + public var WallpaperPreview_SwipeTopText: String { return self._s[2875]! } + public var InstantPage_AutoNightTheme: String { return self._s[2877]! } + public var Watch_Conversation_Reply: String { return self._s[2878]! } + public var VoiceChat_Share: String { return self._s[2880]! } + public var VoiceChat_AddPhoto: String { return self._s[2881]! } + public var Chat_PanelUnpinAllMessages: String { return self._s[2882]! } + public var WallpaperPreview_Pattern: String { return self._s[2883]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[2884]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2839]!, self._r[2839]!, [_0]) + return formatWithArgumentRanges(self._s[2885]!, self._r[2885]!, [_0]) } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[2840]! } - public var VoiceOver_Chat_GroupInfo: String { return self._s[2841]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[2843]! } - public var Update_Title: String { return self._s[2844]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[2845]! } - public var WallpaperPreview_CropTopText: String { return self._s[2848]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[2849]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2850]! } - public var ChatListFolder_DiscardCancel: String { return self._s[2851]! } - public var Message_PinnedPhotoMessage: String { return self._s[2852]! } - public var Appearance_ThemeDayClassic: String { return self._s[2853]! } - public var VoiceChat_ChangeName: String { return self._s[2854]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[2855]! } - public var VoiceChat_DisplayAsInfo: String { return self._s[2857]! } - public var AccessDenied_Wallpapers: String { return self._s[2862]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[2886]! } + public var VoiceOver_Chat_GroupInfo: String { return self._s[2887]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[2889]! } + public var Update_Title: String { return self._s[2890]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[2891]! } + public var WallpaperPreview_CropTopText: String { return self._s[2894]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[2895]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2896]! } + public var ChatListFolder_DiscardCancel: String { return self._s[2897]! } + public var Message_PinnedPhotoMessage: String { return self._s[2898]! } + public var Appearance_ThemeDayClassic: String { return self._s[2899]! } + public var VoiceChat_ChangeName: String { return self._s[2900]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[2902]! } + public var VoiceChat_DisplayAsInfo: String { return self._s[2904]! } + public var AccessDenied_Wallpapers: String { return self._s[2909]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2863]!, self._r[2863]!, [_0]) + return formatWithArgumentRanges(self._s[2910]!, self._r[2910]!, [_0]) } - public var Weekday_Sunday: String { return self._s[2864]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[2866]! } - public var PeopleNearby_MakeVisibleDescription: String { return self._s[2867]! } - public var AccessDenied_LocationDisabled: String { return self._s[2868]! } - public var Tour_Text3: String { return self._s[2869]! } - public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2870]! } + public var Weekday_Sunday: String { return self._s[2911]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[2913]! } + public var PeopleNearby_MakeVisibleDescription: String { return self._s[2914]! } + public var AccessDenied_LocationDisabled: String { return self._s[2915]! } + public var Tour_Text3: String { return self._s[2916]! } + public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2917]! } public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2871]!, self._r[2871]!, [_0]) + return formatWithArgumentRanges(self._s[2918]!, self._r[2918]!, [_0]) } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[2872]! } - public var Conversation_ClearCache: String { return self._s[2873]! } - public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[2874]! } - public var ChatList_Tabs_AllChats: String { return self._s[2875]! } - public var DialogList_RecentTitlePeople: String { return self._s[2876]! } - public var Stickers_AddToFavorites: String { return self._s[2877]! } - public var ChatList_Context_RemoveFromFolder: String { return self._s[2878]! } - public var VoiceChat_CancelSpeakRequest: String { return self._s[2879]! } - public var Settings_RemoveVideo: String { return self._s[2880]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2881]! } - public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[2882]! } - public var VoiceOver_Chat_YourFile: String { return self._s[2883]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[2885]! } - public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[2886]! } - public var VoiceChat_TapToAddBio: String { return self._s[2887]! } - public var Channel_AdminLog_AddMembers: String { return self._s[2888]! } - public var Map_SendThisLocation: String { return self._s[2890]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[2892]! } - public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2893]! } - public var CloudStorage_Title: String { return self._s[2894]! } - public var TwoFactorSetup_Password_Action: String { return self._s[2895]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[2896]! } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[2898]! } - public var Undo_LeftGroup: String { return self._s[2899]! } - public var Conversation_StopLiveLocation: String { return self._s[2900]! } - public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[2901]! } - public var Message_PinnedInvoice: String { return self._s[2902]! } - public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[2903]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[2919]! } + public var Conversation_ClearCache: String { return self._s[2920]! } + public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[2921]! } + public var ChatList_Tabs_AllChats: String { return self._s[2922]! } + public var DialogList_RecentTitlePeople: String { return self._s[2923]! } + public var Stickers_AddToFavorites: String { return self._s[2924]! } + public var ChatList_Context_RemoveFromFolder: String { return self._s[2925]! } + public var VoiceChat_CancelSpeakRequest: String { return self._s[2926]! } + public var Settings_RemoveVideo: String { return self._s[2927]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2928]! } + public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[2929]! } + public var VoiceOver_Chat_YourFile: String { return self._s[2930]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[2932]! } + public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[2933]! } + public var VoiceChat_TapToAddBio: String { return self._s[2934]! } + public var Channel_AdminLog_AddMembers: String { return self._s[2935]! } + public var Map_SendThisLocation: String { return self._s[2937]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[2939]! } + public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2940]! } + public var CloudStorage_Title: String { return self._s[2941]! } + public var TwoFactorSetup_Password_Action: String { return self._s[2942]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[2943]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[2945]! } + public var Undo_LeftGroup: String { return self._s[2946]! } + public var Conversation_StopLiveLocation: String { return self._s[2947]! } + public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[2948]! } + public var Message_PinnedInvoice: String { return self._s[2949]! } + public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[2950]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2905]!, self._r[2905]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2952]!, self._r[2952]!, [_1, _2]) } public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2906]!, self._r[2906]!, [_0]) + return formatWithArgumentRanges(self._s[2953]!, self._r[2953]!, [_0]) } - public var Weekday_Tuesday: String { return self._s[2907]! } - public var ChangePhoneNumberCode_Code: String { return self._s[2908]! } - public var VoiceOver_Chat_YourMessage: String { return self._s[2909]! } - public var Calls_CallTabDescription: String { return self._s[2910]! } - public var ChatImport_SelectionErrorNotAdmin: String { return self._s[2911]! } - public var SocksProxySetup_UseProxy: String { return self._s[2913]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2914]! } - public var PasscodeSettings_AlphanumericCode: String { return self._s[2915]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[2916]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[2918]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2919]! } - public var Exceptions_AddToExceptions: String { return self._s[2920]! } - public var UserInfo_Title: String { return self._s[2921]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[2923]! } - public var ChatList_Unmute: String { return self._s[2925]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[2926]! } + public var Weekday_Tuesday: String { return self._s[2954]! } + public var ChangePhoneNumberCode_Code: String { return self._s[2955]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2956]! } + public var Calls_CallTabDescription: String { return self._s[2957]! } + public var ChatImport_SelectionErrorNotAdmin: String { return self._s[2958]! } + public var SocksProxySetup_UseProxy: String { return self._s[2960]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2961]! } + public var PasscodeSettings_AlphanumericCode: String { return self._s[2962]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[2963]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[2965]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2966]! } + public var Exceptions_AddToExceptions: String { return self._s[2967]! } + public var UserInfo_Title: String { return self._s[2968]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[2970]! } + public var VoiceChat_EditDescription: String { return self._s[2972]! } + public var ChatList_Unmute: String { return self._s[2973]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[2974]! } public func Channel_AdminLog_MessageChangedAutoremoveTimeoutSet(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2927]!, self._r[2927]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2975]!, self._r[2975]!, [_1, _2]) } - public var Stats_GroupTopPostersTitle: String { return self._s[2928]! } - public var Username_CheckingUsername: String { return self._s[2929]! } - public var WallpaperColors_SetCustomColor: String { return self._s[2930]! } - public var PeerSelection_ImportIntoNewGroup: String { return self._s[2934]! } - public var Location_ProximityAlertSetTitle: String { return self._s[2935]! } - public var AuthSessions_AddedDeviceTerminate: String { return self._s[2936]! } - public var Conversation_JoinVoiceChatAsSpeaker: String { return self._s[2937]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[2938]! } - public var Settings_ChangePhoneNumber: String { return self._s[2939]! } - public var PeerInfo_PaneLinks: String { return self._s[2940]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[2943]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[2945]! } + public var Stats_GroupTopPostersTitle: String { return self._s[2976]! } + public var Username_CheckingUsername: String { return self._s[2978]! } + public var WallpaperColors_SetCustomColor: String { return self._s[2979]! } + public var PeerSelection_ImportIntoNewGroup: String { return self._s[2983]! } + public var Location_ProximityAlertSetTitle: String { return self._s[2984]! } + public var AuthSessions_AddedDeviceTerminate: String { return self._s[2985]! } + public var Conversation_JoinVoiceChatAsSpeaker: String { return self._s[2986]! } + public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[2987]! } + public var Settings_ChangePhoneNumber: String { return self._s[2988]! } + public var PeerInfo_PaneLinks: String { return self._s[2989]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[2992]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[2994]! } public func PUSH_CHAT_VOICECHAT_INVITE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2946]!, self._r[2946]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2995]!, self._r[2995]!, [_1, _2]) } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[2947]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[2948]! } - public var BroadcastGroups_ConfirmationAlert_Title: String { return self._s[2949]! } - public var Stats_FollowersBySourceTitle: String { return self._s[2951]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[2996]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[2997]! } + public var VoiceChat_CancelConfirmationEnd: String { return self._s[2998]! } + public var BroadcastGroups_ConfirmationAlert_Title: String { return self._s[2999]! } + public var Stats_FollowersBySourceTitle: String { return self._s[3001]! } public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2952]!, self._r[2952]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3002]!, self._r[3002]!, [_0, _1]) } - public var Compose_NewEncryptedChatTitle: String { return self._s[2953]! } - public var Channel_CommentsGroup_Header: String { return self._s[2955]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3003]! } + public var Channel_CommentsGroup_Header: String { return self._s[3005]! } public func ShareFileTip_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2959]!, self._r[2959]!, [_0]) + return formatWithArgumentRanges(self._s[3009]!, self._r[3009]!, [_0]) } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2960]!, self._r[2960]!, [_1]) + return formatWithArgumentRanges(self._s[3010]!, self._r[3010]!, [_1]) } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[2962]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3012]! } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2963]!, self._r[2963]!, [_0]) + return formatWithArgumentRanges(self._s[3013]!, self._r[3013]!, [_0]) } - public var Conversation_ReportMessages: String { return self._s[2964]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[2965]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[2966]! } - public var PrivacySettings_LastSeen: String { return self._s[2968]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[2969]! } - public var Theme_Colors_Proceed: String { return self._s[2970]! } - public var UserInfo_ScamBotWarning: String { return self._s[2971]! } - public var LogoutOptions_LogOut: String { return self._s[2973]! } - public var Conversation_SendMessage: String { return self._s[2974]! } - public var Conversation_CancelForwardCancelForward: String { return self._s[2975]! } - public var Passport_Address_Region: String { return self._s[2977]! } - public var MediaPicker_CameraRoll: String { return self._s[2979]! } + public var Conversation_ReportMessages: String { return self._s[3014]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3015]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3016]! } + public var PrivacySettings_LastSeen: String { return self._s[3018]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[3019]! } + public var Theme_Colors_Proceed: String { return self._s[3020]! } + public var UserInfo_ScamBotWarning: String { return self._s[3021]! } + public var LogoutOptions_LogOut: String { return self._s[3023]! } + public var Conversation_SendMessage: String { return self._s[3024]! } + public var Conversation_CancelForwardCancelForward: String { return self._s[3025]! } + public var VoiceChat_Scheduled: String { return self._s[3027]! } + public var Passport_Address_Region: String { return self._s[3028]! } + public var MediaPicker_CameraRoll: String { return self._s[3030]! } public func VoiceOver_Chat_ForwardedFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_0]) + return formatWithArgumentRanges(self._s[3032]!, self._r[3032]!, [_0]) } - public var Call_ReportSend: String { return self._s[2983]! } - public var VoiceOver_ChatList_Message: String { return self._s[2984]! } - public var Month_ShortJune: String { return self._s[2985]! } - public var AutoDownloadSettings_GroupChats: String { return self._s[2986]! } + public var Call_ReportSend: String { return self._s[3034]! } + public var VoiceOver_ChatList_Message: String { return self._s[3035]! } + public var Month_ShortJune: String { return self._s[3036]! } + public var AutoDownloadSettings_GroupChats: String { return self._s[3037]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2989]!, self._r[2989]!, [_0]) + return formatWithArgumentRanges(self._s[3040]!, self._r[3040]!, [_0]) } - public var TwoStepAuth_DisableSuccess: String { return self._s[2990]! } - public var Cache_KeepMedia: String { return self._s[2991]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[3041]! } + public var Cache_KeepMedia: String { return self._s[3042]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2992]!, self._r[2992]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3043]!, self._r[3043]!, [_1, _2, _3]) } - public var Appearance_LargeEmoji: String { return self._s[2993]! } + public var Appearance_LargeEmoji: String { return self._s[3044]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2994]!, self._r[2994]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_1, _2, _3, _4, _5, _6]) } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2995]! } - public var Call_CameraConfirmationText: String { return self._s[2996]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[3046]! } + public var Privacy_PaymentsClear_PaymentInfoCleared: String { return self._s[3047]! } + public var Call_CameraConfirmationText: String { return self._s[3048]! } public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2998]!, self._r[2998]!, [_0]) + return formatWithArgumentRanges(self._s[3050]!, self._r[3050]!, [_0]) } - public var DialogList_SearchSectionChats: String { return self._s[2999]! } - public var VoiceOver_MessageContextReport: String { return self._s[3001]! } - public var VoiceChat_RemovePeer: String { return self._s[3002]! } - public var ChatListFolder_ExcludeChatsTitle: String { return self._s[3003]! } - public var InviteLink_ContextCopy: String { return self._s[3004]! } - public var NotificationsSound_Tritone: String { return self._s[3006]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3009]! } - public var Stats_GroupTopAdmin_Actions: String { return self._s[3010]! } - public var PeerInfo_AddToContacts: String { return self._s[3011]! } - public var VoiceChat_OpenChat: String { return self._s[3012]! } - public var AccessDenied_Title: String { return self._s[3013]! } - public var InviteLink_QRCode_InfoChannel: String { return self._s[3014]! } - public var Tour_Title1: String { return self._s[3015]! } - public var VoiceOver_AttachMedia: String { return self._s[3016]! } + public var DialogList_SearchSectionChats: String { return self._s[3051]! } + public var VoiceOver_MessageContextReport: String { return self._s[3053]! } + public var VoiceChat_RemovePeer: String { return self._s[3054]! } + public var ChatListFolder_ExcludeChatsTitle: String { return self._s[3055]! } + public var InviteLink_ContextCopy: String { return self._s[3056]! } + public var NotificationsSound_Tritone: String { return self._s[3058]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3061]! } + public var Stats_GroupTopAdmin_Actions: String { return self._s[3062]! } + public var PeerInfo_AddToContacts: String { return self._s[3063]! } + public var VoiceChat_OpenChat: String { return self._s[3064]! } + public var AccessDenied_Title: String { return self._s[3065]! } + public var InviteLink_QRCode_InfoChannel: String { return self._s[3066]! } + public var Tour_Title1: String { return self._s[3067]! } + public var VoiceOver_AttachMedia: String { return self._s[3068]! } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3018]!, self._r[3018]!, [_0]) + return formatWithArgumentRanges(self._s[3070]!, self._r[3070]!, [_0]) } - public var Chat_Gifs_SavedSectionHeader: String { return self._s[3019]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[3020]! } + public var Chat_Gifs_SavedSectionHeader: String { return self._s[3071]! } + public var Privacy_DeleteDrafts_DraftsDeleted: String { return self._s[3072]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[3073]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3021]!, self._r[3021]!, [_0]) + return formatWithArgumentRanges(self._s[3074]!, self._r[3074]!, [_0]) } - public var Channel_AdminLog_MessagePreviousLink: String { return self._s[3022]! } - public var OldChannels_Title: String { return self._s[3023]! } - public var LoginPassword_FloodError: String { return self._s[3024]! } - public var ChatImportActivity_InProgress: String { return self._s[3026]! } - public var Checkout_ErrorPaymentFailed: String { return self._s[3027]! } + public var Channel_AdminLog_MessagePreviousLink: String { return self._s[3075]! } + public var OldChannels_Title: String { return self._s[3076]! } + public var LoginPassword_FloodError: String { return self._s[3077]! } + public var ChatImportActivity_InProgress: String { return self._s[3079]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[3080]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3028]!, self._r[3028]!, [_0]) - } - public var VoiceOver_Media_PlaybackPlay: String { return self._s[3031]! } - public var Passport_CorrectErrors: String { return self._s[3033]! } - public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3034]!, self._r[3034]!, [_1, _2]) - } - public var ChatListFolderSettings_Title: String { return self._s[3035]! } - public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3036]!, self._r[3036]!, [_1, _2]) - } - public var PhotoEditor_HighlightsTool: String { return self._s[3037]! } - public var Contacts_NotRegisteredSection: String { return self._s[3040]! } - public func Call_VoiceChatInProgressCallMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3041]!, self._r[3041]!, [_1, _2]) - } - public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3042]!, self._r[3042]!, [_1]) - } - public var InviteLink_Create_UsersLimitInfo: String { return self._s[3043]! } - public var User_DeletedAccount: String { return self._s[3044]! } - public var Conversation_ViewContactDetails: String { return self._s[3045]! } - public var Conversation_Dice_u1F3B3: String { return self._s[3046]! } - public var WebSearch_GIFs: String { return self._s[3047]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[3048]! } - public var Appearance_PreviewOutgoingText: String { return self._s[3049]! } - public var Calls_CallTabTitle: String { return self._s[3050]! } - public var Call_VoiceChatInProgressTitle: String { return self._s[3051]! } - public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3052]!, self._r[3052]!, [_0]) - } - public var Channel_Status: String { return self._s[3053]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[3055]! } - public var VoiceOver_Chat_OptionSelected: String { return self._s[3056]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3057]! } - public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3058]!, self._r[3058]!, [_0, _1]) - } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3060]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[3062]! } - public var Month_ShortDecember: String { return self._s[3063]! } - public var Username_Help: String { return self._s[3064]! } - public var Login_InfoAvatarAdd: String { return self._s[3065]! } - public var Month_ShortMay: String { return self._s[3066]! } - public var DialogList_UnknownPinLimitError: String { return self._s[3067]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[3068]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[3069]! } - public var VoiceChat_AskedToSpeak: String { return self._s[3070]! } - public var Weekday_ShortSunday: String { return self._s[3071]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3072]! } - public var AuthSessions_TerminateSession: String { return self._s[3073]! } - public var Passport_Identity_FilesTitle: String { return self._s[3074]! } - public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3075]!, self._r[3075]!, [_0]) - } - public var PeopleNearby_MakeVisible: String { return self._s[3077]! } - public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_0]) - } - public var Widget_UpdatedAt: String { return self._s[3079]! } - public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3080]!, self._r[3080]!, [_1, _2]) - } - public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3081]!, self._r[3081]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3082]! } - public var Conversation_ContextMenuForward: String { return self._s[3083]! } - public var Channel_AdminLog_CanManageCalls: String { return self._s[3084]! } + public var VoiceOver_Media_PlaybackPlay: String { return self._s[3084]! } + public var Passport_CorrectErrors: String { return self._s[3086]! } + public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3087]!, self._r[3087]!, [_1, _2]) + } + public var ChatListFolderSettings_Title: String { return self._s[3088]! } + public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3089]!, self._r[3089]!, [_1, _2]) + } + public var PhotoEditor_HighlightsTool: String { return self._s[3090]! } + public var Contacts_NotRegisteredSection: String { return self._s[3093]! } + public func Call_VoiceChatInProgressCallMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3094]!, self._r[3094]!, [_1, _2]) + } + public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_1]) + } + public var InviteLink_Create_UsersLimitInfo: String { return self._s[3096]! } + public var User_DeletedAccount: String { return self._s[3097]! } + public var Conversation_ViewContactDetails: String { return self._s[3098]! } + public var Conversation_Dice_u1F3B3: String { return self._s[3099]! } + public var WebSearch_GIFs: String { return self._s[3100]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[3101]! } + public var Appearance_PreviewOutgoingText: String { return self._s[3102]! } + public var Calls_CallTabTitle: String { return self._s[3103]! } + public var Call_VoiceChatInProgressTitle: String { return self._s[3104]! } + public var Checkout_OptionalTipItem: String { return self._s[3105]! } + public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3106]!, self._r[3106]!, [_0]) + } + public var Channel_Status: String { return self._s[3107]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[3109]! } + public var VoiceOver_Chat_OptionSelected: String { return self._s[3110]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3111]! } + public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3112]!, self._r[3112]!, [_0, _1]) + } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3114]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[3116]! } + public var Month_ShortDecember: String { return self._s[3117]! } + public var Username_Help: String { return self._s[3118]! } + public var Login_InfoAvatarAdd: String { return self._s[3119]! } + public var Month_ShortMay: String { return self._s[3120]! } + public var DialogList_UnknownPinLimitError: String { return self._s[3121]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[3122]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[3123]! } + public var VoiceChat_AskedToSpeak: String { return self._s[3124]! } + public var Weekday_ShortSunday: String { return self._s[3125]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3126]! } + public var AuthSessions_TerminateSession: String { return self._s[3127]! } + public var Passport_Identity_FilesTitle: String { return self._s[3128]! } + public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3129]!, self._r[3129]!, [_0]) + } + public var PeopleNearby_MakeVisible: String { return self._s[3131]! } + public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3132]!, self._r[3132]!, [_0]) + } + public var Widget_UpdatedAt: String { return self._s[3133]! } + public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3134]!, self._r[3134]!, [_1, _2]) + } + public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3135]!, self._r[3135]!, [_0]) + } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3136]! } + public var Conversation_ContextMenuForward: String { return self._s[3138]! } + public var Channel_AdminLog_CanManageCalls: String { return self._s[3139]! } public func PUSH_CHAT_MESSAGE_QUIZ(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3086]!, self._r[3086]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3141]!, self._r[3141]!, [_1, _2, _3]) } - public var Notification_GroupInviterSelf: String { return self._s[3088]! } - public var Privacy_Forwards_NeverLink: String { return self._s[3089]! } - public var AuthSessions_CurrentSession: String { return self._s[3090]! } - public var Passport_Address_EditPassportRegistration: String { return self._s[3091]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3092]! } - public var ChatSearch_ResultsTooltip: String { return self._s[3094]! } - public var CheckoutInfo_Pay: String { return self._s[3095]! } + public var Notification_GroupInviterSelf: String { return self._s[3143]! } + public var Privacy_Forwards_NeverLink: String { return self._s[3144]! } + public var AuthSessions_CurrentSession: String { return self._s[3145]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[3146]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3147]! } + public var ChatSearch_ResultsTooltip: String { return self._s[3149]! } + public var CheckoutInfo_Pay: String { return self._s[3150]! } public func Conversation_PinMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3097]!, self._r[3097]!, [_0]) + return formatWithArgumentRanges(self._s[3152]!, self._r[3152]!, [_0]) } - public var GroupInfo_AddParticipant: String { return self._s[3098]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[3099]! } + public var GroupInfo_AddParticipant: String { return self._s[3153]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[3154]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3100]!, self._r[3100]!, [_0]) + return formatWithArgumentRanges(self._s[3155]!, self._r[3155]!, [_0]) } - public var Localization_LanguageCustom: String { return self._s[3101]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[3102]! } - public var Settings_UsernameEmpty: String { return self._s[3103]! } - public var Settings_FAQ_URL: String { return self._s[3104]! } - public var ChatList_UndoArchiveText1: String { return self._s[3105]! } - public var Common_Select: String { return self._s[3107]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[3108]! } - public var Notification_PassportValueAddress: String { return self._s[3109]! } - public var Conversation_MessageDialogDelete: String { return self._s[3110]! } - public var Map_OpenInYandexNavigator: String { return self._s[3112]! } - public var DialogList_SearchSectionDialogs: String { return self._s[3113]! } - public var AccessDenied_Contacts: String { return self._s[3114]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[3116]! } - public var Passport_ScanPassportHelp: String { return self._s[3117]! } - public var Chat_PinnedListPreview_HidePinnedMessages: String { return self._s[3118]! } - public var ChatListFolder_NameChannels: String { return self._s[3119]! } - public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[3120]! } + public var Localization_LanguageCustom: String { return self._s[3156]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[3157]! } + public var Settings_UsernameEmpty: String { return self._s[3158]! } + public var Settings_FAQ_URL: String { return self._s[3159]! } + public var ChatList_UndoArchiveText1: String { return self._s[3160]! } + public var Common_Select: String { return self._s[3162]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[3163]! } + public var Notification_PassportValueAddress: String { return self._s[3164]! } + public var Conversation_MessageDialogDelete: String { return self._s[3165]! } + public var Map_OpenInYandexNavigator: String { return self._s[3167]! } + public var DialogList_SearchSectionDialogs: String { return self._s[3168]! } + public var AccessDenied_Contacts: String { return self._s[3169]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[3171]! } + public var Passport_ScanPassportHelp: String { return self._s[3172]! } + public var Chat_PinnedListPreview_HidePinnedMessages: String { return self._s[3173]! } + public var ChatListFolder_NameChannels: String { return self._s[3174]! } + public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[3175]! } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3176]!, self._r[3176]!, [_1, _2]) } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[3122]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[3177]! } public func VoiceChat_InviteMemberToGroupFirstText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3123]!, self._r[3123]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3178]!, self._r[3178]!, [_1, _2]) } - public var Conversation_GifTooltip: String { return self._s[3124]! } - public var Widget_MessageAutoremoveTimerUpdated: String { return self._s[3125]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3127]! } - public var VoiceChat_Connecting: String { return self._s[3128]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3129]! } + public var Conversation_GifTooltip: String { return self._s[3179]! } + public var Widget_MessageAutoremoveTimerUpdated: String { return self._s[3180]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3182]! } + public var VoiceChat_Connecting: String { return self._s[3183]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3184]! } public func Channel_AdminLog_CreatedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3130]!, self._r[3130]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3185]!, self._r[3185]!, [_1, _2]) } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3131]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3132]! } - public var CreatePoll_Quiz: String { return self._s[3133]! } - public var TwoFactorSetup_Email_Placeholder: String { return self._s[3135]! } - public var Watch_Message_Invoice: String { return self._s[3136]! } - public var Settings_AddAnotherAccount_Help: String { return self._s[3137]! } - public var Watch_Message_Unsupported: String { return self._s[3138]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3186]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3187]! } + public var CreatePoll_Quiz: String { return self._s[3188]! } + public var TwoFactorSetup_Email_Placeholder: String { return self._s[3190]! } + public var Watch_Message_Invoice: String { return self._s[3191]! } + public var Settings_AddAnotherAccount_Help: String { return self._s[3192]! } + public var Watch_Message_Unsupported: String { return self._s[3193]! } public func Call_CameraOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3140]!, self._r[3140]!, [_0]) + return formatWithArgumentRanges(self._s[3195]!, self._r[3195]!, [_0]) } - public var AuthSessions_TerminateOtherSessions: String { return self._s[3141]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[3143]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[3144]! } - public var Call_IncomingVoiceCall: String { return self._s[3145]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[3196]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[3198]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[3199]! } + public var Call_IncomingVoiceCall: String { return self._s[3200]! } public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3146]!, self._r[3146]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3201]!, self._r[3201]!, [_1, _2]) } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[3147]! } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[3148]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[3149]! } - public var Group_ErrorAccessDenied: String { return self._s[3150]! } - public var PasscodeSettings_HelpTop: String { return self._s[3151]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3152]! } - public var AddContact_SharedContactException: String { return self._s[3153]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[3154]! } - public var Privacy_TopPeers: String { return self._s[3155]! } - public var Web_OpenExternal: String { return self._s[3156]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[3157]! } - public var Channel_Management_LabelAdministrator: String { return self._s[3158]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[3202]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[3203]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[3204]! } + public var Group_ErrorAccessDenied: String { return self._s[3205]! } + public var PasscodeSettings_HelpTop: String { return self._s[3206]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3207]! } + public var AddContact_SharedContactException: String { return self._s[3208]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[3209]! } + public var Privacy_TopPeers: String { return self._s[3210]! } + public var Web_OpenExternal: String { return self._s[3211]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[3212]! } + public var Channel_Management_LabelAdministrator: String { return self._s[3213]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3159]!, self._r[3159]!, [_0]) + return formatWithArgumentRanges(self._s[3214]!, self._r[3214]!, [_0]) } - public var Conversation_PhoneCopied: String { return self._s[3160]! } - public var Permissions_Skip: String { return self._s[3161]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3162]! } + public var Conversation_PhoneCopied: String { return self._s[3215]! } + public var Permissions_Skip: String { return self._s[3216]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3217]! } public func VoiceChat_ForwardTooltip_TwoChats(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3163]!, self._r[3163]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_0, _1]) } - public var PeopleNearby_Title: String { return self._s[3164]! } - public var GroupInfo_SharedMediaNone: String { return self._s[3165]! } + public var PeopleNearby_Title: String { return self._s[3219]! } + public var GroupInfo_SharedMediaNone: String { return self._s[3220]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3167]!, self._r[3167]!, [_1]) + return formatWithArgumentRanges(self._s[3222]!, self._r[3222]!, [_1]) } - public var Profile_MessageLifetime1w: String { return self._s[3168]! } + public var Profile_MessageLifetime1w: String { return self._s[3223]! } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3169]!, self._r[3169]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3224]!, self._r[3224]!, [_1, _2, _3]) } - public var WebBrowser_DefaultBrowser: String { return self._s[3170]! } - public var Conversation_PinOlderMessageAlertTitle: String { return self._s[3172]! } - public var EditTheme_Edit_BottomInfo: String { return self._s[3173]! } - public var Privacy_Forwards_Preview: String { return self._s[3174]! } - public var Settings_EditAccount: String { return self._s[3175]! } + public var WebBrowser_DefaultBrowser: String { return self._s[3225]! } + public var Conversation_PinOlderMessageAlertTitle: String { return self._s[3227]! } + public var EditTheme_Edit_BottomInfo: String { return self._s[3228]! } + public var Privacy_Forwards_Preview: String { return self._s[3229]! } + public var Settings_EditAccount: String { return self._s[3230]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3176]!, self._r[3176]!, [_0]) + return formatWithArgumentRanges(self._s[3231]!, self._r[3231]!, [_0]) } - public var TwoFactorSetup_Intro_Title: String { return self._s[3177]! } + public var TwoFactorSetup_Intro_Title: String { return self._s[3232]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3179]!, self._r[3179]!, [_1]) + return formatWithArgumentRanges(self._s[3234]!, self._r[3234]!, [_1]) } - public var PeerInfo_ButtonVideoCall: String { return self._s[3180]! } + public var PeerInfo_ButtonVideoCall: String { return self._s[3235]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3181]!, self._r[3181]!, [_0]) + return formatWithArgumentRanges(self._s[3236]!, self._r[3236]!, [_0]) } - public var Login_InfoHelp: String { return self._s[3182]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[3183]! } - public var VoiceChat_SpeakPermissionEveryone: String { return self._s[3184]! } - public var Profile_MessageLifetime1d: String { return self._s[3185]! } - public var Group_UpgradeConfirmation: String { return self._s[3186]! } + public var Login_InfoHelp: String { return self._s[3237]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[3238]! } + public var VoiceChat_SpeakPermissionEveryone: String { return self._s[3239]! } + public var Profile_MessageLifetime1d: String { return self._s[3240]! } + public var Group_UpgradeConfirmation: String { return self._s[3241]! } public func PUSH_PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3187]!, self._r[3187]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3242]!, self._r[3242]!, [_1, _2]) } - public var Appearance_RemoveThemeColor: String { return self._s[3188]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3189]! } + public var Appearance_RemoveThemeColor: String { return self._s[3243]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3244]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3190]!, self._r[3190]!, [_0]) + return formatWithArgumentRanges(self._s[3245]!, self._r[3245]!, [_0]) } - public var UserInfo_BotSettings: String { return self._s[3191]! } + public var UserInfo_BotSettings: String { return self._s[3246]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_0]) + return formatWithArgumentRanges(self._s[3248]!, self._r[3248]!, [_0]) } - public var Permissions_ContactsText_v0: String { return self._s[3194]! } - public var Conversation_PinMessagesForMe: String { return self._s[3195]! } - public var VoiceChat_PanelJoin: String { return self._s[3196]! } - public var Conversation_DiscussionStarted: String { return self._s[3198]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[3199]! } - public var SharedMedia_SearchNoResults: String { return self._s[3201]! } + public var Permissions_ContactsText_v0: String { return self._s[3249]! } + public var Conversation_PinMessagesForMe: String { return self._s[3250]! } + public var VoiceChat_PanelJoin: String { return self._s[3251]! } + public var Conversation_DiscussionStarted: String { return self._s[3253]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[3254]! } + public var SharedMedia_SearchNoResults: String { return self._s[3256]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3203]!, self._r[3203]!, [_0]) + return formatWithArgumentRanges(self._s[3258]!, self._r[3258]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3205]!, self._r[3205]!, [_0]) + return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0]) } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[3206]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3207]! } - public var Call_AudioRouteHeadphones: String { return self._s[3208]! } - public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3210]!, self._r[3210]!, [_1]) - } - public var Passport_Identity_FilesView: String { return self._s[3211]! } - public var TwoStepAuth_SetupEmail: String { return self._s[3212]! } - public var Widget_ApplicationStartRequired: String { return self._s[3213]! } - public var PhotoEditor_Original: String { return self._s[3214]! } - public var Call_YourMicrophoneOff: String { return self._s[3215]! } - public var Permissions_ContactsAllow_v0: String { return self._s[3216]! } - public var Conversation_CardNumberCopied: String { return self._s[3217]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[3218]! } - public var PrivacyPolicy_Decline: String { return self._s[3219]! } - public var SettingsSearch_Synonyms_ChatFolders: String { return self._s[3220]! } - public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[3221]! } - public var ChatListFolder_IncludeSectionInfo: String { return self._s[3222]! } - public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3223]!, self._r[3223]!, [_0]) - } - public var Passport_Identity_Name: String { return self._s[3224]! } - public var WallpaperPreview_PatternTitle: String { return self._s[3226]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[3227]! } - public var WallpaperSearch_ColorOrange: String { return self._s[3229]! } - public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[3230]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[3231]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3232]! } - public var IntentsSettings_ResetAll: String { return self._s[3233]! } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3235]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3236]! } - public var ChatList_DeleteForAllSubscribers: String { return self._s[3237]! } - public var Notification_Exceptions_Add: String { return self._s[3238]! } - public var Group_DeleteGroup: String { return self._s[3239]! } - public var Cache_Help: String { return self._s[3240]! } - public var Call_AudioRouteMute: String { return self._s[3241]! } - public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[3242]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[3243]! } - public func VoiceChat_Status_MembersFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3244]!, self._r[3244]!, [_1, _2]) - } - public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3245]!, self._r[3245]!, [_1]) - } - public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3246]!, self._r[3246]!, [_1, _2]) - } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3247]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[3248]! } - public func PUSH_CHAT_VOICECHAT_INVITE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3249]!, self._r[3249]!, [_1, _2, _3]) - } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[3250]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[3251]! } - public var ClearCache_StorageFree: String { return self._s[3252]! } - public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3253]!, self._r[3253]!, [_0]) - } - public var Privacy_Forwards_CustomHelp: String { return self._s[3254]! } - public func Channel_AdminLog_EditedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3256]!, self._r[3256]!, [_1, _2]) - } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[3257]! } - public var DialogList_Typing: String { return self._s[3258]! } - public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3259]!, self._r[3259]!, [_0]) - } - public var Target_SelectGroup: String { return self._s[3260]! } - public var AuthSessions_IncompleteAttempts: String { return self._s[3261]! } - public func Notification_ProximityReached(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3262]!, self._r[3262]!, [_1, _2, _3]) - } - public var Chat_PinnedListPreview_ShowAllMessages: String { return self._s[3263]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[3264]! } - public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[3261]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3262]! } + public var Call_AudioRouteHeadphones: String { return self._s[3263]! } + public func Notification_VoiceChatScheduledTomorrowChannel(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3265]!, self._r[3265]!, [_0]) } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3266]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[3267]! } - public var ChatSettings_TextSize: String { return self._s[3268]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[3270]! } - public var Map_SendThisPlace: String { return self._s[3271]! } - public var Conversation_TextCopied: String { return self._s[3272]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3273]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3274]! } - public var Call_ShareStats: String { return self._s[3275]! } + public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3266]!, self._r[3266]!, [_1]) + } + public var Passport_Identity_FilesView: String { return self._s[3267]! } + public var TwoStepAuth_SetupEmail: String { return self._s[3268]! } + public var Widget_ApplicationStartRequired: String { return self._s[3269]! } + public var PhotoEditor_Original: String { return self._s[3270]! } + public var Call_YourMicrophoneOff: String { return self._s[3271]! } + public var Permissions_ContactsAllow_v0: String { return self._s[3272]! } + public var Conversation_CardNumberCopied: String { return self._s[3273]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[3274]! } + public var PrivacyPolicy_Decline: String { return self._s[3275]! } + public var SettingsSearch_Synonyms_ChatFolders: String { return self._s[3276]! } + public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[3277]! } + public var ChatListFolder_IncludeSectionInfo: String { return self._s[3278]! } + public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3279]!, self._r[3279]!, [_0]) + } + public var Passport_Identity_Name: String { return self._s[3280]! } + public var WallpaperPreview_PatternTitle: String { return self._s[3282]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[3283]! } + public var WallpaperSearch_ColorOrange: String { return self._s[3285]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[3286]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[3287]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3288]! } + public var IntentsSettings_ResetAll: String { return self._s[3289]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3291]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3292]! } + public var ChatList_DeleteForAllSubscribers: String { return self._s[3293]! } + public var Notification_Exceptions_Add: String { return self._s[3294]! } + public var Group_DeleteGroup: String { return self._s[3295]! } + public var Cache_Help: String { return self._s[3296]! } + public var Call_AudioRouteMute: String { return self._s[3297]! } + public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[3298]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[3299]! } + public func VoiceChat_Status_MembersFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3300]!, self._r[3300]!, [_1, _2]) + } + public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3301]!, self._r[3301]!, [_1]) + } + public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3302]!, self._r[3302]!, [_1, _2]) + } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3303]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[3304]! } + public func PUSH_CHAT_VOICECHAT_INVITE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3305]!, self._r[3305]!, [_1, _2, _3]) + } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[3306]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[3307]! } + public var ClearCache_StorageFree: String { return self._s[3308]! } + public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3309]!, self._r[3309]!, [_0]) + } + public var Privacy_Forwards_CustomHelp: String { return self._s[3310]! } + public func Channel_AdminLog_EditedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3312]!, self._r[3312]!, [_1, _2]) + } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[3313]! } + public var DialogList_Typing: String { return self._s[3314]! } + public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3315]!, self._r[3315]!, [_0]) + } + public var Target_SelectGroup: String { return self._s[3316]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[3317]! } + public func Notification_ProximityReached(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3318]!, self._r[3318]!, [_1, _2, _3]) + } + public var Chat_PinnedListPreview_ShowAllMessages: String { return self._s[3319]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[3320]! } + public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3321]!, self._r[3321]!, [_0]) + } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3322]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[3323]! } + public var ChatSettings_TextSize: String { return self._s[3324]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[3326]! } + public var Map_SendThisPlace: String { return self._s[3327]! } + public var Conversation_TextCopied: String { return self._s[3328]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3329]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3330]! } + public var Call_ShareStats: String { return self._s[3331]! } public func PUSH_CHAT_VOICECHAT_END(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3277]!, self._r[3277]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3333]!, self._r[3333]!, [_1, _2]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3278]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[3279]! } - public var Settings_Support: String { return self._s[3280]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[3281]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3334]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[3335]! } + public var Settings_Support: String { return self._s[3336]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[3337]! } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3283]!, self._r[3283]!, [_0]) + return formatWithArgumentRanges(self._s[3339]!, self._r[3339]!, [_0]) } - public var Watch_Conversation_GroupInfo: String { return self._s[3284]! } - public var Tour_Text4: String { return self._s[3285]! } - public var UserInfo_FakeUserWarning: String { return self._s[3287]! } - public var PasscodeSettings_AutoLock: String { return self._s[3288]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3289]! } - public var Bot_DescriptionTitle: String { return self._s[3290]! } - public var Map_LocationTitle: String { return self._s[3291]! } - public var ChatListFolder_ExcludeSectionInfo: String { return self._s[3292]! } - public var Conversation_HashtagCopied: String { return self._s[3293]! } + public var Watch_Conversation_GroupInfo: String { return self._s[3340]! } + public var Tour_Text4: String { return self._s[3341]! } + public var VoiceChat_CancelReminder: String { return self._s[3342]! } + public var UserInfo_FakeUserWarning: String { return self._s[3344]! } + public var PasscodeSettings_AutoLock: String { return self._s[3345]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3346]! } + public var Bot_DescriptionTitle: String { return self._s[3348]! } + public var Map_LocationTitle: String { return self._s[3349]! } + public var ChatListFolder_ExcludeSectionInfo: String { return self._s[3350]! } + public var Conversation_HashtagCopied: String { return self._s[3351]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3294]!, self._r[3294]!, [_1]) + return formatWithArgumentRanges(self._s[3352]!, self._r[3352]!, [_1]) } - public var Login_EmailNotConfiguredError: String { return self._s[3295]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[3296]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[3297]! } - public var Permissions_CellularDataText_v0: String { return self._s[3298]! } - public var Conversation_EncryptionProcessing: String { return self._s[3299]! } - public var GroupPermission_Delete: String { return self._s[3300]! } - public var Contacts_SortByName: String { return self._s[3301]! } - public var TwoStepAuth_RecoveryUnavailable: String { return self._s[3302]! } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[3303]! } - public var Group_Management_AddModeratorHelp: String { return self._s[3305]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[3306]! } - public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3307]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[3309]! } + public var VoiceChat_ReminderNotify: String { return self._s[3353]! } + public var Login_EmailNotConfiguredError: String { return self._s[3354]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[3355]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[3356]! } + public var Permissions_CellularDataText_v0: String { return self._s[3357]! } + public var Conversation_EncryptionProcessing: String { return self._s[3358]! } + public var GroupPermission_Delete: String { return self._s[3360]! } + public var Contacts_SortByName: String { return self._s[3361]! } + public var TwoStepAuth_RecoveryUnavailable: String { return self._s[3362]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[3363]! } + public var Group_Management_AddModeratorHelp: String { return self._s[3365]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[3366]! } + public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3367]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[3369]! } public func PUSH_CHANNEL_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3310]!, self._r[3310]!, [_1]) + return formatWithArgumentRanges(self._s[3370]!, self._r[3370]!, [_1]) } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3311]!, self._r[3311]!, [_0]) + return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_0]) } - public var ChatList_Context_Delete: String { return self._s[3312]! } - public var VoiceChat_InviteMember: String { return self._s[3313]! } - public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[3314]! } - public var Conversation_Processing: String { return self._s[3315]! } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[3316]! } - public var ChatSettings_Stickers: String { return self._s[3317]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3318]! } - public var Passport_Language_cs: String { return self._s[3319]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3321]! } - public var Conversation_Contact: String { return self._s[3322]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[3323]! } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[3324]! } - public var Theme_Unsupported: String { return self._s[3325]! } - public var Privacy_TopPeersWarning: String { return self._s[3326]! } - public var InviteLink_Title: String { return self._s[3328]! } + public var ChatList_Context_Delete: String { return self._s[3372]! } + public var VoiceChat_InviteMember: String { return self._s[3373]! } + public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[3374]! } + public var Conversation_Processing: String { return self._s[3375]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[3376]! } + public var ChatSettings_Stickers: String { return self._s[3377]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3378]! } + public var Passport_Language_cs: String { return self._s[3379]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3381]! } + public var Conversation_Contact: String { return self._s[3382]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[3383]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[3384]! } + public var Theme_Unsupported: String { return self._s[3385]! } + public var Privacy_TopPeersWarning: String { return self._s[3386]! } + public func Conversation_ScheduledVoiceChatStartsTodayShort(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3387]!, self._r[3387]!, [_0]) + } + public var InviteLink_Title: String { return self._s[3389]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3329]!, self._r[3329]!, [_0]) + return formatWithArgumentRanges(self._s[3390]!, self._r[3390]!, [_0]) } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3330]! } - public var TwoStepAuth_RemovePassword: String { return self._s[3331]! } - public var Settings_CheckPhoneNumberText: String { return self._s[3332]! } - public var PeopleNearby_Users: String { return self._s[3333]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3334]! } - public var Settings_SetProfilePhoto: String { return self._s[3335]! } - public var Conversation_ContextMenuBan: String { return self._s[3336]! } - public var KeyCommand_ScrollUp: String { return self._s[3337]! } - public var Settings_ChatSettings: String { return self._s[3339]! } - public var CallList_RecentCallsHeader: String { return self._s[3340]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3391]! } + public var TwoStepAuth_RemovePassword: String { return self._s[3392]! } + public var Settings_CheckPhoneNumberText: String { return self._s[3393]! } + public var PeopleNearby_Users: String { return self._s[3394]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3395]! } + public var Settings_SetProfilePhoto: String { return self._s[3396]! } + public var Conversation_ContextMenuBan: String { return self._s[3397]! } + public var KeyCommand_ScrollUp: String { return self._s[3398]! } + public var Settings_ChatSettings: String { return self._s[3400]! } + public var CallList_RecentCallsHeader: String { return self._s[3401]! } public func PUSH_CHAT_MESSAGE_VIDEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3341]!, self._r[3341]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3402]!, self._r[3402]!, [_1, _2]) } - public var Stats_GroupTopInvitersTitle: String { return self._s[3342]! } - public var Passport_Phone_EnterOtherNumber: String { return self._s[3343]! } - public var VoiceChat_StartRecordingTitle: String { return self._s[3344]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[3346]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3347]! } - public var VoiceOver_ChatList_MessageRead: String { return self._s[3348]! } - public var Stats_GroupTopPoster_Promote: String { return self._s[3349]! } - public var Cache_Title: String { return self._s[3350]! } - public func Conversation_AutoremoveTimerSetToastText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3351]!, self._r[3351]!, [_0]) - } - public var Clipboard_SendPhoto: String { return self._s[3352]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[3354]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3355]! } - public var WatchRemote_AlertTitle: String { return self._s[3358]! } - public var Appearance_ReduceMotion: String { return self._s[3359]! } - public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3362]!, self._r[3362]!, [_1, _2]) - } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[3363]! } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[3364]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[3365]! } - public func Call_CallInProgressVoiceChatMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3366]!, self._r[3366]!, [_1, _2]) - } - public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3368]!, self._r[3368]!, [_0]) - } - public var ChatListFolder_DiscardConfirmation: String { return self._s[3369]! } - public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3370]!, self._r[3370]!, [_0]) - } - public var InstantPage_Search: String { return self._s[3371]! } - public var ChatState_WaitingForNetwork: String { return self._s[3372]! } - public var GroupInfo_Sound: String { return self._s[3373]! } - public var NotificationsSound_Telegraph: String { return self._s[3374]! } - public var NotificationsSound_Hello: String { return self._s[3375]! } - public var VoiceChat_LeaveConfirmation: String { return self._s[3376]! } - public var UserInfo_LinkForwardTooltip_SavedMessages_One: String { return self._s[3377]! } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[3378]! } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[3379]! } - public var Conversation_HoldForVideo: String { return self._s[3380]! } - public var Conversation_PinOlderMessageAlertText: String { return self._s[3381]! } - public var Appearance_ShareTheme: String { return self._s[3382]! } - public var TwoStepAuth_SetupHint: String { return self._s[3383]! } - public var Stats_GrowthTitle: String { return self._s[3386]! } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3387]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[3388]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[3389]! } - public var GroupPermission_NoSendMessages: String { return self._s[3392]! } - public var Conversation_SetReminder_Title: String { return self._s[3393]! } - public var Privacy_Calls_CustomHelp: String { return self._s[3394]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3395]! } - public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3396]!, self._r[3396]!, [_0]) - } - public var InviteLinks_InviteLinkExpired: String { return self._s[3398]! } - public var Undo_SecretChatDeleted: String { return self._s[3399]! } - public var PhotoEditor_ContrastTool: String { return self._s[3400]! } - public var Privacy_Forwards: String { return self._s[3401]! } - public var AuthSessions_LoggedInWithTelegram: String { return self._s[3402]! } - public var KeyCommand_SendMessage: String { return self._s[3404]! } - public var Conversation_PrivateMessageLinkCopiedLong: String { return self._s[3405]! } - public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + public var Stats_GroupTopInvitersTitle: String { return self._s[3403]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[3404]! } + public var VoiceChat_StartRecordingTitle: String { return self._s[3405]! } + public func Notification_VoiceChatScheduledToday(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3406]!, self._r[3406]!, [_1, _2]) } - public var GroupPermission_NoSendGifs: String { return self._s[3407]! } - public var Notification_MessageLifetime2s: String { return self._s[3408]! } - public var Message_Theme: String { return self._s[3409]! } - public var Conversation_Dice_u1F3AF: String { return self._s[3412]! } - public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[3408]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3409]! } + public var VoiceOver_ChatList_MessageRead: String { return self._s[3410]! } + public var Stats_GroupTopPoster_Promote: String { return self._s[3411]! } + public var Cache_Title: String { return self._s[3412]! } + public func Conversation_AutoremoveTimerSetToastText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3413]!, self._r[3413]!, [_0]) } - public var Group_UpgradeNoticeHeader: String { return self._s[3415]! } - public var PeerInfo_BioExpand: String { return self._s[3416]! } - public var Passport_DeletePersonalDetails: String { return self._s[3417]! } - public var Widget_NoUsers: String { return self._s[3418]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[3419]! } - public var Login_TermsOfServiceDecline: String { return self._s[3420]! } - public var CreatePoll_QuizTip: String { return self._s[3422]! } - public var Watch_LastSeen_WithinAWeek: String { return self._s[3423]! } - public var MessagePoll_SubmitVote: String { return self._s[3425]! } - public var ChatSettings_AutoDownloadEnabled: String { return self._s[3426]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[3427]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3428]! } - public var Conversation_UpdateTelegram: String { return self._s[3429]! } - public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Clipboard_SendPhoto: String { return self._s[3414]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[3416]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3417]! } + public var WatchRemote_AlertTitle: String { return self._s[3420]! } + public var Appearance_ReduceMotion: String { return self._s[3421]! } + public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3424]!, self._r[3424]!, [_1, _2]) + } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[3425]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[3426]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[3427]! } + public func Call_CallInProgressVoiceChatMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3428]!, self._r[3428]!, [_1, _2]) + } + public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3430]!, self._r[3430]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3431]! } - public var CallSettings_Always: String { return self._s[3432]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[3433]! } - public var VoiceChat_MutedByAdminHelp: String { return self._s[3434]! } - public var Login_TermsOfServiceHeader: String { return self._s[3435]! } - public var KeyCommand_ChatInfo: String { return self._s[3436]! } - public var MessagePoll_LabelPoll: String { return self._s[3437]! } - public var Paint_Clear: String { return self._s[3438]! } - public var PeerInfo_ButtonMute: String { return self._s[3439]! } - public var LastSeen_WithinAWeek: String { return self._s[3440]! } - public var Invitation_JoinVoiceChatAsSpeaker: String { return self._s[3441]! } - public var Passport_Identity_FrontSide: String { return self._s[3442]! } - public var Stickers_GroupStickers: String { return self._s[3443]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[3444]! } + public var ChatListFolder_DiscardConfirmation: String { return self._s[3431]! } + public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3433]!, self._r[3433]!, [_0]) + } + public var InstantPage_Search: String { return self._s[3434]! } + public var ChatState_WaitingForNetwork: String { return self._s[3435]! } + public var GroupInfo_Sound: String { return self._s[3436]! } + public var NotificationsSound_Telegraph: String { return self._s[3437]! } + public var NotificationsSound_Hello: String { return self._s[3438]! } + public var VoiceChat_LeaveConfirmation: String { return self._s[3439]! } + public var UserInfo_LinkForwardTooltip_SavedMessages_One: String { return self._s[3440]! } + public var Passport_FieldIdentityDetailsHelp: String { return self._s[3441]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[3442]! } + public var Conversation_HoldForVideo: String { return self._s[3443]! } + public var Conversation_PinOlderMessageAlertText: String { return self._s[3444]! } + public var Appearance_ShareTheme: String { return self._s[3445]! } + public var TwoStepAuth_SetupHint: String { return self._s[3446]! } + public var Stats_GrowthTitle: String { return self._s[3449]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3450]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[3451]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[3452]! } + public var GroupPermission_NoSendMessages: String { return self._s[3455]! } + public var Conversation_SetReminder_Title: String { return self._s[3456]! } + public var Privacy_Calls_CustomHelp: String { return self._s[3457]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3458]! } + public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3459]!, self._r[3459]!, [_0]) + } + public var InviteLinks_InviteLinkExpired: String { return self._s[3461]! } + public var Undo_SecretChatDeleted: String { return self._s[3462]! } + public var PhotoEditor_ContrastTool: String { return self._s[3463]! } + public var Privacy_Forwards: String { return self._s[3464]! } + public var AuthSessions_LoggedInWithTelegram: String { return self._s[3465]! } + public var KeyCommand_SendMessage: String { return self._s[3467]! } + public var Conversation_PrivateMessageLinkCopiedLong: String { return self._s[3468]! } + public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3469]!, self._r[3469]!, [_1, _2]) + } + public var GroupPermission_NoSendGifs: String { return self._s[3470]! } + public func Notification_VoiceChatEndedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3471]!, self._r[3471]!, [_1, _2]) + } + public var Notification_MessageLifetime2s: String { return self._s[3472]! } + public var Message_Theme: String { return self._s[3473]! } + public var Conversation_Dice_u1F3AF: String { return self._s[3476]! } + public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3477]!, self._r[3477]!, [_0]) + } + public var Group_UpgradeNoticeHeader: String { return self._s[3479]! } + public var PeerInfo_BioExpand: String { return self._s[3480]! } + public var Passport_DeletePersonalDetails: String { return self._s[3481]! } + public var Widget_NoUsers: String { return self._s[3482]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[3483]! } + public var Login_TermsOfServiceDecline: String { return self._s[3484]! } + public var CreatePoll_QuizTip: String { return self._s[3486]! } + public var Watch_LastSeen_WithinAWeek: String { return self._s[3487]! } + public var MessagePoll_SubmitVote: String { return self._s[3489]! } + public var ChatSettings_AutoDownloadEnabled: String { return self._s[3490]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[3491]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3492]! } + public var Conversation_UpdateTelegram: String { return self._s[3493]! } + public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3494]!, self._r[3494]!, [_0]) + } + public var UserInfo_About_Placeholder: String { return self._s[3495]! } + public var CallSettings_Always: String { return self._s[3496]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[3497]! } + public var VoiceChat_MutedByAdminHelp: String { return self._s[3498]! } + public var Login_TermsOfServiceHeader: String { return self._s[3499]! } + public var KeyCommand_ChatInfo: String { return self._s[3500]! } + public var MessagePoll_LabelPoll: String { return self._s[3501]! } + public var Paint_Clear: String { return self._s[3502]! } + public var PeerInfo_ButtonMute: String { return self._s[3503]! } + public var LastSeen_WithinAWeek: String { return self._s[3504]! } + public var Invitation_JoinVoiceChatAsSpeaker: String { return self._s[3505]! } + public var Passport_Identity_FrontSide: String { return self._s[3506]! } + public var Stickers_GroupStickers: String { return self._s[3507]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[3508]! } public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3445]!, self._r[3445]!, [_0]) + return formatWithArgumentRanges(self._s[3509]!, self._r[3509]!, [_0]) } - public var VoiceOver_BotCommands: String { return self._s[3446]! } + public var VoiceOver_BotCommands: String { return self._s[3510]! } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3449]!, self._r[3449]!, [_1]) + return formatWithArgumentRanges(self._s[3513]!, self._r[3513]!, [_1]) } - public var SocksProxySetup_ProxyStatusConnected: String { return self._s[3450]! } - public var Chat_MultipleTextMessagesDisabled: String { return self._s[3451]! } - public var InviteLink_ContextDelete: String { return self._s[3452]! } + public var SocksProxySetup_ProxyStatusConnected: String { return self._s[3514]! } + public var Chat_MultipleTextMessagesDisabled: String { return self._s[3515]! } + public var InviteLink_ContextDelete: String { return self._s[3516]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3453]!, self._r[3453]!, [_0]) + return formatWithArgumentRanges(self._s[3517]!, self._r[3517]!, [_0]) } - public var WebSearch_SearchNoResults: String { return self._s[3455]! } - public var Channel_DiscussionGroup_Create: String { return self._s[3456]! } - public var Passport_Language_es: String { return self._s[3457]! } - public var EnterPasscode_EnterCurrentPasscode: String { return self._s[3458]! } - public var Map_LiveLocationShowAll: String { return self._s[3459]! } - public var Cache_MaximumCacheSizeHelp: String { return self._s[3461]! } - public var Map_OpenInGoogleMaps: String { return self._s[3462]! } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[3464]! } - public var EditTheme_Create_BottomInfo: String { return self._s[3465]! } - public var PhotoEditor_BlurToolLinear: String { return self._s[3466]! } + public var WebSearch_SearchNoResults: String { return self._s[3519]! } + public var Channel_DiscussionGroup_Create: String { return self._s[3520]! } + public var Passport_Language_es: String { return self._s[3521]! } + public var EnterPasscode_EnterCurrentPasscode: String { return self._s[3522]! } + public var Map_LiveLocationShowAll: String { return self._s[3523]! } + public var Cache_MaximumCacheSizeHelp: String { return self._s[3525]! } + public var Map_OpenInGoogleMaps: String { return self._s[3526]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[3528]! } + public var EditTheme_Create_BottomInfo: String { return self._s[3529]! } + public var PhotoEditor_BlurToolLinear: String { return self._s[3530]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3467]!, self._r[3467]!, [_0]) + return formatWithArgumentRanges(self._s[3531]!, self._r[3531]!, [_0]) } - public var Passport_Phone_Delete: String { return self._s[3468]! } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[3469]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[3470]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[3471]! } + public var Passport_Phone_Delete: String { return self._s[3532]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[3533]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[3534]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[3535]! } public func EncryptionKey_Description(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3472]!, self._r[3472]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_1, _2]) } - public var LogoutOptions_LogOutInfo: String { return self._s[3473]! } - public var Cache_ByPeerHeader: String { return self._s[3475]! } - public var Username_InvalidCharacters: String { return self._s[3476]! } - public var Checkout_ShippingAddress: String { return self._s[3477]! } + public var LogoutOptions_LogOutInfo: String { return self._s[3537]! } + public var Cache_ByPeerHeader: String { return self._s[3539]! } + public var Username_InvalidCharacters: String { return self._s[3540]! } + public var Checkout_ShippingAddress: String { return self._s[3542]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3478]!, self._r[3478]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[3543]!, self._r[3543]!, [_1, _2, _3, _4]) } - public var VoiceChat_LeaveAndEndVoiceChat: String { return self._s[3480]! } - public var Conversation_AddContact: String { return self._s[3481]! } - public var Passport_Address_EditUtilityBill: String { return self._s[3482]! } - public var InviteLink_ContextGetQRCode: String { return self._s[3483]! } - public var Conversation_ChecksTooltip_Delivered: String { return self._s[3485]! } + public var VoiceChat_LeaveAndEndVoiceChat: String { return self._s[3545]! } + public var Conversation_AddContact: String { return self._s[3546]! } + public var Passport_Address_EditUtilityBill: String { return self._s[3547]! } + public var InviteLink_ContextGetQRCode: String { return self._s[3548]! } + public var Conversation_ChecksTooltip_Delivered: String { return self._s[3550]! } public func Channel_AdminLog_MessageAddedAdminNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3486]!, self._r[3486]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3551]!, self._r[3551]!, [_1, _2]) } - public var Message_Video: String { return self._s[3487]! } + public var Message_Video: String { return self._s[3552]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3488]!, self._r[3488]!, [_0]) + return formatWithArgumentRanges(self._s[3553]!, self._r[3553]!, [_0]) } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3489]!, self._r[3489]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[3554]!, self._r[3554]!, ["\(_0)"]) } - public var InviteLink_ReactivateLink: String { return self._s[3490]! } - public var Passport_Language_km: String { return self._s[3491]! } + public var InviteLink_ReactivateLink: String { return self._s[3555]! } + public var Passport_Language_km: String { return self._s[3557]! } public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3492]!, self._r[3492]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3558]!, self._r[3558]!, [_1, _2, _3]) } - public var EmptyGroupInfo_Line4: String { return self._s[3493]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3495]! } - public var Notification_CallCanceledShort: String { return self._s[3496]! } - public var PhotoEditor_FadeTool: String { return self._s[3497]! } - public var Group_PublicLink_Info: String { return self._s[3498]! } - public var Contacts_DeselectAll: String { return self._s[3499]! } - public var Conversation_Moderate_Delete: String { return self._s[3500]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3501]! } - public var NotificationsSound_Note: String { return self._s[3504]! } + public var EmptyGroupInfo_Line4: String { return self._s[3559]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3561]! } + public var Notification_CallCanceledShort: String { return self._s[3562]! } + public var PhotoEditor_FadeTool: String { return self._s[3563]! } + public var Group_PublicLink_Info: String { return self._s[3564]! } + public var Contacts_DeselectAll: String { return self._s[3565]! } + public var Conversation_Moderate_Delete: String { return self._s[3567]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3568]! } + public var NotificationsSound_Note: String { return self._s[3571]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3505]!, self._r[3505]!, [_0]) + return formatWithArgumentRanges(self._s[3572]!, self._r[3572]!, [_0]) } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[3506]! } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3508]! } - public var DialogList_SearchSectionGlobal: String { return self._s[3509]! } - public var AccessDenied_Settings: String { return self._s[3510]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3511]! } - public var AuthSessions_EmptyTitle: String { return self._s[3512]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[3513]! } - public var GroupInfo_GroupType: String { return self._s[3514]! } - public var Calls_Missed: String { return self._s[3515]! } - public var Contacts_VoiceOver_AddContact: String { return self._s[3516]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3518]! } - public var Passport_Language_uz: String { return self._s[3519]! } - public var Conversation_StopQuizConfirmationTitle: String { return self._s[3520]! } - public var PhotoEditor_BlurToolPortrait: String { return self._s[3521]! } - public var Map_ChooseLocationTitle: String { return self._s[3522]! } - public var Checkout_EnterPassword: String { return self._s[3523]! } - public var GroupInfo_ConvertToSupergroup: String { return self._s[3524]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[3525]! } - public var NetworkUsageSettings_Title: String { return self._s[3526]! } - public var Location_ProximityAlertCancelled: String { return self._s[3527]! } - public var SettingsSearch_Synonyms_ChatSettings_IntentsSettings: String { return self._s[3528]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[3529]! } - public var Compose_NewChannel: String { return self._s[3530]! } - public var Privacy_PaymentsClearInfo: String { return self._s[3532]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[3573]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3575]! } + public var DialogList_SearchSectionGlobal: String { return self._s[3576]! } + public var AccessDenied_Settings: String { return self._s[3577]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3578]! } + public var AuthSessions_EmptyTitle: String { return self._s[3579]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[3580]! } + public var GroupInfo_GroupType: String { return self._s[3581]! } + public var Calls_Missed: String { return self._s[3582]! } + public var Contacts_VoiceOver_AddContact: String { return self._s[3583]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3585]! } + public var Passport_Language_uz: String { return self._s[3586]! } + public var Conversation_StopQuizConfirmationTitle: String { return self._s[3587]! } + public var PhotoEditor_BlurToolPortrait: String { return self._s[3588]! } + public var VoiceChat_CreateNewVoiceChatStartNow: String { return self._s[3589]! } + public var Map_ChooseLocationTitle: String { return self._s[3590]! } + public var Checkout_EnterPassword: String { return self._s[3591]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[3592]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[3593]! } + public var NetworkUsageSettings_Title: String { return self._s[3594]! } + public var Location_ProximityAlertCancelled: String { return self._s[3595]! } + public var SettingsSearch_Synonyms_ChatSettings_IntentsSettings: String { return self._s[3596]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[3597]! } + public var Compose_NewChannel: String { return self._s[3598]! } + public var Privacy_PaymentsClearInfo: String { return self._s[3600]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3533]!, self._r[3533]!, [_1]) + return formatWithArgumentRanges(self._s[3601]!, self._r[3601]!, [_1]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3534]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3535]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[3538]! } - public var WallpaperSearch_ColorBrown: String { return self._s[3539]! } - public var Appearance_AppIconDefault: String { return self._s[3540]! } - public var StickerSettings_ContextInfo: String { return self._s[3543]! } - public var Channel_AddBotErrorNoRights: String { return self._s[3544]! } - public var Passport_FieldPhone: String { return self._s[3546]! } - public var Contacts_PermissionsTitle: String { return self._s[3547]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3548]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3602]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3603]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[3606]! } + public var WallpaperSearch_ColorBrown: String { return self._s[3607]! } + public var Appearance_AppIconDefault: String { return self._s[3608]! } + public var StickerSettings_ContextInfo: String { return self._s[3611]! } + public var Channel_AddBotErrorNoRights: String { return self._s[3612]! } + public var Passport_FieldPhone: String { return self._s[3614]! } + public var Contacts_PermissionsTitle: String { return self._s[3615]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3616]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3549]!, self._r[3549]!, [_0]) + return formatWithArgumentRanges(self._s[3617]!, self._r[3617]!, [_0]) } - public var Bot_Unblock: String { return self._s[3550]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[3551]! } - public var InviteLink_InviteLinkCopiedText: String { return self._s[3552]! } - public var Passport_PasswordHelp: String { return self._s[3553]! } - public var Watch_Conversation_UserInfo: String { return self._s[3554]! } + public var Bot_Unblock: String { return self._s[3618]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[3619]! } + public var InviteLink_InviteLinkCopiedText: String { return self._s[3620]! } + public var Passport_PasswordHelp: String { return self._s[3621]! } + public var Watch_Conversation_UserInfo: String { return self._s[3622]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3558]!, self._r[3558]!, [_0]) + return formatWithArgumentRanges(self._s[3626]!, self._r[3626]!, [_0]) } - public var State_Connecting: String { return self._s[3560]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3561]! } - public var TextFormat_AddLinkPlaceholder: String { return self._s[3562]! } - public var Conversation_Dice_u1F3B2: String { return self._s[3563]! } + public var State_Connecting: String { return self._s[3628]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3629]! } + public var TextFormat_AddLinkPlaceholder: String { return self._s[3630]! } + public var Conversation_Dice_u1F3B2: String { return self._s[3631]! } public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3564]!, self._r[3564]!, [_0]) + return formatWithArgumentRanges(self._s[3632]!, self._r[3632]!, [_0]) } - public var Conversation_SendingOptionsTooltip: String { return self._s[3565]! } - public var ChatList_UndoArchiveTitle: String { return self._s[3566]! } - public var ChatList_EmptyChatListNewMessage: String { return self._s[3567]! } - public var WallpaperSearch_ColorGreen: String { return self._s[3569]! } - public var PhotoEditor_BlurToolOff: String { return self._s[3570]! } - public var Conversation_AutoremoveOff: String { return self._s[3571]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[3572]! } - public var Weekday_Saturday: String { return self._s[3573]! } - public var DialogList_Unread: String { return self._s[3574]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[3575]! } - public var Stats_GroupPosters: String { return self._s[3576]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[3633]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3634]! } + public var ChatList_EmptyChatListNewMessage: String { return self._s[3635]! } + public var WallpaperSearch_ColorGreen: String { return self._s[3637]! } + public var PhotoEditor_BlurToolOff: String { return self._s[3638]! } + public var Conversation_AutoremoveOff: String { return self._s[3639]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[3640]! } + public var Weekday_Saturday: String { return self._s[3641]! } + public var DialogList_Unread: String { return self._s[3642]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[3643]! } + public var Stats_GroupPosters: String { return self._s[3644]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3577]!, self._r[3577]!, [_1]) + return formatWithArgumentRanges(self._s[3645]!, self._r[3645]!, [_1]) } - public var Conversation_AlsoClearCacheTitle: String { return self._s[3578]! } + public var Conversation_AlsoClearCacheTitle: String { return self._s[3646]! } public func Conversation_ForwardTooltip_TwoChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3579]!, self._r[3579]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3647]!, self._r[3647]!, [_0, _1]) } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3582]!, self._r[3582]!, [_0]) + return formatWithArgumentRanges(self._s[3650]!, self._r[3650]!, [_0]) } - public var ReportPeer_ReasonChildAbuse: String { return self._s[3583]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[3651]! } public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3584]!, self._r[3584]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3652]!, self._r[3652]!, [_1, _2]) } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[3585]! } - public var Conversation_EmailCopied: String { return self._s[3587]! } - public var AutoNightTheme_UseSunsetSunrise: String { return self._s[3588]! } - public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[3589]! } - public var Call_VoiceOver_VoiceCallCanceled: String { return self._s[3590]! } - public var Passport_Language_dv: String { return self._s[3591]! } - public var GroupPermission_AddSuccess: String { return self._s[3593]! } - public var Passport_Email_Help: String { return self._s[3594]! } - public var Call_ReportPlaceholder: String { return self._s[3595]! } - public var CreatePoll_AddOption: String { return self._s[3596]! } - public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3598]! } - public var PeerInfo_ButtonLeave: String { return self._s[3599]! } - public var PhotoEditor_TiltShift: String { return self._s[3602]! } - public var SecretGif_Title: String { return self._s[3604]! } - public var GroupInfo_InviteLinks: String { return self._s[3605]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[3606]! } - public var SocksProxySetup_Connecting: String { return self._s[3608]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3609]! } - public var ContactInfo_PhoneLabelWork: String { return self._s[3610]! } - public var Stats_GroupTopHoursTitle: String { return self._s[3611]! } - public var Compose_NewMessage: String { return self._s[3612]! } - public var VoiceOver_Common_SwitchHint: String { return self._s[3613]! } - public var NotificationsSound_Synth: String { return self._s[3614]! } - public var ChatImport_UserErrorNotMutual: String { return self._s[3615]! } - public var Conversation_FileOpenIn: String { return self._s[3616]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[3617]! } - public var UserInfo_SendMessage: String { return self._s[3618]! } - public var Checkout_PayWithFaceId: String { return self._s[3619]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[3653]! } + public var Conversation_EmailCopied: String { return self._s[3655]! } + public var AutoNightTheme_UseSunsetSunrise: String { return self._s[3656]! } + public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[3657]! } + public var Call_VoiceOver_VoiceCallCanceled: String { return self._s[3658]! } + public var VoiceChat_LateBy: String { return self._s[3659]! } + public var Passport_Language_dv: String { return self._s[3660]! } + public var GroupPermission_AddSuccess: String { return self._s[3662]! } + public var Passport_Email_Help: String { return self._s[3663]! } + public var Call_ReportPlaceholder: String { return self._s[3664]! } + public var CreatePoll_AddOption: String { return self._s[3665]! } + public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3667]! } + public var PeerInfo_ButtonLeave: String { return self._s[3668]! } + public var PhotoEditor_TiltShift: String { return self._s[3671]! } + public var SecretGif_Title: String { return self._s[3673]! } + public var GroupInfo_InviteLinks: String { return self._s[3674]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[3675]! } + public var SocksProxySetup_Connecting: String { return self._s[3677]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3678]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[3679]! } + public var Stats_GroupTopHoursTitle: String { return self._s[3680]! } + public var Compose_NewMessage: String { return self._s[3681]! } + public var VoiceOver_Common_SwitchHint: String { return self._s[3682]! } + public var NotificationsSound_Synth: String { return self._s[3683]! } + public var ChatImport_UserErrorNotMutual: String { return self._s[3684]! } + public var Conversation_FileOpenIn: String { return self._s[3685]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[3686]! } + public var UserInfo_SendMessage: String { return self._s[3687]! } + public var Checkout_PayWithFaceId: String { return self._s[3688]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3620]!, self._r[3620]!, [_0]) + return formatWithArgumentRanges(self._s[3689]!, self._r[3689]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[3621]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[3622]! } - public var Conversation_ViewChannel: String { return self._s[3623]! } + public var TextFormat_Strikethrough: String { return self._s[3690]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[3691]! } + public var Conversation_ViewChannel: String { return self._s[3692]! } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3624]!, self._r[3624]!, [_0]) + return formatWithArgumentRanges(self._s[3693]!, self._r[3693]!, [_0]) } - public var Channel_Stickers_Placeholder: String { return self._s[3625]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3626]! } - public var Message_ScamAccount: String { return self._s[3627]! } - public var Camera_FlashAuto: String { return self._s[3628]! } - public var Conversation_EncryptedDescription1: String { return self._s[3629]! } - public var LocalGroup_Text: String { return self._s[3630]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[3631]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[3632]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[3633]! } - public var Conversation_EncryptedDescription2: String { return self._s[3634]! } - public var Conversation_CancelForwardText: String { return self._s[3635]! } - public var Notification_GroupActivated: String { return self._s[3636]! } - public var LastSeen_Lately: String { return self._s[3637]! } - public var Conversation_EncryptedDescription3: String { return self._s[3638]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[3639]! } - public var Conversation_SwipeToReplyHintText: String { return self._s[3640]! } - public var Conversation_EncryptedDescription4: String { return self._s[3641]! } - public var SharedMedia_EmptyTitle: String { return self._s[3642]! } - public var Appearance_CreateTheme: String { return self._s[3643]! } - public var Stats_SharesPerPost: String { return self._s[3644]! } - public var Contacts_TabTitle: String { return self._s[3645]! } - public var Weekday_ShortThursday: String { return self._s[3646]! } - public var MessageTimer_Forever: String { return self._s[3647]! } - public var ChatListFolder_CategoryArchived: String { return self._s[3648]! } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3649]! } - public var EditTheme_Create_TopInfo: String { return self._s[3651]! } + public var Channel_Stickers_Placeholder: String { return self._s[3694]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3695]! } + public var Message_ScamAccount: String { return self._s[3696]! } + public var Camera_FlashAuto: String { return self._s[3697]! } + public var Conversation_EncryptedDescription1: String { return self._s[3698]! } + public var LocalGroup_Text: String { return self._s[3699]! } + public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[3700]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[3701]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[3702]! } + public var Conversation_EncryptedDescription2: String { return self._s[3703]! } + public var Conversation_CancelForwardText: String { return self._s[3704]! } + public var Notification_GroupActivated: String { return self._s[3705]! } + public var LastSeen_Lately: String { return self._s[3706]! } + public var Conversation_EncryptedDescription3: String { return self._s[3707]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[3708]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3709]! } + public var Conversation_EncryptedDescription4: String { return self._s[3710]! } + public var SharedMedia_EmptyTitle: String { return self._s[3711]! } + public var Appearance_CreateTheme: String { return self._s[3713]! } + public var Stats_SharesPerPost: String { return self._s[3714]! } + public var Contacts_TabTitle: String { return self._s[3715]! } + public var Weekday_ShortThursday: String { return self._s[3716]! } + public var MessageTimer_Forever: String { return self._s[3717]! } + public var ChatListFolder_CategoryArchived: String { return self._s[3718]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3719]! } + public var EditTheme_Create_TopInfo: String { return self._s[3721]! } public func VoiceOver_ChatList_MessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3652]!, self._r[3652]!, [_0]) + return formatWithArgumentRanges(self._s[3722]!, self._r[3722]!, [_0]) } - public var Month_GenDecember: String { return self._s[3653]! } - public var EnterPasscode_EnterPasscode: String { return self._s[3654]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3655]! } - public var PeopleNearby_CreateGroup: String { return self._s[3657]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3658]! } - public var Paint_ClearConfirm: String { return self._s[3659]! } - public var ChatList_ReadAll: String { return self._s[3660]! } - public var ChatSettings_IntentsSettings: String { return self._s[3661]! } - public var Passport_PassportInformation: String { return self._s[3663]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3665]! } - public var Location_ProximityNotification_DistanceMI: String { return self._s[3668]! } - public var PhotoEditor_ExposureTool: String { return self._s[3669]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[3670]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[3671]! } - public var Stats_GroupTopPoster_History: String { return self._s[3672]! } - public var UserInfo_AddPhone: String { return self._s[3673]! } - public var Media_SendWithTimer: String { return self._s[3675]! } - public var SettingsSearch_Synonyms_Notifications_Title: String { return self._s[3676]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3677]! } - public var GroupInfo_GroupHistoryShort: String { return self._s[3678]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[3679]! } - public var ChatList_Context_Unarchive: String { return self._s[3681]! } + public var Month_GenDecember: String { return self._s[3723]! } + public var EnterPasscode_EnterPasscode: String { return self._s[3724]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3725]! } + public var PeopleNearby_CreateGroup: String { return self._s[3727]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3728]! } + public var Paint_ClearConfirm: String { return self._s[3729]! } + public var ChatList_ReadAll: String { return self._s[3730]! } + public var ChatSettings_IntentsSettings: String { return self._s[3731]! } + public var Passport_PassportInformation: String { return self._s[3733]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3735]! } + public var Location_ProximityNotification_DistanceMI: String { return self._s[3738]! } + public var PhotoEditor_ExposureTool: String { return self._s[3739]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[3740]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[3741]! } + public var Stats_GroupTopPoster_History: String { return self._s[3742]! } + public var UserInfo_AddPhone: String { return self._s[3743]! } + public var Media_SendWithTimer: String { return self._s[3745]! } + public var SettingsSearch_Synonyms_Notifications_Title: String { return self._s[3746]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3747]! } + public var GroupInfo_GroupHistoryShort: String { return self._s[3748]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[3749]! } + public var ChatList_Context_Unarchive: String { return self._s[3751]! } public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3682]!, self._r[3682]!, [_0]) + return formatWithArgumentRanges(self._s[3752]!, self._r[3752]!, [_0]) } - public var BlockedUsers_Title: String { return self._s[3684]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[3685]! } - public var Media_ShareThisPhoto: String { return self._s[3686]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[3687]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[3688]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3692]! } - public var CallFeedback_ReasonNoise: String { return self._s[3694]! } - public var WebBrowser_Title: String { return self._s[3695]! } + public var BlockedUsers_Title: String { return self._s[3754]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[3755]! } + public var Media_ShareThisPhoto: String { return self._s[3756]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[3757]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[3758]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3762]! } + public var CallFeedback_ReasonNoise: String { return self._s[3764]! } + public var WebBrowser_Title: String { return self._s[3765]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3696]!, self._r[3696]!, [_0]) + return formatWithArgumentRanges(self._s[3766]!, self._r[3766]!, [_0]) } - public var Notification_MessageLifetime5s: String { return self._s[3698]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3699]! } - public var Profile_MessageLifetime1m: String { return self._s[3701]! } - public var Passport_ScanPassport: String { return self._s[3702]! } - public var Stats_LoadingTitle: String { return self._s[3703]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3705]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[3706]! } - public var Login_InvalidFirstNameError: String { return self._s[3707]! } - public var Undo_ChatCleared: String { return self._s[3709]! } + public var Notification_MessageLifetime5s: String { return self._s[3768]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3769]! } + public var Profile_MessageLifetime1m: String { return self._s[3771]! } + public var Passport_ScanPassport: String { return self._s[3772]! } + public var Stats_LoadingTitle: String { return self._s[3773]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3775]! } + public var Permissions_NotificationsAllow_v0: String { return self._s[3776]! } + public var Login_InvalidFirstNameError: String { return self._s[3777]! } + public var Undo_ChatCleared: String { return self._s[3779]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3711]!, self._r[3711]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3781]!, self._r[3781]!, [_1, _2]) } - public var Conversation_PinMessageAlertPin: String { return self._s[3712]! } + public var Conversation_PinMessageAlertPin: String { return self._s[3782]! } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3713]!, self._r[3713]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[3783]!, self._r[3783]!, [_1, _2, _3, _4, _5]) } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3714]!, self._r[3714]!, [_1]) + return formatWithArgumentRanges(self._s[3784]!, self._r[3784]!, [_1]) } - public var Share_MultipleMessagesDisabled: String { return self._s[3715]! } - public var TwoStepAuth_EmailInvalid: String { return self._s[3716]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3718]! } - public var VoiceChat_InviteLink_Speaker: String { return self._s[3719]! } - public var CallSettings_RecentCalls: String { return self._s[3720]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[3721]! } - public var AuthSessions_OtherSessions: String { return self._s[3722]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3723]! } - public var Tour_Text5: String { return self._s[3724]! } - public var Login_PadPhoneHelp: String { return self._s[3725]! } - public var Wallpaper_PhotoLibrary: String { return self._s[3727]! } - public var Conversation_ViewGroup: String { return self._s[3728]! } - public var PeopleNearby_MakeVisibleTitle: String { return self._s[3730]! } - public var VoiceOver_Chat_YourContact: String { return self._s[3731]! } - public var Watch_AuthRequired: String { return self._s[3732]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[3734]! } - public var Conversation_ForwardContacts: String { return self._s[3735]! } - public var Conversation_InputTextPlaceholder: String { return self._s[3736]! } + public var Share_MultipleMessagesDisabled: String { return self._s[3785]! } + public var TwoStepAuth_EmailInvalid: String { return self._s[3786]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3788]! } + public var VoiceChat_InviteLink_Speaker: String { return self._s[3789]! } + public var CallSettings_RecentCalls: String { return self._s[3790]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[3791]! } + public var AuthSessions_OtherSessions: String { return self._s[3792]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3793]! } + public var Tour_Text5: String { return self._s[3794]! } + public var Login_PadPhoneHelp: String { return self._s[3795]! } + public var Wallpaper_PhotoLibrary: String { return self._s[3798]! } + public var Conversation_ViewGroup: String { return self._s[3799]! } + public var PeopleNearby_MakeVisibleTitle: String { return self._s[3801]! } + public var VoiceOver_Chat_YourContact: String { return self._s[3802]! } + public var Watch_AuthRequired: String { return self._s[3803]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[3805]! } + public var Conversation_ForwardContacts: String { return self._s[3806]! } + public var Conversation_InputTextPlaceholder: String { return self._s[3807]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3737]!, self._r[3737]!, [_1]) + return formatWithArgumentRanges(self._s[3808]!, self._r[3808]!, [_1]) } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3738]!, self._r[3738]!, [_0]) + return formatWithArgumentRanges(self._s[3809]!, self._r[3809]!, [_0]) } - public var Channel_Setup_TypePrivate: String { return self._s[3739]! } + public var Channel_Setup_TypePrivate: String { return self._s[3810]! } public func Conversation_NoticeInvitedByInChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3740]!, self._r[3740]!, [_0]) + return formatWithArgumentRanges(self._s[3811]!, self._r[3811]!, [_0]) } - public var InviteLink_Create_TimeLimitExpiryDate: String { return self._s[3741]! } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[3742]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[3743]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[3744]! } - public var UserInfo_StartSecretChatStart: String { return self._s[3745]! } + public var Checkout_OptionalTipItemPlaceholder: String { return self._s[3812]! } + public var InviteLink_Create_TimeLimitExpiryDate: String { return self._s[3813]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[3814]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[3815]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[3816]! } + public var UserInfo_StartSecretChatStart: String { return self._s[3817]! } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3746]!, self._r[3746]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3818]!, self._r[3818]!, [_1, _2]) } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3747]!, self._r[3747]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[3819]!, self._r[3819]!, [_0, _1, _2]) } public func Conversation_ForwardTooltip_TwoChats_Many(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3748]!, self._r[3748]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3820]!, self._r[3820]!, [_0, _1]) } - public var PrivacySettings_AutoArchiveTitle: String { return self._s[3749]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[3750]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[3751]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[3753]! } - public var NewContact_Title: String { return self._s[3756]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3757]! } - public var VoiceChat_StatusSpeaking: String { return self._s[3758]! } - public var Notifications_PermissionsKeepDisabled: String { return self._s[3759]! } + public var PrivacySettings_AutoArchiveTitle: String { return self._s[3821]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[3822]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[3823]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[3825]! } + public var NewContact_Title: String { return self._s[3828]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3829]! } + public var VoiceChat_StatusSpeaking: String { return self._s[3830]! } + public var Notifications_PermissionsKeepDisabled: String { return self._s[3831]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3760]!, self._r[3760]!, [_0]) + return formatWithArgumentRanges(self._s[3832]!, self._r[3832]!, [_0]) } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3761]!, self._r[3761]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3833]!, self._r[3833]!, [_0, _1]) } - public var Chat_SlowmodeTooltipPending: String { return self._s[3762]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[3834]! } public func Time_MediumDate(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3764]!, self._r[3764]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3836]!, self._r[3836]!, [_1, _2]) } - public var ContactInfo_PhoneLabelHome: String { return self._s[3765]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3766]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[3767]! } - public func PUSH_MESSAGE_DOCS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3770]!, self._r[3770]!, [_1, "\(_2)"]) - } - public var Conversation_MessageEditedLabel: String { return self._s[3771]! } - public var CallList_ActiveVoiceChatsHeader: String { return self._s[3772]! } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3773]! } - public var ChatList_Context_AddToContacts: String { return self._s[3774]! } - public var Passport_Language_is: String { return self._s[3775]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[3776]! } - public var PhotoEditor_CurvesBlue: String { return self._s[3777]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[3837]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3838]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[3839]! } + public var Conversation_MessageEditedLabel: String { return self._s[3842]! } + public var CallList_ActiveVoiceChatsHeader: String { return self._s[3843]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3844]! } + public var ChatList_Context_AddToContacts: String { return self._s[3845]! } + public var Passport_Language_is: String { return self._s[3846]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[3847]! } + public var PhotoEditor_CurvesBlue: String { return self._s[3848]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3778]!, self._r[3778]!, [_0]) + return formatWithArgumentRanges(self._s[3849]!, self._r[3849]!, [_0]) } - public var SocksProxySetup_Username: String { return self._s[3779]! } - public var Login_SmsRequestState3: String { return self._s[3780]! } - public var Message_PinnedVideoMessage: String { return self._s[3781]! } - public var SharedMedia_TitleLink: String { return self._s[3782]! } - public var Passport_FieldIdentity: String { return self._s[3783]! } - public var GroupInfo_Permissions_BroadcastConvert: String { return self._s[3785]! } + public var SocksProxySetup_Username: String { return self._s[3850]! } + public var Login_SmsRequestState3: String { return self._s[3851]! } + public var Message_PinnedVideoMessage: String { return self._s[3852]! } + public var SharedMedia_TitleLink: String { return self._s[3853]! } + public var Passport_FieldIdentity: String { return self._s[3854]! } + public var GroupInfo_Permissions_BroadcastConvert: String { return self._s[3856]! } public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3788]!, self._r[3788]!, [_0]) + return formatWithArgumentRanges(self._s[3859]!, self._r[3859]!, [_0]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[3791]! } - public var ReportSpam_DeleteThisChat: String { return self._s[3792]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3793]! } - public var Passport_Identity_DateOfBirth: String { return self._s[3794]! } - public var Call_StatusIncoming: String { return self._s[3795]! } - public var ChatAdmins_AdminLabel: String { return self._s[3796]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[3862]! } + public var ReportSpam_DeleteThisChat: String { return self._s[3863]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3864]! } + public var Passport_Identity_DateOfBirth: String { return self._s[3865]! } + public var Call_StatusIncoming: String { return self._s[3866]! } + public var ChatAdmins_AdminLabel: String { return self._s[3867]! } public func InstantPage_OpenInBrowser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3797]!, self._r[3797]!, [_0]) + return formatWithArgumentRanges(self._s[3868]!, self._r[3868]!, [_0]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3799]!, self._r[3799]!, [_0]) + return formatWithArgumentRanges(self._s[3870]!, self._r[3870]!, [_0]) } - public var Message_PinnedAnimationMessage: String { return self._s[3800]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[3801]! } - public var Preview_CopyAddress: String { return self._s[3802]! } - public var MediaPlayer_UnknownTrack: String { return self._s[3804]! } - public var Login_CancelSignUpConfirmation: String { return self._s[3805]! } - public var Map_OpenInYandexMaps: String { return self._s[3807]! } + public var Message_PinnedAnimationMessage: String { return self._s[3871]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[3872]! } + public var Preview_CopyAddress: String { return self._s[3873]! } + public var MediaPlayer_UnknownTrack: String { return self._s[3875]! } + public var Login_CancelSignUpConfirmation: String { return self._s[3876]! } + public var Map_OpenInYandexMaps: String { return self._s[3878]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3810]!, self._r[3810]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3881]!, self._r[3881]!, [_1, _2, _3]) } - public var GroupRemoved_Remove: String { return self._s[3811]! } - public var ChatListFolder_TitleCreate: String { return self._s[3812]! } + public var GroupRemoved_Remove: String { return self._s[3882]! } + public var ChatListFolder_TitleCreate: String { return self._s[3883]! } public func InstantPage_AuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3814]!, self._r[3814]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3885]!, self._r[3885]!, [_1, _2]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[3815]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[3886]! } public func UserInfo_LinkForwardTooltip_TwoChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3817]!, self._r[3817]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3888]!, self._r[3888]!, [_0, _1]) } - public var Group_UpgradeNoticeText2: String { return self._s[3818]! } - public var Stats_GroupGrowthTitle: String { return self._s[3819]! } - public var CreatePoll_CancelConfirmation: String { return self._s[3822]! } - public var Month_GenOctober: String { return self._s[3823]! } - public var Conversation_TitleCommentsEmpty: String { return self._s[3824]! } - public var Settings_Appearance: String { return self._s[3825]! } + public var Group_UpgradeNoticeText2: String { return self._s[3889]! } + public var Stats_GroupGrowthTitle: String { return self._s[3890]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3893]! } + public var Month_GenOctober: String { return self._s[3894]! } + public var Conversation_TitleCommentsEmpty: String { return self._s[3895]! } + public var Settings_Appearance: String { return self._s[3896]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3826]!, self._r[3826]!, [_0]) + return formatWithArgumentRanges(self._s[3897]!, self._r[3897]!, [_0]) } - public var UserInfo_AddToExisting: String { return self._s[3827]! } - public var Call_PhoneCallInProgressMessage: String { return self._s[3829]! } - public var Map_HomeAndWorkInfo: String { return self._s[3830]! } - public var InstantPage_VoiceOver_ResetFontSize: String { return self._s[3831]! } - public var Paint_Arrow: String { return self._s[3832]! } - public var InviteLink_CreatePrivateLinkHelp: String { return self._s[3833]! } + public var UserInfo_AddToExisting: String { return self._s[3898]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3900]! } + public var Map_HomeAndWorkInfo: String { return self._s[3901]! } + public var InstantPage_VoiceOver_ResetFontSize: String { return self._s[3902]! } + public var Paint_Arrow: String { return self._s[3903]! } + public var InviteLink_CreatePrivateLinkHelp: String { return self._s[3904]! } public func DialogList_MultipleTypingPair(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3905]!, self._r[3905]!, [_0, _1]) } - public var CancelResetAccount_Title: String { return self._s[3835]! } - public var NotificationsSound_Circles: String { return self._s[3836]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[3837]! } - public var ChatState_Connecting: String { return self._s[3839]! } - public var Profile_MessageLifetime5s: String { return self._s[3840]! } + public var CancelResetAccount_Title: String { return self._s[3906]! } + public var NotificationsSound_Circles: String { return self._s[3907]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[3908]! } + public var ChatState_Connecting: String { return self._s[3910]! } + public var Profile_MessageLifetime5s: String { return self._s[3911]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3841]!, self._r[3841]!, [_0]) + return formatWithArgumentRanges(self._s[3912]!, self._r[3912]!, [_0]) } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[3842]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[3843]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3844]! } - public var Conversation_DefaultRestrictedStickers: String { return self._s[3846]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[3847]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[3913]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[3914]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3915]! } + public var Conversation_DefaultRestrictedStickers: String { return self._s[3917]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[3918]! } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3848]!, self._r[3848]!, [_0]) + return formatWithArgumentRanges(self._s[3919]!, self._r[3919]!, [_0]) } - public var Passport_Phone_Help: String { return self._s[3849]! } - public var Privacy_ContactsSync: String { return self._s[3850]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3851]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[3853]! } - public var Map_SendMyCurrentLocation: String { return self._s[3854]! } - public var Map_AddressOnMap: String { return self._s[3855]! } - public var BroadcastGroups_ConfirmationAlert_Convert: String { return self._s[3857]! } - public var DialogList_SearchLabel: String { return self._s[3858]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3859]! } - public var GroupInfo_FakeGroupWarning: String { return self._s[3860]! } - public var Conversation_ChecksTooltip_Read: String { return self._s[3862]! } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3863]! } - public var ChatList_Search_ShowMore: String { return self._s[3864]! } - public var DialogList_EncryptionRejected: String { return self._s[3865]! } - public var VoiceChat_InviteLinkCopiedText: String { return self._s[3866]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[3867]! } - public var VoiceChat_StartRecordingText: String { return self._s[3868]! } - public var Privacy_TopPeersDelete: String { return self._s[3869]! } - public var AttachmentMenu_SendAsFile: String { return self._s[3871]! } - public var ChatList_GenericPsaAlert: String { return self._s[3873]! } - public var SecretTimer_ImageDescription: String { return self._s[3875]! } + public var Passport_Phone_Help: String { return self._s[3920]! } + public var Privacy_ContactsSync: String { return self._s[3921]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3922]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[3924]! } + public var Map_SendMyCurrentLocation: String { return self._s[3925]! } + public var Map_AddressOnMap: String { return self._s[3926]! } + public var BroadcastGroups_ConfirmationAlert_Convert: String { return self._s[3928]! } + public var DialogList_SearchLabel: String { return self._s[3929]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3930]! } + public var GroupInfo_FakeGroupWarning: String { return self._s[3931]! } + public var Conversation_ChecksTooltip_Read: String { return self._s[3933]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3935]! } + public var ChatList_Search_ShowMore: String { return self._s[3936]! } + public var DialogList_EncryptionRejected: String { return self._s[3937]! } + public var VoiceChat_InviteLinkCopiedText: String { return self._s[3938]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[3939]! } + public var VoiceChat_StartRecordingText: String { return self._s[3940]! } + public var Privacy_TopPeersDelete: String { return self._s[3941]! } + public var AttachmentMenu_SendAsFile: String { return self._s[3943]! } + public var ChatList_GenericPsaAlert: String { return self._s[3945]! } + public var SecretTimer_ImageDescription: String { return self._s[3947]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3876]!, self._r[3876]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3948]!, self._r[3948]!, [_0, _1]) } - public var VoiceChat_EditNameSuccess: String { return self._s[3877]! } - public var ChatSettings_TextSizeUnits: String { return self._s[3878]! } - public var Notification_RenamedGroup: String { return self._s[3880]! } - public var Tour_Title2: String { return self._s[3881]! } - public var Settings_CopyUsername: String { return self._s[3882]! } - public var Compose_NewEncryptedChat: String { return self._s[3883]! } - public var Conversation_CloudStorageInfo_Title: String { return self._s[3884]! } - public var Month_ShortSeptember: String { return self._s[3885]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[3886]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[3887]! } - public var Call_StatusConnecting: String { return self._s[3889]! } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[3890]! } - public var Map_ShareLiveLocationHelp: String { return self._s[3891]! } - public var Cache_Files: String { return self._s[3892]! } - public var Notifications_Reset: String { return self._s[3893]! } + public var VoiceChat_EditNameSuccess: String { return self._s[3949]! } + public var ChatSettings_TextSizeUnits: String { return self._s[3950]! } + public var Notification_RenamedGroup: String { return self._s[3952]! } + public var Tour_Title2: String { return self._s[3953]! } + public var Settings_CopyUsername: String { return self._s[3954]! } + public var Compose_NewEncryptedChat: String { return self._s[3955]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[3956]! } + public var VoiceChat_SetReminder: String { return self._s[3957]! } + public var Month_ShortSeptember: String { return self._s[3958]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[3959]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[3960]! } + public var VoiceChat_StartNow: String { return self._s[3961]! } + public var Call_StatusConnecting: String { return self._s[3963]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[3964]! } + public var Map_ShareLiveLocationHelp: String { return self._s[3965]! } + public var Cache_Files: String { return self._s[3966]! } + public var Notifications_Reset: String { return self._s[3967]! } public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3894]!, self._r[3894]!, [_0]) + return formatWithArgumentRanges(self._s[3968]!, self._r[3968]!, [_0]) } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[3895]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[3969]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3896]!, self._r[3896]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3970]!, self._r[3970]!, [_1, _2]) } - public var Notification_CallIncomingShort: String { return self._s[3897]! } - public var UserInfo_BotPrivacy: String { return self._s[3900]! } - public var Appearance_BubbleCorners_Apply: String { return self._s[3901]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3902]! } - public var Conversation_ContextMenuLookUp: String { return self._s[3904]! } - public var Calls_RatingTitle: String { return self._s[3905]! } - public var SecretImage_Title: String { return self._s[3906]! } - public var Weekday_Monday: String { return self._s[3907]! } + public var Notification_CallIncomingShort: String { return self._s[3971]! } + public var UserInfo_BotPrivacy: String { return self._s[3974]! } + public var Appearance_BubbleCorners_Apply: String { return self._s[3975]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3976]! } + public var Conversation_ContextMenuLookUp: String { return self._s[3978]! } + public var Calls_RatingTitle: String { return self._s[3979]! } + public var SecretImage_Title: String { return self._s[3980]! } + public var Weekday_Monday: String { return self._s[3981]! } public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3908]!, self._r[3908]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3982]!, self._r[3982]!, [_1, _2]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3909]! } - public var VoiceChat_InviteLink_CopySpeakerLink: String { return self._s[3910]! } - public var Invitation_JoinVoiceChatAsListener: String { return self._s[3911]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3983]! } + public var VoiceChat_InviteLink_CopySpeakerLink: String { return self._s[3984]! } + public var Invitation_JoinVoiceChatAsListener: String { return self._s[3985]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3912]!, self._r[3912]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3986]!, self._r[3986]!, [_1, _2]) } - public var Stats_GroupMembers: String { return self._s[3913]! } - public var Camera_Retake: String { return self._s[3914]! } - public var Conversation_SearchPlaceholder: String { return self._s[3916]! } + public var Stats_GroupMembers: String { return self._s[3987]! } + public var Camera_Retake: String { return self._s[3988]! } + public var Conversation_SearchPlaceholder: String { return self._s[3990]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3917]!, self._r[3917]!, [_0]) + return formatWithArgumentRanges(self._s[3991]!, self._r[3991]!, [_0]) } - public var Channel_DiscussionGroup_Info: String { return self._s[3918]! } - public var SocksProxySetup_Hostname: String { return self._s[3919]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3920]! } - public var Privacy_DeleteDrafts: String { return self._s[3922]! } - public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3923]!, self._r[3923]!, [_1, _1, _1, _2]) - } - public var Login_CancelPhoneVerification: String { return self._s[3925]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3926]! } - public var VoiceOver_Chat_Profile: String { return self._s[3927]! } + public var Channel_DiscussionGroup_Info: String { return self._s[3992]! } + public var SocksProxySetup_Hostname: String { return self._s[3993]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3994]! } + public var Privacy_DeleteDrafts: String { return self._s[3996]! } + public var Login_CancelPhoneVerification: String { return self._s[3998]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3999]! } + public var VoiceOver_Chat_Profile: String { return self._s[4000]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3928]!, self._r[3928]!, [_0]) + return formatWithArgumentRanges(self._s[4001]!, self._r[4001]!, [_0]) } - public var TwoStepAuth_EmailSent: String { return self._s[3929]! } - public var Cache_Indexing: String { return self._s[3930]! } - public var Notifications_ExceptionsNone: String { return self._s[3931]! } - public var MessagePoll_LabelQuiz: String { return self._s[3932]! } - public var Call_EncryptionKey_Title: String { return self._s[3933]! } - public var Common_Yes: String { return self._s[3934]! } - public var Channel_ErrorAddBlocked: String { return self._s[3935]! } - public var Month_GenJanuary: String { return self._s[3936]! } - public var Checkout_NewCard_Title: String { return self._s[3937]! } + public var TwoStepAuth_EmailSent: String { return self._s[4002]! } + public var Cache_Indexing: String { return self._s[4003]! } + public var Notifications_ExceptionsNone: String { return self._s[4004]! } + public var MessagePoll_LabelQuiz: String { return self._s[4005]! } + public var Call_EncryptionKey_Title: String { return self._s[4006]! } + public var Common_Yes: String { return self._s[4007]! } + public var Channel_ErrorAddBlocked: String { return self._s[4008]! } + public var Month_GenJanuary: String { return self._s[4009]! } + public var Checkout_NewCard_Title: String { return self._s[4010]! } public func TwoStepAuth_EnterPasswordHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3938]!, self._r[3938]!, [_0]) + return formatWithArgumentRanges(self._s[4011]!, self._r[4011]!, [_0]) } - public var Conversation_InputTextPlaceholderReply: String { return self._s[3940]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3941]! } - public var Conversation_SendDice: String { return self._s[3942]! } + public var Conversation_InputTextPlaceholderReply: String { return self._s[4013]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[4014]! } + public var Conversation_SendDice: String { return self._s[4015]! } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3943]!, self._r[3943]!, [_0]) + return formatWithArgumentRanges(self._s[4016]!, self._r[4016]!, [_0]) } public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3944]!, self._r[3944]!, [_0]) + return formatWithArgumentRanges(self._s[4017]!, self._r[4017]!, [_0]) } - public var Weekday_Wednesday: String { return self._s[3945]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[3946]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[3947]! } - public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[3948]! } - public var OldChannels_NoticeTitle: String { return self._s[3949]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[3950]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[3951]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[3952]! } - public var Passport_Address_AddUtilityBill: String { return self._s[3953]! } + public var Weekday_Wednesday: String { return self._s[4018]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[4019]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[4020]! } + public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[4021]! } + public var OldChannels_NoticeTitle: String { return self._s[4022]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[4023]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[4024]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[4025]! } + public var Passport_Address_AddUtilityBill: String { return self._s[4026]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3955]!, self._r[3955]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4028]!, self._r[4028]!, [_1, _2, _3]) } - public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[3957]! } - public var Stats_GroupTopAdminsTitle: String { return self._s[3958]! } - public var Paint_Regular: String { return self._s[3959]! } - public var Message_Contact: String { return self._s[3960]! } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[3961]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[3962]! } - public var Notification_Mute1hMin: String { return self._s[3963]! } + public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[4030]! } + public var Stats_GroupTopAdminsTitle: String { return self._s[4031]! } + public var Paint_Regular: String { return self._s[4033]! } + public var Message_Contact: String { return self._s[4034]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[4035]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[4036]! } + public var Notification_Mute1hMin: String { return self._s[4037]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3964]!, self._r[3964]!, [_0]) - } - public var Profile_MessageLifetime1h: String { return self._s[3965]! } - public var TwoStepAuth_GenericHelp: String { return self._s[3966]! } - public var TextFormat_Monospace: String { return self._s[3967]! } - public var VoiceOver_Media_PlaybackRateChange: String { return self._s[3969]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3970]! } - public var ChatList_DeleteChat: String { return self._s[3971]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[3974]! } - public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3975]!, self._r[3975]!, [_1, _2, _3, _4]) - } - public var Login_CancelPhoneVerificationStop: String { return self._s[3976]! } - public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[3977]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[3978]! } - public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3979]!, self._r[3979]!, [_0]) - } - public var Notifications_Badge_IncludeChannels: String { return self._s[3980]! } - public var InviteLink_CreatePrivateLinkHelpChannel: String { return self._s[3981]! } - public var StickerPack_ViewPack: String { return self._s[3984]! } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[3986]! } - public var EditTheme_Expand_Preview_IncomingText: String { return self._s[3987]! } - public var Notifications_Title: String { return self._s[3988]! } - public var Conversation_InputTextPlaceholderComment: String { return self._s[3989]! } - public var GroupInfo_PublicLink: String { return self._s[3990]! } - public var VoiceOver_DiscardPreparedContent: String { return self._s[3991]! } - public var Conversation_Moderate_Ban: String { return self._s[3995]! } - public var InviteLink_Manage: String { return self._s[3996]! } - public var InstantPage_FontNewYork: String { return self._s[3997]! } - public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3998]!, self._r[3998]!, [_0]) - } - public var TextFormat_Underline: String { return self._s[3999]! } - public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4000]!, self._r[4000]!, [_0, _1]) - } - public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4001]!, self._r[4001]!, [_1]) - } - public var PollResults_Collapse: String { return self._s[4003]! } - public var Contacts_GlobalSearch: String { return self._s[4004]! } - public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4006]!, self._r[4006]!, [_0]) - } - public var Channel_Management_LabelEditor: String { return self._s[4007]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[4009]! } - public var Conversation_Theme: String { return self._s[4010]! } - public func PUSH_CHANNEL_MESSAGE_DOCS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4011]!, self._r[4011]!, [_1, "\(_2)"]) - } - public var Conversation_LinkDialogSave: String { return self._s[4012]! } - public var EnterPasscode_TouchId: String { return self._s[4013]! } - public var Conversation_VoiceChatMediaRecordingRestricted: String { return self._s[4014]! } - public var Group_ErrorAdminsTooMuch: String { return self._s[4015]! } - public var Stats_MessageOverview: String { return self._s[4016]! } - public var Privacy_Calls_P2PAlways: String { return self._s[4018]! } - public var Message_Sticker: String { return self._s[4019]! } - public var Conversation_Mute: String { return self._s[4022]! } - public var VoiceChat_AnonymousDisabledAlertText: String { return self._s[4023]! } - public var ContactInfo_Title: String { return self._s[4024]! } - public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4025]!, self._r[4025]!, [_1]) - } - public var Channel_Setup_TypeHeader: String { return self._s[4026]! } - public var AuthSessions_LogOut: String { return self._s[4027]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[4028]! } - public var VoiceChat_PinVideo: String { return self._s[4029]! } - public var Group_Info_Members: String { return self._s[4031]! } - public var ChatListFolderSettings_NewFolder: String { return self._s[4032]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[4033]! } - public var CreatePoll_Title: String { return self._s[4034]! } - public var EditTheme_EditTitle: String { return self._s[4035]! } - public var ChatListFolderSettings_RecommendedFoldersSection: String { return self._s[4036]! } - public var TwoStepAuth_SetPassword: String { return self._s[4037]! } - public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4038]!, self._r[4038]!, [_0]) } - public var BlockedUsers_Info: String { return self._s[4039]! } - public var AuthSessions_Sessions: String { return self._s[4040]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4041]! } - public var Common_ActionNotAllowedError: String { return self._s[4042]! } - public var WebPreview_GettingLinkInfo: String { return self._s[4043]! } - public var Appearance_AppIconFilledX: String { return self._s[4044]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[4045]! } - public var FeaturedStickers_OtherSection: String { return self._s[4046]! } - public var VoiceChat_RecordingStarted: String { return self._s[4047]! } - public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[4048]! } - public var Profile_Username: String { return self._s[4049]! } - public var Appearance_RemoveTheme: String { return self._s[4050]! } - public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[4051]! } - public var Message_PinnedStickerMessage: String { return self._s[4052]! } - public var AccessDenied_VideoMicrophone: String { return self._s[4053]! } - public var WallpaperPreview_CustomColorBottomText: String { return self._s[4054]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[4055]! } - public var Conversation_VoiceChat: String { return self._s[4056]! } - public var VoiceChat_EditBioSuccess: String { return self._s[4057]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[4058]! } - public var TwoStepAuth_Title: String { return self._s[4059]! } - public var VoiceOver_Chat_YourAnimatedSticker: String { return self._s[4060]! } - public var Checkout_WebConfirmation_Title: String { return self._s[4061]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[4062]! } - public var ChatListFolder_CategoryGroups: String { return self._s[4064]! } - public var Stats_GroupTopInviter_Promote: String { return self._s[4065]! } - public var Conversation_EditingPhotoPanelTitle: String { return self._s[4066]! } - public var Month_GenJuly: String { return self._s[4067]! } - public var Passport_Identity_Gender: String { return self._s[4068]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[4069]! } - public var Notification_Exceptions_DeleteAll: String { return self._s[4070]! } - public var VoiceChat_StopRecording: String { return self._s[4071]! } + public var Profile_MessageLifetime1h: String { return self._s[4039]! } + public var TwoStepAuth_GenericHelp: String { return self._s[4040]! } + public var TextFormat_Monospace: String { return self._s[4041]! } + public var VoiceOver_Media_PlaybackRateChange: String { return self._s[4043]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[4044]! } + public var ChatList_DeleteChat: String { return self._s[4045]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[4048]! } + public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4049]!, self._r[4049]!, [_1, _2, _3, _4]) + } + public var Login_CancelPhoneVerificationStop: String { return self._s[4050]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[4051]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[4052]! } + public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4053]!, self._r[4053]!, [_0]) + } + public var Notifications_Badge_IncludeChannels: String { return self._s[4054]! } + public var InviteLink_CreatePrivateLinkHelpChannel: String { return self._s[4055]! } + public var StickerPack_ViewPack: String { return self._s[4058]! } + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[4060]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[4061]! } + public var Notifications_Title: String { return self._s[4062]! } + public var Conversation_InputTextPlaceholderComment: String { return self._s[4063]! } + public var GroupInfo_PublicLink: String { return self._s[4064]! } + public func ScheduleVoiceChat_GroupText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4065]!, self._r[4065]!, [_0]) + } + public var VoiceOver_DiscardPreparedContent: String { return self._s[4066]! } + public var Conversation_Moderate_Ban: String { return self._s[4070]! } + public var InviteLink_Manage: String { return self._s[4071]! } + public var InstantPage_FontNewYork: String { return self._s[4072]! } + public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4073]!, self._r[4073]!, [_0]) + } + public var TextFormat_Underline: String { return self._s[4074]! } + public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4075]!, self._r[4075]!, [_0, _1]) + } + public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4076]!, self._r[4076]!, [_1]) + } + public var PollResults_Collapse: String { return self._s[4078]! } + public var Contacts_GlobalSearch: String { return self._s[4079]! } + public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4081]!, self._r[4081]!, [_0]) + } + public var Channel_Management_LabelEditor: String { return self._s[4082]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[4084]! } + public var Conversation_Theme: String { return self._s[4085]! } + public func PUSH_CHANNEL_MESSAGE_DOCS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4086]!, self._r[4086]!, [_1, "\(_2)"]) + } + public var Conversation_LinkDialogSave: String { return self._s[4087]! } + public var EnterPasscode_TouchId: String { return self._s[4088]! } + public var Conversation_VoiceChatMediaRecordingRestricted: String { return self._s[4089]! } + public var Group_ErrorAdminsTooMuch: String { return self._s[4090]! } + public var Stats_MessageOverview: String { return self._s[4091]! } + public var Privacy_Calls_P2PAlways: String { return self._s[4093]! } + public var Message_Sticker: String { return self._s[4094]! } + public var Conversation_Mute: String { return self._s[4097]! } + public var VoiceChat_AnonymousDisabledAlertText: String { return self._s[4098]! } + public var ContactInfo_Title: String { return self._s[4099]! } + public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4100]!, self._r[4100]!, [_1]) + } + public var Channel_Setup_TypeHeader: String { return self._s[4101]! } + public var AuthSessions_LogOut: String { return self._s[4102]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[4103]! } + public var VoiceChat_PinVideo: String { return self._s[4104]! } + public var Group_Info_Members: String { return self._s[4106]! } + public var ChatListFolderSettings_NewFolder: String { return self._s[4107]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[4108]! } + public var CreatePoll_Title: String { return self._s[4109]! } + public var EditTheme_EditTitle: String { return self._s[4110]! } + public var ChatListFolderSettings_RecommendedFoldersSection: String { return self._s[4111]! } + public var TwoStepAuth_SetPassword: String { return self._s[4112]! } + public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4113]!, self._r[4113]!, [_0]) + } + public var BlockedUsers_Info: String { return self._s[4114]! } + public var AuthSessions_Sessions: String { return self._s[4115]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4116]! } + public var Common_ActionNotAllowedError: String { return self._s[4117]! } + public var WebPreview_GettingLinkInfo: String { return self._s[4118]! } + public var Appearance_AppIconFilledX: String { return self._s[4119]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[4120]! } + public var FeaturedStickers_OtherSection: String { return self._s[4121]! } + public var VoiceChat_RecordingStarted: String { return self._s[4122]! } + public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[4123]! } + public var Profile_Username: String { return self._s[4124]! } + public var Settings_TipsUsername: String { return self._s[4125]! } + public var Appearance_RemoveTheme: String { return self._s[4126]! } + public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[4127]! } + public var Message_PinnedStickerMessage: String { return self._s[4128]! } + public var AccessDenied_VideoMicrophone: String { return self._s[4129]! } + public var WallpaperPreview_CustomColorBottomText: String { return self._s[4130]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[4131]! } + public var Conversation_VoiceChat: String { return self._s[4132]! } + public var VoiceChat_EditBioSuccess: String { return self._s[4133]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[4134]! } + public var TwoStepAuth_Title: String { return self._s[4135]! } + public var VoiceOver_Chat_YourAnimatedSticker: String { return self._s[4136]! } + public var Checkout_WebConfirmation_Title: String { return self._s[4137]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[4138]! } + public var ChatListFolder_CategoryGroups: String { return self._s[4140]! } + public var Stats_GroupTopInviter_Promote: String { return self._s[4141]! } + public var Conversation_EditingPhotoPanelTitle: String { return self._s[4142]! } + public var Month_GenJuly: String { return self._s[4143]! } + public var Passport_Identity_Gender: String { return self._s[4144]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[4145]! } + public var Notification_Exceptions_DeleteAll: String { return self._s[4146]! } + public var VoiceChat_StopRecording: String { return self._s[4147]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4072]!, self._r[4072]!, [_0]) - } - public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4073]!, self._r[4073]!, [_0, _1, _2]) - } - public var Login_CodeSentSms: String { return self._s[4074]! } - public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4075]!, self._r[4075]!, [_0]) - } - public var Login_CallRequestState2: String { return self._s[4076]! } - public var Channel_DiscussionGroup_Header: String { return self._s[4077]! } - public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_0]) - } - public var Passport_Language_ms: String { return self._s[4079]! } - public var PeopleNearby_MakeInvisible: String { return self._s[4081]! } - public var ChatList_Search_FilterVoice: String { return self._s[4083]! } - public var Camera_TapAndHoldForVideo: String { return self._s[4085]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[4086]! } - public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4087]!, self._r[4087]!, [_0]) - } - public func Call_VoiceChatInProgressMessageCall(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4088]!, self._r[4088]!, [_1, _2]) - } - public var Map_Locating: String { return self._s[4089]! } - public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4091]!, self._r[4091]!, [_0]) - } - public var Passport_Identity_TypeInternalPassport: String { return self._s[4093]! } - public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[4094]! } - public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[4095]! } - public var Stickers_Installed: String { return self._s[4096]! } - public var Notifications_PermissionsAllowInSettings: String { return self._s[4097]! } - public var StickerPackActionInfo_RemovedTitle: String { return self._s[4098]! } - public var CallSettings_Never: String { return self._s[4100]! } - public var Channel_Setup_TypePublicHelp: String { return self._s[4101]! } - public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4103]!, self._r[4103]!, [_0]) - } - public var Message_Game: String { return self._s[4104]! } - public var Call_Message: String { return self._s[4105]! } - public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4106]!, self._r[4106]!, [_1]) - } - public var ChannelIntro_Text: String { return self._s[4107]! } - public var StickerPack_Send: String { return self._s[4108]! } - public var Share_AuthDescription: String { return self._s[4109]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[4110]! } - public var CallFeedback_WhatWentWrong: String { return self._s[4111]! } - public var Common_Create: String { return self._s[4114]! } - public var Passport_Language_hy: String { return self._s[4115]! } - public var CreatePoll_Explanation: String { return self._s[4116]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[4117]! } - public var ChatImport_CreateGroupAlertImportAction: String { return self._s[4118]! } - public var PeerInfo_ButtonVoiceChat: String { return self._s[4119]! } - public var Undo_ChatClearedForBothSides: String { return self._s[4120]! } - public var DialogList_NoMessagesTitle: String { return self._s[4121]! } - public var GroupInfo_Title: String { return self._s[4123]! } - public var UserInfo_ContactForwardTooltip_SavedMessages_One: String { return self._s[4124]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[4125]! } - public var PhoneNumberHelp_Help: String { return self._s[4126]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4127]! } - public var Settings_Logout: String { return self._s[4128]! } - public var Privacy_PaymentsTitle: String { return self._s[4129]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[4130]! } - public var Tour_Text6: String { return self._s[4131]! } - public var ChatImportActivity_Title: String { return self._s[4133]! } - public var Channel_Username_Help: String { return self._s[4134]! } - public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[4135]! } - public var AttachmentMenu_Poll: String { return self._s[4136]! } - public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[4137]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[4138]! } - public var Passport_DeletePassport: String { return self._s[4139]! } - public var Login_Code: String { return self._s[4140]! } - public var Notification_SecretChatScreenshot: String { return self._s[4141]! } - public var VoiceChat_AddBio: String { return self._s[4142]! } - public var Login_CodeFloodError: String { return self._s[4143]! } - public func Notification_PinnedAnimationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4144]!, self._r[4144]!, [_0]) - } - public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4145]!, self._r[4145]!, [_0]) - } - public var Watch_Stickers_Recents: String { return self._s[4146]! } - public var Generic_ErrorMoreInfo: String { return self._s[4147]! } - public func Call_AccountIsLoggedOnCurrentDevice(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4148]!, self._r[4148]!, [_0]) } - public var AutoDownloadSettings_DataUsage: String { return self._s[4149]! } - public var Conversation_ViewTheme: String { return self._s[4150]! } - public var Contacts_InviteSearchLabel: String { return self._s[4151]! } - public var Settings_CancelUpload: String { return self._s[4153]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[4154]! } + public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4149]!, self._r[4149]!, [_0, _1, _2]) + } + public var Login_CodeSentSms: String { return self._s[4150]! } + public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4151]!, self._r[4151]!, [_0]) + } + public var Login_CallRequestState2: String { return self._s[4152]! } + public var Channel_DiscussionGroup_Header: String { return self._s[4153]! } + public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4154]!, self._r[4154]!, [_0]) + } + public var Passport_Language_ms: String { return self._s[4155]! } + public var PeopleNearby_MakeInvisible: String { return self._s[4157]! } + public var ChatList_Search_FilterVoice: String { return self._s[4159]! } + public var Camera_TapAndHoldForVideo: String { return self._s[4161]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[4162]! } + public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4163]!, self._r[4163]!, [_0]) + } + public func Call_VoiceChatInProgressMessageCall(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4164]!, self._r[4164]!, [_1, _2]) + } + public var Map_Locating: String { return self._s[4165]! } + public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4167]!, self._r[4167]!, [_0]) + } + public var Passport_Identity_TypeInternalPassport: String { return self._s[4169]! } + public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[4170]! } + public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[4171]! } + public var Stickers_Installed: String { return self._s[4172]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[4173]! } + public var StickerPackActionInfo_RemovedTitle: String { return self._s[4174]! } + public var CallSettings_Never: String { return self._s[4176]! } + public var Channel_Setup_TypePublicHelp: String { return self._s[4177]! } + public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4179]!, self._r[4179]!, [_0]) + } + public var Message_Game: String { return self._s[4180]! } + public var Call_Message: String { return self._s[4181]! } + public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4182]!, self._r[4182]!, [_1]) + } + public var ChannelIntro_Text: String { return self._s[4183]! } + public var StickerPack_Send: String { return self._s[4184]! } + public var Share_AuthDescription: String { return self._s[4185]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[4186]! } + public var CallFeedback_WhatWentWrong: String { return self._s[4187]! } + public var Common_Create: String { return self._s[4190]! } + public var Passport_Language_hy: String { return self._s[4191]! } + public var CreatePoll_Explanation: String { return self._s[4192]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[4193]! } + public var ChatImport_CreateGroupAlertImportAction: String { return self._s[4194]! } + public var PeerInfo_ButtonVoiceChat: String { return self._s[4195]! } + public var Undo_ChatClearedForBothSides: String { return self._s[4196]! } + public var DialogList_NoMessagesTitle: String { return self._s[4197]! } + public var GroupInfo_Title: String { return self._s[4199]! } + public func ScheduleVoiceChat_ScheduleToday(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4200]!, self._r[4200]!, [_0]) + } + public var UserInfo_ContactForwardTooltip_SavedMessages_One: String { return self._s[4201]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[4202]! } + public var PhoneNumberHelp_Help: String { return self._s[4203]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4204]! } + public var Settings_Logout: String { return self._s[4205]! } + public var Privacy_PaymentsTitle: String { return self._s[4206]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[4207]! } + public var Tour_Text6: String { return self._s[4208]! } + public var ChatImportActivity_Title: String { return self._s[4210]! } + public var Channel_Username_Help: String { return self._s[4211]! } + public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[4212]! } + public var AttachmentMenu_Poll: String { return self._s[4213]! } + public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[4214]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[4215]! } + public var Passport_DeletePassport: String { return self._s[4216]! } + public var Login_Code: String { return self._s[4217]! } + public var Notification_SecretChatScreenshot: String { return self._s[4218]! } + public var VoiceChat_AddBio: String { return self._s[4219]! } + public var Login_CodeFloodError: String { return self._s[4220]! } + public func Notification_PinnedAnimationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4221]!, self._r[4221]!, [_0]) + } + public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4222]!, self._r[4222]!, [_0]) + } + public var Watch_Stickers_Recents: String { return self._s[4223]! } + public var Generic_ErrorMoreInfo: String { return self._s[4224]! } + public func Call_AccountIsLoggedOnCurrentDevice(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4225]!, self._r[4225]!, [_0]) + } + public var AutoDownloadSettings_DataUsage: String { return self._s[4226]! } + public var Conversation_ViewTheme: String { return self._s[4227]! } + public var Contacts_InviteSearchLabel: String { return self._s[4228]! } + public var Settings_CancelUpload: String { return self._s[4230]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[4231]! } public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4155]!, self._r[4155]!, [_0]) + return formatWithArgumentRanges(self._s[4232]!, self._r[4232]!, [_0]) } - public var ChatList_AddFolder: String { return self._s[4156]! } - public var Conversation_Location: String { return self._s[4158]! } - public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[4159]! } - public var DialogList_AdLabel: String { return self._s[4160]! } + public var ChatList_AddFolder: String { return self._s[4233]! } + public var Conversation_Location: String { return self._s[4235]! } + public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[4236]! } + public var DialogList_AdLabel: String { return self._s[4237]! } public func Time_TomorrowAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4162]!, self._r[4162]!, [_0]) + return formatWithArgumentRanges(self._s[4239]!, self._r[4239]!, [_0]) } - public var Message_InvoiceLabel: String { return self._s[4163]! } - public var Channel_TooMuchBots: String { return self._s[4164]! } + public var Message_InvoiceLabel: String { return self._s[4240]! } + public var Channel_TooMuchBots: String { return self._s[4241]! } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4166]!, self._r[4166]!, [_0]) + return formatWithArgumentRanges(self._s[4243]!, self._r[4243]!, [_0]) } - public var Call_IncomingVideoCall: String { return self._s[4167]! } - public var Conversation_LiveLocation: String { return self._s[4168]! } - public var VoiceChat_AskedToSpeakHelp: String { return self._s[4169]! } - public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[4170]! } - public var Passport_Identity_EditPassport: String { return self._s[4171]! } - public var Permissions_CellularDataTitle_v0: String { return self._s[4173]! } - public var ChatList_Search_NoResultsFitlerVoice: String { return self._s[4174]! } - public var GroupInfo_Permissions_AddException: String { return self._s[4175]! } + public var Call_IncomingVideoCall: String { return self._s[4244]! } + public var Conversation_LiveLocation: String { return self._s[4245]! } + public var VoiceChat_AskedToSpeakHelp: String { return self._s[4246]! } + public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[4247]! } + public var Passport_Identity_EditPassport: String { return self._s[4248]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[4250]! } + public var ChatList_Search_NoResultsFitlerVoice: String { return self._s[4251]! } + public var GroupInfo_Permissions_AddException: String { return self._s[4252]! } public func VoiceChat_RemovePeerConfirmationChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4177]!, self._r[4177]!, [_0]) + return formatWithArgumentRanges(self._s[4254]!, self._r[4254]!, [_0]) } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[4178]! } - public var Channel_MessageVideoUpdated: String { return self._s[4179]! } - public var GroupInfo_Permissions_EditingDisabled: String { return self._s[4180]! } - public var AutoremoveSetup_TimeSectionHeader: String { return self._s[4183]! } - public var AccessDenied_Camera: String { return self._s[4184]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[4255]! } + public var Channel_MessageVideoUpdated: String { return self._s[4256]! } + public var GroupInfo_Permissions_EditingDisabled: String { return self._s[4257]! } + public var AutoremoveSetup_TimeSectionHeader: String { return self._s[4260]! } + public var AccessDenied_Camera: String { return self._s[4261]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4185]!, self._r[4185]!, [_0]) + return formatWithArgumentRanges(self._s[4262]!, self._r[4262]!, [_0]) } - public var Theme_Context_ChangeColors: String { return self._s[4186]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[4187]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[4188]! } - public var Login_CodeExpiredError: String { return self._s[4189]! } - public var State_ConnectingToProxy: String { return self._s[4190]! } - public var TextFormat_Link: String { return self._s[4191]! } - public var Passport_Language_lv: String { return self._s[4193]! } - public var Conversation_AutoremoveTimerRemovedGroup: String { return self._s[4194]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[4195]! } - public var WallpaperPreview_SwipeBottomText: String { return self._s[4196]! } - public var ProfilePhoto_SetMainVideo: String { return self._s[4197]! } - public var AutoDownloadSettings_Cellular: String { return self._s[4199]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[4200]! } + public var Theme_Context_ChangeColors: String { return self._s[4263]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[4264]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[4265]! } + public var Login_CodeExpiredError: String { return self._s[4266]! } + public var State_ConnectingToProxy: String { return self._s[4267]! } + public var TextFormat_Link: String { return self._s[4268]! } + public var Passport_Language_lv: String { return self._s[4270]! } + public var Conversation_AutoremoveTimerRemovedGroup: String { return self._s[4271]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[4272]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[4273]! } + public var ProfilePhoto_SetMainVideo: String { return self._s[4274]! } + public var AutoDownloadSettings_Cellular: String { return self._s[4276]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[4277]! } public func Channel_AdminLog_MessageKickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4201]!, self._r[4201]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4278]!, self._r[4278]!, [_1, _2]) } - public var ChatList_EmptyChatListFilterTitle: String { return self._s[4202]! } - public var Checkout_PayNone: String { return self._s[4203]! } - public var NotificationsSound_Complete: String { return self._s[4205]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[4206]! } - public var InviteLink_CreateInfo: String { return self._s[4207]! } - public var AuthSessions_DevicesTitle: String { return self._s[4208]! } + public var ChatList_EmptyChatListFilterTitle: String { return self._s[4279]! } + public var Checkout_PayNone: String { return self._s[4280]! } + public var NotificationsSound_Complete: String { return self._s[4282]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[4283]! } + public var InviteLink_CreateInfo: String { return self._s[4284]! } + public var AuthSessions_DevicesTitle: String { return self._s[4285]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4209]!, self._r[4209]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4286]!, self._r[4286]!, [_0, _1]) } - public var Message_LiveLocation: String { return self._s[4210]! } - public var Watch_Suggestion_BRB: String { return self._s[4211]! } - public var Channel_BanUser_Title: String { return self._s[4212]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[4213]! } - public var Conversation_Dice_u1F3C0: String { return self._s[4214]! } - public var Conversation_ClearSelfHistory: String { return self._s[4215]! } - public var ProfilePhoto_OpenGallery: String { return self._s[4216]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[4217]! } - public var Weekday_Thursday: String { return self._s[4218]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4219]! } - public var Privacy_ProfilePhoto: String { return self._s[4221]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[4222]! } + public var Message_LiveLocation: String { return self._s[4287]! } + public var Watch_Suggestion_BRB: String { return self._s[4288]! } + public var Channel_BanUser_Title: String { return self._s[4289]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[4290]! } + public var Conversation_Dice_u1F3C0: String { return self._s[4291]! } + public var Conversation_ClearSelfHistory: String { return self._s[4292]! } + public var ProfilePhoto_OpenGallery: String { return self._s[4293]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[4294]! } + public var Weekday_Thursday: String { return self._s[4295]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4296]! } + public var Privacy_ProfilePhoto: String { return self._s[4298]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[4299]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4223]!, self._r[4223]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4300]!, self._r[4300]!, [_1, _2]) } - public var Message_Audio: String { return self._s[4224]! } - public var Conversation_Info: String { return self._s[4225]! } - public var Cache_Videos: String { return self._s[4226]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[4227]! } - public var Channel_ErrorAddTooMuch: String { return self._s[4228]! } + public var Message_Audio: String { return self._s[4301]! } + public var Conversation_Info: String { return self._s[4302]! } + public var Cache_Videos: String { return self._s[4303]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[4304]! } + public var Channel_ErrorAddTooMuch: String { return self._s[4305]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4229]!, self._r[4229]!, [_0]) + return formatWithArgumentRanges(self._s[4306]!, self._r[4306]!, [_0]) } - public var VoiceChat_EditBio: String { return self._s[4230]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[4232]! } - public var ScheduledMessages_Title: String { return self._s[4234]! } - public var ShareFileTip_Title: String { return self._s[4237]! } - public var Chat_Gifs_TrendingSectionHeader: String { return self._s[4238]! } - public var ChatList_RemoveFolderConfirmation: String { return self._s[4239]! } + public var VoiceChat_EditBio: String { return self._s[4307]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[4309]! } + public var ScheduledMessages_Title: String { return self._s[4312]! } + public var ShareFileTip_Title: String { return self._s[4315]! } + public var Chat_Gifs_TrendingSectionHeader: String { return self._s[4316]! } + public var ChatList_RemoveFolderConfirmation: String { return self._s[4317]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4240]!, self._r[4240]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4318]!, self._r[4318]!, [_1, _2]) } - public var Conversation_ContextViewStats: String { return self._s[4242]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[4243]! } - public var PasscodeSettings_Title: String { return self._s[4244]! } - public var Channel_AdminLog_SendPolls: String { return self._s[4245]! } - public var LastSeen_ALongTimeAgo: String { return self._s[4246]! } + public var Conversation_ContextViewStats: String { return self._s[4320]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[4321]! } + public var PasscodeSettings_Title: String { return self._s[4322]! } + public var Channel_AdminLog_SendPolls: String { return self._s[4323]! } + public var LastSeen_ALongTimeAgo: String { return self._s[4324]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4247]!, self._r[4247]!, [_1]) + return formatWithArgumentRanges(self._s[4325]!, self._r[4325]!, [_1]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4248]! } - public var ChannelInfo_FakeChannelWarning: String { return self._s[4249]! } - public var CallFeedback_VideoReasonLowQuality: String { return self._s[4250]! } - public var Conversation_PinnedPreviousMessage: String { return self._s[4251]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[4252]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[4253]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4326]! } + public var ChannelInfo_FakeChannelWarning: String { return self._s[4327]! } + public var CallFeedback_VideoReasonLowQuality: String { return self._s[4328]! } + public var Conversation_PinnedPreviousMessage: String { return self._s[4329]! } + public var SocksProxySetup_AddProxyTitle: String { return self._s[4330]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[4331]! } public func ChatList_RemovedFromFolderTooltip(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4254]!, self._r[4254]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4332]!, self._r[4332]!, [_1, _2]) } public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4255]!, self._r[4255]!, [_0]) + return formatWithArgumentRanges(self._s[4333]!, self._r[4333]!, [_0]) } - public var Passport_Identity_GenderFemale: String { return self._s[4256]! } - public var Location_ProximityNotification_DistanceKM: String { return self._s[4259]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[4260]! } + public var Passport_Identity_GenderFemale: String { return self._s[4334]! } + public var Location_ProximityNotification_DistanceKM: String { return self._s[4337]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[4338]! } public func Message_ImportedDateFormat(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4261]!, self._r[4261]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4339]!, self._r[4339]!, [_1, _2, _3]) } - public var VoiceChat_Audio: String { return self._s[4262]! } - public var SharedMedia_TitleAll: String { return self._s[4263]! } - public var Settings_Context_Logout: String { return self._s[4264]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[4267]! } - public var Settings_About_Title: String { return self._s[4268]! } - public var StickerSettings_ContextHide: String { return self._s[4269]! } + public var VoiceChat_Audio: String { return self._s[4340]! } + public var SharedMedia_TitleAll: String { return self._s[4341]! } + public var Settings_Context_Logout: String { return self._s[4342]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[4345]! } + public var Settings_About_Title: String { return self._s[4346]! } + public var StickerSettings_ContextHide: String { return self._s[4347]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4270]!, self._r[4270]!, [_0]) + return formatWithArgumentRanges(self._s[4348]!, self._r[4348]!, [_0]) } public func Conversation_LiveLocationYouAndOther(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4271]!, self._r[4271]!, [_0]) + return formatWithArgumentRanges(self._s[4349]!, self._r[4349]!, [_0]) } - public var ChatImport_SelectionConfirmationAlertImportAction: String { return self._s[4273]! } - public var Common_Cancel: String { return self._s[4274]! } - public var CallFeedback_Title: String { return self._s[4276]! } + public var ChatImport_SelectionConfirmationAlertImportAction: String { return self._s[4351]! } + public var Common_Cancel: String { return self._s[4352]! } + public var CallFeedback_Title: String { return self._s[4354]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4277]!, self._r[4277]!, [_0]) + return formatWithArgumentRanges(self._s[4355]!, self._r[4355]!, [_0]) } - public var Conversation_StickerAddedToFavorites: String { return self._s[4278]! } - public var Activity_UploadingVideoMessage: String { return self._s[4280]! } - public var MediaPicker_Send: String { return self._s[4281]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[4282]! } - public var Conversation_LiveLocationYou: String { return self._s[4283]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[4284]! } + public var Conversation_StickerAddedToFavorites: String { return self._s[4356]! } + public var Activity_UploadingVideoMessage: String { return self._s[4358]! } + public var MediaPicker_Send: String { return self._s[4359]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[4360]! } + public var Conversation_LiveLocationYou: String { return self._s[4361]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[4362]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4286]!, self._r[4286]!, [_0]) + return formatWithArgumentRanges(self._s[4364]!, self._r[4364]!, [_0]) } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4287]!, self._r[4287]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4365]!, self._r[4365]!, [_1, _2]) } - public var Conversation_ViewBackground: String { return self._s[4288]! } - public var ChatSettings_PrivateChats: String { return self._s[4291]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[4292]! } - public var BroadcastGroups_LimitAlert_LearnMore: String { return self._s[4293]! } - public var Appearance_ThemeNight: String { return self._s[4294]! } - public var Common_Search: String { return self._s[4295]! } - public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[4296]! } - public var ChangePhoneNumberNumber_Help: String { return self._s[4298]! } - public var InviteLink_QRCode_Share: String { return self._s[4299]! } - public var Stickers_SuggestAdded: String { return self._s[4301]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[4304]! } - public var Widget_UpdatedTodayAt: String { return self._s[4305]! } - public var NetworkUsageSettings_Cellular: String { return self._s[4306]! } - public var CheckoutInfo_Title: String { return self._s[4307]! } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[4308]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[4309]! } + public var Checkout_PaymentLiabilityAlert: String { return self._s[4366]! } + public var Conversation_ViewBackground: String { return self._s[4367]! } + public var ChatSettings_PrivateChats: String { return self._s[4370]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[4371]! } + public var BroadcastGroups_LimitAlert_LearnMore: String { return self._s[4372]! } + public var Appearance_ThemeNight: String { return self._s[4373]! } + public var Common_Search: String { return self._s[4374]! } + public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[4375]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[4377]! } + public var InviteLink_QRCode_Share: String { return self._s[4378]! } + public var Stickers_SuggestAdded: String { return self._s[4380]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[4383]! } + public var Widget_UpdatedTodayAt: String { return self._s[4384]! } + public var NetworkUsageSettings_Cellular: String { return self._s[4385]! } + public var CheckoutInfo_Title: String { return self._s[4386]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[4387]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[4388]! } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4310]!, self._r[4310]!, [_0]) + return formatWithArgumentRanges(self._s[4389]!, self._r[4389]!, [_0]) } - public var MaskStickerSettings_Info: String { return self._s[4312]! } - public var GroupRemoved_DeleteUser: String { return self._s[4314]! } - public var Contacts_ShareTelegram: String { return self._s[4315]! } - public var Group_UpgradeNoticeText1: String { return self._s[4316]! } + public var MaskStickerSettings_Info: String { return self._s[4391]! } + public var GroupRemoved_DeleteUser: String { return self._s[4393]! } + public var Contacts_ShareTelegram: String { return self._s[4394]! } + public var Group_UpgradeNoticeText1: String { return self._s[4395]! } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4317]!, self._r[4317]!, [_1]) + return formatWithArgumentRanges(self._s[4396]!, self._r[4396]!, [_1]) } - public var PrivacyLastSeenSettings_Title: String { return self._s[4318]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[4322]! } - public var PhotoEditor_TintTool: String { return self._s[4323]! } - public var ChatImportActivity_OpenApp: String { return self._s[4325]! } - public var GroupPermission_NoSendPolls: String { return self._s[4326]! } - public var NotificationsSound_None: String { return self._s[4327]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[4397]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[4401]! } + public var PhotoEditor_TintTool: String { return self._s[4402]! } + public var ChatImportActivity_OpenApp: String { return self._s[4404]! } + public var GroupPermission_NoSendPolls: String { return self._s[4405]! } + public var NotificationsSound_None: String { return self._s[4406]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4328]!, self._r[4328]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[4407]!, self._r[4407]!, [_1, "\(_2)"]) } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[4331]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[4410]! } public func Conversation_AutoremoveTimerSetChannel(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4333]!, self._r[4333]!, [_1]) + return formatWithArgumentRanges(self._s[4412]!, self._r[4412]!, [_1]) } - public var ExplicitContent_AlertChannel: String { return self._s[4334]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[4335]! } - public var Contacts_SortedByPresence: String { return self._s[4336]! } - public var WallpaperSearch_ColorGray: String { return self._s[4337]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[4338]! } - public var Conversation_ReportSpam: String { return self._s[4339]! } - public var ChatList_Search_NoResultsFilter: String { return self._s[4342]! } - public var WallpaperSearch_ColorBlack: String { return self._s[4343]! } - public var ArchivedChats_IntroTitle3: String { return self._s[4344]! } - public var InviteLink_DeleteAllRevokedLinksAlert_Action: String { return self._s[4345]! } + public var ExplicitContent_AlertChannel: String { return self._s[4413]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[4414]! } + public var Contacts_SortedByPresence: String { return self._s[4415]! } + public var WallpaperSearch_ColorGray: String { return self._s[4416]! } + public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[4417]! } + public var Conversation_ReportSpam: String { return self._s[4418]! } + public var ChatList_Search_NoResultsFilter: String { return self._s[4421]! } + public var WallpaperSearch_ColorBlack: String { return self._s[4422]! } + public var ArchivedChats_IntroTitle3: String { return self._s[4423]! } + public var InviteLink_DeleteAllRevokedLinksAlert_Action: String { return self._s[4424]! } public func VoiceChat_PeerJoinedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4346]!, self._r[4346]!, [_0]) + return formatWithArgumentRanges(self._s[4425]!, self._r[4425]!, [_0]) } - public var Conversation_DefaultRestrictedText: String { return self._s[4347]! } - public var Settings_Devices: String { return self._s[4348]! } - public var Call_AudioRouteSpeaker: String { return self._s[4349]! } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[4350]! } - public var Passport_Address_Country: String { return self._s[4352]! } - public var Cache_MaximumCacheSize: String { return self._s[4353]! } - public var Chat_PanelHidePinnedMessages: String { return self._s[4354]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[4355]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[4357]! } - public var Login_TermsOfServiceLabel: String { return self._s[4358]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[4359]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[4360]! } - public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[4361]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[4362]! } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[4363]! } - public var ConvertToSupergroup_Note: String { return self._s[4365]! } - public var Settings_SetNewProfilePhotoOrVideo: String { return self._s[4366]! } - public var PrivacySettings_PasscodeAndTouchId: String { return self._s[4367]! } - public var Common_More: String { return self._s[4368]! } - public var ShareMenu_SelectChats: String { return self._s[4370]! } + public var Conversation_DefaultRestrictedText: String { return self._s[4426]! } + public var Settings_Devices: String { return self._s[4427]! } + public var Call_AudioRouteSpeaker: String { return self._s[4428]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[4429]! } + public var VoiceChat_StartsIn: String { return self._s[4430]! } + public var VoiceChat_CreateNewVoiceChatSchedule: String { return self._s[4431]! } + public var VoiceChat_EditDescriptionTitle: String { return self._s[4433]! } + public var Passport_Address_Country: String { return self._s[4434]! } + public var Cache_MaximumCacheSize: String { return self._s[4435]! } + public var Chat_PanelHidePinnedMessages: String { return self._s[4436]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[4437]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[4439]! } + public var Login_TermsOfServiceLabel: String { return self._s[4440]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[4441]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[4442]! } + public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[4443]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[4444]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[4445]! } + public var ConvertToSupergroup_Note: String { return self._s[4447]! } + public var Settings_SetNewProfilePhotoOrVideo: String { return self._s[4448]! } + public var PrivacySettings_PasscodeAndTouchId: String { return self._s[4449]! } + public var Common_More: String { return self._s[4450]! } + public var ShareMenu_SelectChats: String { return self._s[4452]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4371]!, self._r[4371]!, [_0]) + return formatWithArgumentRanges(self._s[4453]!, self._r[4453]!, [_0]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4372]!, self._r[4372]!, [_0]) + return formatWithArgumentRanges(self._s[4454]!, self._r[4454]!, [_0]) } - public var Contacts_PermissionsKeepDisabled: String { return self._s[4374]! } - public var VoiceChat_EditBioText: String { return self._s[4375]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[4456]! } + public var VoiceChat_EditBioText: String { return self._s[4457]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4376]!, self._r[4376]!, [_0]) + return formatWithArgumentRanges(self._s[4458]!, self._r[4458]!, [_0]) } - public var WatchRemote_AlertOpen: String { return self._s[4377]! } + public var WatchRemote_AlertOpen: String { return self._s[4459]! } public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4378]!, self._r[4378]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4460]!, self._r[4460]!, [_1, _2, _3]) } - public var Channel_Members_AddMembersHelp: String { return self._s[4379]! } - public var Shortcut_SwitchAccount: String { return self._s[4380]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4381]! } + public var Channel_Members_AddMembersHelp: String { return self._s[4461]! } + public var Shortcut_SwitchAccount: String { return self._s[4462]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4463]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4382]!, self._r[4382]!, [_0]) + return formatWithArgumentRanges(self._s[4464]!, self._r[4464]!, [_0]) } - public var Compose_NewGroupTitle: String { return self._s[4383]! } - public var DialogList_You: String { return self._s[4384]! } - public var Call_VoiceOver_VoiceCallOutgoing: String { return self._s[4385]! } - public var ReportPeer_ReasonViolence: String { return self._s[4386]! } + public var Compose_NewGroupTitle: String { return self._s[4465]! } + public var DialogList_You: String { return self._s[4466]! } + public var Call_VoiceOver_VoiceCallOutgoing: String { return self._s[4467]! } + public var ReportPeer_ReasonViolence: String { return self._s[4468]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4387]!, self._r[4387]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4469]!, self._r[4469]!, [_1, _2]) } - public var VoiceChat_Reconnecting: String { return self._s[4389]! } - public var KeyCommand_ScrollDown: String { return self._s[4392]! } - public var ChatSettings_DownloadInBackground: String { return self._s[4393]! } - public var Wallpaper_ResetWallpapers: String { return self._s[4394]! } - public var Channel_BanList_RestrictedTitle: String { return self._s[4395]! } - public var ArchivedChats_IntroText3: String { return self._s[4396]! } - public var HashtagSearch_AllChats: String { return self._s[4398]! } - public var VoiceChat_EndVoiceChat: String { return self._s[4399]! } - public var Conversation_MessageCopied: String { return self._s[4401]! } - public var Channel_Info_BlackList: String { return self._s[4402]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[4403]! } - public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[4404]! } - public var Paint_Neon: String { return self._s[4406]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[4407]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[4408]! } + public var VoiceChat_Reconnecting: String { return self._s[4471]! } + public var KeyCommand_ScrollDown: String { return self._s[4474]! } + public var ChatSettings_DownloadInBackground: String { return self._s[4475]! } + public var Wallpaper_ResetWallpapers: String { return self._s[4476]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[4477]! } + public var ArchivedChats_IntroText3: String { return self._s[4478]! } + public var HashtagSearch_AllChats: String { return self._s[4480]! } + public var VoiceChat_EndVoiceChat: String { return self._s[4481]! } + public var Conversation_MessageCopied: String { return self._s[4483]! } + public var Channel_Info_BlackList: String { return self._s[4484]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[4485]! } + public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[4486]! } + public var Paint_Neon: String { return self._s[4488]! } + public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[4489]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[4490]! } public func Notification_PinnedVideoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4410]!, self._r[4410]!, [_0]) + return formatWithArgumentRanges(self._s[4492]!, self._r[4492]!, [_0]) } - public var Map_StopLiveLocation: String { return self._s[4411]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[4412]! } - public var Channel_Username_InvalidCharacters: String { return self._s[4413]! } - public var InstantPage_Reference: String { return self._s[4415]! } - public var Group_Members_AddMembers: String { return self._s[4417]! } - public var ChatList_HideAction: String { return self._s[4418]! } - public var Conversation_FileICloudDrive: String { return self._s[4420]! } + public var Map_StopLiveLocation: String { return self._s[4493]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[4494]! } + public var Channel_Username_InvalidCharacters: String { return self._s[4495]! } + public var InstantPage_Reference: String { return self._s[4497]! } + public var Group_Members_AddMembers: String { return self._s[4499]! } + public func Conversation_ScheduledVoiceChatStartsOn(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4500]!, self._r[4500]!, [_0]) + } + public var ChatList_HideAction: String { return self._s[4501]! } + public var Conversation_FileICloudDrive: String { return self._s[4503]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4421]!, self._r[4421]!, [_1]) + return formatWithArgumentRanges(self._s[4504]!, self._r[4504]!, [_1]) } - public var Passport_PasswordReset: String { return self._s[4423]! } - public var ChatList_Context_UnhideArchive: String { return self._s[4425]! } - public var ConvertToSupergroup_HelpText: String { return self._s[4426]! } - public var Calls_AddTab: String { return self._s[4427]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[4428]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[4429]! } - public var Privacy_GroupsAndChannels: String { return self._s[4432]! } - public var Conversation_UsernameCopied: String { return self._s[4433]! } - public var AutoNightTheme_Disabled: String { return self._s[4434]! } - public var CreatePoll_MultipleChoice: String { return self._s[4435]! } + public var Passport_PasswordReset: String { return self._s[4506]! } + public var ChatList_Context_UnhideArchive: String { return self._s[4508]! } + public var ConvertToSupergroup_HelpText: String { return self._s[4509]! } + public var Calls_AddTab: String { return self._s[4510]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[4512]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[4513]! } + public var Privacy_GroupsAndChannels: String { return self._s[4516]! } + public var Conversation_UsernameCopied: String { return self._s[4517]! } + public var AutoNightTheme_Disabled: String { return self._s[4518]! } + public var CreatePoll_MultipleChoice: String { return self._s[4519]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4436]!, self._r[4436]!, [_1]) + return formatWithArgumentRanges(self._s[4520]!, self._r[4520]!, [_1]) } - public var Watch_Bot_Restart: String { return self._s[4438]! } + public var Watch_Bot_Restart: String { return self._s[4522]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4439]!, self._r[4439]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[4523]!, self._r[4523]!, ["\(_0)"]) } - public var GroupInfo_ScamGroupWarning: String { return self._s[4441]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[4442]! } - public var Appearance_PreviewIncomingText: String { return self._s[4443]! } - public var ChatSettings_WidgetSettings: String { return self._s[4444]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[4445]! } - public var ChatList_UndoArchiveRevealedTitle: String { return self._s[4447]! } - public var Stats_GroupOverview: String { return self._s[4449]! } - public var ScheduledMessages_EditTime: String { return self._s[4452]! } - public var Month_GenFebruary: String { return self._s[4453]! } - public var ChatList_AutoarchiveSuggestion_OpenSettings: String { return self._s[4454]! } - public var Stickers_ClearRecent: String { return self._s[4455]! } - public var InviteLink_Create_UsersLimitNumberOfUsersUnlimited: String { return self._s[4456]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[4457]! } - public var Stats_Message_PublicShares: String { return self._s[4458]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[4525]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[4526]! } + public var Appearance_PreviewIncomingText: String { return self._s[4527]! } + public var ChatSettings_WidgetSettings: String { return self._s[4528]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[4529]! } + public var ChatList_UndoArchiveRevealedTitle: String { return self._s[4531]! } + public var Stats_GroupOverview: String { return self._s[4533]! } + public var ScheduledMessages_EditTime: String { return self._s[4536]! } + public var Month_GenFebruary: String { return self._s[4537]! } + public var ChatList_AutoarchiveSuggestion_OpenSettings: String { return self._s[4538]! } + public var Stickers_ClearRecent: String { return self._s[4539]! } + public var InviteLink_Create_UsersLimitNumberOfUsersUnlimited: String { return self._s[4540]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[4541]! } + public var Stats_Message_PublicShares: String { return self._s[4542]! } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4459]!, self._r[4459]!, [_0]) + return formatWithArgumentRanges(self._s[4543]!, self._r[4543]!, [_0]) } - public var Login_TermsOfServiceSignupDecline: String { return self._s[4460]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[4461]! } - public var VoiceOver_Chat_PlayHint: String { return self._s[4462]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[4463]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[4465]! } - public var CreatePoll_Create: String { return self._s[4466]! } - public var ChatList_Search_FilterLinks: String { return self._s[4467]! } - public var Your_cards_number_is_invalid: String { return self._s[4468]! } - public var Month_ShortApril: String { return self._s[4469]! } - public var SocksProxySetup_UseForCalls: String { return self._s[4470]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[4471]! } - public var SocksProxySetup_Status: String { return self._s[4472]! } - public var VoiceChat_UnmuteForMe: String { return self._s[4473]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[4474]! } - public var ChatListFolder_CategoryBots: String { return self._s[4475]! } - public var Passport_FieldIdentitySelfieHelp: String { return self._s[4477]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[4478]! } - public var Chat_PinnedListPreview_UnpinAllMessages: String { return self._s[4479]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[4480]! } - public var Conversation_TitleUnmute: String { return self._s[4481]! } - public var Group_Setup_TypeHeader: String { return self._s[4482]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[4544]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[4545]! } + public var VoiceOver_Chat_PlayHint: String { return self._s[4546]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[4547]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[4549]! } + public var CreatePoll_Create: String { return self._s[4550]! } + public var ChatList_Search_FilterLinks: String { return self._s[4551]! } + public var Your_cards_number_is_invalid: String { return self._s[4552]! } + public var Month_ShortApril: String { return self._s[4553]! } + public var SocksProxySetup_UseForCalls: String { return self._s[4554]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[4555]! } + public var SocksProxySetup_Status: String { return self._s[4556]! } + public var VoiceChat_UnmuteForMe: String { return self._s[4557]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[4558]! } + public var ChatListFolder_CategoryBots: String { return self._s[4559]! } + public var Passport_FieldIdentitySelfieHelp: String { return self._s[4561]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[4562]! } + public var Chat_PinnedListPreview_UnpinAllMessages: String { return self._s[4563]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[4564]! } + public var Conversation_TitleUnmute: String { return self._s[4565]! } + public var Group_Setup_TypeHeader: String { return self._s[4566]! } public func Conversation_ForwardTooltip_ManyChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4483]!, self._r[4483]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4567]!, self._r[4567]!, [_0, _1]) } - public var Stats_ViewsPerPost: String { return self._s[4484]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[4485]! } - public var Passport_Identity_TranslationHelp: String { return self._s[4486]! } + public var Stats_ViewsPerPost: String { return self._s[4568]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[4569]! } + public var Passport_Identity_TranslationHelp: String { return self._s[4570]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4487]!, self._r[4487]!, [_1]) + return formatWithArgumentRanges(self._s[4571]!, self._r[4571]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[4488]! } + public var GroupInfo_Administrators_Title: String { return self._s[4572]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4489]!, self._r[4489]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4573]!, self._r[4573]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4490]!, self._r[4490]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4574]!, self._r[4574]!, [_1, _2, _3]) } - public var CheckoutInfo_ShippingInfoState: String { return self._s[4491]! } - public var Passport_Language_my: String { return self._s[4493]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[4494]! } - public var Map_PlacesNearby: String { return self._s[4495]! } - public var Channel_About_Help: String { return self._s[4496]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[4497]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[4498]! } - public var Channel_Username_Title: String { return self._s[4499]! } - public var Activity_RecordingVideoMessage: String { return self._s[4500]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[4575]! } + public var Passport_Language_my: String { return self._s[4577]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[4578]! } + public var Map_PlacesNearby: String { return self._s[4579]! } + public var Channel_About_Help: String { return self._s[4580]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[4581]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[4582]! } + public var Channel_Username_Title: String { return self._s[4583]! } + public var Activity_RecordingVideoMessage: String { return self._s[4584]! } public func StickerPackActionInfo_RemovedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4501]!, self._r[4501]!, [_0]) + return formatWithArgumentRanges(self._s[4585]!, self._r[4585]!, [_0]) } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[4502]! } - public var Passport_DiscardMessageDescription: String { return self._s[4503]! } - public var Conversation_LinkDialogOpen: String { return self._s[4504]! } - public var ChatList_Context_HideArchive: String { return self._s[4505]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[4586]! } + public var Passport_DiscardMessageDescription: String { return self._s[4587]! } + public var Conversation_LinkDialogOpen: String { return self._s[4588]! } + public var ChatList_Context_HideArchive: String { return self._s[4589]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4506]!, self._r[4506]!, [_0]) + return formatWithArgumentRanges(self._s[4590]!, self._r[4590]!, [_0]) } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[4507]! } - public var Conversation_Admin: String { return self._s[4508]! } - public var DialogList_TabTitle: String { return self._s[4509]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[4591]! } + public var Conversation_Admin: String { return self._s[4592]! } + public var DialogList_TabTitle: String { return self._s[4593]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4510]!, self._r[4510]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4594]!, self._r[4594]!, [_1, _2]) } - public var Notifications_PermissionsUnreachableText: String { return self._s[4511]! } - public var Passport_Identity_GenderMale: String { return self._s[4513]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[4595]! } + public var Passport_Identity_GenderMale: String { return self._s[4597]! } public func VoiceChat_EditTitleSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4515]!, self._r[4515]!, [_0]) + return formatWithArgumentRanges(self._s[4599]!, self._r[4599]!, [_0]) } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4516]! } - public var PhoneNumberHelp_Alert: String { return self._s[4517]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[4518]! } - public var Notifications_InAppNotifications: String { return self._s[4519]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4600]! } + public var PhoneNumberHelp_Alert: String { return self._s[4601]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[4602]! } + public var Notifications_InAppNotifications: String { return self._s[4603]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4520]!, self._r[4520]!, [_0]) + return formatWithArgumentRanges(self._s[4604]!, self._r[4604]!, [_0]) } - public var Notification_VideoCallOutgoing: String { return self._s[4521]! } - public var Login_InvalidCodeError: String { return self._s[4522]! } - public var Conversation_PrivateChannelTimeLimitedAlertJoin: String { return self._s[4523]! } + public var Notification_VideoCallOutgoing: String { return self._s[4605]! } + public var Login_InvalidCodeError: String { return self._s[4606]! } + public var Conversation_PrivateChannelTimeLimitedAlertJoin: String { return self._s[4607]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4525]!, self._r[4525]!, [_0]) + return formatWithArgumentRanges(self._s[4609]!, self._r[4609]!, [_0]) } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[4526]! } - public var ReportPeer_Report: String { return self._s[4527]! } - public var Camera_FlashOff: String { return self._s[4530]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[4533]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[4536]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[4537]! } - public var Passport_FieldEmail: String { return self._s[4538]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[4610]! } + public var ReportPeer_Report: String { return self._s[4611]! } + public var Camera_FlashOff: String { return self._s[4614]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[4617]! } + public func Notification_VoiceChatScheduledTomorrow(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4618]!, self._r[4618]!, [_1, _2]) + } + public var PrivacyPolicy_DeclineTitle: String { return self._s[4621]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[4622]! } + public var Passport_FieldEmail: String { return self._s[4623]! } public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4539]!, self._r[4539]!, [_1]) + return formatWithArgumentRanges(self._s[4624]!, self._r[4624]!, [_1]) } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[4540]! } - public var PeerInfo_PaneVoiceAndVideo: String { return self._s[4541]! } - public var Group_OwnershipTransfer_Title: String { return self._s[4542]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[4543]! } - public var Login_PhoneNumberHelp: String { return self._s[4545]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[4546]! } - public var Conversation_PinnedQuiz: String { return self._s[4547]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[4548]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[4549]! } - public var Group_MessagePhotoUpdated: String { return self._s[4550]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[4551]! } - public var BroadcastGroups_ConfirmationAlert_Text: String { return self._s[4552]! } - public var Passport_Identity_Translations: String { return self._s[4554]! } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[4555]! } - public var ChannelInfo_DeleteChannel: String { return self._s[4557]! } - public var PasscodeSettings_HelpBottom: String { return self._s[4558]! } - public var Channel_Members_AddMembers: String { return self._s[4559]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[4560]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[4562]! } - public var Conversation_HoldForAudio: String { return self._s[4563]! } - public var Media_LimitedAccessChangeSettings: String { return self._s[4565]! } - public var Watch_LastSeen_Lately: String { return self._s[4566]! } - public var ChatList_Context_MarkAsRead: String { return self._s[4567]! } - public var Conversation_PinnedMessage: String { return self._s[4568]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[4569]! } - public var VoiceChat_StopRecordingStop: String { return self._s[4571]! } - public var Passport_UpdateRequiredError: String { return self._s[4572]! } - public var PrivacySettings_Passcode: String { return self._s[4573]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[4625]! } + public var PeerInfo_PaneVoiceAndVideo: String { return self._s[4626]! } + public var Group_OwnershipTransfer_Title: String { return self._s[4627]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[4628]! } + public var Login_PhoneNumberHelp: String { return self._s[4630]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[4631]! } + public var Conversation_PinnedQuiz: String { return self._s[4632]! } + public var CreateGroup_SoftUserLimitAlert: String { return self._s[4633]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[4634]! } + public var Group_MessagePhotoUpdated: String { return self._s[4635]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[4636]! } + public var BroadcastGroups_ConfirmationAlert_Text: String { return self._s[4637]! } + public var Passport_Identity_Translations: String { return self._s[4639]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[4640]! } + public var ChannelInfo_DeleteChannel: String { return self._s[4642]! } + public var PasscodeSettings_HelpBottom: String { return self._s[4643]! } + public var Channel_Members_AddMembers: String { return self._s[4644]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[4645]! } + public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[4647]! } + public var Conversation_HoldForAudio: String { return self._s[4648]! } + public var Media_LimitedAccessChangeSettings: String { return self._s[4650]! } + public var Watch_LastSeen_Lately: String { return self._s[4651]! } + public var ChatList_Context_MarkAsRead: String { return self._s[4652]! } + public var Conversation_PinnedMessage: String { return self._s[4653]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[4654]! } + public var VoiceChat_StopRecordingStop: String { return self._s[4656]! } + public var Passport_UpdateRequiredError: String { return self._s[4657]! } + public var PrivacySettings_Passcode: String { return self._s[4658]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4574]!, self._r[4574]!, [_0]) + return formatWithArgumentRanges(self._s[4659]!, self._r[4659]!, [_0]) } - public var AutoNightTheme_NotAvailable: String { return self._s[4575]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[4576]! } - public var VoiceOver_Common_On: String { return self._s[4577]! } - public var LoginPassword_InvalidPasswordError: String { return self._s[4578]! } - public var ChatListFolder_IncludedSectionHeader: String { return self._s[4579]! } - public var Channel_SignMessages_Help: String { return self._s[4580]! } - public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[4581]! } - public var Conversation_TitleNoComments: String { return self._s[4582]! } - public var MediaPicker_LivePhotoDescription: String { return self._s[4583]! } - public var GroupInfo_Permissions: String { return self._s[4584]! } - public var GroupPermission_NoSendLinks: String { return self._s[4587]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[4588]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[4590]! } - public var ChatList_ArchiveAction: String { return self._s[4591]! } + public var AutoNightTheme_NotAvailable: String { return self._s[4660]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[4661]! } + public var VoiceOver_Common_On: String { return self._s[4662]! } + public var LoginPassword_InvalidPasswordError: String { return self._s[4663]! } + public var ChatListFolder_IncludedSectionHeader: String { return self._s[4664]! } + public var Channel_SignMessages_Help: String { return self._s[4665]! } + public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[4666]! } + public var Conversation_TitleNoComments: String { return self._s[4667]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[4668]! } + public var GroupInfo_Permissions: String { return self._s[4669]! } + public var GroupPermission_NoSendLinks: String { return self._s[4672]! } + public func Conversation_ScheduledVoiceChatStartsTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4673]!, self._r[4673]!, [_0]) + } + public var Passport_Identity_ResidenceCountry: String { return self._s[4674]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[4676]! } + public var ChatList_ArchiveAction: String { return self._s[4677]! } public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4592]!, self._r[4592]!, [_0]) + return formatWithArgumentRanges(self._s[4678]!, self._r[4678]!, [_0]) } - public var GroupInfo_GroupHistory: String { return self._s[4593]! } + public var GroupInfo_GroupHistory: String { return self._s[4679]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4595]!, self._r[4595]!, [_0]) + return formatWithArgumentRanges(self._s[4681]!, self._r[4681]!, [_0]) } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[4597]! } - public var Channel_Info_Banned: String { return self._s[4598]! } - public var Paint_RecentStickers: String { return self._s[4599]! } - public var VoiceOver_MessageContextSend: String { return self._s[4600]! } - public var Group_ErrorNotMutualContact: String { return self._s[4601]! } - public var ReportPeer_ReasonOther: String { return self._s[4603]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[4604]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[4606]! } - public var KeyCommand_Find: String { return self._s[4607]! } + public var Privacy_Forwards_LinkIfAllowed: String { return self._s[4683]! } + public var Channel_Info_Banned: String { return self._s[4684]! } + public var Paint_RecentStickers: String { return self._s[4685]! } + public var VoiceOver_MessageContextSend: String { return self._s[4686]! } + public var Group_ErrorNotMutualContact: String { return self._s[4687]! } + public var ReportPeer_ReasonOther: String { return self._s[4689]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[4690]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[4692]! } + public var KeyCommand_Find: String { return self._s[4693]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4608]!, self._r[4608]!, [_0]) + return formatWithArgumentRanges(self._s[4694]!, self._r[4694]!, [_0]) } - public var ChatList_Context_Unmute: String { return self._s[4609]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[4610]! } - public var Stickers_GroupStickersHelp: String { return self._s[4611]! } - public var Checkout_Title: String { return self._s[4612]! } - public var Activity_RecordingAudio: String { return self._s[4613]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[4614]! } - public var BlockedUsers_BlockTitle: String { return self._s[4615]! } - public var DialogList_SavedMessagesHelp: String { return self._s[4617]! } - public var Calls_All: String { return self._s[4618]! } - public var Settings_FAQ_Button: String { return self._s[4620]! } - public var Conversation_Dice_u1F3B0: String { return self._s[4622]! } + public var ChatList_Context_Unmute: String { return self._s[4695]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[4696]! } + public var Stickers_GroupStickersHelp: String { return self._s[4697]! } + public var Checkout_Title: String { return self._s[4698]! } + public var Activity_RecordingAudio: String { return self._s[4699]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[4700]! } + public var BlockedUsers_BlockTitle: String { return self._s[4701]! } + public var DialogList_SavedMessagesHelp: String { return self._s[4703]! } + public var Calls_All: String { return self._s[4704]! } + public var Settings_FAQ_Button: String { return self._s[4706]! } + public var Conversation_Dice_u1F3B0: String { return self._s[4708]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4623]!, self._r[4623]!, [_0]) + return formatWithArgumentRanges(self._s[4709]!, self._r[4709]!, [_0]) } - public var Conversation_ReportGroupLocation: String { return self._s[4624]! } - public var Passport_Scans_Upload: String { return self._s[4625]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[4627]! } - public var ChatList_UnarchiveAction: String { return self._s[4628]! } - public var Stats_GroupTopInviter_History: String { return self._s[4629]! } - public var GroupInfo_Permissions_Title: String { return self._s[4630]! } - public var VoiceChat_CreateNewVoiceChatStart: String { return self._s[4631]! } - public var Passport_Language_el: String { return self._s[4632]! } - public var Channel_DiscussionMessageUnavailable: String { return self._s[4633]! } + public var Conversation_ReportGroupLocation: String { return self._s[4710]! } + public var Passport_Scans_Upload: String { return self._s[4711]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[4713]! } + public var ChatList_UnarchiveAction: String { return self._s[4714]! } + public var Stats_GroupTopInviter_History: String { return self._s[4715]! } + public var GroupInfo_Permissions_Title: String { return self._s[4716]! } + public var VoiceChat_CreateNewVoiceChatStart: String { return self._s[4717]! } + public var Passport_Language_el: String { return self._s[4718]! } + public var Channel_DiscussionMessageUnavailable: String { return self._s[4719]! } public func UserInfo_ContactForwardTooltip_TwoChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4634]!, self._r[4634]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4720]!, self._r[4720]!, [_0, _1]) } - public var GroupInfo_ActionPromote: String { return self._s[4635]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[4636]! } - public var Media_LimitedAccessSelectMore: String { return self._s[4637]! } + public var GroupInfo_ActionPromote: String { return self._s[4721]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[4722]! } + public var Media_LimitedAccessSelectMore: String { return self._s[4723]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4638]!, self._r[4638]!, [_0]) + return formatWithArgumentRanges(self._s[4724]!, self._r[4724]!, [_0]) } - public var VoiceOver_Chat_Reply: String { return self._s[4639]! } - public var Month_GenMay: String { return self._s[4640]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[4641]! } - public var Chat_PsaTooltip_covid: String { return self._s[4642]! } - public var Watch_Suggestion_CantTalk: String { return self._s[4643]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[4644]! } - public var AppUpgrade_Running: String { return self._s[4645]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[4648]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[4649]! } - public var SharedMedia_EmptyText: String { return self._s[4650]! } - public var Passport_Address_EditResidentialAddress: String { return self._s[4651]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[4652]! } - public var Message_PinnedGame: String { return self._s[4653]! } - public var KeyCommand_SearchInChat: String { return self._s[4654]! } - public var Appearance_ThemeCarouselNewNight: String { return self._s[4655]! } - public var ChatList_Search_FilterMedia: String { return self._s[4656]! } - public var Message_PinnedAudioMessage: String { return self._s[4657]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[4659]! } + public var VoiceOver_Chat_Reply: String { return self._s[4725]! } + public var Month_GenMay: String { return self._s[4726]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[4727]! } + public var Chat_PsaTooltip_covid: String { return self._s[4728]! } + public var Watch_Suggestion_CantTalk: String { return self._s[4729]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[4730]! } + public var AppUpgrade_Running: String { return self._s[4731]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[4734]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[4735]! } + public var SharedMedia_EmptyText: String { return self._s[4736]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[4737]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[4738]! } + public var Message_PinnedGame: String { return self._s[4739]! } + public var KeyCommand_SearchInChat: String { return self._s[4740]! } + public var Appearance_ThemeCarouselNewNight: String { return self._s[4741]! } + public var ChatList_Search_FilterMedia: String { return self._s[4742]! } + public var Message_PinnedAudioMessage: String { return self._s[4743]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[4745]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4660]!, self._r[4660]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4746]!, self._r[4746]!, [_1, _2]) } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4661]! } - public var InviteLink_Create: String { return self._s[4662]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4747]! } + public var InviteLink_Create: String { return self._s[4748]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4663]!, self._r[4663]!, [_0]) - } - public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4664]!, self._r[4664]!, [_0]) - } - public var Settings_AddAccount: String { return self._s[4665]! } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[4666]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[4667]! } - public var Channel_JoinChannel: String { return self._s[4668]! } - public var Watch_UserInfo_Unblock: String { return self._s[4669]! } - public var PhoneLabel_Title: String { return self._s[4670]! } - public var VoiceChat_EditPermissions: String { return self._s[4672]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[4673]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[4674]! } - public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4675]!, self._r[4675]!, [_1, _2, _3, _4, _5, _6]) - } - public var Channel_AddBotErrorHaveRights: String { return self._s[4676]! } - public var ChatList_TabIconFoldersTooltipNonEmptyFolders: String { return self._s[4677]! } - public var DialogList_EncryptionProcessing: String { return self._s[4678]! } - public var ChatList_Search_FilterChats: String { return self._s[4679]! } - public var WatchRemote_NotificationText: String { return self._s[4680]! } - public var EditTheme_ChangeColors: String { return self._s[4681]! } - public var GroupRemoved_ViewUserInfo: String { return self._s[4682]! } - public var CallSettings_OnMobile: String { return self._s[4684]! } - public var Month_ShortFebruary: String { return self._s[4686]! } - public var VoiceOver_MessageContextReply: String { return self._s[4687]! } - public var AutoremoveSetup_TimerValueNever: String { return self._s[4688]! } - public var Group_Location_ChangeLocation: String { return self._s[4690]! } - public func PUSH_VIDEO_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4691]!, self._r[4691]!, [_1]) - } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[4692]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[4693]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[4694]! } - public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4696]!, self._r[4696]!, [_0]) - } - public var PhotoEditor_WarmthTool: String { return self._s[4697]! } - public var Login_InfoAvatarPhoto: String { return self._s[4698]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[4699]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[4700]! } - public var Map_PlacesInThisArea: String { return self._s[4701]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[4702]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[4703]! } - public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4704]!, self._r[4704]!, [_1]) - } - public var PeerInfo_ReportProfileVideo: String { return self._s[4705]! } - public var ShareMenu_Send: String { return self._s[4706]! } - public var Username_InvalidStartsWithNumber: String { return self._s[4707]! } - public func Channel_AdminLog_StartedVoiceChat(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4708]!, self._r[4708]!, [_1]) - } - public var Appearance_AppIconClassicX: String { return self._s[4709]! } - public var Report_Report: String { return self._s[4710]! } - public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4711]!, self._r[4711]!, [_1]) - } - public var Conversation_StopPoll: String { return self._s[4712]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[4714]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[4715]! } - public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[4716]! } - public var Conversation_Timer_Title: String { return self._s[4717]! } - public var Common_Next: String { return self._s[4718]! } - public var Notification_Exceptions_NewException: String { return self._s[4719]! } - public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4720]!, self._r[4720]!, [_0]) - } - public var AccessDenied_CallMicrophone: String { return self._s[4721]! } - public var VoiceChat_UnmutePeer: String { return self._s[4722]! } - public var ChatImportActivity_Retry: String { return self._s[4723]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[4724]! } - public var ChangePhoneNumberCode_Help: String { return self._s[4725]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[4726]! } - public var Channel_AdminLogFilter_EventsLeaving: String { return self._s[4727]! } - public var BlockedUsers_LeavePrefix: String { return self._s[4728]! } - public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4729]!, self._r[4729]!, [_0]) - } - public var Group_About_Help: String { return self._s[4730]! } - public var TwoStepAuth_ChangePasswordDescription: String { return self._s[4731]! } - public var Tour_Title3: String { return self._s[4732]! } - public var Watch_Conversation_Unblock: String { return self._s[4733]! } - public var Watch_UserInfo_Block: String { return self._s[4734]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[4735]! } - public var TwoFactorSetup_Hint_Action: String { return self._s[4736]! } - public var IntentsSettings_SuggestedChatsInfo: String { return self._s[4737]! } - public var TextFormat_AddLinkTitle: String { return self._s[4738]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[4739]! } - public var Notification_VoiceChatScheduled: String { return self._s[4740]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[4741]! } - public var FastTwoStepSetup_PasswordSection: String { return self._s[4743]! } - public var Compose_ChannelMembers: String { return self._s[4744]! } - public var Conversation_ForwardTitle: String { return self._s[4745]! } - public var Conversation_PinnedPoll: String { return self._s[4748]! } - public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4749]!, self._r[4749]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4750]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4751]! } - public var Stats_Overview: String { return self._s[4752]! } - public var Map_HomeAndWorkTitle: String { return self._s[4753]! } + public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4750]!, self._r[4750]!, [_0]) + } + public var Settings_AddAccount: String { return self._s[4751]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[4752]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[4753]! } + public var Channel_JoinChannel: String { return self._s[4754]! } + public var Watch_UserInfo_Unblock: String { return self._s[4755]! } + public var PhoneLabel_Title: String { return self._s[4756]! } + public var VoiceChat_EditPermissions: String { return self._s[4758]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[4759]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[4760]! } + public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4761]!, self._r[4761]!, [_1, _2, _3, _4, _5, _6]) + } + public var Channel_AddBotErrorHaveRights: String { return self._s[4762]! } + public var ChatList_TabIconFoldersTooltipNonEmptyFolders: String { return self._s[4763]! } + public var DialogList_EncryptionProcessing: String { return self._s[4764]! } + public var ChatList_Search_FilterChats: String { return self._s[4765]! } + public var WatchRemote_NotificationText: String { return self._s[4766]! } + public var EditTheme_ChangeColors: String { return self._s[4768]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[4769]! } + public var CallSettings_OnMobile: String { return self._s[4771]! } + public var Month_ShortFebruary: String { return self._s[4773]! } + public var VoiceOver_MessageContextReply: String { return self._s[4774]! } + public var AutoremoveSetup_TimerValueNever: String { return self._s[4775]! } + public var Group_Location_ChangeLocation: String { return self._s[4777]! } + public func PUSH_VIDEO_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4778]!, self._r[4778]!, [_1]) + } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[4779]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[4780]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[4781]! } + public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4783]!, self._r[4783]!, [_0]) + } + public var PhotoEditor_WarmthTool: String { return self._s[4784]! } + public var Login_InfoAvatarPhoto: String { return self._s[4785]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[4786]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[4787]! } + public var Map_PlacesInThisArea: String { return self._s[4788]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[4789]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[4790]! } + public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4791]!, self._r[4791]!, [_1]) + } + public var PeerInfo_ReportProfileVideo: String { return self._s[4792]! } + public var ShareMenu_Send: String { return self._s[4793]! } + public var Username_InvalidStartsWithNumber: String { return self._s[4794]! } + public func Channel_AdminLog_StartedVoiceChat(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4795]!, self._r[4795]!, [_1]) + } + public var Appearance_AppIconClassicX: String { return self._s[4796]! } + public var Report_Report: String { return self._s[4797]! } + public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4798]!, self._r[4798]!, [_1]) + } + public var Conversation_StopPoll: String { return self._s[4799]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[4801]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[4802]! } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[4803]! } + public var Conversation_Timer_Title: String { return self._s[4804]! } + public var Common_Next: String { return self._s[4805]! } + public var Notification_Exceptions_NewException: String { return self._s[4806]! } + public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4807]!, self._r[4807]!, [_0]) + } + public var AccessDenied_CallMicrophone: String { return self._s[4808]! } + public var VoiceChat_UnmutePeer: String { return self._s[4809]! } + public var ChatImportActivity_Retry: String { return self._s[4810]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[4811]! } + public var ChangePhoneNumberCode_Help: String { return self._s[4812]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[4813]! } + public var Channel_AdminLogFilter_EventsLeaving: String { return self._s[4814]! } + public var BlockedUsers_LeavePrefix: String { return self._s[4815]! } + public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4816]!, self._r[4816]!, [_0]) + } + public var Group_About_Help: String { return self._s[4817]! } + public var TwoStepAuth_ChangePasswordDescription: String { return self._s[4818]! } + public var Tour_Title3: String { return self._s[4819]! } + public var Watch_Conversation_Unblock: String { return self._s[4820]! } + public var Watch_UserInfo_Block: String { return self._s[4821]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[4822]! } + public var TwoFactorSetup_Hint_Action: String { return self._s[4823]! } + public var IntentsSettings_SuggestedChatsInfo: String { return self._s[4824]! } + public var TextFormat_AddLinkTitle: String { return self._s[4825]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[4826]! } + public func Notification_VoiceChatScheduled(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4827]!, self._r[4827]!, [_1, _2]) + } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[4828]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[4830]! } + public var Compose_ChannelMembers: String { return self._s[4831]! } + public var Conversation_ForwardTitle: String { return self._s[4832]! } + public var Conversation_PinnedPoll: String { return self._s[4835]! } + public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4836]!, self._r[4836]!, [_0]) + } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4837]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4839]! } + public var Stats_Overview: String { return self._s[4840]! } + public var Map_HomeAndWorkTitle: String { return self._s[4841]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4754]!, self._r[4754]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4842]!, self._r[4842]!, [_1, _2, _3]) } - public var Passport_Address_CityPlaceholder: String { return self._s[4755]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[4756]! } - public var Privacy_PhoneNumber: String { return self._s[4757]! } - public var ChatList_Search_FilterFiles: String { return self._s[4758]! } - public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[4759]! } - public var ChannelIntro_CreateChannel: String { return self._s[4760]! } - public var Conversation_InputTextAnonymousPlaceholder: String { return self._s[4761]! } + public var Passport_Address_CityPlaceholder: String { return self._s[4843]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[4844]! } + public var Privacy_PhoneNumber: String { return self._s[4845]! } + public var ChatList_Search_FilterFiles: String { return self._s[4846]! } + public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[4847]! } + public var ChannelIntro_CreateChannel: String { return self._s[4848]! } + public var Conversation_InputTextAnonymousPlaceholder: String { return self._s[4849]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4762]!, self._r[4762]!, [_0]) + return formatWithArgumentRanges(self._s[4850]!, self._r[4850]!, [_0]) } - public var Weekday_ShortMonday: String { return self._s[4763]! } - public var Passport_Language_ar: String { return self._s[4765]! } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[4766]! } - public var TwoFactorSetup_Done_Title: String { return self._s[4767]! } - public var Calls_RatingFeedback: String { return self._s[4768]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[4769]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[4772]! } + public var Weekday_ShortMonday: String { return self._s[4851]! } + public var Passport_Language_ar: String { return self._s[4853]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[4854]! } + public var TwoFactorSetup_Done_Title: String { return self._s[4855]! } + public var Calls_RatingFeedback: String { return self._s[4856]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[4857]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[4860]! } public func VoiceOver_SelfDestructTimerOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4773]!, self._r[4773]!, [_0]) + return formatWithArgumentRanges(self._s[4861]!, self._r[4861]!, [_0]) } - public var Watch_Compose_Send: String { return self._s[4774]! } - public var PasscodeSettings_ChangePasscode: String { return self._s[4775]! } - public var WebSearch_RecentSectionClear: String { return self._s[4776]! } + public var Watch_Compose_Send: String { return self._s[4862]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[4863]! } + public var WebSearch_RecentSectionClear: String { return self._s[4864]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4777]!, self._r[4777]!, [_0]) + return formatWithArgumentRanges(self._s[4865]!, self._r[4865]!, [_0]) } - public var WallpaperSearch_ColorTeal: String { return self._s[4778]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[4779]! } - public var Permissions_ContactsTitle_v0: String { return self._s[4780]! } - public var Checkout_PasswordEntry_Pay: String { return self._s[4782]! } - public var Settings_SavedMessages: String { return self._s[4783]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[4784]! } - public var Month_ShortMarch: String { return self._s[4785]! } - public var Message_Location: String { return self._s[4786]! } + public var WallpaperSearch_ColorTeal: String { return self._s[4866]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[4867]! } + public var Permissions_ContactsTitle_v0: String { return self._s[4868]! } + public var Checkout_PasswordEntry_Pay: String { return self._s[4870]! } + public var Settings_SavedMessages: String { return self._s[4871]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[4872]! } + public var Month_ShortMarch: String { return self._s[4873]! } + public var Message_Location: String { return self._s[4874]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4787]!, self._r[4787]!, [_1]) + return formatWithArgumentRanges(self._s[4875]!, self._r[4875]!, [_1]) } public func Channel_AdminLog_MessageRemovedAdminName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4788]!, self._r[4788]!, [_1]) + return formatWithArgumentRanges(self._s[4876]!, self._r[4876]!, [_1]) } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4789]!, self._r[4789]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4877]!, self._r[4877]!, [_1, _2]) } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[4791]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[4879]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4792]!, self._r[4792]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4880]!, self._r[4880]!, [_1, _2]) } - public var GroupPermission_NoSendMedia: String { return self._s[4793]! } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[4794]! } - public var SharedMedia_CategoryDocs: String { return self._s[4795]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[4796]! } - public var Paint_Framed: String { return self._s[4797]! } - public var Channel_Setup_LinkTypePublic: String { return self._s[4798]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[4799]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[4800]! } + public var GroupPermission_NoSendMedia: String { return self._s[4881]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[4882]! } + public var SharedMedia_CategoryDocs: String { return self._s[4883]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[4884]! } + public var Paint_Framed: String { return self._s[4885]! } + public var Channel_Setup_LinkTypePublic: String { return self._s[4886]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[4887]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[4888]! } public func ChatImport_SelectionConfirmationUserWithTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4801]!, self._r[4801]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4889]!, self._r[4889]!, [_1, _2]) } - public var Channel_SignMessages: String { return self._s[4802]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[4803]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[4804]! } + public var Channel_SignMessages: String { return self._s[4890]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[4891]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[4892]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4805]!, self._r[4805]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4893]!, self._r[4893]!, [_1, _2]) } - public var InviteLink_Create_TimeLimitNoLimit: String { return self._s[4806]! } - public var GroupInfo_UpgradeButton: String { return self._s[4807]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[4808]! } - public var AutoDownloadSettings_Files: String { return self._s[4809]! } + public var InviteLink_Create_TimeLimitNoLimit: String { return self._s[4894]! } + public var GroupInfo_UpgradeButton: String { return self._s[4895]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[4896]! } + public func Conversation_ScheduledVoiceChatStartsTomorrowShort(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4897]!, self._r[4897]!, [_0]) + } + public var AutoDownloadSettings_Files: String { return self._s[4898]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4810]!, self._r[4810]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4899]!, self._r[4899]!, [_0, _1]) } - public var Login_SendCodeViaSms: String { return self._s[4812]! } - public var Update_UpdateApp: String { return self._s[4813]! } - public var Channel_Setup_TypePublic: String { return self._s[4814]! } - public var Watch_Compose_CreateMessage: String { return self._s[4815]! } + public var Login_SendCodeViaSms: String { return self._s[4901]! } + public var Update_UpdateApp: String { return self._s[4902]! } + public var Channel_Setup_TypePublic: String { return self._s[4903]! } + public var Watch_Compose_CreateMessage: String { return self._s[4904]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4816]!, self._r[4816]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4905]!, self._r[4905]!, [_1, _2, _3]) } - public var StickerPacksSettings_ManagingHelp: String { return self._s[4817]! } - public var VoiceOver_Chat_Video: String { return self._s[4818]! } - public var Forward_ChannelReadOnly: String { return self._s[4819]! } - public var StickerPack_HideStickers: String { return self._s[4820]! } - public var ChatListFolder_NameContacts: String { return self._s[4821]! } - public var Profile_BotInfo: String { return self._s[4822]! } - public var Document_TargetConfirmationFormat: String { return self._s[4823]! } - public var GroupInfo_InviteByLink: String { return self._s[4824]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[4825]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[4826]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[4827]! } - public var Passport_NotLoggedInMessage: String { return self._s[4828]! } - public var Conversation_StopQuizConfirmation: String { return self._s[4829]! } - public var Checkout_PaymentMethod: String { return self._s[4830]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[4834]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[4835]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[4836]! } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[4837]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[4838]! } - public var Conversation_GigagroupDescription: String { return self._s[4839]! } - public var Camera_Title: String { return self._s[4840]! } - public var Map_Directions: String { return self._s[4841]! } - public var Stats_MessagePublicForwardsTitle: String { return self._s[4843]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[4844]! } - public var Profile_EncryptionKey: String { return self._s[4845]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[4906]! } + public var VoiceOver_Chat_Video: String { return self._s[4907]! } + public var Forward_ChannelReadOnly: String { return self._s[4908]! } + public var StickerPack_HideStickers: String { return self._s[4909]! } + public var ChatListFolder_NameContacts: String { return self._s[4910]! } + public var Profile_BotInfo: String { return self._s[4911]! } + public var Document_TargetConfirmationFormat: String { return self._s[4912]! } + public var GroupInfo_InviteByLink: String { return self._s[4913]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[4914]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[4915]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[4916]! } + public var Passport_NotLoggedInMessage: String { return self._s[4917]! } + public var Conversation_StopQuizConfirmation: String { return self._s[4918]! } + public var Checkout_PaymentMethod: String { return self._s[4919]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[4924]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[4925]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[4926]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[4927]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[4928]! } + public var Conversation_GigagroupDescription: String { return self._s[4929]! } + public var Camera_Title: String { return self._s[4930]! } + public var Map_Directions: String { return self._s[4931]! } + public var Stats_MessagePublicForwardsTitle: String { return self._s[4933]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[4934]! } + public var Profile_EncryptionKey: String { return self._s[4935]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4846]!, self._r[4846]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[4936]!, self._r[4936]!, [_1, "\(_2)"]) } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4847]!, self._r[4847]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4937]!, self._r[4937]!, [_0, _1]) + } + public var Passport_Identity_TypePassport: String { return self._s[4938]! } + public var CreatePoll_QuizOptionsHeader: String { return self._s[4940]! } + public var Common_No: String { return self._s[4941]! } + public var Conversation_SendMessage_ScheduleMessage: String { return self._s[4942]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[4943]! } + public var Settings_AboutEmpty: String { return self._s[4944]! } + public var TwoStepAuth_FloodError: String { return self._s[4946]! } + public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[4947]! } + public func Notification_VoiceChatScheduledChannel(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4948]!, self._r[4948]!, [_0]) } - public var Passport_Identity_TypePassport: String { return self._s[4848]! } - public var CreatePoll_QuizOptionsHeader: String { return self._s[4850]! } - public var Common_No: String { return self._s[4851]! } - public var Conversation_SendMessage_ScheduleMessage: String { return self._s[4852]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[4853]! } - public var Settings_AboutEmpty: String { return self._s[4854]! } - public var TwoStepAuth_FloodError: String { return self._s[4856]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[4857]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4859]!, self._r[4859]!, [_1]) + return formatWithArgumentRanges(self._s[4950]!, self._r[4950]!, [_1]) } - public var Notification_Exceptions_MessagePreviewAlwaysOn: String { return self._s[4862]! } - public var Conversation_Edit: String { return self._s[4863]! } - public var CheckoutInfo_SaveInfo: String { return self._s[4865]! } - public var VoiceOver_Chat_AnonymousPoll: String { return self._s[4866]! } - public var Call_CameraTooltip: String { return self._s[4868]! } - public var InstantPage_FeedbackButtonShort: String { return self._s[4869]! } - public var Contacts_InviteToTelegram: String { return self._s[4870]! } - public var Notifications_ResetAllNotifications: String { return self._s[4871]! } - public var Calls_NewCall: String { return self._s[4872]! } - public var VoiceOver_Chat_Music: String { return self._s[4875]! } - public var Channel_AdminLogFilter_EventsInviteLinks: String { return self._s[4876]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[4877]! } - public var Channel_Edit_AboutItem: String { return self._s[4878]! } - public var Message_VideoExpired: String { return self._s[4879]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[4880]! } + public var Notification_Exceptions_MessagePreviewAlwaysOn: String { return self._s[4953]! } + public var Conversation_Edit: String { return self._s[4954]! } + public var CheckoutInfo_SaveInfo: String { return self._s[4956]! } + public var VoiceOver_Chat_AnonymousPoll: String { return self._s[4957]! } + public var Call_CameraTooltip: String { return self._s[4959]! } + public var InstantPage_FeedbackButtonShort: String { return self._s[4960]! } + public var Contacts_InviteToTelegram: String { return self._s[4961]! } + public var Notifications_ResetAllNotifications: String { return self._s[4962]! } + public var Calls_NewCall: String { return self._s[4963]! } + public var VoiceOver_Chat_Music: String { return self._s[4966]! } + public var Channel_AdminLogFilter_EventsInviteLinks: String { return self._s[4967]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[4968]! } + public var Channel_Edit_AboutItem: String { return self._s[4969]! } + public var Message_VideoExpired: String { return self._s[4970]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[4971]! } public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4881]!, self._r[4881]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4972]!, self._r[4972]!, [_1, _2]) } - public var NotificationsSound_Input: String { return self._s[4883]! } - public var Notifications_ClassicTones: String { return self._s[4884]! } - public var Conversation_StatusTyping: String { return self._s[4885]! } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[4886]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[4887]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4888]! } - public var Conversation_MessageLeaveComment: String { return self._s[4889]! } - public var UserInfo_TapToCall: String { return self._s[4890]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[4891]! } - public var Conversation_ClearAll: String { return self._s[4893]! } - public var UserInfo_NotificationsDefault: String { return self._s[4894]! } - public var Location_ProximityGroupTip: String { return self._s[4895]! } - public var Map_ChooseAPlace: String { return self._s[4896]! } - public var GroupInfo_AddParticipantTitle: String { return self._s[4898]! } - public var ChatList_PeerTypeNonContact: String { return self._s[4899]! } - public var Conversation_SlideToCancel: String { return self._s[4900]! } - public var Month_ShortJuly: String { return self._s[4901]! } - public var SocksProxySetup_ProxyType: String { return self._s[4902]! } + public var NotificationsSound_Input: String { return self._s[4974]! } + public var Notifications_ClassicTones: String { return self._s[4975]! } + public var Conversation_StatusTyping: String { return self._s[4976]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[4977]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[4978]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4979]! } + public var Conversation_MessageLeaveComment: String { return self._s[4980]! } + public var UserInfo_TapToCall: String { return self._s[4981]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[4982]! } + public func ScheduleVoiceChat_ScheduleOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4983]!, self._r[4983]!, [_0, _1]) + } + public var Conversation_ClearAll: String { return self._s[4985]! } + public var UserInfo_NotificationsDefault: String { return self._s[4986]! } + public var Location_ProximityGroupTip: String { return self._s[4987]! } + public var Map_ChooseAPlace: String { return self._s[4988]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[4990]! } + public var ChatList_PeerTypeNonContact: String { return self._s[4991]! } + public var Conversation_SlideToCancel: String { return self._s[4992]! } + public var Month_ShortJuly: String { return self._s[4993]! } + public var SocksProxySetup_ProxyType: String { return self._s[4994]! } public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4903]!, self._r[4903]!, [_0]) + return formatWithArgumentRanges(self._s[4995]!, self._r[4995]!, [_0]) } - public var StickerPacks_ActionArchive: String { return self._s[4904]! } - public var ChatList_EditFolders: String { return self._s[4905]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[4906]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[4908]! } + public var StickerPacks_ActionArchive: String { return self._s[4996]! } + public var ChatList_EditFolders: String { return self._s[4997]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[4998]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[5000]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4909]!, self._r[4909]!, [_0]) + return formatWithArgumentRanges(self._s[5001]!, self._r[5001]!, [_0]) } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[4910]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[4911]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[4913]! } - public var Passport_DeleteAddress: String { return self._s[4915]! } - public var Passport_DeletePassportConfirmation: String { return self._s[4916]! } - public var Passport_Identity_ReverseSide: String { return self._s[4917]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[4918]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[4919]! } - public var InviteLink_CreatedBy: String { return self._s[4920]! } - public var Passport_FieldAddress: String { return self._s[4921]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[4922]! } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[4925]! } - public var VoiceChat_Panel_TapToJoin: String { return self._s[4926]! } - public var Map_Home: String { return self._s[4927]! } - public var PollResults_Title: String { return self._s[4930]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[5002]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[5003]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[5005]! } + public func Conversation_ScheduledVoiceChatStartsOnShort(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[5007]!, self._r[5007]!, [_0]) + } + public var Passport_DeleteAddress: String { return self._s[5008]! } + public var Passport_DeletePassportConfirmation: String { return self._s[5009]! } + public var Passport_Identity_ReverseSide: String { return self._s[5010]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[5012]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[5013]! } + public var InviteLink_CreatedBy: String { return self._s[5014]! } + public var Passport_FieldAddress: String { return self._s[5015]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[5016]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[5019]! } + public var VoiceChat_Panel_TapToJoin: String { return self._s[5020]! } + public var Map_Home: String { return self._s[5021]! } + public var PollResults_Title: String { return self._s[5024]! } public func InviteLink_OtherPermanentLinkInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4931]!, self._r[4931]!, [_1, _2]) + return formatWithArgumentRanges(self._s[5025]!, self._r[5025]!, [_1, _2]) } - public var ArchivedChats_IntroText2: String { return self._s[4933]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[4934]! } - public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[4935]! } - public var VoiceChat_Muted: String { return self._s[4937]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[4938]! } - public var Passport_Identity_AddPersonalDetails: String { return self._s[4939]! } - public var Conversation_AutoremoveActionEnable: String { return self._s[4941]! } - public var Group_Info_AdminLog: String { return self._s[4942]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[4943]! } - public var Appearance_Animations: String { return self._s[4944]! } - public var Appearance_TextSizeSetting: String { return self._s[4945]! } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + public var ArchivedChats_IntroText2: String { return self._s[5027]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[5028]! } + public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[5029]! } + public var VoiceChat_Muted: String { return self._s[5031]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[5032]! } + public var Passport_Identity_AddPersonalDetails: String { return self._s[5033]! } + public var Conversation_AutoremoveActionEnable: String { return self._s[5035]! } + public var Group_Info_AdminLog: String { return self._s[5036]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[5037]! } + public var Appearance_Animations: String { return self._s[5038]! } + public var Appearance_TextSizeSetting: String { return self._s[5039]! } + public func Contacts_InviteContacts(_ 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 GroupInfo_ParticipantCount(_ value: Int32) -> String { + public func Theme_UsersCount(_ 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 StickerPack_RemoveMaskCount(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[3 * 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[4 * 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[5 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Chat_MessagesUnpinned(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Chat_TitlePinnedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func MuteFor_Days(_ 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_StatusSubscribers(_ 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 ChatList_MessageMusic(_ 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 AttachmentMenu_SendGif(_ 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 PasscodeSettings_FailedAttempts(_ 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 StickerPacks_ArchiveStickerPacksConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func InviteLink_PeopleJoinedShort(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Minutes(_ 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 PeopleNearby_ShowMorePeople(_ 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 Stats_GroupTopPosterMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ 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 VoiceOver_Chat_PollOptionCount(_ 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_FWDS(_ 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 SharedMedia_Video(_ 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 MuteExpires_Hours(_ 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 GroupInfo_ShowMoreMembers(_ 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 Media_ShareItem(_ 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 InviteLink_PeopleCanJoin(_ 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 ForwardedMessages(_ 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 InviteLink_PeopleRemaining(_ 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 Stats_GroupTopAdminKicks(_ 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 Watch_LastSeen_MinutesAgo(_ 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 OldChannels_Leave(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_MessageVideos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_SelectedChats(_ 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 Conversation_TitleReplies(_ 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 ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendPhoto(_ 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 PollResults_ShowMore(_ 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 Media_ShareVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusOnline(_ 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 ForwardedContacts(_ 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 SharedMedia_Generic(_ 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 Stats_GroupShowMoreTopPosters(_ 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 Map_ETAMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ServiceMessage_GameScoreSelfExtended(_ 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 ServiceMessage_GameScoreSimple(_ 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 Stats_MessageViews(_ 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 Conversation_TitleComments(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_GroupFormat(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_SelectedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_Search_Messages(_ 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_ShortSeconds(_ 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 Notification_GameScoreSelfSimple(_ 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 MessageTimer_ShortDays(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Link(_ 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 PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func UserCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ 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 SharedMedia_Photo(_ 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 ChatList_MessageFiles(_ 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 Watch_UserInfo_Mute(_ 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 InstantPage_Views(_ 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 MessageTimer_Weeks(_ 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 ForwardedGifs(_ 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 OldChannels_InactiveWeek(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedLocations(_ 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 VoiceOver_Chat_UnreadMessages(_ 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 Map_ETAHours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_MessagePhotos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_AutoremoveRemainingDays(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_ContextViewReplies(_ 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 SharedMedia_File(_ 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 Chat_DeleteMessagesConfirmation(_ 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 Notifications_ExceptionMuteExpires_Minutes(_ 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 Stats_GroupTopInviterInvites(_ 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 ForwardedPolls(_ 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 Contacts_ImportersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortWeeks(_ 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 Stats_GroupTopAdminDeletions(_ 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 MessageTimer_ShortMinutes(_ 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 Notifications_ExceptionMuteExpires_Hours(_ 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 PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func VoiceOver_Chat_MessagesSelected(_ 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 ForwardedAudios(_ 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 CreatePoll_AddMoreOptions(_ 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 MuteExpires_Minutes(_ 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 Call_Days(_ 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 MessagePoll_QuizCount(_ 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 LiveLocation_MenuChatsCount(_ 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 AttachmentMenu_SendVideo(_ 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 VoiceOver_Chat_PollVotes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedVideos(_ 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 QuickSend_Photos(_ 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_CHANNEL_MESSAGE_DOCS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, _1, _2) } public func OldChannels_InactiveYear(_ 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 Passport_Scans(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceChat_Status_Members(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ 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 InviteLink_InviteLinks(_ 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_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) - } - 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[115 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Contacts_InviteContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[116 * 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[117 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Stats_MessageForwards(_ 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 ForwardedPhotos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Hours(_ 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 Call_Seconds(_ 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 Stats_GroupShowMoreTopAdmins(_ 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 Call_Minutes(_ 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 Invitation_Members(_ 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 InviteLink_PeopleJoined(_ 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 ForwardedFiles(_ 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 func Conversation_MessageViewComments(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[127 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceChat_Panel_Members(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[128 * 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[129 * 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[130 * 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[131 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_DOCS_FIX1(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[132 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func ForwardedStickers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[133 * 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[134 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceChat_InviteLink_InviteSpeakers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[135 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Stats_GroupTopPosterChars(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[136 * 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[137 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[138 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func StickerPack_AddStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[139 * 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[140 * 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[141 * 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[142 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[143 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Months(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[144 * 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[145 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func OldChannels_InactiveMonth(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[146 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatListFilter_ShowMoreChats(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[147 * 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[148 * 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[149 * 6 + Int(form.rawValue)]!, _0, _1) + return String(format: self._ps[3 * 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[150 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + public func OldChannels_GroupFormat(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[151 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_Hours(_ value: Int32) -> String { + public func Call_Seconds(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[152 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortHours(_ value: Int32) -> String { + public func MuteExpires_Minutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[153 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + public func ScheduledIn_Weeks(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[154 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_ShortMinutes(_ 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[155 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_ContextMenuSelectAll(_ value: Int32) -> String { + 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[10 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func PUSH_CHANNEL_MESSAGE_DOCS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Map_ETAMinutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[156 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_ShortSeconds(_ value: Int32) -> String { + public func Conversation_ContextViewReplies(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[157 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } - public func StickerPacks_DeleteStickerPacksConfirmation(_ value: Int32) -> String { + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[158 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Stats_GroupTopAdminBans(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[159 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceChat_InviteLink_InviteListeners(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[160 * 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[161 * 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[162 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[14 * 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[163 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[15 * 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[16 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteLink_PeopleJoined(_ 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 Conversation_StatusMembers(_ 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 Conversation_TitleReplies(_ 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 Conversation_StatusOnline(_ 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 Stats_MessageForwards(_ 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_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func SharedMedia_Video(_ 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 Map_ETAHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteLink_InviteLinks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Days(_ 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 StickerPack_RemoveStickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_MessageFiles(_ 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 ScheduledIn_Minutes(_ 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 VoiceChat_InviteLink_InviteSpeakers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusSubscribers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) + } + public func 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) + } + 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[37 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Call_Hours(_ 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 Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveWeek(_ 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 AttachmentMenu_SendVideo(_ 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 MessageTimer_ShortSeconds(_ 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 Notification_GameScoreSelfExtended(_ 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 ScheduledIn_Hours(_ 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 ChatList_MessageVideos(_ 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 VoiceChat_InviteLink_InviteListeners(_ 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 VoiceChat_Status_Members(_ 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 ChatList_MessagePhotos(_ 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 VoiceOver_Chat_PollOptionCount(_ 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 Stats_GroupShowMoreTopPosters(_ 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 InstantPage_Views(_ 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 SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortHours(_ 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 Stats_GroupTopAdminBans(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func CreatePoll_AddMoreOptions(_ 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 StickerPack_RemoveMaskCount(_ 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 Conversation_LiveLocationMembersCount(_ 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 MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareItem(_ 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 Conversation_TitleComments(_ 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 MessageTimer_Years(_ 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 Call_Minutes(_ 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 ForwardedFiles(_ 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 Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Generic(_ 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 Stats_GroupTopPosterMessages(_ 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 ForwardedContacts(_ 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 SharedMedia_Photo(_ 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 Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Weeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactEmailCount(_ 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 InviteLink_PeopleRemaining(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_Leave(_ 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 Call_ShortMinutes(_ 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 Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteLink_PeopleCanJoin(_ 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 VoiceOver_Chat_PollVotes(_ 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 ScheduledIn_Months(_ 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 ChatList_Search_Messages(_ 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 ForwardedStickers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Invitation_Members(_ 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_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func ChatList_SelectedChats(_ 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 PollResults_ShowMore(_ 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 UserCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ScheduledIn_Seconds(_ 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 Conversation_SelectedMessages(_ 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 MuteExpires_Days(_ 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 OldChannels_InactiveMonth(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_MessageMusic(_ 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 Chat_TitlePinnedMessages(_ 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 MuteFor_Hours(_ 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 ForwardedAudios(_ 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 ForwardedPolls(_ 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 Call_ShortSeconds(_ 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 StickerPack_AddStickerCount(_ 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 LiveLocationUpdated_MinutesAgo(_ 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 LastSeen_MinutesAgo(_ 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 Wallpaper_DeleteConfirmation(_ 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 MessageTimer_ShortDays(_ 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 StickerPacks_ArchiveStickerPacksConfirmation(_ 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 ChatListFilter_ShowMoreChats(_ 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_MESSAGE_FILES(_ 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 PUSH_CHANNEL_MESSAGE_ROUNDS(_ 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) + } + public func Media_SharePhoto(_ 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 Stats_GroupTopPosterChars(_ 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 PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Months(_ 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 StickerPack_StickerCount(_ 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 MessagePoll_VotedCount(_ 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 ForwardedLocations(_ 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 Stats_MessageViews(_ 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 AttachmentMenu_SendPhoto(_ 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 StickerPack_AddMaskCount(_ 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 MessagePoll_QuizCount(_ 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 ScheduledIn_Years(_ 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 func ChatList_DeletedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[127 * 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[128 * 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[129 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_AutoremoveRemainingDays(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[130 * 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[131 * 6 + Int(form.rawValue)]!, _1, _2) + } + 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[132 * 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[133 * 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[134 * 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[135 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Stats_GroupTopAdminDeletions(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[136 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PeopleNearby_ShowMorePeople(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[137 * 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[138 * 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[139 * 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[164 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[140 * 6 + Int(form.rawValue)]!, stringValue) } - public func Stats_GroupShowMoreTopInviters(_ value: Int32) -> String { + public func VoiceOver_Chat_MessagesSelected(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[165 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[141 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_DOCS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[166 * 6 + Int(form.rawValue)]!, _1, _2) + public func ScheduledIn_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[142 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_UnreadMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[143 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_MessageViewComments(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[144 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Link(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[145 * 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[146 * 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[147 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_ContextMenuSelectAll(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[148 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Chat_MessagesUnpinned(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[149 * 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[150 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Stats_GroupTopAdminKicks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[151 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[152 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceChat_Panel_Members(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[153 * 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[154 * 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[155 * 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[156 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Stats_GroupShowMoreTopInviters(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[157 * 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[158 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func StickerPacks_DeleteStickerPacksConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[159 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Stats_GroupShowMoreTopAdmins(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[160 * 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[161 * 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[162 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[163 * 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[164 * 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[165 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[166 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[167 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_CHAT_MESSAGE_DOCS_FIX1(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = getPluralizationForm(self.lc, selector) return String(format: self._ps[168 * 6 + Int(form.rawValue)]!, _2, _1, _3) } + public func Stats_GroupTopInviterInvites(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[169 * 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[170 * 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[171 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteLink_PeopleJoinedShort(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[172 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[173 * 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[174 * 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[175 * 6 + Int(form.rawValue)]!, stringValue) + } public init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) { self.primaryComponent = primaryComponent diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift index 6a170942b0..6463a32f4f 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift @@ -406,6 +406,25 @@ public final class PresentationInputFieldTheme { } public final class PresentationThemeList { + public final class PaymentOption { + public let inactiveFillColor: UIColor + public let inactiveForegroundColor: UIColor + public let activeFillColor: UIColor + public let activeForegroundColor: UIColor + + public init( + inactiveFillColor: UIColor, + inactiveForegroundColor: UIColor, + activeFillColor: UIColor, + activeForegroundColor: UIColor + ) { + self.inactiveFillColor = inactiveFillColor + self.inactiveForegroundColor = inactiveForegroundColor + self.activeFillColor = activeFillColor + self.activeForegroundColor = activeForegroundColor + } + } + public let blocksBackgroundColor: UIColor public let plainBackgroundColor: UIColor public let itemPrimaryTextColor: UIColor @@ -437,8 +456,42 @@ public final class PresentationThemeList { public let inputClearButtonColor: UIColor public let itemBarChart: PresentationThemeItemBarChart public let itemInputField: PresentationInputFieldTheme + public let paymentOption: PaymentOption - public init(blocksBackgroundColor: UIColor, plainBackgroundColor: UIColor, itemPrimaryTextColor: UIColor, itemSecondaryTextColor: UIColor, itemDisabledTextColor: UIColor, itemAccentColor: UIColor, itemHighlightedColor: UIColor, itemDestructiveColor: UIColor, itemPlaceholderTextColor: UIColor, itemBlocksBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, itemBlocksSeparatorColor: UIColor, itemPlainSeparatorColor: UIColor, disclosureArrowColor: UIColor, sectionHeaderTextColor: UIColor, freeTextColor: UIColor, freeTextErrorColor: UIColor, freeTextSuccessColor: UIColor, freeMonoIconColor: UIColor, itemSwitchColors: PresentationThemeSwitch, itemDisclosureActions: PresentationThemeItemDisclosureActions, itemCheckColors: PresentationThemeFillStrokeForeground, controlSecondaryColor: UIColor, freeInputField: PresentationInputFieldTheme, freePlainInputField: PresentationInputFieldTheme, mediaPlaceholderColor: UIColor, scrollIndicatorColor: UIColor, pageIndicatorInactiveColor: UIColor, inputClearButtonColor: UIColor, itemBarChart: PresentationThemeItemBarChart, itemInputField: PresentationInputFieldTheme) { + public init( + blocksBackgroundColor: UIColor, + plainBackgroundColor: UIColor, + itemPrimaryTextColor: UIColor, + itemSecondaryTextColor: UIColor, + itemDisabledTextColor: UIColor, + itemAccentColor: UIColor, + itemHighlightedColor: UIColor, + itemDestructiveColor: UIColor, + itemPlaceholderTextColor: UIColor, + itemBlocksBackgroundColor: UIColor, + itemHighlightedBackgroundColor: UIColor, + itemBlocksSeparatorColor: UIColor, + itemPlainSeparatorColor: UIColor, + disclosureArrowColor: UIColor, + sectionHeaderTextColor: UIColor, + freeTextColor: UIColor, + freeTextErrorColor: UIColor, + freeTextSuccessColor: UIColor, + freeMonoIconColor: UIColor, + itemSwitchColors: PresentationThemeSwitch, + itemDisclosureActions: PresentationThemeItemDisclosureActions, + itemCheckColors: PresentationThemeFillStrokeForeground, + controlSecondaryColor: UIColor, + freeInputField: PresentationInputFieldTheme, + freePlainInputField: PresentationInputFieldTheme, + mediaPlaceholderColor: UIColor, + scrollIndicatorColor: UIColor, + pageIndicatorInactiveColor: UIColor, + inputClearButtonColor: UIColor, + itemBarChart: PresentationThemeItemBarChart, + itemInputField: PresentationInputFieldTheme, + paymentOption: PaymentOption + ) { self.blocksBackgroundColor = blocksBackgroundColor self.plainBackgroundColor = plainBackgroundColor self.itemPrimaryTextColor = itemPrimaryTextColor @@ -470,10 +523,11 @@ public final class PresentationThemeList { self.inputClearButtonColor = inputClearButtonColor self.itemBarChart = itemBarChart self.itemInputField = itemInputField + self.paymentOption = paymentOption } - public func withUpdated(blocksBackgroundColor: UIColor? = nil, plainBackgroundColor: UIColor? = nil, itemPrimaryTextColor: UIColor? = nil, itemSecondaryTextColor: UIColor? = nil, itemDisabledTextColor: UIColor? = nil, itemAccentColor: UIColor? = nil, itemHighlightedColor: UIColor? = nil, itemDestructiveColor: UIColor? = nil, itemPlaceholderTextColor: UIColor? = nil, itemBlocksBackgroundColor: UIColor? = nil, itemHighlightedBackgroundColor: UIColor? = nil, itemBlocksSeparatorColor: UIColor? = nil, itemPlainSeparatorColor: UIColor? = nil, disclosureArrowColor: UIColor? = nil, sectionHeaderTextColor: UIColor? = nil, freeTextColor: UIColor? = nil, freeTextErrorColor: UIColor? = nil, freeTextSuccessColor: UIColor? = nil, freeMonoIconColor: UIColor? = nil, itemSwitchColors: PresentationThemeSwitch? = nil, itemDisclosureActions: PresentationThemeItemDisclosureActions? = nil, itemCheckColors: PresentationThemeFillStrokeForeground? = nil, controlSecondaryColor: UIColor? = nil, freeInputField: PresentationInputFieldTheme? = nil, freePlainInputField: PresentationInputFieldTheme? = nil, mediaPlaceholderColor: UIColor? = nil, scrollIndicatorColor: UIColor? = nil, pageIndicatorInactiveColor: UIColor? = nil, inputClearButtonColor: UIColor? = nil, itemBarChart: PresentationThemeItemBarChart? = nil, itemInputField: PresentationInputFieldTheme? = nil) -> PresentationThemeList { - return PresentationThemeList(blocksBackgroundColor: blocksBackgroundColor ?? self.blocksBackgroundColor, plainBackgroundColor: plainBackgroundColor ?? self.plainBackgroundColor, itemPrimaryTextColor: itemPrimaryTextColor ?? self.itemPrimaryTextColor, itemSecondaryTextColor: itemSecondaryTextColor ?? self.itemSecondaryTextColor, itemDisabledTextColor: itemDisabledTextColor ?? self.itemDisabledTextColor, itemAccentColor: itemAccentColor ?? self.itemAccentColor, itemHighlightedColor: itemHighlightedColor ?? self.itemHighlightedColor, itemDestructiveColor: itemDestructiveColor ?? self.itemDestructiveColor, itemPlaceholderTextColor: itemPlaceholderTextColor ?? self.itemPlaceholderTextColor, itemBlocksBackgroundColor: itemBlocksBackgroundColor ?? self.itemBlocksBackgroundColor, itemHighlightedBackgroundColor: itemHighlightedBackgroundColor ?? self.itemHighlightedBackgroundColor, itemBlocksSeparatorColor: itemBlocksSeparatorColor ?? self.itemBlocksSeparatorColor, itemPlainSeparatorColor: itemPlainSeparatorColor ?? self.itemPlainSeparatorColor, disclosureArrowColor: disclosureArrowColor ?? self.disclosureArrowColor, sectionHeaderTextColor: sectionHeaderTextColor ?? self.sectionHeaderTextColor, freeTextColor: freeTextColor ?? self.freeTextColor, freeTextErrorColor: freeTextErrorColor ?? self.freeTextErrorColor, freeTextSuccessColor: freeTextSuccessColor ?? self.freeTextSuccessColor, freeMonoIconColor: freeMonoIconColor ?? self.freeMonoIconColor, itemSwitchColors: itemSwitchColors ?? self.itemSwitchColors, itemDisclosureActions: itemDisclosureActions ?? self.itemDisclosureActions, itemCheckColors: itemCheckColors ?? self.itemCheckColors, controlSecondaryColor: controlSecondaryColor ?? self.controlSecondaryColor, freeInputField: freeInputField ?? self.freeInputField, freePlainInputField: freePlainInputField ?? self.freePlainInputField, mediaPlaceholderColor: mediaPlaceholderColor ?? self.mediaPlaceholderColor, scrollIndicatorColor: scrollIndicatorColor ?? self.scrollIndicatorColor, pageIndicatorInactiveColor: pageIndicatorInactiveColor ?? self.pageIndicatorInactiveColor, inputClearButtonColor: inputClearButtonColor ?? self.inputClearButtonColor, itemBarChart: itemBarChart ?? self.itemBarChart, itemInputField: itemInputField ?? self.itemInputField) + public func withUpdated(blocksBackgroundColor: UIColor? = nil, plainBackgroundColor: UIColor? = nil, itemPrimaryTextColor: UIColor? = nil, itemSecondaryTextColor: UIColor? = nil, itemDisabledTextColor: UIColor? = nil, itemAccentColor: UIColor? = nil, itemHighlightedColor: UIColor? = nil, itemDestructiveColor: UIColor? = nil, itemPlaceholderTextColor: UIColor? = nil, itemBlocksBackgroundColor: UIColor? = nil, itemHighlightedBackgroundColor: UIColor? = nil, itemBlocksSeparatorColor: UIColor? = nil, itemPlainSeparatorColor: UIColor? = nil, disclosureArrowColor: UIColor? = nil, sectionHeaderTextColor: UIColor? = nil, freeTextColor: UIColor? = nil, freeTextErrorColor: UIColor? = nil, freeTextSuccessColor: UIColor? = nil, freeMonoIconColor: UIColor? = nil, itemSwitchColors: PresentationThemeSwitch? = nil, itemDisclosureActions: PresentationThemeItemDisclosureActions? = nil, itemCheckColors: PresentationThemeFillStrokeForeground? = nil, controlSecondaryColor: UIColor? = nil, freeInputField: PresentationInputFieldTheme? = nil, freePlainInputField: PresentationInputFieldTheme? = nil, mediaPlaceholderColor: UIColor? = nil, scrollIndicatorColor: UIColor? = nil, pageIndicatorInactiveColor: UIColor? = nil, inputClearButtonColor: UIColor? = nil, itemBarChart: PresentationThemeItemBarChart? = nil, itemInputField: PresentationInputFieldTheme? = nil, paymentOption: PaymentOption? = nil) -> PresentationThemeList { + return PresentationThemeList(blocksBackgroundColor: blocksBackgroundColor ?? self.blocksBackgroundColor, plainBackgroundColor: plainBackgroundColor ?? self.plainBackgroundColor, itemPrimaryTextColor: itemPrimaryTextColor ?? self.itemPrimaryTextColor, itemSecondaryTextColor: itemSecondaryTextColor ?? self.itemSecondaryTextColor, itemDisabledTextColor: itemDisabledTextColor ?? self.itemDisabledTextColor, itemAccentColor: itemAccentColor ?? self.itemAccentColor, itemHighlightedColor: itemHighlightedColor ?? self.itemHighlightedColor, itemDestructiveColor: itemDestructiveColor ?? self.itemDestructiveColor, itemPlaceholderTextColor: itemPlaceholderTextColor ?? self.itemPlaceholderTextColor, itemBlocksBackgroundColor: itemBlocksBackgroundColor ?? self.itemBlocksBackgroundColor, itemHighlightedBackgroundColor: itemHighlightedBackgroundColor ?? self.itemHighlightedBackgroundColor, itemBlocksSeparatorColor: itemBlocksSeparatorColor ?? self.itemBlocksSeparatorColor, itemPlainSeparatorColor: itemPlainSeparatorColor ?? self.itemPlainSeparatorColor, disclosureArrowColor: disclosureArrowColor ?? self.disclosureArrowColor, sectionHeaderTextColor: sectionHeaderTextColor ?? self.sectionHeaderTextColor, freeTextColor: freeTextColor ?? self.freeTextColor, freeTextErrorColor: freeTextErrorColor ?? self.freeTextErrorColor, freeTextSuccessColor: freeTextSuccessColor ?? self.freeTextSuccessColor, freeMonoIconColor: freeMonoIconColor ?? self.freeMonoIconColor, itemSwitchColors: itemSwitchColors ?? self.itemSwitchColors, itemDisclosureActions: itemDisclosureActions ?? self.itemDisclosureActions, itemCheckColors: itemCheckColors ?? self.itemCheckColors, controlSecondaryColor: controlSecondaryColor ?? self.controlSecondaryColor, freeInputField: freeInputField ?? self.freeInputField, freePlainInputField: freePlainInputField ?? self.freePlainInputField, mediaPlaceholderColor: mediaPlaceholderColor ?? self.mediaPlaceholderColor, scrollIndicatorColor: scrollIndicatorColor ?? self.scrollIndicatorColor, pageIndicatorInactiveColor: pageIndicatorInactiveColor ?? self.pageIndicatorInactiveColor, inputClearButtonColor: inputClearButtonColor ?? self.inputClearButtonColor, itemBarChart: itemBarChart ?? self.itemBarChart, itemInputField: itemInputField ?? self.itemInputField, paymentOption: paymentOption ?? self.paymentOption) } } diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift index 850e04a645..ca6049a1ff 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -745,6 +745,33 @@ extension PresentationInputFieldTheme: Codable { } } +extension PresentationThemeList.PaymentOption: Codable { + enum CodingKeys: String, CodingKey { + case inactiveFill + case inactiveForeground + case activeFill + case activeForeground + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init( + inactiveFillColor: try decodeColor(values, .inactiveFill), + inactiveForegroundColor: try decodeColor(values, .inactiveForeground), + activeFillColor: try decodeColor(values, .activeFill), + activeForegroundColor: try decodeColor(values, .activeForeground) + ) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.activeFillColor, .inactiveFill) + try encodeColor(&values, self.activeForegroundColor, .inactiveForeground) + try encodeColor(&values, self.activeFillColor, .activeFill) + try encodeColor(&values, self.activeForegroundColor, .activeForeground) + } +} + extension PresentationThemeList: Codable { enum CodingKeys: String, CodingKey { case blocksBg @@ -778,6 +805,7 @@ extension PresentationThemeList: Codable { case inputClearButton case itemBarChart case itemInputField + case paymentOption } public convenience init(from decoder: Decoder) throws { @@ -789,6 +817,8 @@ extension PresentationThemeList: Codable { } else { freePlainInputField = try values.decode(PresentationInputFieldTheme.self, forKey: .freeInputField) } + + let freeTextSuccessColor = try decodeColor(values, .freeTextSuccess) self.init( blocksBackgroundColor: try decodeColor(values, .blocksBg), @@ -808,7 +838,7 @@ extension PresentationThemeList: Codable { sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText), freeTextColor: try decodeColor(values, .freeText), freeTextErrorColor: try decodeColor(values, .freeTextError), - freeTextSuccessColor: try decodeColor(values, .freeTextSuccess), + freeTextSuccessColor: freeTextSuccessColor, freeMonoIconColor: try decodeColor(values, .freeMonoIcon), itemSwitchColors: try values.decode(PresentationThemeSwitch.self, forKey: .switch), itemDisclosureActions: try values.decode(PresentationThemeItemDisclosureActions.self, forKey: .disclosureActions), @@ -821,7 +851,13 @@ extension PresentationThemeList: Codable { pageIndicatorInactiveColor: try decodeColor(values, .pageIndicatorInactive), inputClearButtonColor: try decodeColor(values, .inputClearButton), itemBarChart: try values.decode(PresentationThemeItemBarChart.self, forKey: .itemBarChart), - itemInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .itemInputField) + itemInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .itemInputField), + paymentOption: (try? values.decode(PresentationThemeList.PaymentOption.self, forKey: .paymentOption)) ?? PresentationThemeList.PaymentOption( + inactiveFillColor: freeTextSuccessColor.withMultipliedAlpha(0.3), + inactiveForegroundColor: freeTextSuccessColor, + activeFillColor: freeTextSuccessColor, + activeForegroundColor: UIColor(rgb: 0xffffff) + ) ) } diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift index 66b3464aab..bbd74bbbcb 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift @@ -521,12 +521,14 @@ public final class PrincipalThemeAdditionalGraphics { public let chatBubbleActionButtonIncomingShareIconImage: UIImage public let chatBubbleActionButtonIncomingPhoneIconImage: UIImage public let chatBubbleActionButtonIncomingLocationIconImage: UIImage + public let chatBubbleActionButtonIncomingPaymentIconImage: UIImage public let chatBubbleActionButtonOutgoingMessageIconImage: UIImage public let chatBubbleActionButtonOutgoingLinkIconImage: UIImage public let chatBubbleActionButtonOutgoingShareIconImage: UIImage public let chatBubbleActionButtonOutgoingPhoneIconImage: UIImage public let chatBubbleActionButtonOutgoingLocationIconImage: UIImage + public let chatBubbleActionButtonOutgoingPaymentIconImage: UIImage public let chatEmptyItemLockIcon: UIImage public let emptyChatListCheckIcon: UIImage @@ -565,11 +567,13 @@ public final class PrincipalThemeAdditionalGraphics { self.chatBubbleActionButtonIncomingShareIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotShare"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonIncomingPhoneIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPhone"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonIncomingLocationIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotLocation"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))! + self.chatBubbleActionButtonIncomingPaymentIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPayment"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonOutgoingMessageIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotMessage"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonOutgoingLinkIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotLink"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonOutgoingShareIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotShare"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonOutgoingPhoneIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPhone"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))! self.chatBubbleActionButtonOutgoingLocationIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotLocation"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))! + self.chatBubbleActionButtonOutgoingPaymentIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPayment"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))! self.chatEmptyItemLockIcon = generateImage(CGSize(width: 9.0, height: 13.0), rotatedContext: { size, context in context.clear(CGRect(origin: CGPoint(), size: size)) diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift index 3ae4d727d1..233b536b94 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift @@ -56,6 +56,7 @@ public struct PresentationResourcesSettings { public static let support = renderIcon(name: "Settings/MenuIcons/Support") public static let faq = renderIcon(name: "Settings/MenuIcons/Faq") + public static let tips = renderIcon(name: "Settings/MenuIcons/Faq") public static let addAccount = renderIcon(name: "Settings/MenuIcons/AddAccount") public static let setPasscode = renderIcon(name: "Settings/MenuIcons/SetPasscode") diff --git a/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift b/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift index 8e7b4ec27b..632299a592 100644 --- a/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift +++ b/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift @@ -46,6 +46,55 @@ private func loadCurrencyFormatterEntries() -> [String: CurrencyFormatterEntry] private let currencyFormatterEntries = loadCurrencyFormatterEntries() +public func setupCurrencyNumberFormatter(currency: String) -> NumberFormatter { + guard let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] else { + preconditionFailure() + } + + var result = "" + if entry.symbolOnLeft { + result.append("¤") + if entry.spaceBetweenAmountAndSymbol { + result.append(" ") + } + } + + result.append("#") + + result.append(entry.decimalSeparator) + + for _ in 0 ..< entry.decimalDigits { + result.append("#") + } + if entry.decimalDigits != 0 { + result.append("0") + } + + if !entry.symbolOnLeft { + if entry.spaceBetweenAmountAndSymbol { + result.append(" ") + } + result.append("¤") + } + + let numberFormatter = NumberFormatter() + + numberFormatter.numberStyle = .currency + + numberFormatter.positiveFormat = result + numberFormatter.negativeFormat = "-\(result)" + + numberFormatter.currencySymbol = "" + numberFormatter.currencyDecimalSeparator = entry.decimalSeparator + numberFormatter.currencyGroupingSeparator = entry.thousandsSeparator + + numberFormatter.minimumFractionDigits = entry.decimalDigits + numberFormatter.maximumFractionDigits = entry.decimalDigits + numberFormatter.minimumIntegerDigits = 1 + + return numberFormatter +} + public func fractionalToCurrencyAmount(value: Double, currency: String) -> Int64? { guard let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] else { return nil @@ -54,7 +103,11 @@ public func fractionalToCurrencyAmount(value: Double, currency: String) -> Int64 for _ in 0 ..< entry.decimalDigits { factor *= 10.0 } - return Int64(value * factor) + if value > Double(Int64.max) / factor { + return nil + } else { + return Int64(value * factor) + } } public func currencyToFractionalAmount(value: Int64, currency: String) -> Double? { @@ -111,3 +164,42 @@ public func formatCurrencyAmount(_ amount: Int64, currency: String) -> String { return formatter.string(from: (Float(amount) * 0.01) as NSNumber) ?? "" } } + +public func formatCurrencyAmountCustom(_ amount: Int64, currency: String) -> (String, String, Bool) { + if let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] { + var result = "" + if amount < 0 { + result.append("-") + } + /*if entry.symbolOnLeft { + result.append(entry.symbol) + if entry.spaceBetweenAmountAndSymbol { + result.append(" ") + } + }*/ + var integerPart = abs(amount) + var fractional: [Character] = [] + for _ in 0 ..< entry.decimalDigits { + let part = integerPart % 10 + integerPart /= 10 + if let scalar = UnicodeScalar(UInt32(part + 48)) { + fractional.append(Character(scalar)) + } + } + result.append("\(integerPart)") + result.append(entry.decimalSeparator) + for i in 0 ..< fractional.count { + result.append(fractional[fractional.count - i - 1]) + } + /*if !entry.symbolOnLeft { + if entry.spaceBetweenAmountAndSymbol { + result.append(" ") + } + result.append(entry.symbol) + }*/ + + return (result, entry.symbol, entry.symbolOnLeft) + } else { + return ("", "", false) + } +} diff --git a/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift b/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift index 6b0549106e..d2689b2a6b 100644 --- a/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift +++ b/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift @@ -24,6 +24,7 @@ public enum MessageContentKindKey { case poll case restricted case dice + case invoice } public enum MessageContentKind: Equatable { @@ -44,6 +45,7 @@ public enum MessageContentKind: Equatable { case poll(String) case restricted(String) case dice(String) + case invoice(String) public var key: MessageContentKindKey { switch self { @@ -81,11 +83,13 @@ public enum MessageContentKind: Equatable { return .restricted case .dice: return .dice + case .invoice: + return .invoice } } } -public func messageContentKind(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, accountPeerId: PeerId) -> MessageContentKind { +public func messageContentKind(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, accountPeerId: PeerId) -> MessageContentKind { for attribute in message.attributes { if let attribute = attribute as? RestrictedContentMessageAttribute { if let text = attribute.platformText(platform: "ios", contentSettings: contentSettings) { @@ -95,14 +99,14 @@ public func messageContentKind(contentSettings: ContentSettings, message: Messag } } for media in message.media { - if let kind = mediaContentKind(media, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: accountPeerId) { + if let kind = mediaContentKind(media, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: accountPeerId) { return kind } } return .text(message.text) } -public func mediaContentKind(_ media: Media, message: Message? = nil, strings: PresentationStrings? = nil, nameDisplayOrder: PresentationPersonNameOrder? = nil, accountPeerId: PeerId? = nil) -> MessageContentKind? { +public func mediaContentKind(_ media: Media, message: Message? = nil, strings: PresentationStrings? = nil, nameDisplayOrder: PresentationPersonNameOrder? = nil, dateTimeFormat: PresentationDateTimeFormat? = nil, accountPeerId: PeerId? = nil) -> MessageContentKind? { switch media { case let expiredMedia as TelegramMediaExpiredContent: switch expiredMedia.data { @@ -163,7 +167,7 @@ public func mediaContentKind(_ media: Media, message: Message? = nil, strings: P } case _ as TelegramMediaAction: if let message = message, let strings = strings, let nameDisplayOrder = nameDisplayOrder, let accountPeerId = accountPeerId { - return .text(plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: false) ?? "") + return .text(plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat ?? PresentationDateTimeFormat(timeFormat: .military, dateFormat: .dayFirst, dateSeparator: ".", dateSuffix: "", requiresFullYear: false, decimalSeparator: ".", groupingSeparator: ""), message: message, accountPeerId: accountPeerId, forChatList: false) ?? "") } else { return nil } @@ -171,6 +175,8 @@ public func mediaContentKind(_ media: Media, message: Message? = nil, strings: P return .poll(poll.text) case let dice as TelegramMediaDice: return .dice(dice.emoji) + case let invoice as TelegramMediaInvoice: + return .invoice(invoice.title) default: return nil } @@ -220,11 +226,13 @@ public func stringForMediaKind(_ kind: MessageContentKind, strings: Presentation return (text, false) case let .dice(emoji): return (emoji, true) + case let .invoice(text): + return (text, true) } } -public func descriptionStringForMessage(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, accountPeerId: PeerId) -> (String, Bool) { - let contentKind = messageContentKind(contentSettings: contentSettings, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: accountPeerId) +public func descriptionStringForMessage(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, accountPeerId: PeerId) -> (String, Bool) { + let contentKind = messageContentKind(contentSettings: contentSettings, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: accountPeerId) if !message.text.isEmpty && ![.expiredImage, .expiredVideo].contains(contentKind.key) { return (foldLineBreaks(message.text), false) } diff --git a/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift index f0ab9f7838..532e5df540 100644 --- a/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift +++ b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift @@ -126,21 +126,38 @@ public func stringForUserPresence(strings: PresentationStrings, day: RelativeTim return dayString } -private func humanReadableStringForTimestamp(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32) -> String { +private func humanReadableStringForTimestamp(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32, format: HumanReadableStringFormat? = nil) -> String { let dayString: String switch day { case .today: - dayString = strings.Time_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 + let string = stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat) + dayString = format?.todayFormatString(string) ?? strings.Time_TodayAt(string).0 case .yesterday: - dayString = strings.Time_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 + let string = stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat) + dayString = format?.yesterdayFormatString(string) ?? strings.Time_YesterdayAt(string).0 case .tomorrow: - dayString = strings.Time_TomorrowAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 + let string = stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat) + dayString = format?.tomorrowFormatString(string) ?? strings.Time_TomorrowAt(string).0 } return dayString } -public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, timestamp: Int32) -> String { +public struct HumanReadableStringFormat { + let dateFormatString: (String) -> String + let tomorrowFormatString: (String) -> String + let todayFormatString: (String) -> String + let yesterdayFormatString: (String) -> String + + public init(dateFormatString: @escaping (String) -> String, tomorrowFormatString: @escaping (String) -> String, todayFormatString: @escaping (String) -> String, yesterdayFormatString: @escaping (String) -> String) { + self.dateFormatString = dateFormatString + self.tomorrowFormatString = tomorrowFormatString + self.todayFormatString = todayFormatString + self.yesterdayFormatString = yesterdayFormatString + } +} + +public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, timestamp: Int32, alwaysShowTime: Bool = false, allowYesterday: Bool = true, format: HumanReadableStringFormat? = nil) -> String { var t: time_t = time_t(timestamp) var timeinfo: tm = tm() localtime_r(&t, &timeinfo) @@ -151,11 +168,17 @@ public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTi localtime_r(&now, &timeinfoNow) if timeinfo.tm_year != timeinfoNow.tm_year { - return "\(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat))" + let string: String + if alwaysShowTime { + string = stringForMediumDate(timestamp: timestamp, strings: strings, dateTimeFormat: dateTimeFormat) + } else { + string = stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat) + } + return format?.dateFormatString(string) ?? string } let dayDifference = timeinfo.tm_yday - timeinfoNow.tm_yday - if dayDifference == 0 || dayDifference == -1 || dayDifference == 1 { + if dayDifference == 0 || (dayDifference == -1 && allowYesterday) || dayDifference == 1 { let day: RelativeTimestampFormatDay if dayDifference == 0 { day = .today @@ -164,9 +187,15 @@ public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTi } else { day = .tomorrow } - return humanReadableStringForTimestamp(strings: strings, day: day, dateTimeFormat: dateTimeFormat, hours: timeinfo.tm_hour, minutes: timeinfo.tm_min) + return humanReadableStringForTimestamp(strings: strings, day: day, dateTimeFormat: dateTimeFormat, hours: timeinfo.tm_hour, minutes: timeinfo.tm_min, format: format) } else { - return "\(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat))" + let string: String + if alwaysShowTime { + string = stringForMediumDate(timestamp: timestamp, strings: strings, dateTimeFormat: dateTimeFormat) + } else { + string = stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat) + } + return format?.dateFormatString(string) ?? string } } diff --git a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift index 149d269a65..008d2d066a 100644 --- a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift +++ b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift @@ -27,11 +27,11 @@ private func peerMentionsAttributes(primaryTextColor: UIColor, peerIds: [(Int, P return result } -public func plainServiceMessageString(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, message: Message, accountPeerId: PeerId, forChatList: Bool) -> String? { - return universalServiceMessageString(presentationData: nil, strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: forChatList)?.string +public func plainServiceMessageString(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, message: Message, accountPeerId: PeerId, forChatList: Bool) -> String? { + return universalServiceMessageString(presentationData: nil, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: forChatList)?.string } -public func universalServiceMessageString(presentationData: (PresentationTheme, TelegramWallpaper)?, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, message: Message, accountPeerId: PeerId, forChatList: Bool) -> NSAttributedString? { +public func universalServiceMessageString(presentationData: (PresentationTheme, TelegramWallpaper)?, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, message: Message, accountPeerId: PeerId, forChatList: Bool) -> NSAttributedString? { var attributedString: NSAttributedString? let primaryTextColor: UIColor @@ -448,8 +448,15 @@ public func universalServiceMessageString(presentationData: (PresentationTheme, attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor) case let .groupPhoneCall(_, _, scheduleDate, duration): if let scheduleDate = scheduleDate { - let titleString = strings.Notification_VoiceChatScheduled - attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor) + if message.author?.id.namespace == Namespaces.Peer.CloudChannel { + let titleString = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: scheduleDate, alwaysShowTime: true, allowYesterday: false, format: HumanReadableStringFormat(dateFormatString: { strings.Notification_VoiceChatScheduledChannel($0).0 }, tomorrowFormatString: { strings.Notification_VoiceChatScheduledTomorrowChannel($0).0 }, todayFormatString: { strings.Notification_VoiceChatScheduledTodayChannel($0).0 }, yesterdayFormatString: { $0 })) + attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor) + } else { + let timeString = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: scheduleDate) + let attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)] + let titleString = strings.Notification_VoiceChatScheduled(authorName, timeString) + attributedString = addAttributesToStringWithRanges(titleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds)) + } } else if let duration = duration { let titleString = strings.Notification_VoiceChatEnded(callDurationString(strings: strings, value: duration)).0 attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor) diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/Contents.json new file mode 100644 index 0000000000..7a8982f200 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "callshare (1).pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/callshare (1).pdf b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/callshare (1).pdf new file mode 100644 index 0000000000..03f94787bb Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/callshare (1).pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/Contents.json new file mode 100644 index 0000000000..8d74185285 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "card.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/card.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/card.pdf new file mode 100644 index 0000000000..3e219e9e05 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/card.pdf differ diff --git a/submodules/TelegramUI/Resources/Animations/anim_payment.json b/submodules/TelegramUI/Resources/Animations/anim_payment.json new file mode 100644 index 0000000000..d0dee855cb --- /dev/null +++ b/submodules/TelegramUI/Resources/Animations/anim_payment.json @@ -0,0 +1 @@ +{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":63,"w":512,"h":512,"nm":"Card 3","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Coin 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14,"s":[50]},{"t":62,"s":[140.566]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":0.848},"o":{"x":0.05,"y":0},"t":17,"s":[270.605,259.865,0],"to":[0,0,0],"ti":[40.605,0.865,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.053},"t":42,"s":[215.605,71.865,0],"to":[-40.605,-0.865,0],"ti":[0,0,0]},{"t":62,"s":[165.605,457.865,0]}],"ix":2},"a":{"a":0,"k":[43.395,127.865,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":59,"s":[-100,100,100]},{"t":62,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":17,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":37,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":47,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":57,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"t":62,"s":[{"i":[[0,-19.405],[14.995,0.275],[0,19.405],[-14.284,0.398]],"o":[[0,19.405],[-14.284,-0.238],[0,-19.405],[14.234,-0.393]],"v":[[65.256,127.865],[43.395,163],[21.534,127.865],[43.395,92.729]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":194,"st":12,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Coin 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"t":55,"s":[200]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":0.872},"o":{"x":0.05,"y":0},"t":5,"s":[197.605,259.865,0],"to":[0,0,0],"ti":[57.605,-1.135,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.048},"t":30,"s":[132.605,40.865,0],"to":[-57.605,1.135,0],"ti":[0,0,0]},{"t":50,"s":[33.605,459.865,0]}],"ix":2},"a":{"a":0,"k":[43.395,127.865,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":47,"s":[-100,100,100]},{"t":50,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,-19.405],[13.231,0.385],[0,19.405],[-12.236,0.557]],"o":[[0,19.405],[-12.236,-0.333],[0,-19.405],[12.166,-0.551]],"v":[[59.946,127.865],[44.829,157.471],[26.844,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":45,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"t":55,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":12,"op":182,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Coin","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":11,"s":[0]},{"t":61,"s":[178]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":0.872},"o":{"x":0.05,"y":0},"t":11,"s":[314.395,259.865,0],"to":[0,0,0],"ti":[-57.605,-1.135,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.048},"t":36,"s":[379.395,40.865,0],"to":[57.605,1.135,0],"ti":[0,0,0]},{"t":56,"s":[478.395,459.865,0]}],"ix":2},"a":{"a":0,"k":[43.395,127.865,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":53,"s":[100,100,100]},{"t":56,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[0.921,-19.383],[15.877,0.22],[0,19.405],[-15.308,0.318]],"o":[[-0.423,8.902],[-15.308,-0.19],[0,-19.405],[15.268,-0.315]],"v":[[67.911,127.865],[40.876,136.815],[18.879,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":17,"s":[{"i":[[0.614,-19.39],[14.113,0.33],[0,19.405],[-13.26,0.477]],"o":[[-0.282,12.403],[-13.26,-0.285],[0,-19.405],[13.2,-0.472]],"v":[[62.601,127.865],[42.796,162.033],[24.189,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":21,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":41,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":51,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"t":61,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":15,"op":183,"st":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Card","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.29,"y":0},"t":0,"s":[256,376,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.71,"y":1},"o":{"x":0.6,"y":0},"t":8,"s":[256,350,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":0.587},"o":{"x":0.2,"y":0},"t":18,"s":[256,448,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.058},"t":40,"s":[256,424,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.71,"y":1},"o":{"x":0.3,"y":0},"t":50,"s":[256,357,0],"to":[0,0,0],"ti":[0,0,0]},{"t":59,"s":[256,376,0]}],"ix":2},"a":{"a":0,"k":[256,376,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.29,0.29,0.29],"y":[0,0,0]},"t":0,"s":[60,0,100]},{"i":{"x":[0.71,0.71,0.71],"y":[1,1,1]},"o":{"x":[0.6,0.6,0.6],"y":[0,0,0]},"t":10,"s":[98,102,100]},{"i":{"x":[0.42,0.42,0.42],"y":[1,1,1]},"o":{"x":[0.2,0.2,0.2],"y":[0,0,0]},"t":20,"s":[102,97,100]},{"i":{"x":[0.3,0.3,0.3],"y":[1.413,1.413,1.413]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":32,"s":[100,100,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.6,0.6,0.6],"y":[0.058,0.058,-0.058]},"t":42,"s":[100,100,100]},{"i":{"x":[0.71,0.71,0.71],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":52,"s":[98,102,100]},{"t":61,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.142,0],[0,0],[0,4.142],[0,0],[15.188,0],[0,0],[0,-15.188],[0,0]],"o":[[0,0],[4.142,0],[0,0],[0,-15.188],[0,0],[-15.188,0],[0,0],[0,4.142]],"v":[[-150,-65],[150,-65],[157.5,-72.5],[157.5,-92.5],[130,-120],[-130,-120],[-157.5,-92.5],[-157.5,-72.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle-Copy","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[256,163.5],"ix":2},"a":{"a":0,"k":[0,-92.5],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Card Top","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.142,0],[0,0],[0,-4.142],[0,0],[19.33,0],[0,0],[0,19.33],[0,0]],"o":[[0,0],[4.142,0],[0,0],[0,19.33],[0,0],[-19.33,0],[0,0],[0,-4.142]],"v":[[-150,-20],[150,-20],[157.5,-12.5],[157.5,85],[122.5,120],[-122.5,120],[-157.5,85],[-157.5,-12.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[256,267],"ix":2},"a":{"a":0,"k":[0,11],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Card Bottom","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":183,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/submodules/TelegramUI/Resources/Animations/anim_profilemute.json b/submodules/TelegramUI/Resources/Animations/anim_profilemute.json index d5af447715..dd68bee0b7 100644 --- a/submodules/TelegramUI/Resources/Animations/anim_profilemute.json +++ b/submodules/TelegramUI/Resources/Animations/anim_profilemute.json @@ -1 +1 @@ -{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":37,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":3,"s":[-14.236,-12.181,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":17,"s":[18.2,19.9,0],"to":[0,0,0],"ti":[0,0,0]},{"t":25,"s":[6.2,8.4,0]}],"ix":2},"a":{"a":0,"k":[6.2,8.4,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.6,-100.5],[115,117.3]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":3,"s":[0]},{"t":17,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":18,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-34.15,23.2,0],"ix":2},"a":{"a":0,"k":[-34.15,23.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-78.2,-54.55],[50.226,64.601],[52.497,66.708],[74.8,87.4],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[0,0],[-3.653,-3.294],[-5.525,13.962],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[3.653,3.294],[4.195,2.447],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.034,-46.903],[-53.116,-21.384],[-29.754,-30.355],[79.924,87.426],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[-0.456,-0.411],[-8.27,20.578],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.456,0.411],[7.125,4.156],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.617,-41.562],[-16.001,19.968],[12.155,10.038],[81.126,87.722],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,0],[0,0],[-11.064,22.792],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[7.543,4.4],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[13.701,50.721],[44.112,42.695],[81.297,87.764],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,0],[0,0],[-2.767,-2.505],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[6.956,6.247],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.323,65.744],[35.335,71.99],[53.148,87.283],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"t":13,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.741,66.641],[29.641,68.541],[48.3,87.2],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":2,"s":[0]},{"i":{"x":[0.302],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":8,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":19,"s":[5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":28,"s":[-3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.082,261,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":6,"s":[255.082,241,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":17,"s":[255.082,281,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":26,"s":[255.082,247,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.082,261,0]}],"ix":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-8.591,5.791],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[2.614,-16.107],[3.57,-2.406],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[74.05,87.3],[58.993,73.332],[56.28,70.816],[-77.95,-53.7],[-55.871,-86.266],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[2.996,5.408],[2.697,3.901],[0,0],[1.169,3.154],[-2.365,0.891],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[9.243,-9.472],[-1.489,-2.155],[0,0],[2.903,-1.871],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[77.248,87.333],[-26.556,-26.717],[-20.783,-50.138],[-48.601,-78.89],[-55.265,-86.894],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.088,9.185],[0,0],[0,0],[0.495,1.383],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[13.299,-14.381],[0,0],[0,0],[2.415,-1.46],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.481,87.357],[13.203,11.744],[15.1,-16.693],[-50.846,-83.329],[-53.923,-87.557],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.386,9.724],[0,0],[0,0],[1.412,2.634],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[18.116,-11.123],[0,0],[0,0],[2.406,-1.458],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.8,87.36],[42.716,46.351],[50.914,18.408],[-48.925,-81.098],[-53.91,-87.541],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.33,-4.16],[0,0],[0,0],[0,0],[0,0],[0,0],[1.412,2.634],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-1.6,-0.785],[0,0],[0,0],[0,0],[0,0],[0,0],[2.406,-1.458],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113.604,82.187],[108.027,77.93],[99.8,69.311],[66.73,34.844],[50.914,18.408],[-48.925,-81.098],[-53.91,-87.541],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"t":13,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.33,-4.16],[0,0],[0,0],[0,0],[0,0],[0,0],[1.412,2.634],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-1.6,-0.785],[0,0],[0,0],[0,0],[0,0],[0,0],[2.406,-1.458],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113.952,81.547],[108.63,77.404],[100.024,68.676],[66.73,34.844],[50.914,18.408],[-48.925,-81.098],[-53.91,-87.541],[-47.1,-91],[-34.2,-96.2]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.2,117.55,0],"ix":2},"a":{"a":0,"k":[-0.2,117.55,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[17.8,0],[6.4,15.6]],"o":[[-6.4,15.5],[-17.8,0],[0,0]],"v":[[39.3,104.3],[-0.2,130.8],[-39.7,104.3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":37,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":3,"s":[-14.236,-12.181,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":17,"s":[18.2,19.9,0],"to":[0,0,0],"ti":[0,0,0]},{"t":25,"s":[6.2,8.4,0]}],"ix":2},"a":{"a":0,"k":[6.2,8.4,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.6,-100.5],[115,117.3]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":3,"s":[0]},{"t":17,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":18,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-34.15,23.2,0],"ix":2},"a":{"a":0,"k":[-34.15,23.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-78.2,-54.55],[50.226,64.601],[52.497,66.708],[74.8,87.4],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[0,0],[-3.653,-3.294],[-5.525,13.962],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[3.653,3.294],[4.195,2.447],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.034,-46.903],[-53.116,-21.384],[-29.754,-30.355],[79.924,87.426],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[-0.456,-0.411],[-8.27,20.578],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.456,0.411],[7.125,4.156],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.617,-41.562],[-16.001,19.968],[12.155,10.038],[81.126,87.722],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,0],[0,0],[-11.064,22.792],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[7.543,4.4],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[13.701,50.721],[44.112,42.695],[81.297,87.764],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,0],[0,0],[-2.767,-2.505],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[6.956,6.247],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.323,65.744],[35.335,71.99],[53.148,87.283],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"t":13,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.741,66.641],[29.641,68.541],[48.3,87.2],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":7,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":2,"s":[0]},{"i":{"x":[0.302],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":8,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":19,"s":[5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":28,"s":[-3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.082,261,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":6,"s":[255.082,241,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":17,"s":[255.082,281,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":26,"s":[255.082,247,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.082,261,0]}],"ix":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[3.7,-22.8],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[71.672,87.301],[50.558,76.645],[47.845,74.129],[-77.95,-53.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[2.996,5.407],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[-3.828,-2.942],[0,0],[2.866,-12.122],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[77.248,87.333],[-20.395,-19.416],[-32.09,-33.406],[-68.304,-69.815],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.088,9.185],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[1.015,-4.019],[0,0],[2.283,-4.664],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.481,87.357],[13.203,11.744],[6.417,-2.958],[-67.338,-75.841],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.386,9.724],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[4.232,-6.783],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.8,87.36],[42.716,46.351],[40.339,31.849],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[93.023,87.394],[76.068,68.529],[72.041,63.833],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"t":13,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[95.3,87.4],[79.202,71.144],[76.303,68.216],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":7,"op":180,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.2,117.55,0],"ix":2},"a":{"a":0,"k":[-0.2,117.55,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[17.8,0],[6.4,15.6]],"o":[[-6.4,15.5],[-17.8,0],[0,0]],"v":[[39.3,104.3],[-0.2,130.8],[-39.7,104.3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"EXAMPLE","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0.232,0.2,0],"ix":2},"a":{"a":0,"k":[0.232,0.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-18.9,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3],[0,0],[-18.3,7.3],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0],[1.4,-19.6],[0,0],[-0.1,-19]],"v":[[0.2,-130.4],[34.3,-98.4],[34.4,-96.2],[47.3,-91],[79.4,-47.1],[83.8,15],[104.4,57.6],[112.6,65.1],[113.4,83.2],[104,87.4],[-103.5,87.4],[-116.3,74.6],[-112.1,65.2],[-103.9,57.7],[-83.3,15.1],[-78.9,-47],[-46.8,-90.9],[-33.9,-96.1]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":7,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/submodules/TelegramUI/Resources/Animations/anim_profileunmute.json b/submodules/TelegramUI/Resources/Animations/anim_profileunmute.json index 2e2197da17..ebfea4f952 100644 --- a/submodules/TelegramUI/Resources/Animations/anim_profileunmute.json +++ b/submodules/TelegramUI/Resources/Animations/anim_profileunmute.json @@ -1 +1 @@ -{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":37,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":1,"s":[6.2,8.4,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":7,"s":[17.813,19.808,0],"to":[0,0,0],"ti":[0,0,0]},{"t":18,"s":[-8.985,-6.628,0]}],"ix":2},"a":{"a":0,"k":[6.2,8.4,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.6,-100.5],[115,117.3]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":7,"s":[100]},{"t":18,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":18,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":136,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-34.15,23.2,0],"ix":2},"a":{"a":0,"k":[-34.15,23.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.741,66.641],[29.641,68.541],[48.3,87.2],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[0,0],[-11.064,22.792],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[7.543,4.4],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[13.701,50.721],[44.112,42.695],[81.297,87.764],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,0],[-0.456,-0.411],[-7.14,22.508],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.456,0.411],[7.125,4.156],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.617,-41.562],[-36.617,-1.022],[-8.461,-10.952],[81.126,87.722],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,0],[-0.304,-0.274],[-3.842,19.542],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.304,0.274],[4.75,2.771],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.145,-45.891],[-67.552,-34.675],[-46.665,-45.462],[79.017,87.614],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"t":13,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-78.2,-54.55],[50.226,64.601],[52.497,66.708],[74.8,87.4],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":1,"s":[0]},{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":7,"s":[3]},{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":20,"s":[-5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":29,"s":[3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.082,261,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":5,"s":[255.082,281,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":18,"s":[255.082,237,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":27,"s":[255.082,283,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.082,261,0]}],"ix":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.33,-4.16],[0,0],[0,0],[0,0],[0,0],[0,0],[1.412,2.634],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-1.6,-0.785],[0,0],[0,0],[0,0],[0,0],[0,0],[2.406,-1.458],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113.952,81.547],[108.63,77.404],[100.024,68.676],[66.73,34.844],[50.914,18.408],[-48.925,-81.098],[-53.91,-87.541],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.386,9.724],[0,0],[0,0],[1.412,2.634],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[18.116,-11.123],[0,0],[0,0],[2.406,-1.458],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.8,87.36],[42.716,46.351],[50.914,18.408],[-48.925,-81.098],[-53.91,-87.541],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.088,9.185],[0,0],[0,0],[0.495,1.383],[-2.025,0.763],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[13.299,-14.381],[0,0],[0,0],[2.415,-1.46],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.481,87.357],[-3.46,-5.093],[-1.563,-33.53],[-50.846,-83.329],[-53.923,-87.557],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[2.996,5.408],[2.697,3.901],[0,0],[1.169,3.154],[-2.365,0.891],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[9.243,-9.472],[-1.489,-2.155],[0,0],[2.903,-1.871],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[77.248,87.333],[-41.459,-39.87],[-34.93,-63.521],[-48.601,-78.89],[-55.265,-86.894],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"t":13,"s":[{"i":[[-18.8,0],[-6.125,-5.762],[-0.55,-8.95],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[9.05,0],[6.125,5.763],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[3.7,-22.8],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[23.225,-121.113],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[74.05,87.3],[58.993,73.332],[56.28,70.816],[-77.95,-53.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.2,117.55,0],"ix":2},"a":{"a":0,"k":[-0.2,117.55,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[17.8,0],[6.4,15.6]],"o":[[-6.4,15.5],[-17.8,0],[0,0]],"v":[[39.3,104.3],[-0.2,130.8],[-39.7,104.3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":37,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":1,"s":[6.2,8.4,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":7,"s":[17.813,19.808,0],"to":[0,0,0],"ti":[0,0,0]},{"t":18,"s":[-8.985,-6.628,0]}],"ix":2},"a":{"a":0,"k":[6.2,8.4,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.6,-100.5],[115,117.3]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":7,"s":[100]},{"t":18,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":18,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":136,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-34.15,23.2,0],"ix":2},"a":{"a":0,"k":[-34.15,23.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.741,66.641],[29.641,68.541],[48.3,87.2],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[0,0],[-11.064,22.792],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[7.543,4.4],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[13.701,50.721],[44.112,42.695],[81.297,87.764],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,0],[-0.456,-0.411],[-7.14,22.508],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.456,0.411],[7.125,4.156],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.617,-41.562],[-36.617,-1.022],[-8.461,-10.952],[81.126,87.722],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,0],[-0.304,-0.274],[-3.842,19.542],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.304,0.274],[4.75,2.771],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.145,-45.891],[-67.552,-34.675],[-46.665,-45.462],[79.017,87.614],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"t":13,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-78.2,-54.55],[50.226,64.601],[52.497,66.708],[74.8,87.4],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":13,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":1,"s":[0]},{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":7,"s":[3]},{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":20,"s":[-5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":29,"s":[3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.082,261,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":5,"s":[255.082,281,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":18,"s":[255.082,237,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":27,"s":[255.082,283,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.082,261,0]}],"ix":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[95.3,87.4],[79.202,71.144],[76.303,68.216],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.386,9.724],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[4.232,-6.783],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.8,87.36],[42.716,46.351],[40.339,31.849],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.088,9.185],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[1.015,-4.019],[0,0],[2.283,-4.664],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.481,87.357],[-8.726,-11.611],[-10.415,-21.132],[-67.338,-75.841],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[3.392,6.123],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0.676,-2.679],[0,0],[2.755,-10.709],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[77.671,87.338],[10.934,17.854],[2.793,9.156],[-70.875,-68.461],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"t":13,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[3.7,-22.8],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[74.05,87.3],[58.993,73.332],[56.28,70.816],[-77.95,-53.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":13,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.2,117.55,0],"ix":2},"a":{"a":0,"k":[-0.2,117.55,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[17.8,0],[6.4,15.6]],"o":[[-6.4,15.5],[-17.8,0],[0,0]],"v":[[39.3,104.3],[-0.2,130.8],[-39.7,104.3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"EXAMPLE","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0.232,0.2,0],"ix":2},"a":{"a":0,"k":[0.232,0.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-18.9,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3],[0,0],[-18.3,7.3],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0],[1.4,-19.6],[0,0],[-0.1,-19]],"v":[[0.2,-130.4],[34.3,-98.4],[34.4,-96.2],[47.3,-91],[79.4,-47.1],[83.8,15],[104.4,57.6],[112.6,65.1],[113.4,83.2],[104,87.4],[-103.5,87.4],[-116.3,74.6],[-112.1,65.2],[-103.9,57.7],[-83.3,15.1],[-78.9,-47],[-46.8,-90.9],[-33.9,-96.1]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":13,"op":180,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/submodules/TelegramUI/Resources/Animations/anim_profilevc.json b/submodules/TelegramUI/Resources/Animations/anim_profilevc.json index 672362d7e7..66ae10a5fa 100644 --- a/submodules/TelegramUI/Resources/Animations/anim_profilevc.json +++ b/submodules/TelegramUI/Resources/Animations/anim_profilevc.json @@ -1 +1 @@ -{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":48,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[153.7,256.05,0],"ix":2},"a":{"a":0,"k":[-102.3,0.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.3,-50.8],[-102.3,50.9]],"c":false}]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":10,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.1,-115.632],[-102.1,115.232]],"c":false}]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":20,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.3,-39.5],[-102.3,39.6]],"c":false}]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":30,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.1,-97.4],[-102.1,97]],"c":false}]},{"t":45,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.3,-50.8],[-102.3,50.9]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Line 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,256,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":2,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-115.5],[0,115.5]],"c":false}]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":12,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-52],[0,52]],"c":false}]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":22,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-115.5],[0,115.5]],"c":false}]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":32,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-52],[0,52]],"c":false}]},{"t":46,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-115.5],[0,115.5]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Line 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[358.5,256.05,0],"ix":2},"a":{"a":0,"k":[102.5,0.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":4,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-50.8],[102.5,50.9]],"c":false}]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":14,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-115.34],[102.5,114.94]],"c":false}]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":24,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-37.4],[102.5,37.5]],"c":false}]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":34,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-115.34],[102.5,114.94]],"c":false}]},{"t":47,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-50.8],[102.5,50.9]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":27,"w":512,"h":512,"nm":"VoiceChat 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[153.7,256.05,0],"ix":2},"a":{"a":0,"k":[-102.3,0.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.3,-50.8],[-102.3,50.9]],"c":false}]},{"i":{"x":0.4,"y":1},"o":{"x":0.4,"y":0},"t":11,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.1,-133],[-102.1,132.6]],"c":false}]},{"t":23,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.3,-50.8],[-102.3,50.9]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Line 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,256,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":2,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-115.5],[0,115.5]],"c":false}]},{"i":{"x":0.4,"y":1},"o":{"x":0.4,"y":0},"t":13,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-45],[0,45]],"c":false}]},{"t":25,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-115.5],[0,115.5]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Line 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[358.5,256.05,0],"ix":2},"a":{"a":0,"k":[102.5,0.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":4,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-50.8],[102.5,50.9]],"c":false}]},{"i":{"x":0.4,"y":1},"o":{"x":0.4,"y":0},"t":15,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-131.4],[102.5,131]],"c":false}]},{"t":26,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-50.8],[102.5,50.9]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/submodules/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/Resources/PresentationStrings.mapping index 38fe107644..a078c3d675 100644 Binary files a/submodules/TelegramUI/Resources/PresentationStrings.mapping and b/submodules/TelegramUI/Resources/PresentationStrings.mapping differ diff --git a/submodules/TelegramUI/Sources/AccountContext.swift b/submodules/TelegramUI/Sources/AccountContext.swift index 4621ae114e..95fe8149b6 100644 --- a/submodules/TelegramUI/Sources/AccountContext.swift +++ b/submodules/TelegramUI/Sources/AccountContext.swift @@ -238,7 +238,7 @@ public final class AccountContextImpl: AccountContext { }) } - account.callSessionManager.updateVersions(versions: PresentationCallManagerImpl.voipVersions(includeExperimental: true, includeReference: false).map { version, supportsVideo -> CallSessionManagerImplementationVersion in + account.callSessionManager.updateVersions(versions: PresentationCallManagerImpl.voipVersions(includeExperimental: true, includeReference: sharedContext.immediateExperimentalUISettings.experimentalCompatibility).map { version, supportsVideo -> CallSessionManagerImplementationVersion in CallSessionManagerImplementationVersion(version: version, supportsVideo: supportsVideo) }) } @@ -302,6 +302,10 @@ public final class AccountContextImpl: AccountContext { } } + public func scheduleGroupCall(peerId: PeerId) { + let _ = self.sharedContext.callManager?.scheduleGroupCall(context: self, peerId: peerId, endCurrentIfAny: true) + } + public func joinGroupCall(peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, activeCall: CachedChannelData.ActiveCall) { let callResult = self.sharedContext.callManager?.joinGroupCall(context: self, peerId: peerId, invite: invite, requestJoinAsPeerId: requestJoinAsPeerId, initialCall: activeCall, endCurrentIfAny: false) if let callResult = callResult, case let .alreadyInProgress(currentPeerId) = callResult { diff --git a/submodules/TelegramUI/Sources/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift index 87d08d9814..b1cbaba978 100644 --- a/submodules/TelegramUI/Sources/AppDelegate.swift +++ b/submodules/TelegramUI/Sources/AppDelegate.swift @@ -815,14 +815,14 @@ final class SharedApplicationContext { } }) - self.mainWindow.debugAction = { + /*self.mainWindow.debugAction = { self.mainWindow.debugAction = nil let presentationData = sharedContext.currentPresentationData.with { $0 } let navigationController = NavigationController(mode: .single, theme: NavigationControllerTheme(presentationTheme: presentationData.theme)) navigationController.viewControllers = [debugController(sharedContext: sharedContext, context: nil)] self.mainWindow.present(navigationController, on: .root) - } + }*/ presentationDataPromise.set(sharedContext.presentationData) diff --git a/submodules/TelegramUI/Sources/ApplicationContext.swift b/submodules/TelegramUI/Sources/ApplicationContext.swift index a1f8433069..4e4c9df927 100644 --- a/submodules/TelegramUI/Sources/ApplicationContext.swift +++ b/submodules/TelegramUI/Sources/ApplicationContext.swift @@ -356,7 +356,7 @@ final class AuthorizedApplicationContext { if inAppNotificationSettings.displayPreviews { let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } - strongSelf.notificationController.enqueue(ChatMessageNotificationItem(context: strongSelf.context, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, messages: messages, tapAction: { + strongSelf.notificationController.enqueue(ChatMessageNotificationItem(context: strongSelf.context, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, messages: messages, tapAction: { if let strongSelf = self { var foundOverlay = false strongSelf.mainWindow.forEachViewController({ controller in diff --git a/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift index 99808d4147..6ae6070ef1 100644 --- a/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift +++ b/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift @@ -177,14 +177,14 @@ public final class AuthorizationSequenceController: NavigationController, MFMail controller.inProgress = false let text: String - var actions: [TextAlertAction] = [ - TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}) - ] + var actions: [TextAlertAction] = [] switch error { case .limitExceeded: text = strongSelf.presentationData.strings.Login_CodeFloodError + actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) case .invalidPhoneNumber: text = strongSelf.presentationData.strings.Login_InvalidPhoneError + actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Login_PhoneNumberHelp, action: { [weak controller] in guard let strongSelf = self, let controller = controller else { return @@ -200,8 +200,10 @@ public final class AuthorizationSequenceController: NavigationController, MFMail })) case .phoneLimitExceeded: text = strongSelf.presentationData.strings.Login_PhoneFloodError + actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) case .phoneBanned: text = strongSelf.presentationData.strings.Login_PhoneBannedError + actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Login_PhoneNumberHelp, action: { [weak controller] in guard let strongSelf = self, let controller = controller else { return @@ -217,6 +219,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail })) case let .generic(info): text = strongSelf.presentationData.strings.Login_UnknownError + actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Login_PhoneNumberHelp, action: { [weak controller] in guard let strongSelf = self, let controller = controller else { return @@ -238,6 +241,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail })) case .timeout: text = strongSelf.presentationData.strings.Login_NetworkError + actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})) actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.ChatSettings_ConnectionType_UseProxy, action: { [weak controller] in guard let strongSelf = self, let controller = controller else { return diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift index 6edc11f355..6a0a8535cc 100644 --- a/submodules/TelegramUI/Sources/ChatController.swift +++ b/submodules/TelegramUI/Sources/ChatController.swift @@ -356,6 +356,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G private weak var sendMessageActionsController: ChatSendMessageActionSheetController? private var searchResultsController: ChatSearchResultsController? + + private weak var currentPinchController: PinchController? + private weak var currentPinchSourceItemNode: ListViewItemNode? private var screenCaptureManager: ScreenCaptureDetectionManager? private let chatAdditionalDataDisposable = MetaDisposable() @@ -535,7 +538,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } case .groupPhoneCall, .inviteToGroupPhoneCall: if let activeCall = strongSelf.presentationInterfaceState.activeGroupCallInfo?.activeCall { - strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: activeCall.id, accessHash: activeCall.accessHash, title: activeCall.title)) + strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: activeCall.id, accessHash: activeCall.accessHash, title: activeCall.title, scheduleTimestamp: activeCall.scheduleTimestamp, subscribedToScheduled: activeCall.subscribedToScheduled)) } else { var canManageGroupCalls = false if let channel = strongSelf.presentationInterfaceState.renderedPeer?.chatMainPeer as? TelegramChannel { @@ -553,7 +556,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } if canManageGroupCalls { - strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatText, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatStart, action: { + strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatStartNow, action: { if let strongSelf = self { var dismissStatus: (() -> Void)? let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: { @@ -564,12 +567,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G statusController?.dismiss() } strongSelf.present(statusController, in: .window(.root)) - strongSelf.createVoiceChatDisposable.set((createGroupCall(account: strongSelf.context.account, peerId: message.id.peerId) + strongSelf.createVoiceChatDisposable.set((createGroupCall(account: strongSelf.context.account, peerId: message.id.peerId, title: nil, scheduleDate: nil) |> deliverOnMainQueue).start(next: { [weak self] info in guard let strongSelf = self else { return } - strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title)) + strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: info.subscribedToScheduled)) }, error: { [weak self] error in dismissStatus?() @@ -579,7 +582,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G let text: String switch error { - case .generic: + case .generic, .scheduledTooLate: text = strongSelf.presentationData.strings.Login_UnknownError case .anonymousNotAllowed: text = strongSelf.presentationData.strings.VoiceChat_AnonymousDisabledAlertText @@ -589,7 +592,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G dismissStatus?() })) } - })]), in: .window(.root)) + }), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatSchedule, action: { + if let strongSelf = self { + strongSelf.context.scheduleGroupCall(peerId: message.id.peerId) + } + }), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {})], actionLayout: .vertical), in: .window(.root)) } } return true @@ -620,12 +627,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.presentAutoremoveSetup() } case .paymentSent: - for attribute in message.attributes { + strongSelf.present(BotReceiptController(context: strongSelf.context, messageId: message.id), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + /*for attribute in message.attributes { if let attribute = attribute as? ReplyMessageAttribute { - strongSelf.navigateToMessage(from: message.id, to: .id(attribute.messageId)) + //strongSelf.navigateToMessage(from: message.id, to: .id(attribute.messageId)) break } - } + }*/ return true default: break @@ -912,6 +920,31 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.window?.presentInGlobalOverlay(controller) }) } + }, activateMessagePinch: { [weak self] sourceNode in + guard let strongSelf = self else { + return + } + + var sourceItemNode: ListViewItemNode? + strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in + guard let itemNode = itemNode as? ListViewItemNode else { + return + } + if sourceNode.view.isDescendant(of: itemNode.view) { + sourceItemNode = itemNode + } + } + + let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: { + guard let strongSelf = self else { + return CGRect() + } + + return strongSelf.chatDisplayNode.view.convert(strongSelf.chatDisplayNode.frameForVisibleArea(), to: nil) + }) + strongSelf.currentPinchController = pinchController + strongSelf.currentPinchSourceItemNode = sourceItemNode + strongSelf.window?.presentInGlobalOverlay(pinchController) }, openMessageContextActions: { message, node, rect, gesture in gesture?.cancel() }, navigateToMessage: { [weak self] fromId, id in @@ -1838,9 +1871,30 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let invoice = media as? TelegramMediaInvoice { strongSelf.chatDisplayNode.dismissInput() if let receiptMessageId = invoice.receiptMessageId { - strongSelf.present(BotReceiptController(context: strongSelf.context, invoice: invoice, messageId: receiptMessageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + strongSelf.present(BotReceiptController(context: strongSelf.context, messageId: receiptMessageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) } else { - strongSelf.present(BotCheckoutController(context: strongSelf.context, invoice: invoice, messageId: messageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + let inputData = Promise() + inputData.set(BotCheckoutController.InputData.fetch(context: strongSelf.context, messageId: message.id) + |> map(Optional.init) + |> `catch` { _ -> Signal in + return .single(nil) + }) + strongSelf.present(BotCheckoutController(context: strongSelf.context, invoice: invoice, messageId: messageId, inputData: inputData, completed: { currencyValue, receiptMessageId in + guard let strongSelf = self else { + return + } + strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .paymentSent(currencyValue: currencyValue, itemTitle: invoice.title), elevatedLayout: false, action: { action in + guard let strongSelf = self, let receiptMessageId = receiptMessageId else { + return false + } + + if case .info = action { + strongSelf.present(BotReceiptController(context: strongSelf.context, messageId: receiptMessageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + return true + } + return false + }), in: .current) + }), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) } } } @@ -4001,21 +4055,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G guard let strongSelf = self else { return } - for (tooltipScreen, tooltipItemNode) in strongSelf.currentMessageTooltipScreens { - if let itemNode = itemNode { - if itemNode === tooltipItemNode { - tooltipScreen.addRelativeScrollingOffset(-offset, transition: transition) - } - } else { - tooltipScreen.addRelativeScrollingOffset(-offset, transition: transition) - } - } - } - - self.chatDisplayNode.historyNode.didScrollWithOffset = { [weak self] offset, _, _ in - guard let strongSelf = self else { - return - } if offset > 0.0 { if var scrolledToMessageIdValue = strongSelf.scrolledToMessageIdValue { @@ -4025,6 +4064,16 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } else if offset < 0.0 { strongSelf.scrolledToMessageIdValue = nil } + + if let currentPinchSourceItemNode = strongSelf.currentPinchSourceItemNode { + if let itemNode = itemNode { + if itemNode === currentPinchSourceItemNode { + strongSelf.currentPinchController?.addRelativeContentOffset(CGPoint(x: 0.0, y: -offset), transition: transition) + } + } else { + strongSelf.currentPinchController?.addRelativeContentOffset(CGPoint(x: 0.0, y: -offset), transition: transition) + } + } } if case .pinnedMessages = self.presentationInterfaceState.subject { diff --git a/submodules/TelegramUI/Sources/ChatControllerInteraction.swift b/submodules/TelegramUI/Sources/ChatControllerInteraction.swift index 2863f406e8..f6997caa90 100644 --- a/submodules/TelegramUI/Sources/ChatControllerInteraction.swift +++ b/submodules/TelegramUI/Sources/ChatControllerInteraction.swift @@ -53,6 +53,7 @@ public final class ChatControllerInteraction { let openPeer: (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void let openPeerMention: (String) -> Void let openMessageContextMenu: (Message, Bool, ASDisplayNode, CGRect, UIGestureRecognizer?) -> Void + let activateMessagePinch: (PinchSourceContainerNode) -> Void let openMessageContextActions: (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void let navigateToMessage: (MessageId, MessageId) -> Void let navigateToMessageStandalone: (MessageId) -> Void @@ -144,6 +145,7 @@ public final class ChatControllerInteraction { openPeer: @escaping (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void, openPeerMention: @escaping (String) -> Void, openMessageContextMenu: @escaping (Message, Bool, ASDisplayNode, CGRect, UIGestureRecognizer?) -> Void, + activateMessagePinch: @escaping (PinchSourceContainerNode) -> Void, openMessageContextActions: @escaping (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void, navigateToMessage: @escaping (MessageId, MessageId) -> Void, navigateToMessageStandalone: @escaping (MessageId) -> Void, @@ -222,6 +224,7 @@ public final class ChatControllerInteraction { self.openPeer = openPeer self.openPeerMention = openPeerMention self.openMessageContextMenu = openMessageContextMenu + self.activateMessagePinch = activateMessagePinch self.openMessageContextActions = openMessageContextActions self.navigateToMessage = navigateToMessage self.navigateToMessageStandalone = navigateToMessageStandalone @@ -301,7 +304,7 @@ public final class ChatControllerInteraction { static var `default`: ChatControllerInteraction { return ChatControllerInteraction(openMessage: { _, _ in - return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _ in return false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in }, openWallpaper: { _ in }, openTheme: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in + return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, activateMessagePinch: { _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _ in return false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in }, openWallpaper: { _ in }, openTheme: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in }, presentController: { _, _ in }, navigationController: { return nil }, chatControllerNode: { diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift index 38957c8645..85c468508d 100644 --- a/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift +++ b/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift @@ -32,7 +32,7 @@ func accessoryPanelForChatPresentationIntefaceState(_ chatPresentationInterfaceS editPanelNode.updateThemeAndStrings(theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) return editPanelNode } else { - let panelNode = EditAccessoryPanelNode(context: context, messageId: editMessage.messageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder) + let panelNode = EditAccessoryPanelNode(context: context, messageId: editMessage.messageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder, dateTimeFormat: chatPresentationInterfaceState.dateTimeFormat) panelNode.interfaceInteraction = interfaceInteraction return panelNode } @@ -63,7 +63,7 @@ func accessoryPanelForChatPresentationIntefaceState(_ chatPresentationInterfaceS replyPanelNode.updateThemeAndStrings(theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) return replyPanelNode } else { - let panelNode = ReplyAccessoryPanelNode(context: context, messageId: replyMessageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder) + let panelNode = ReplyAccessoryPanelNode(context: context, messageId: replyMessageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder, dateTimeFormat: chatPresentationInterfaceState.dateTimeFormat) panelNode.interfaceInteraction = interfaceInteraction return panelNode } diff --git a/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift index ab5189f89b..81baa28bb1 100644 --- a/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift @@ -103,6 +103,8 @@ private final class ChatMessageActionButtonNode: ASDisplayNode { iconImage = incoming ? graphics.chatBubbleActionButtonIncomingLocationIconImage : graphics.chatBubbleActionButtonOutgoingLinkIconImage case .switchInline: iconImage = incoming ? graphics.chatBubbleActionButtonIncomingShareIconImage : graphics.chatBubbleActionButtonOutgoingLinkIconImage + case .payment: + iconImage = incoming ? graphics.chatBubbleActionButtonIncomingPaymentIconImage : graphics.chatBubbleActionButtonOutgoingPaymentIconImage default: iconImage = nil } diff --git a/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift index 4eb1e5df7a..bd21d88018 100644 --- a/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift @@ -18,8 +18,8 @@ import UniversalMediaPlayer import TelegramUniversalVideoContent import GalleryUI -private func attributedServiceMessageString(theme: ChatPresentationThemeData, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, message: Message, accountPeerId: PeerId) -> NSAttributedString? { - return universalServiceMessageString(presentationData: (theme.theme, theme.wallpaper), strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: false) +private func attributedServiceMessageString(theme: ChatPresentationThemeData, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, message: Message, accountPeerId: PeerId) -> NSAttributedString? { + return universalServiceMessageString(presentationData: (theme.theme, theme.wallpaper), strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: false) } class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode { @@ -132,7 +132,7 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode { let backgroundImage = PresentationResourcesChat.chatActionPhotoBackgroundImage(item.presentationData.theme.theme, wallpaper: !item.presentationData.theme.wallpaper.isEmpty) return (contentProperties, nil, CGFloat.greatestFiniteMagnitude, { constrainedSize, position in - let attributedString = attributedServiceMessageString(theme: item.presentationData.theme, strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, message: item.message, accountPeerId: item.context.account.peerId) + let attributedString = attributedServiceMessageString(theme: item.presentationData.theme, strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, message: item.message, accountPeerId: item.context.account.peerId) var image: TelegramMediaImage? for media in item.message.media { diff --git a/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift index 12e233aa60..2ddfe11858 100644 --- a/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift @@ -271,7 +271,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { self.addSubnode(self.statusNode) } - func asyncLayout() -> (_ presentationData: ChatPresentationData, _ automaticDownloadSettings: MediaAutoDownloadSettings, _ associatedData: ChatMessageItemAssociatedData, _ attributes: ChatMessageEntryAttributes, _ context: AccountContext, _ controllerInteraction: ChatControllerInteraction, _ message: Message, _ messageRead: Bool, _ chatLocation: ChatLocation, _ title: String?, _ subtitle: NSAttributedString?, _ text: String?, _ entities: [MessageTextEntity]?, _ media: (Media, ChatMessageAttachedContentNodeMediaFlags)?, _ mediaBadge: String?, _ actionIcon: ChatMessageAttachedContentActionIcon?, _ actionTitle: String?, _ displayLine: Bool, _ layoutConstants: ChatMessageItemLayoutConstants, _ constrainedSize: CGSize) -> (CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { + func asyncLayout() -> (_ presentationData: ChatPresentationData, _ automaticDownloadSettings: MediaAutoDownloadSettings, _ associatedData: ChatMessageItemAssociatedData, _ attributes: ChatMessageEntryAttributes, _ context: AccountContext, _ controllerInteraction: ChatControllerInteraction, _ message: Message, _ messageRead: Bool, _ chatLocation: ChatLocation, _ title: String?, _ subtitle: NSAttributedString?, _ text: String?, _ entities: [MessageTextEntity]?, _ media: (Media, ChatMessageAttachedContentNodeMediaFlags)?, _ mediaBadge: String?, _ actionIcon: ChatMessageAttachedContentActionIcon?, _ actionTitle: String?, _ displayLine: Bool, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ constrainedSize: CGSize) -> (CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let textAsyncLayout = TextNode.asyncLayout(self.textNode) let currentImage = self.media as? TelegramMediaImage let imageLayout = self.inlineImageNode.asyncLayout() @@ -284,7 +284,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { let currentAdditionalImageBadgeNode = self.additionalImageBadgeNode - return { presentationData, automaticDownloadSettings, associatedData, attributes, context, controllerInteraction, message, messageRead, chatLocation, title, subtitle, text, entities, mediaAndFlags, mediaBadge, actionIcon, actionTitle, displayLine, layoutConstants, constrainedSize in + return { presentationData, automaticDownloadSettings, associatedData, attributes, context, controllerInteraction, message, messageRead, chatLocation, title, subtitle, text, entities, mediaAndFlags, mediaBadge, actionIcon, actionTitle, displayLine, layoutConstants, preparePosition, constrainedSize in let isPreview = presentationData.isPreview let fontSize: CGFloat = floor(presentationData.fontSize.baseDisplaySize * 15.0 / 17.0) @@ -420,11 +420,99 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { if case .replyThread = chatLocation { isReplyThread = true } + + var imageMode = false + + var textStatusType: ChatMessageDateAndStatusType? + var imageStatusType: ChatMessageDateAndStatusType? + var additionalImageBadgeContent: ChatMessageInteractiveMediaBadgeContent? + + if let (media, flags) = mediaAndFlags { + if let file = media as? TelegramMediaFile { + if file.mimeType == "application/x-tgtheme-ios", let size = file.size, size < 16 * 1024 { + imageMode = true + } else if file.isInstantVideo { + imageMode = true + } else if file.isVideo { + imageMode = true + } else if file.isSticker || file.isAnimatedSticker { + imageMode = true + } + } else if let _ = media as? TelegramMediaImage { + if !flags.contains(.preferMediaInline) { + imageMode = true + } + } else if let _ = media as? TelegramMediaWebFile { + imageMode = true + } else if let _ = media as? WallpaperPreviewMedia { + imageMode = true + } + } + + if preferMediaBeforeText { + imageMode = false + } + + let statusInText = !imageMode + + switch preparePosition { + case .linear(_, .None), .linear(_, .Neighbour(true, _, _)): + if let count = webpageGalleryMediaCount { + additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: presentationData.strings.Items_NOfM("1", "\(count)").0)) + skipStandardStatus = imageMode + } else if let mediaBadge = mediaBadge { + additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: mediaBadge)) + } + + if !skipStandardStatus { + if message.effectivelyIncoming(context.account.peerId) { + if imageMode { + imageStatusType = .ImageIncoming + } else { + textStatusType = .BubbleIncoming + } + } else { + if message.flags.contains(.Failed) { + if imageMode { + imageStatusType = .ImageOutgoing(.Failed) + } else { + textStatusType = .BubbleOutgoing(.Failed) + } + } else if (message.flags.isSending && !message.isSentOrAcknowledged) || attributes.updatingMedia != nil { + if imageMode { + imageStatusType = .ImageOutgoing(.Sending) + } else { + textStatusType = .BubbleOutgoing(.Sending) + } + } else { + if imageMode { + imageStatusType = .ImageOutgoing(.Sent(read: messageRead)) + } else { + textStatusType = .BubbleOutgoing(.Sent(read: messageRead)) + } + } + } + } + default: + break + } + + let imageDateAndStatus = imageStatusType.flatMap { statusType -> ChatMessageDateAndStatus in + ChatMessageDateAndStatus( + type: statusType, + edited: edited, + viewCount: viewCount, + dateReplies: dateReplies, + dateReactions: dateReactions, + isPinned: message.tags.contains(.pinned) && !associatedData.isInPinnedListMode && !isReplyThread, + dateText: dateText + ) + } if let (media, flags) = mediaAndFlags { if let file = media as? TelegramMediaFile { if file.mimeType == "application/x-tgtheme-ios", let size = file.size, size < 16 * 1024 { - let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, file, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) + let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, file, imageDateAndStatus, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout } else if file.isInstantVideo { @@ -455,12 +543,12 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { } } - let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, file, automaticDownload, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) + let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, file, imageDateAndStatus, automaticDownload, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout } else if file.isSticker || file.isAnimatedSticker { let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: file) - let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, file, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) + let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, file, imageDateAndStatus, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout } else { @@ -485,7 +573,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { } else if let image = media as? TelegramMediaImage { if !flags.contains(.preferMediaInline) { let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: image) - let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, image, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) + let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, image, imageDateAndStatus, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout } else if let dimensions = largestImageRepresentation(image.representations)?.dimensions { @@ -497,11 +585,11 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { } } else if let image = media as? TelegramMediaWebFile { let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: image) - let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, image, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) + let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, image, imageDateAndStatus, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout } else if let wallpaper = media as? WallpaperPreviewMedia { - let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, wallpaper, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) + let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, wallpaper, imageDateAndStatus, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout if case let .file(_, _, _, _, isTheme, _) = wallpaper.content, isTheme { @@ -527,60 +615,12 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { break } - var statusInText = false - var statusSizeAndApply: (CGSize, (Bool) -> Void)? - + let textConstrainedSize = CGSize(width: constrainedSize.width - insets.left - insets.right, height: constrainedSize.height - insets.top - insets.bottom) - - var additionalImageBadgeContent: ChatMessageInteractiveMediaBadgeContent? - - switch position { - case .linear(_, .None), .linear(_, .Neighbour(true, _, _)): - let imageMode = !((refineContentImageLayout == nil && refineContentFileLayout == nil && contentInstantVideoSizeAndApply == nil) || preferMediaBeforeText) - statusInText = !imageMode - - if let count = webpageGalleryMediaCount { - additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: presentationData.strings.Items_NOfM("1", "\(count)").0)) - skipStandardStatus = imageMode - } else if let mediaBadge = mediaBadge { - additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: mediaBadge)) - } - - if !skipStandardStatus { - let statusType: ChatMessageDateAndStatusType - if message.effectivelyIncoming(context.account.peerId) { - if imageMode { - statusType = .ImageIncoming - } else { - statusType = .BubbleIncoming - } - } else { - if message.flags.contains(.Failed) { - if imageMode { - statusType = .ImageOutgoing(.Failed) - } else { - statusType = .BubbleOutgoing(.Failed) - } - } else if (message.flags.isSending && !message.isSentOrAcknowledged) || attributes.updatingMedia != nil { - if imageMode { - statusType = .ImageOutgoing(.Sending) - } else { - statusType = .BubbleOutgoing(.Sending) - } - } else { - if imageMode { - statusType = .ImageOutgoing(.Sent(read: messageRead)) - } else { - statusType = .BubbleOutgoing(.Sent(read: messageRead)) - } - } - } - - statusSizeAndApply = statusLayout(context, presentationData, edited, viewCount, dateText, statusType, textConstrainedSize, dateReactions, dateReplies, message.tags.contains(.pinned) && !associatedData.isInPinnedListMode && !isReplyThread, message.isSelfExpiring) - } - default: - break + + if let textStatusType = textStatusType { + statusSizeAndApply = statusLayout(context, presentationData, edited, viewCount, dateText, textStatusType, textConstrainedSize, dateReactions, dateReplies, message.tags.contains(.pinned) && !associatedData.isInPinnedListMode && !isReplyThread, message.isSelfExpiring) } var updatedAdditionalImageBadge: ChatMessageInteractiveMediaBadge? @@ -823,6 +863,9 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { let contentImageNode = contentImageApply(transition, synchronousLoads) if strongSelf.contentImageNode !== contentImageNode { strongSelf.contentImageNode = contentImageNode + contentImageNode.activatePinch = { sourceNode in + controllerInteraction.activateMessagePinch(sourceNode) + } strongSelf.addSubnode(contentImageNode) contentImageNode.activateLocalContent = { [weak strongSelf] mode in if let strongSelf = strongSelf { diff --git a/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift b/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift index 2803acb223..1328a749ad 100644 --- a/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift @@ -236,7 +236,7 @@ class ChatMessageDateAndStatusNode: ASDisplayNode { let clockMinImage: UIImage? var impressionImage: UIImage? var repliesImage: UIImage? - var selfExpiringImage: UIImage? + let selfExpiringImage: UIImage? = nil let themeUpdated = presentationData.theme != currentTheme || type != currentType diff --git a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift index 110dc38a36..5b3cbb1970 100644 --- a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift @@ -25,7 +25,7 @@ final class ChatMessageEventLogPreviousDescriptionContentNode: ChatMessageBubble override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let contentNodeLayout = self.contentNode.asyncLayout() - return { item, layoutConstants, _, _, constrainedSize in + return { item, layoutConstants, preparePosition, _, constrainedSize in var messageEntities: [MessageTextEntity]? for attribute in item.message.attributes { @@ -44,7 +44,7 @@ final class ChatMessageEventLogPreviousDescriptionContentNode: ChatMessageBubble } let mediaAndFlags: (Media, ChatMessageAttachedContentNodeMediaFlags)? = nil - let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize) + let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize) let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none) diff --git a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift index c0ff0ffa39..c481ff165c 100644 --- a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift @@ -25,7 +25,7 @@ final class ChatMessageEventLogPreviousLinkContentNode: ChatMessageBubbleContent override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let contentNodeLayout = self.contentNode.asyncLayout() - return { item, layoutConstants, _, _, constrainedSize in + return { item, layoutConstants, preparePosition, _, constrainedSize in var messageEntities: [MessageTextEntity]? for attribute in item.message.attributes { @@ -39,7 +39,7 @@ final class ChatMessageEventLogPreviousLinkContentNode: ChatMessageBubbleContent let text: String = item.message.text let mediaAndFlags: (Media, ChatMessageAttachedContentNodeMediaFlags)? = nil - let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize) + let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize) let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none) diff --git a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift index 0d638f3fd4..b0e5ba0891 100644 --- a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift @@ -25,7 +25,7 @@ final class ChatMessageEventLogPreviousMessageContentNode: ChatMessageBubbleCont override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let contentNodeLayout = self.contentNode.asyncLayout() - return { item, layoutConstants, _, _, constrainedSize in + return { item, layoutConstants, preparePosition, _, constrainedSize in var messageEntities: [MessageTextEntity]? for attribute in item.message.attributes { @@ -44,7 +44,7 @@ final class ChatMessageEventLogPreviousMessageContentNode: ChatMessageBubbleCont } let mediaAndFlags: (Media, ChatMessageAttachedContentNodeMediaFlags)? = nil - let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize) + let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize) let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none) diff --git a/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift index de1c237da2..240ee141fa 100644 --- a/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift @@ -45,7 +45,7 @@ final class ChatMessageGameBubbleContentNode: ChatMessageBubbleContentNode { override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let contentNodeLayout = self.contentNode.asyncLayout() - return { item, layoutConstants, _, _, constrainedSize in + return { item, layoutConstants, preparePosition, _, constrainedSize in var game: TelegramMediaGame? var messageEntities: [MessageTextEntity]? @@ -78,7 +78,7 @@ final class ChatMessageGameBubbleContentNode: ChatMessageBubbleContentNode { } } - let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, .peer(item.message.id.peerId), title, nil, item.message.text.isEmpty ? text : item.message.text, item.message.text.isEmpty ? nil : messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize) + let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, .peer(item.message.id.peerId), title, nil, item.message.text.isEmpty ? text : item.message.text, item.message.text.isEmpty ? nil : messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize) let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none) diff --git a/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift index fed0355010..1f0f32bcbb 100644 --- a/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift @@ -22,6 +22,7 @@ import TelegramAnimatedStickerNode import LocalMediaResources import WallpaperResources import ChatMessageInteractiveMediaBadge +import ContextUI private struct FetchControls { let fetch: (Bool) -> Void @@ -64,9 +65,23 @@ enum InteractiveMediaNodePlayWithSoundMode { case loop } +struct ChatMessageDateAndStatus { + var type: ChatMessageDateAndStatusType + var edited: Bool + var viewCount: Int? + var dateReplies: Int + var dateReactions: [MessageReaction] + var isPinned: Bool + var dateText: String +} + final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitionNode { + private let pinchContainerNode: PinchSourceContainerNode private let imageNode: TransformImageNode private var currentImageArguments: TransformImageArguments? + private var currentHighQualityImageSignal: (Signal<(TransformImageArguments) -> DrawingContext?, NoError>, CGSize)? + private var highQualityImageNode: TransformImageNode? + private var videoNode: UniversalVideoNode? private var videoContent: NativeVideoContent? private var animatedStickerNode: AnimatedStickerNode? @@ -75,6 +90,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio var decoration: UniversalVideoDecoration? { return self.videoNodeDecoration } + let dateAndStatusNode: ChatMessageDateAndStatusNode private var badgeNode: ChatMessageInteractiveMediaBadge? private var tapRecognizer: UITapGestureRecognizer? @@ -134,15 +150,103 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } var activateLocalContent: (InteractiveMediaNodeActivateContent) -> Void = { _ in } + var activatePinch: ((PinchSourceContainerNode) -> Void)? override init() { + self.pinchContainerNode = PinchSourceContainerNode() + + self.dateAndStatusNode = ChatMessageDateAndStatusNode() + self.imageNode = TransformImageNode() self.imageNode.contentAnimations = [.subsequentUpdates] super.init() + + self.addSubnode(self.pinchContainerNode) self.imageNode.displaysAsynchronously = false - self.addSubnode(self.imageNode) + self.pinchContainerNode.contentNode.addSubnode(self.imageNode) + + self.pinchContainerNode.activate = { [weak self] sourceNode in + guard let strongSelf = self else { + return + } + strongSelf.activatePinch?(sourceNode) + } + + self.pinchContainerNode.scaleUpdated = { [weak self] scale, transition in + guard let strongSelf = self else { + return + } + + let factor: CGFloat = max(0.0, min(1.0, (scale - 1.0) * 8.0)) + + transition.updateAlpha(node: strongSelf.dateAndStatusNode, alpha: 1.0 - factor) + + if abs(scale - 1.0) > CGFloat.ulpOfOne { + var highQualityImageNode: TransformImageNode? + if let current = strongSelf.highQualityImageNode { + highQualityImageNode = current + } else if let (currentHighQualityImageSignal, nativeImageSize) = strongSelf.currentHighQualityImageSignal, let currentImageArguments = strongSelf.currentImageArguments { + let imageNode = TransformImageNode() + imageNode.frame = strongSelf.imageNode.frame + + let corners = currentImageArguments.corners + if isRoundEqualCorners(corners) { + imageNode.cornerRadius = corners.topLeft.radius + imageNode.layer.mask = nil + } else { + imageNode.cornerRadius = 0 + + let boundingSize: CGSize = CGSize(width: max(corners.topLeft.radius, corners.bottomLeft.radius) + max(corners.topRight.radius, corners.bottomRight.radius), height: max(corners.topLeft.radius, corners.topRight.radius) + max(corners.bottomLeft.radius, corners.bottomRight.radius)) + let size: CGSize = CGSize(width: boundingSize.width + corners.extendedEdges.left + corners.extendedEdges.right, height: boundingSize.height + corners.extendedEdges.top + corners.extendedEdges.bottom) + let arguments = TransformImageArguments(corners: corners, imageSize: size, boundingSize: boundingSize, intrinsicInsets: UIEdgeInsets()) + let context = DrawingContext(size: size, clear: true) + context.withContext { ctx in + ctx.setFillColor(UIColor.black.cgColor) + ctx.fill(arguments.drawingRect) + } + addCorners(context, arguments: arguments) + + if let maskImage = context.generateImage() { + let mask = CALayer() + mask.contents = maskImage.cgImage + mask.contentsScale = maskImage.scale + mask.contentsCenter = CGRect(x: max(corners.topLeft.radius, corners.bottomLeft.radius) / maskImage.size.width, y: max(corners.topLeft.radius, corners.topRight.radius) / maskImage.size.height, width: (maskImage.size.width - max(corners.topLeft.radius, corners.bottomLeft.radius) - max(corners.topRight.radius, corners.bottomRight.radius)) / maskImage.size.width, height: (maskImage.size.height - max(corners.topLeft.radius, corners.topRight.radius) - max(corners.bottomLeft.radius, corners.bottomRight.radius)) / maskImage.size.height) + + imageNode.layer.mask = mask + imageNode.layer.mask?.frame = imageNode.bounds + } + } + + strongSelf.pinchContainerNode.contentNode.insertSubnode(imageNode, aboveSubnode: strongSelf.imageNode) + + let scaleFactor = nativeImageSize.height / currentImageArguments.imageSize.height + + let apply = imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: CGSize(width: currentImageArguments.imageSize.width * scaleFactor, height: currentImageArguments.imageSize.height * scaleFactor), boundingSize: CGSize(width: currentImageArguments.boundingSize.width * scaleFactor, height: currentImageArguments.boundingSize.height * scaleFactor), intrinsicInsets: UIEdgeInsets(top: currentImageArguments.intrinsicInsets.top * scaleFactor, left: currentImageArguments.intrinsicInsets.left * scaleFactor, bottom: currentImageArguments.intrinsicInsets.bottom * scaleFactor, right: currentImageArguments.intrinsicInsets.right * scaleFactor))) + let _ = apply() + imageNode.setSignal(currentHighQualityImageSignal, attemptSynchronously: false) + + highQualityImageNode = imageNode + strongSelf.highQualityImageNode = imageNode + } + if let highQualityImageNode = highQualityImageNode { + transition.updateAlpha(node: highQualityImageNode, alpha: factor) + } + } else if let highQualityImageNode = strongSelf.highQualityImageNode { + strongSelf.highQualityImageNode = nil + transition.updateAlpha(node: highQualityImageNode, alpha: 0.0, completion: { [weak highQualityImageNode] _ in + highQualityImageNode?.removeFromSupernode() + }) + } + + if let badgeNode = strongSelf.badgeNode { + transition.updateAlpha(node: badgeNode, alpha: 1.0 - factor) + } + if let statusNode = strongSelf.statusNode { + transition.updateAlpha(node: statusNode, alpha: 1.0 - factor) + } + } } deinit { @@ -242,10 +346,11 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } } - func asyncLayout() -> (_ context: AccountContext, _ theme: PresentationTheme, _ strings: PresentationStrings, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void))) { + func asyncLayout() -> (_ context: AccountContext, _ presentationData: ChatPresentationData, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ dateAndStatus: ChatMessageDateAndStatus?, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void))) { let currentMessage = self.message let currentMedia = self.media let imageLayout = self.imageNode.asyncLayout() + let statusLayout = self.dateAndStatusNode.asyncLayout() let currentVideoNode = self.videoNode let currentAnimatedStickerNode = self.animatedStickerNode @@ -255,7 +360,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio let currentAutomaticDownload = self.automaticDownload let currentAutomaticPlayback = self.automaticPlayback - return { [weak self] context, theme, strings, dateTimeFormat, message, attributes, media, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in + return { [weak self] context, presentationData, dateTimeFormat, message, attributes, media, dateAndStatus, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in var nativeSize: CGSize let isSecretMedia = message.containsSecretMedia @@ -359,6 +464,15 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio case .unconstrained: nativeSize = unboundSize } + + var statusSize = CGSize() + var statusApply: ((Bool) -> Void)? + + if let dateAndStatus = dateAndStatus { + let (size, apply) = statusLayout(context, presentationData, dateAndStatus.edited, dateAndStatus.viewCount, dateAndStatus.dateText, dateAndStatus.type, CGSize(width: nativeSize.width - 30.0, height: CGFloat.greatestFiniteMagnitude), dateAndStatus.dateReactions, dateAndStatus.dateReplies, dateAndStatus.isPinned, message.isSelfExpiring) + statusSize = size + statusApply = apply + } let maxWidth: CGFloat if isSecretMedia { @@ -367,7 +481,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio maxWidth = maxDimensions.width } if isSecretMedia { - let _ = PresentationResourcesChat.chatBubbleSecretMediaIcon(theme) + let _ = PresentationResourcesChat.chatBubbleSecretMediaIcon(presentationData.theme.theme) } return (nativeSize, maxWidth, { constrainedSize, automaticPlayback, wideLayout, corners in @@ -416,7 +530,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio drawingSize = nativeSize.aspectFilled(boundingSize) } - var updateImageSignal: ((Bool) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError>)? + var updateImageSignal: ((Bool, Bool) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError>)? var updatedStatusSignal: Signal<(MediaResourceStatus, MediaResourceStatus?), NoError>? var updatedFetchControls: FetchControls? @@ -453,7 +567,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio if isSticker { emptyColor = .clear } else { - emptyColor = message.effectivelyIncoming(context.account.peerId) ? theme.chat.message.incoming.mediaPlaceholderColor : theme.chat.message.outgoing.mediaPlaceholderColor + emptyColor = message.effectivelyIncoming(context.account.peerId) ? presentationData.theme.theme.chat.message.incoming.mediaPlaceholderColor : presentationData.theme.theme.chat.message.outgoing.mediaPlaceholderColor } if let wallpaper = media as? WallpaperPreviewMedia { if case let .file(_, patternColor, patternBottomColor, rotation, _, _) = wallpaper.content { @@ -475,12 +589,12 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio replaceAnimatedStickerNode = true } if isSecretMedia { - updateImageSignal = { synchronousLoad in + updateImageSignal = { synchronousLoad, _ in return chatSecretPhoto(account: context.account, photoReference: .message(message: MessageReference(message), media: image)) } } else { - updateImageSignal = { synchronousLoad in - return chatMessagePhoto(postbox: context.account.postbox, photoReference: .message(message: MessageReference(message), media: image), synchronousLoad: synchronousLoad) + updateImageSignal = { synchronousLoad, highQuality in + return chatMessagePhoto(postbox: context.account.postbox, photoReference: .message(message: MessageReference(message), media: image), synchronousLoad: synchronousLoad, highQuality: highQuality) } } @@ -505,7 +619,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio if hasCurrentAnimatedStickerNode { replaceAnimatedStickerNode = true } - updateImageSignal = { synchronousLoad in + updateImageSignal = { synchronousLoad, _ in return chatWebFileImage(account: context.account, file: image) } @@ -518,22 +632,22 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio }) } else if let file = media as? TelegramMediaFile { if isSecretMedia { - updateImageSignal = { synchronousLoad in + updateImageSignal = { synchronousLoad, _ in return chatSecretMessageVideo(account: context.account, videoReference: .message(message: MessageReference(message), media: file)) } } else { if file.isAnimatedSticker { let dimensions = file.dimensions ?? PixelDimensions(width: 512, height: 512) - updateImageSignal = { synchronousLoad in + updateImageSignal = { synchronousLoad, _ in return chatMessageAnimatedSticker(postbox: context.account.postbox, file: file, small: false, size: dimensions.cgSize.aspectFitted(CGSize(width: 400.0, height: 400.0))) } } else if file.isSticker { - updateImageSignal = { synchronousLoad in + updateImageSignal = { synchronousLoad, _ in return chatMessageSticker(account: context.account, file: file, small: false) } } else { onlyFullSizeVideoThumbnail = isSendingUpdated - updateImageSignal = { synchronousLoad in + updateImageSignal = { synchronousLoad, _ in return mediaGridMessageVideo(postbox: context.account.postbox, videoReference: .message(message: MessageReference(message), media: file), onlyFullSize: currentMedia?.id?.namespace == Namespaces.Media.LocalFile, autoFetchFullSizeThumbnail: true) } } @@ -598,7 +712,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } }) } else if let wallpaper = media as? WallpaperPreviewMedia { - updateImageSignal = { synchronousLoad in + updateImageSignal = { synchronousLoad, _ in switch wallpaper.content { case let .file(file, _, _, _, isTheme, _): if isTheme { @@ -692,27 +806,52 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio strongSelf.attributes = attributes strongSelf.media = media strongSelf.wideLayout = wideLayout - strongSelf.themeAndStrings = (theme, strings, dateTimeFormat.decimalSeparator) + strongSelf.themeAndStrings = (presentationData.theme.theme, presentationData.strings, dateTimeFormat.decimalSeparator) strongSelf.sizeCalculation = sizeCalculation strongSelf.automaticPlayback = automaticPlayback strongSelf.automaticDownload = automaticDownload if let previousArguments = strongSelf.currentImageArguments { if previousArguments.imageSize == arguments.imageSize { - strongSelf.imageNode.frame = imageFrame + strongSelf.pinchContainerNode.frame = imageFrame + strongSelf.pinchContainerNode.update(size: imageFrame.size, transition: .immediate) + strongSelf.imageNode.frame = CGRect(origin: CGPoint(), size: imageFrame.size) } else { - transition.updateFrame(node: strongSelf.imageNode, frame: imageFrame) + transition.updateFrame(node: strongSelf.pinchContainerNode, frame: imageFrame) + transition.updateFrame(node: strongSelf.imageNode, frame: CGRect(origin: CGPoint(), size: imageFrame.size)) + strongSelf.pinchContainerNode.update(size: imageFrame.size, transition: transition) + } } else { - strongSelf.imageNode.frame = imageFrame + strongSelf.pinchContainerNode.frame = imageFrame + strongSelf.pinchContainerNode.update(size: imageFrame.size, transition: .immediate) + strongSelf.imageNode.frame = CGRect(origin: CGPoint(), size: imageFrame.size) } strongSelf.currentImageArguments = arguments imageApply() + + if let statusApply = statusApply { + if strongSelf.dateAndStatusNode.supernode == nil { + strongSelf.pinchContainerNode.contentNode.addSubnode(strongSelf.dateAndStatusNode) + } + var hasAnimation = true + if transition.isAnimated { + hasAnimation = false + } + statusApply(hasAnimation) + + let dateAndStatusFrame = CGRect(origin: CGPoint(x: imageFrame.width - layoutConstants.image.statusInsets.right - statusSize.width, y: imageFrame.height - layoutConstants.image.statusInsets.bottom - statusSize.height), size: statusSize) + + strongSelf.dateAndStatusNode.frame = dateAndStatusFrame + strongSelf.dateAndStatusNode.bounds = CGRect(origin: CGPoint(), size: dateAndStatusFrame.size) + } else if strongSelf.dateAndStatusNode.supernode != nil { + strongSelf.dateAndStatusNode.removeFromSupernode() + } if let statusNode = strongSelf.statusNode { var statusFrame = statusNode.frame - statusFrame.origin.x = floor(imageFrame.midX - statusFrame.width / 2.0) - statusFrame.origin.y = floor(imageFrame.midY - statusFrame.height / 2.0) + statusFrame.origin.x = floor(imageFrame.width / 2.0 - statusFrame.width / 2.0) + statusFrame.origin.y = floor(imageFrame.height / 2.0 - statusFrame.height / 2.0) statusNode.frame = statusFrame } @@ -776,7 +915,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio let dimensions = updatedAnimatedStickerFile.dimensions ?? PixelDimensions(width: 512, height: 512) let fittedDimensions = dimensions.cgSize.aspectFitted(CGSize(width: 384.0, height: 384.0)) animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: context.account, resource: updatedAnimatedStickerFile.resource), width: Int(fittedDimensions.width), height: Int(fittedDimensions.height), mode: .cached) - strongSelf.insertSubnode(animatedStickerNode, aboveSubnode: strongSelf.imageNode) + strongSelf.pinchContainerNode.contentNode.insertSubnode(animatedStickerNode, aboveSubnode: strongSelf.imageNode) animatedStickerNode.visibility = strongSelf.visibility } } @@ -787,7 +926,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } videoNode.updateLayout(size: arguments.drawingSize, transition: .immediate) - videoNode.frame = imageFrame + videoNode.frame = CGRect(origin: CGPoint(), size: imageFrame.size) if strongSelf.visibility { if !videoNode.canAttachContent { @@ -807,7 +946,20 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } if let updateImageSignal = updateImageSignal { - strongSelf.imageNode.setSignal(updateImageSignal(synchronousLoads), attemptSynchronously: synchronousLoads) + strongSelf.imageNode.setSignal(updateImageSignal(synchronousLoads, false), attemptSynchronously: synchronousLoads) + + var imageDimensions: CGSize? + if let image = media as? TelegramMediaImage, let dimensions = largestImageRepresentation(image.representations)?.dimensions { + imageDimensions = dimensions.cgSize + } else if let file = media as? TelegramMediaFile, let dimensions = file.dimensions { + imageDimensions = dimensions.cgSize + } else if let image = media as? TelegramMediaWebFile, let dimensions = image.dimensions { + imageDimensions = dimensions.cgSize + } + + if let imageDimensions = imageDimensions { + strongSelf.currentHighQualityImageSignal = (updateImageSignal(false, true), imageDimensions) + } } if let _ = secretBeginTimeAndTimeout { @@ -837,7 +989,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio |> deliverOnMainQueue).start(next: { [weak strongSelf] status in displayLinkDispatcher.dispatch { if let strongSelf = strongSelf, let videoNode = strongSelf.videoNode { - strongSelf.insertSubnode(videoNode, aboveSubnode: strongSelf.imageNode) + strongSelf.pinchContainerNode.contentNode.insertSubnode(videoNode, aboveSubnode: strongSelf.imageNode) } } })) @@ -898,6 +1050,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } strongSelf.updateStatus(animated: synchronousLoads) + + strongSelf.pinchContainerNode.isPinchGestureEnabled = !isSecretMedia } }) }) @@ -997,10 +1151,10 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio if progressRequired { if self.statusNode == nil { let statusNode = RadialStatusNode(backgroundNodeColor: theme.chat.message.mediaOverlayControlColors.fillColor) - let imagePosition = self.imageNode.position - statusNode.frame = CGRect(origin: CGPoint(x: floor(imagePosition.x - radialStatusSize / 2.0), y: floor(imagePosition.y - radialStatusSize / 2.0)), size: CGSize(width: radialStatusSize, height: radialStatusSize)) + let imageSize = self.imageNode.bounds.size + statusNode.frame = CGRect(origin: CGPoint(x: floor(imageSize.width / 2.0 - radialStatusSize / 2.0), y: floor(imageSize.height / 2.0 - radialStatusSize / 2.0)), size: CGSize(width: radialStatusSize, height: radialStatusSize)) self.statusNode = statusNode - self.addSubnode(statusNode) + self.pinchContainerNode.contentNode.addSubnode(statusNode) } } else { if let statusNode = self.statusNode { @@ -1275,7 +1429,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } } self.badgeNode = badgeNode - self.addSubnode(badgeNode) + self.pinchContainerNode.contentNode.addSubnode(badgeNode) animated = false } @@ -1300,12 +1454,12 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } } - static func asyncLayout(_ node: ChatMessageInteractiveMediaNode?) -> (_ context: AccountContext, _ theme: PresentationTheme, _ strings: PresentationStrings, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> ChatMessageInteractiveMediaNode))) { + static func asyncLayout(_ node: ChatMessageInteractiveMediaNode?) -> (_ context: AccountContext, _ presentationData: ChatPresentationData, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ dateAndStatus: ChatMessageDateAndStatus?, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> ChatMessageInteractiveMediaNode))) { let currentAsyncLayout = node?.asyncLayout() - return { context, theme, strings, dateTimeFormat, message, attributes, media, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in + return { context, presentationData, dateTimeFormat, message, attributes, media, dateAndStatus, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in var imageNode: ChatMessageInteractiveMediaNode - var imageLayout: (_ context: AccountContext, _ theme: PresentationTheme, _ strings: PresentationStrings, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void))) + var imageLayout: (_ context: AccountContext, _ presentationData: ChatPresentationData, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ dateAndStatus: ChatMessageDateAndStatus?, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void))) if let node = node, let currentAsyncLayout = currentAsyncLayout { imageNode = node @@ -1315,7 +1469,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio imageLayout = imageNode.asyncLayout() } - let (unboundSize, initialWidth, continueLayout) = imageLayout(context, theme, strings, dateTimeFormat, message, attributes, media, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode) + let (unboundSize, initialWidth, continueLayout) = imageLayout(context, presentationData, dateTimeFormat, message, attributes, media, dateAndStatus, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode) return (unboundSize, initialWidth, { constrainedSize, automaticPlayback, wideLayout, corners in let (finalWidth, finalLayout) = continueLayout(constrainedSize, automaticPlayback, wideLayout, corners) diff --git a/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift index c30749172b..b38c677bcc 100644 --- a/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift @@ -38,7 +38,7 @@ final class ChatMessageInvoiceBubbleContentNode: ChatMessageBubbleContentNode { override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let contentNodeLayout = self.contentNode.asyncLayout() - return { item, layoutConstants, _, _, constrainedSize in + return { item, layoutConstants, preparePosition, _, constrainedSize in var invoice: TelegramMediaInvoice? for media in item.message.media { if let media = media as? TelegramMediaInvoice { @@ -74,7 +74,7 @@ final class ChatMessageInvoiceBubbleContentNode: ChatMessageBubbleContentNode { } } - let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, automaticDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, nil, mediaAndFlags, nil, nil, nil, false, layoutConstants, constrainedSize) + let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, automaticDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, nil, mediaAndFlags, nil, nil, nil, false, layoutConstants, preparePosition, constrainedSize) let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none) diff --git a/submodules/TelegramUI/Sources/ChatMessageItemView.swift b/submodules/TelegramUI/Sources/ChatMessageItemView.swift index d4a3177ae2..02594b2cd2 100644 --- a/submodules/TelegramUI/Sources/ChatMessageItemView.swift +++ b/submodules/TelegramUI/Sources/ChatMessageItemView.swift @@ -207,7 +207,7 @@ final class ChatMessageAccessibilityData { if let chatPeer = message.peers[item.message.id.peerId] { let authorName = message.author?.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder) - let (_, _, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: [message], chatPeer: RenderedPeer(peer: chatPeer), accountPeerId: item.context.account.peerId) + let (_, _, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: [message], chatPeer: RenderedPeer(peer: chatPeer), accountPeerId: item.context.account.peerId) var text = messageText diff --git a/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift index 9a6d8bd125..d564507543 100644 --- a/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift @@ -17,7 +17,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { } private let interactiveImageNode: ChatMessageInteractiveMediaNode - private let dateAndStatusNode: ChatMessageDateAndStatusNode private var selectionNode: GridMessageSelectionNode? private var highlightedState: Bool = false @@ -32,7 +31,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { required init() { self.interactiveImageNode = ChatMessageInteractiveMediaNode() - self.dateAndStatusNode = ChatMessageDateAndStatusNode() super.init() @@ -54,6 +52,13 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { } } } + + self.interactiveImageNode.activatePinch = { [weak self] sourceNode in + guard let strongSelf = self, let _ = strongSelf.item else { + return + } + strongSelf.item?.controllerInteraction.activateMessagePinch(sourceNode) + } } required init?(coder aDecoder: NSCoder) { @@ -62,7 +67,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let interactiveImageLayout = self.interactiveImageNode.asyncLayout() - let statusLayout = self.dateAndStatusNode.asyncLayout() return { item, layoutConstants, preparePosition, selection, constrainedSize in var selectedMedia: Media? @@ -142,8 +146,81 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { bubbleInsets = UIEdgeInsets() sizeCalculation = .unconstrained } + + var edited = false + if item.attributes.updatingMedia != nil { + edited = true + } + var viewCount: Int? + var dateReplies = 0 + for attribute in item.message.attributes { + if let attribute = attribute as? EditedMessageAttribute { + if case .mosaic = preparePosition { + } else { + edited = !attribute.isHidden + } + } else if let attribute = attribute as? ViewCountMessageAttribute { + viewCount = attribute.count + } else if let attribute = attribute as? ReplyThreadMessageAttribute, case .peer = item.chatLocation { + if let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, case .group = channel.info { + dateReplies = Int(attribute.count) + } + } + } + + var dateReactions: [MessageReaction] = [] + var dateReactionCount = 0 + if let reactionsAttribute = mergedMessageReactions(attributes: item.message.attributes), !reactionsAttribute.reactions.isEmpty { + for reaction in reactionsAttribute.reactions { + if reaction.isSelected { + dateReactions.insert(reaction, at: 0) + } else { + dateReactions.append(reaction) + } + dateReactionCount += Int(reaction.count) + } + } + + let dateText = stringForMessageTimestampStatus(accountPeerId: item.context.account.peerId, message: item.message, dateTimeFormat: item.presentationData.dateTimeFormat, nameDisplayOrder: item.presentationData.nameDisplayOrder, strings: item.presentationData.strings, reactionCount: dateReactionCount) + + let statusType: ChatMessageDateAndStatusType? + switch preparePosition { + case .linear(_, .None), .linear(_, .Neighbour(true, _, _)): + if item.message.effectivelyIncoming(item.context.account.peerId) { + statusType = .ImageIncoming + } else { + if item.message.flags.contains(.Failed) { + statusType = .ImageOutgoing(.Failed) + } else if (item.message.flags.isSending && !item.message.isSentOrAcknowledged) || item.attributes.updatingMedia != nil { + statusType = .ImageOutgoing(.Sending) + } else { + statusType = .ImageOutgoing(.Sent(read: item.read)) + } + } + case .mosaic: + statusType = nil + default: + statusType = nil + } + + var isReplyThread = false + if case .replyThread = item.chatLocation { + isReplyThread = true + } + + let dateAndStatus = statusType.flatMap { statusType -> ChatMessageDateAndStatus in + ChatMessageDateAndStatus( + type: statusType, + edited: edited, + viewCount: viewCount, + dateReplies: dateReplies, + dateReactions: dateReactions, + isPinned: item.message.tags.contains(.pinned) && !item.associatedData.isInPinnedListMode && !isReplyThread, + dateText: dateText + ) + } - let (unboundSize, initialWidth, refineLayout) = interactiveImageLayout(item.context, item.presentationData.theme.theme, item.presentationData.strings, item.presentationData.dateTimeFormat, item.message, item.attributes, selectedMedia!, automaticDownload, item.associatedData.automaticDownloadPeerType, sizeCalculation, layoutConstants, contentMode) + let (unboundSize, initialWidth, refineLayout) = interactiveImageLayout(item.context, item.presentationData, item.presentationData.dateTimeFormat, item.message, item.attributes, selectedMedia!, dateAndStatus, automaticDownload, item.associatedData.automaticDownloadPeerType, sizeCalculation, layoutConstants, contentMode) let forceFullCorners = false let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: true, headerSpacing: 7.0, hidesBackground: .emptyWallpaper, forceFullCorners: forceFullCorners, forceAlignment: .none) @@ -169,82 +246,9 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { return (refinedWidth + bubbleInsets.left + bubbleInsets.right, { boundingWidth in let (imageSize, imageApply) = finishLayout(boundingWidth - bubbleInsets.left - bubbleInsets.right) - var edited = false - if item.attributes.updatingMedia != nil { - edited = true - } - var viewCount: Int? - var dateReplies = 0 - for attribute in item.message.attributes { - if let attribute = attribute as? EditedMessageAttribute { - if case .mosaic = preparePosition { - } else { - edited = !attribute.isHidden - } - } else if let attribute = attribute as? ViewCountMessageAttribute { - viewCount = attribute.count - } else if let attribute = attribute as? ReplyThreadMessageAttribute, case .peer = item.chatLocation { - if let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, case .group = channel.info { - dateReplies = Int(attribute.count) - } - } - } - - var dateReactions: [MessageReaction] = [] - var dateReactionCount = 0 - if let reactionsAttribute = mergedMessageReactions(attributes: item.message.attributes), !reactionsAttribute.reactions.isEmpty { - for reaction in reactionsAttribute.reactions { - if reaction.isSelected { - dateReactions.insert(reaction, at: 0) - } else { - dateReactions.append(reaction) - } - dateReactionCount += Int(reaction.count) - } - } - - let dateText = stringForMessageTimestampStatus(accountPeerId: item.context.account.peerId, message: item.message, dateTimeFormat: item.presentationData.dateTimeFormat, nameDisplayOrder: item.presentationData.nameDisplayOrder, strings: item.presentationData.strings, reactionCount: dateReactionCount) - - let statusType: ChatMessageDateAndStatusType? - switch position { - case .linear(_, .None), .linear(_, .Neighbour(true, _, _)): - if item.message.effectivelyIncoming(item.context.account.peerId) { - statusType = .ImageIncoming - } else { - if item.message.flags.contains(.Failed) { - statusType = .ImageOutgoing(.Failed) - } else if (item.message.flags.isSending && !item.message.isSentOrAcknowledged) || item.attributes.updatingMedia != nil { - statusType = .ImageOutgoing(.Sending) - } else { - statusType = .ImageOutgoing(.Sent(read: item.read)) - } - } - case .mosaic: - statusType = nil - default: - statusType = nil - } - let imageLayoutSize = CGSize(width: imageSize.width + bubbleInsets.left + bubbleInsets.right, height: imageSize.height + bubbleInsets.top + bubbleInsets.bottom) - var statusSize = CGSize() - var statusApply: ((Bool) -> Void)? - - if let statusType = statusType { - var isReplyThread = false - if case .replyThread = item.chatLocation { - isReplyThread = true - } - - let (size, apply) = statusLayout(item.context, item.presentationData, edited, viewCount, dateText, statusType, CGSize(width: imageSize.width - 30.0, height: CGFloat.greatestFiniteMagnitude), dateReactions, dateReplies, item.message.tags.contains(.pinned) && !item.associatedData.isInPinnedListMode && !isReplyThread, item.message.isSelfExpiring) - statusSize = size - statusApply = apply - } - - var layoutWidth = imageLayoutSize.width - if case .constrained = sizeCalculation { - layoutWidth = max(layoutWidth, statusSize.width + bubbleInsets.left + bubbleInsets.right + layoutConstants.image.statusInsets.left + layoutConstants.image.statusInsets.right) - } + let layoutWidth = imageLayoutSize.width let layoutSize = CGSize(width: layoutWidth, height: imageLayoutSize.height) @@ -262,24 +266,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { transition.updateFrame(node: strongSelf.interactiveImageNode, frame: imageFrame) - if let statusApply = statusApply { - if strongSelf.dateAndStatusNode.supernode == nil { - strongSelf.interactiveImageNode.addSubnode(strongSelf.dateAndStatusNode) - } - var hasAnimation = true - if case .None = animation { - hasAnimation = false - } - statusApply(hasAnimation) - - let dateAndStatusFrame = CGRect(origin: CGPoint(x: layoutSize.width - bubbleInsets.right - layoutConstants.image.statusInsets.right - statusSize.width, y: layoutSize.height - bubbleInsets.bottom - layoutConstants.image.statusInsets.bottom - statusSize.height), size: statusSize) - - strongSelf.dateAndStatusNode.frame = dateAndStatusFrame - strongSelf.dateAndStatusNode.bounds = CGRect(origin: CGPoint(), size: dateAndStatusFrame.size) - } else if strongSelf.dateAndStatusNode.supernode != nil { - strongSelf.dateAndStatusNode.removeFromSupernode() - } - imageApply(transition, synchronousLoads) if let selection = selection { @@ -310,14 +296,14 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { } if let forwardInfo = item.message.forwardInfo, forwardInfo.flags.contains(.isImported) { - strongSelf.dateAndStatusNode.pressed = { + strongSelf.interactiveImageNode.dateAndStatusNode.pressed = { guard let strongSelf = self else { return } - item.controllerInteraction.displayImportedMessageTooltip(strongSelf.dateAndStatusNode) + item.controllerInteraction.displayImportedMessageTooltip(strongSelf.interactiveImageNode.dateAndStatusNode) } } else { - strongSelf.dateAndStatusNode.pressed = nil + strongSelf.interactiveImageNode.dateAndStatusNode.pressed = nil } } }) @@ -356,7 +342,7 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { self.interactiveImageNode.isHidden = mediaHidden self.interactiveImageNode.updateIsHidden(mediaHidden) - if let automaticPlayback = self.automaticPlayback { + /*if let automaticPlayback = self.automaticPlayback { if !automaticPlayback { self.dateAndStatusNode.isHidden = false } else if self.dateAndStatusNode.isHidden != mediaHidden { @@ -367,7 +353,7 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { self.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) } } - } + }*/ return mediaHidden } @@ -416,9 +402,9 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { } override func reactionTargetNode(value: String) -> (ASDisplayNode, ASDisplayNode)? { - if !self.dateAndStatusNode.isHidden { + /*if !self.dateAndStatusNode.isHidden { return self.dateAndStatusNode.reactionNode(value: value) - } + }*/ return nil } } diff --git a/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift b/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift index 97ceb3beed..a6c20c8cb8 100644 --- a/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift +++ b/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift @@ -18,6 +18,7 @@ import TelegramStringFormatting public final class ChatMessageNotificationItem: NotificationItem { let context: AccountContext let strings: PresentationStrings + let dateTimeFormat: PresentationDateTimeFormat let nameDisplayOrder: PresentationPersonNameOrder let messages: [Message] let tapAction: () -> Bool @@ -27,9 +28,10 @@ public final class ChatMessageNotificationItem: NotificationItem { return messages.first?.id.peerId } - public init(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, messages: [Message], tapAction: @escaping () -> Bool, expandAction: @escaping (() -> (ASDisplayNode?, () -> Void)) -> Void) { + public init(context: AccountContext, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, messages: [Message], tapAction: @escaping () -> Bool, expandAction: @escaping (() -> (ASDisplayNode?, () -> Void)) -> Void) { self.context = context self.strings = strings + self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder self.messages = messages self.tapAction = tapAction @@ -181,7 +183,7 @@ final class ChatMessageNotificationItemNode: NotificationItemNode { if message.containsSecretMedia { imageDimensions = nil } - messageText = descriptionStringForMessage(contentSettings: item.context.currentContentSettings.with { $0 }, message: message, strings: item.strings, nameDisplayOrder: item.nameDisplayOrder, accountPeerId: item.context.account.peerId).0 + messageText = descriptionStringForMessage(contentSettings: item.context.currentContentSettings.with { $0 }, message: message, strings: item.strings, nameDisplayOrder: item.nameDisplayOrder, dateTimeFormat: item.dateTimeFormat, accountPeerId: item.context.account.peerId).0 } else if item.messages.count > 1, let peer = item.messages[0].peers[item.messages[0].id.peerId] { var displayAuthor = true if let channel = peer as? TelegramChannel { @@ -218,9 +220,9 @@ final class ChatMessageNotificationItemNode: NotificationItemNode { } } } else if item.messages[0].groupingKey != nil { - var kind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[0], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: item.context.account.peerId).key + var kind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[0], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: item.context.account.peerId).key for i in 1 ..< item.messages.count { - let nextKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[i], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: item.context.account.peerId) + let nextKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[i], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: item.context.account.peerId) if kind != nextKind.key { kind = .text break @@ -339,7 +341,7 @@ final class ChatMessageNotificationItemNode: NotificationItemNode { messageText = rawText } case .file: - let rawText = presentationData.strings.PUSH_MESSAGE_DOCS(Int32(item.messages.count), peer.displayTitle(strings: item.strings, displayOrder: item.nameDisplayOrder), Int32(item.messages.count)) + let rawText = presentationData.strings.PUSH_MESSAGE_FILES(Int32(item.messages.count), peer.displayTitle(strings: item.strings, displayOrder: item.nameDisplayOrder), Int32(item.messages.count)) if let index = rawText.firstIndex(of: "|") { title = String(rawText[rawText.startIndex ..< index]) messageText = String(rawText[rawText.index(after: index)...]) diff --git a/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift b/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift index af0467d891..91fd6ee3a6 100644 --- a/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift @@ -65,7 +65,7 @@ class ChatMessageReplyInfoNode: ASDisplayNode { } } - let (textString, isMedia) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: context.account.peerId) + let (textString, isMedia) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: context.account.peerId) let placeholderColor: UIColor = message.effectivelyIncoming(context.account.peerId) ? presentationData.theme.theme.chat.message.incoming.mediaPlaceholderColor : presentationData.theme.theme.chat.message.outgoing.mediaPlaceholderColor let titleColor: UIColor diff --git a/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift index 560ab504f6..229a9f0d58 100644 --- a/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift @@ -86,7 +86,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) { let contentNodeLayout = self.contentNode.asyncLayout() - return { item, layoutConstants, _, _, constrainedSize in + return { item, layoutConstants, preparePosition, _, constrainedSize in var webPage: TelegramMediaWebpage? var webPageContent: TelegramMediaWebpageLoadedContent? for media in item.message.media { @@ -301,7 +301,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { } } - let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, entities, mediaAndFlags, badge, actionIcon, actionTitle, true, layoutConstants, constrainedSize) + let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, entities, mediaAndFlags, badge, actionIcon, actionTitle, true, layoutConstants, preparePosition, constrainedSize) let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none) diff --git a/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift index ac47ca0360..681b4045dc 100644 --- a/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift +++ b/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift @@ -269,7 +269,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode { self.currentMessage = interfaceState.pinnedMessage if let currentMessage = self.currentMessage, let currentLayout = self.currentLayout { - self.enqueueTransition(width: currentLayout.0, panelHeight: panelHeight, leftInset: currentLayout.1, rightInset: currentLayout.2, transition: .immediate, animation: messageUpdatedAnimation, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, accountPeerId: self.context.account.peerId, firstTime: previousMessageWasNil, isReplyThread: isReplyThread) + self.enqueueTransition(width: currentLayout.0, panelHeight: panelHeight, leftInset: currentLayout.1, rightInset: currentLayout.2, transition: .immediate, animation: messageUpdatedAnimation, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, dateTimeFormat: interfaceState.dateTimeFormat, accountPeerId: self.context.account.peerId, firstTime: previousMessageWasNil, isReplyThread: isReplyThread) } } @@ -314,14 +314,14 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode { self.currentLayout = (width, leftInset, rightInset) if let currentMessage = self.currentMessage { - self.enqueueTransition(width: width, panelHeight: panelHeight, leftInset: leftInset, rightInset: rightInset, transition: .immediate, animation: .none, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, accountPeerId: interfaceState.accountPeerId, firstTime: true, isReplyThread: isReplyThread) + self.enqueueTransition(width: width, panelHeight: panelHeight, leftInset: leftInset, rightInset: rightInset, transition: .immediate, animation: .none, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, dateTimeFormat: interfaceState.dateTimeFormat, accountPeerId: interfaceState.accountPeerId, firstTime: true, isReplyThread: isReplyThread) } } return panelHeight } - private func enqueueTransition(width: CGFloat, panelHeight: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, animation: PinnedMessageAnimation?, pinnedMessage: ChatPinnedMessage, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, accountPeerId: PeerId, firstTime: Bool, isReplyThread: Bool) { + private func enqueueTransition(width: CGFloat, panelHeight: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, animation: PinnedMessageAnimation?, pinnedMessage: ChatPinnedMessage, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, accountPeerId: PeerId, firstTime: Bool, isReplyThread: Bool) { let message = pinnedMessage.message var animationTransition: ContainedViewLayoutTransition = .immediate @@ -470,7 +470,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode { } let (titleLayout, titleApply) = makeTitleLayout(CGSize(width: width - textLineInset - contentLeftInset - rightInset - textRightInset, height: CGFloat.greatestFiniteMagnitude), titleStrings) - let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: foldLineBreaks(descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: accountPeerId).0), font: Font.regular(15.0), textColor: message.media.isEmpty || message.media.first is TelegramMediaWebpage ? theme.chat.inputPanel.primaryTextColor : theme.chat.inputPanel.secondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: width - textLineInset - contentLeftInset - rightInset - textRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets(top: 2.0, left: 0.0, bottom: 2.0, right: 0.0))) + let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: foldLineBreaks(descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: accountPeerId).0), font: Font.regular(15.0), textColor: message.media.isEmpty || message.media.first is TelegramMediaWebpage ? theme.chat.inputPanel.primaryTextColor : theme.chat.inputPanel.secondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: width - textLineInset - contentLeftInset - rightInset - textRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets(top: 2.0, left: 0.0, bottom: 2.0, right: 0.0))) Queue.mainQueue().async { if let strongSelf = self { diff --git a/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift index d641c88270..505570d638 100644 --- a/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift @@ -260,6 +260,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { self?.openPeerMention(name) }, openMessageContextMenu: { [weak self] message, selectAll, node, frame, _ in self?.openMessageContextMenu(message: message, selectAll: selectAll, node: node, frame: frame) + }, activateMessagePinch: { _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _ in return false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { [weak self] url, _, _, _ in diff --git a/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift b/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift index 7324f017ea..0233a7eafc 100644 --- a/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift +++ b/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift @@ -262,12 +262,12 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel } } + private let calendar = Calendar(identifier: .gregorian) private func updateButtonTitle() { guard let date = self.pickerView?.date else { return } - let calendar = Calendar(identifier: .gregorian) let time = stringForMessageTimestamp(timestamp: Int32(date.timeIntervalSince1970), dateTimeFormat: self.presentationData.dateTimeFormat) switch mode { case .scheduledMessages: diff --git a/submodules/TelegramUI/Sources/DrawingStickersScreen.swift b/submodules/TelegramUI/Sources/DrawingStickersScreen.swift index 3e53710d0a..85da7030df 100644 --- a/submodules/TelegramUI/Sources/DrawingStickersScreen.swift +++ b/submodules/TelegramUI/Sources/DrawingStickersScreen.swift @@ -109,7 +109,8 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode { var selectStickerImpl: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)? self.controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in - return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in + return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, activateMessagePinch: { _ in + }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { fileReference, _, _, node, rect in return selectStickerImpl?(fileReference, node, rect) ?? false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in }, openWallpaper: { _ in }, openTheme: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in }, presentController: { _, _ in }, navigationController: { return nil diff --git a/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift index e13b940f39..50eab52af5 100644 --- a/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift +++ b/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift @@ -15,6 +15,7 @@ import PhotoResources import TelegramStringFormatting final class EditAccessoryPanelNode: AccessoryPanelNode { + let dateTimeFormat: PresentationDateTimeFormat let messageId: MessageId let closeButton: ASButtonNode @@ -67,12 +68,13 @@ final class EditAccessoryPanelNode: AccessoryPanelNode { var strings: PresentationStrings var nameDisplayOrder: PresentationPersonNameOrder - init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) { + init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat) { self.context = context self.messageId = messageId self.theme = theme self.strings = strings self.nameDisplayOrder = nameDisplayOrder + self.dateTimeFormat = dateTimeFormat self.closeButton = ASButtonNode() self.closeButton.accessibilityLabel = strings.VoiceOver_DiscardPreparedContent @@ -159,7 +161,7 @@ final class EditAccessoryPanelNode: AccessoryPanelNode { if let currentEditMediaReference = self.currentEditMediaReference { effectiveMessage = effectiveMessage.withUpdatedMedia([currentEditMediaReference.media]) } - (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder, accountPeerId: self.context.account.peerId) + (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder, dateTimeFormat: self.dateTimeFormat, accountPeerId: self.context.account.peerId) } var updatedMediaReference: AnyMediaReference? @@ -231,7 +233,8 @@ final class EditAccessoryPanelNode: AccessoryPanelNode { if let currentEditMediaReference = self.currentEditMediaReference { effectiveMessage = effectiveMessage.withUpdatedMedia([currentEditMediaReference.media]) } - switch messageContentKind(contentSettings: self.context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: self.context.account.peerId) { + let presentationData = self.context.sharedContext.currentPresentationData.with { $0 } + switch messageContentKind(contentSettings: self.context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: self.context.account.peerId) { case .text: isMedia = false default: diff --git a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift index 28f2e0f4da..e8154a528a 100644 --- a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift +++ b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift @@ -65,6 +65,8 @@ func textStringForForwardedMessage(_ message: Message, strings: PresentationStri return (strings.ForwardedPolls(1), true) case let dice as TelegramMediaDice: return (dice.emoji, true) + case let invoice as TelegramMediaInvoice: + return (invoice.title, true) default: break } diff --git a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift index 193982ef4b..d4316a4d95 100644 --- a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift +++ b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift @@ -70,6 +70,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in + }, activateMessagePinch: { _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift index 7a856a3938..b9ff945628 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift @@ -1019,7 +1019,7 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro displayLeave = false } result.append(.mute) - if hasVoiceChat { + if hasVoiceChat || canStartVoiceChat { result.append(.voiceChat) } if hasDiscussion { @@ -1038,7 +1038,7 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro if channel.isVerified || channel.adminRights != nil || channel.flags.contains(.isCreator) { canReport = false } - if !canReport && !canViewStats && !canStartVoiceChat { + if !canReport && !canViewStats { displayMore = false } if displayMore { @@ -1051,10 +1051,18 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro var isPublic = false var isCreator = false var hasVoiceChat = false + var canStartVoiceChat = false if group.flags.contains(.hasVoiceChat) { hasVoiceChat = true } + if !hasVoiceChat { + if case .creator = group.role { + canStartVoiceChat = true + } else if case let .admin(rights, _) = group.role, rights.rights.contains(.canManageCalls) { + canStartVoiceChat = true + } + } if case .creator = group.role { isCreator = true @@ -1073,13 +1081,11 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro if !group.hasBannedPermission(.banAddMembers) { canAddMembers = true } - if canAddMembers { result.append(.addMember) } - result.append(.mute) - if hasVoiceChat { + if hasVoiceChat || canStartVoiceChat { result.append(.voiceChat) } result.append(.search) diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift index 89d1e8604d..fb9a716dae 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift @@ -21,6 +21,7 @@ import RadialStatusNode import TelegramUIPreferences import PeerInfoAvatarListNode import AnimationUI +import ContextUI enum PeerInfoHeaderButtonKey: Hashable { case message @@ -54,7 +55,7 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { let referenceNode: ContextReferenceContentNode let containerNode: ContextControllerSourceNode private let backgroundNode: ASImageNode - private let backgroundWithIconNode: ASImageNode + private let iconNode: ASImageNode private let textNode: ImmediateTextNode private var animationNode: AnimationNode? @@ -73,11 +74,10 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { self.backgroundNode = ASImageNode() self.backgroundNode.displaysAsynchronously = false self.backgroundNode.displayWithoutProcessing = true - self.backgroundNode.isHidden = true - self.backgroundWithIconNode = ASImageNode() - self.backgroundWithIconNode.displaysAsynchronously = false - self.backgroundWithIconNode.displayWithoutProcessing = true + self.iconNode = ASImageNode() + self.iconNode.displaysAsynchronously = false + self.iconNode.displayWithoutProcessing = true self.textNode = ImmediateTextNode() self.textNode.displaysAsynchronously = false @@ -88,7 +88,7 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { self.containerNode.addSubnode(self.referenceNode) self.referenceNode.addSubnode(self.backgroundNode) - self.referenceNode.addSubnode(self.backgroundWithIconNode) + self.referenceNode.addSubnode(self.iconNode) self.addSubnode(self.containerNode) self.addSubnode(self.textNode) @@ -126,13 +126,12 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { func update(size: CGSize, text: String, icon: PeerInfoHeaderButtonIcon, isActive: Bool, isExpanded: Bool, presentationData: PresentationData, transition: ContainedViewLayoutTransition) { let previousIcon = self.icon let iconUpdated = self.icon != icon - if self.theme != presentationData.theme || self.icon != icon || self.isActive != isActive { + let isActiveUpdated = self.isActive != isActive + self.isActive = isActive + if self.theme != presentationData.theme || self.icon != icon { self.theme = presentationData.theme self.icon = icon - let isActiveUpdated = self.isActive != isActive - self.isActive = isActive - var isGestureEnabled = false if [.mute, .voiceChat, .more].contains(icon) { isGestureEnabled = true @@ -155,6 +154,7 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { colors = ["Middle.Group 1.Fill 1": iconColor, "Top.Group 1.Fill 1": iconColor, "Bottom.Group 1.Fill 1": iconColor, + "EXAMPLE.Group 1.Fill 1": iconColor, "Line.Group 1.Stroke 1": iconColor] if previousIcon == .unmute { playOnce = true @@ -166,6 +166,7 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { colors = ["Middle.Group 1.Fill 1": iconColor, "Top.Group 1.Fill 1": iconColor, "Bottom.Group 1.Fill 1": iconColor, + "EXAMPLE.Group 1.Fill 1": iconColor, "Line.Group 1.Stroke 1": iconColor] if previousIcon == .mute { playOnce = true @@ -195,17 +196,13 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { } } else { animationNode = AnimationNode(animation: animationName, colors: colors, scale: 1.0) - self.addSubnode(animationNode) + self.referenceNode.addSubnode(animationNode) self.animationNode = animationNode } animationNode.frame = CGRect(origin: CGPoint(), size: size) - self.backgroundWithIconNode.isHidden = true - self.backgroundNode.isHidden = false } else if let animationNode = self.animationNode { self.animationNode = nil animationNode.removeFromSupernode() - self.backgroundWithIconNode.isHidden = false - self.backgroundNode.isHidden = true } if playOnce { @@ -213,35 +210,10 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { } else if seekToEnd { self.animationNode?.seekToEnd() } - - if isActiveUpdated, !self.containerNode.alpha.isZero { - let backgroundNode = !self.backgroundNode.isHidden ? self.backgroundNode : self.backgroundWithIconNode - if let snapshotView = backgroundNode.view.snapshotContentTree() { - snapshotView.frame = backgroundNode.view.frame - if let animationNode = self.animationNode { - self.view.insertSubview(snapshotView, belowSubview: animationNode.view) - } else { - self.view.addSubview(snapshotView) - } - snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak snapshotView] _ in - snapshotView?.removeFromSuperview() - }) - } - if !isExpanded, let snapshotView = self.textNode.view.snapshotContentTree() { - snapshotView.frame = self.textNode.view.frame - self.view.addSubview(snapshotView) - - snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak snapshotView] _ in - snapshotView?.removeFromSuperview() - }) - } - } - - self.backgroundNode.image = generateFilledCircleImage(diameter: 40.0, color: isActive ? presentationData.theme.list.itemAccentColor : presentationData.theme.list.itemDisabledTextColor) - self.backgroundWithIconNode.image = generateImage(CGSize(width: 40.0, height: 40.0), contextGenerator: { size, context in + + self.backgroundNode.image = generateFilledCircleImage(diameter: 40.0, color: presentationData.theme.list.itemAccentColor) + self.iconNode.image = generateImage(CGSize(width: 40.0, height: 40.0), contextGenerator: { size, context in context.clear(CGRect(origin: CGPoint(), size: size)) - context.setFillColor(isActive ? presentationData.theme.list.itemAccentColor.cgColor : presentationData.theme.list.itemDisabledTextColor.cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(), size: size)) context.setBlendMode(.normal) context.setFillColor(presentationData.theme.list.itemCheckColors.foregroundColor.cgColor) let imageName: String? @@ -275,15 +247,24 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode { }) } - self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(12.0), textColor: isActive ? presentationData.theme.list.itemAccentColor : presentationData.theme.list.itemDisabledTextColor) + let alpha: CGFloat = isActive ? 1.0 : 0.3 + if isActiveUpdated, !self.containerNode.alpha.isZero { + let alphaTransition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut) + alphaTransition.updateAlpha(node: self.backgroundNode, alpha: isActive ? 1.0 : 0.3) + if !isExpanded { + alphaTransition.updateAlpha(node: self.textNode, alpha: isActive ? 1.0 : 0.3) + } + } + + self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(12.0), textColor: presentationData.theme.list.itemAccentColor) self.accessibilityLabel = text 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.updateFrame(node: self.backgroundWithIconNode, frame: CGRect(origin: CGPoint(), size: size)) + transition.updateFrame(node: self.iconNode, 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) + transition.updateAlpha(node: self.textNode, alpha: isExpanded ? 0.0 : alpha) self.referenceNode.frame = self.containerNode.bounds } @@ -791,6 +772,7 @@ final class PeerInfoEditingAvatarNode: ASDisplayNode { final class PeerInfoAvatarListNode: ASDisplayNode { private let isSettings: Bool + let pinchSourceNode: PinchSourceContainerNode let avatarContainerNode: PeerInfoAvatarTransformContainerNode let listContainerTransformNode: ASDisplayNode let listContainerNode: PeerInfoAvatarListContainerNode @@ -801,9 +783,12 @@ final class PeerInfoAvatarListNode: ASDisplayNode { var item: PeerInfoAvatarListItem? var itemsUpdated: (([PeerInfoAvatarListItem]) -> Void)? + var animateOverlaysFadeIn: (() -> Void)? init(context: AccountContext, readyWhenGalleryLoads: Bool, isSettings: Bool) { self.isSettings = isSettings + + self.pinchSourceNode = PinchSourceContainerNode() self.avatarContainerNode = PeerInfoAvatarTransformContainerNode(context: context) self.listContainerTransformNode = ASDisplayNode() @@ -812,10 +797,11 @@ final class PeerInfoAvatarListNode: ASDisplayNode { self.listContainerNode.isHidden = true super.init() - - self.addSubnode(self.avatarContainerNode) + + self.addSubnode(self.pinchSourceNode) + self.pinchSourceNode.contentNode.addSubnode(self.avatarContainerNode) self.listContainerTransformNode.addSubnode(self.listContainerNode) - self.addSubnode(self.listContainerTransformNode) + self.pinchSourceNode.contentNode.addSubnode(self.listContainerTransformNode) let avatarReady = (self.avatarContainerNode.avatarNode.ready |> mapToSignal { _ -> Signal in @@ -857,10 +843,29 @@ final class PeerInfoAvatarListNode: ASDisplayNode { } } } + + self.pinchSourceNode.activate = { [weak self] sourceNode in + guard let _ = self else { + return + } + let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: { + return UIScreen.main.bounds + }) + context.sharedContext.mainWindow?.presentInGlobalOverlay(pinchController) + } + + self.pinchSourceNode.animatedOut = { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.animateOverlaysFadeIn?() + } } func update(size: CGSize, avatarSize: CGFloat, isExpanded: Bool, peer: Peer?, theme: PresentationTheme, transition: ContainedViewLayoutTransition) { self.arguments = (peer, theme, avatarSize, isExpanded) + self.pinchSourceNode.update(size: size, transition: transition) + self.pinchSourceNode.frame = CGRect(origin: CGPoint(), size: size) self.avatarContainerNode.update(peer: peer, item: self.item, theme: theme, avatarSize: avatarSize, isExpanded: isExpanded, isSettings: self.isSettings) } @@ -1654,6 +1659,7 @@ final class PeerInfoHeaderNode: ASDisplayNode { var requestOpenAvatarForEditing: ((Bool) -> Void)? var cancelUpload: (() -> Void)? var requestUpdateLayout: (() -> Void)? + var animateOverlaysFadeIn: (() -> Void)? var displayAvatarContextMenu: ((ASDisplayNode, ContextGesture?) -> Void)? var displayCopyContextMenu: ((ASDisplayNode, Bool, Bool) -> Void)? @@ -1768,6 +1774,17 @@ final class PeerInfoHeaderNode: ASDisplayNode { } strongSelf.editingContentNode.avatarNode.update(peer: peer, item: strongSelf.avatarListNode.item, updatingAvatar: state.updatingAvatar, uploadProgress: state.avatarUploadProgress, theme: presentationData.theme, avatarSize: avatarSize, isEditing: state.isEditing) } + + self.avatarListNode.animateOverlaysFadeIn = { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.navigationButtonContainer.layer.animateAlpha(from: 0.0, to: strongSelf.navigationButtonContainer.alpha, duration: 0.25) + strongSelf.avatarListNode.listContainerNode.shadowNode.layer.animateAlpha(from: 0.0, to: strongSelf.avatarListNode.listContainerNode.shadowNode.alpha, duration: 0.25) + strongSelf.avatarListNode.listContainerNode.controlsContainerNode.layer.animateAlpha(from: 0.0, to: strongSelf.avatarListNode.listContainerNode.controlsContainerNode.alpha, duration: 0.25) + + strongSelf.animateOverlaysFadeIn?() + } } override func didLoad() { diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift index c2b7d1dc83..f0749cbb1b 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift @@ -524,6 +524,7 @@ private enum PeerInfoSettingsSection { case watch case support case faq + case tips case phoneNumber case username case addAccount @@ -823,6 +824,9 @@ private func settingsItems(data: PeerInfoScreenData?, context: AccountContext, p items[.support]!.append(PeerInfoScreenDisclosureItem(id: 1, text: presentationData.strings.Settings_FAQ, icon: PresentationResourcesSettings.faq, action: { interaction.openSettings(.faq) })) + items[.support]!.append(PeerInfoScreenDisclosureItem(id: 2, text: presentationData.strings.Settings_Tips, icon: PresentationResourcesSettings.tips, action: { + interaction.openSettings(.tips) + })) var result: [(AnyHashable, [PeerInfoScreenItem])] = [] for section in SettingsSection.allCases { @@ -1542,6 +1546,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD private let hasTwoStepAuth = Promise(nil) private let hasPassport = Promise(false) private let supportPeerDisposable = MetaDisposable() + private let tipsPeerDisposable = MetaDisposable() private let cachedFaq = Promise(nil) private let _ready = Promise() @@ -1848,6 +1853,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(MessageContextExtractedContentSource(sourceNode: node)), items: .single(items), reactionItems: [], recognizer: nil, gesture: gesture) strongSelf.controller?.window?.presentInGlobalOverlay(controller) }) + }, activateMessagePinch: { _ in }, openMessageContextActions: { [weak self] message, node, rect, gesture in guard let strongSelf = self else { gesture?.cancel() @@ -2388,6 +2394,13 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD strongSelf.openAvatarForEditing() } } + + self.headerNode.animateOverlaysFadeIn = { [weak self] in + guard let strongSelf = self, let navigationBar = strongSelf.controller?.navigationBar else { + return + } + navigationBar.layer.animateAlpha(from: 0.0, to: navigationBar.alpha, duration: 0.25) + } self.headerNode.requestUpdateLayout = { [weak self] in guard let strongSelf = self else { @@ -2861,6 +2874,8 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD self.resolvePeerByNameDisposable?.dispose() self.navigationActionDisposable.dispose() self.enqueueMediaMessageDisposable.dispose() + self.supportPeerDisposable.dispose() + self.tipsPeerDisposable.dispose() } override func didLoad() { @@ -3371,7 +3386,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD case .videoCall: self.requestCall(isVideo: true) case .voiceChat: - self.requestCall(isVideo: false) + self.requestCall(isVideo: false, gesture: gesture) case .mute: if let notificationSettings = self.data?.notificationSettings, case .muted = notificationSettings.muteState { let _ = updatePeerMuteSetting(account: self.context.account, peerId: self.peerId, muteInterval: nil).start() @@ -3627,20 +3642,6 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD } } } else if let channel = peer as? TelegramChannel { - if !channel.flags.contains(.hasVoiceChat) { - if channel.flags.contains(.isCreator) || channel.hasPermission(.manageCalls) { - items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChannelInfo_CreateVoiceChat, icon: { theme in - generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/VoiceChat"), color: theme.contextMenu.primaryColor) - }, action: { [weak self] c, f in - self?.requestCall(isVideo: false, contextController: c, result: f, backAction: { c in - if let mainItemsImpl = mainItemsImpl { - c.setItems(mainItemsImpl()) - } - }) - }))) - } - } - if let cachedData = self.data?.cachedData as? CachedChannelData, cachedData.flags.contains(.canViewStats) { items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChannelInfo_Stats, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Statistics"), color: theme.contextMenu.primaryColor) @@ -3730,22 +3731,6 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD } } } else if let group = peer as? TelegramGroup { - var canManageGroupCalls = false - if case .creator = group.role { - canManageGroupCalls = true - } else if case let .admin(rights, _) = group.role { - if rights.rights.contains(.canManageCalls) { - canManageGroupCalls = true - } - } - if canManageGroupCalls, !group.flags.contains(.hasVoiceChat) { - items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChannelInfo_CreateVoiceChat, icon: { theme in - generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/VoiceChat"), color: theme.contextMenu.primaryColor) - }, action: { [weak self] c, f in - self?.requestCall(isVideo: false, contextController: c, result: f) - }))) - } - if case .Member = group.membership { if !items.isEmpty { items.append(.separator) @@ -3976,14 +3961,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD } }, activeCall: activeCall) } else { - if let defaultJoinAsPeerId = defaultJoinAsPeerId { - result?(.dismissWithoutContent) - self?.createAndJoinGroupCall(peerId: peerId, joinAsPeerId: defaultJoinAsPeerId) - } else { - self?.openVoiceChatDisplayAsPeerSelection(completion: { joinAsPeerId in - self?.createAndJoinGroupCall(peerId: peerId, joinAsPeerId: joinAsPeerId) - }, gesture: gesture, contextController: contextController, result: result, backAction: backAction) - } + self?.openVoiceChatOptions(defaultJoinAsPeerId: defaultJoinAsPeerId, gesture: gesture, contextController: contextController) } } @@ -4006,6 +3984,17 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD self.context.requestCall(peerId: peer.id, isVideo: isVideo, completion: {}) } + private func scheduleGroupCall() { + self.context.scheduleGroupCall(peerId: self.peerId) +// +// +// let time = Int32(Date().timeIntervalSince1970 + 86400) +// self.activeActionDisposable.set((createGroupCall(account: self.context.account, peerId: self.peerId, title: nil, scheduleDate: time) +// |> deliverOnMainQueue).start(next: { [weak self] info in +// +// })) + } + private func createAndJoinGroupCall(peerId: PeerId, joinAsPeerId: PeerId?) { if let _ = self.context.sharedContext.callManager { let startCall: (Bool) -> Void = { [weak self] endCurrentIfAny in @@ -4013,26 +4002,40 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD return } - var dismissStatus: (() -> Void)? - let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: { - dismissStatus?() - })) - dismissStatus = { [weak self, weak statusController] in - self?.activeActionDisposable.set(nil) - statusController?.dismiss() + var cancelImpl: (() -> Void)? + let presentationData = strongSelf.presentationData + let progressSignal = Signal { [weak self] subscriber in + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + cancelImpl?() + })) + self?.controller?.present(controller, in: .window(.root)) + return ActionDisposable { [weak controller] in + Queue.mainQueue().async() { + controller?.dismiss() + } + } } - strongSelf.controller?.present(statusController, in: .window(.root)) - strongSelf.activeActionDisposable.set((createGroupCall(account: strongSelf.context.account, peerId: peerId) + |> runOn(Queue.mainQueue()) + |> delay(0.15, queue: Queue.mainQueue()) + let progressDisposable = progressSignal.start() + let createSignal = createGroupCall(account: strongSelf.context.account, peerId: peerId, title: nil, scheduleDate: nil) + |> afterDisposed { + Queue.mainQueue().async { + progressDisposable.dispose() + } + } + cancelImpl = { [weak self] in + self?.activeActionDisposable.set(nil) + } + strongSelf.activeActionDisposable.set((createSignal |> deliverOnMainQueue).start(next: { [weak self] info in guard let strongSelf = self else { return } strongSelf.context.joinGroupCall(peerId: peerId, invite: nil, requestJoinAsPeerId: { result in result(joinAsPeerId) - }, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title)) + }, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: nil, subscribedToScheduled: false)) }, error: { [weak self] error in - dismissStatus?() - guard let strongSelf = self else { return } @@ -4040,14 +4043,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD let text: String switch error { - case .generic: + case .generic, .scheduledTooLate: text = strongSelf.presentationData.strings.Login_UnknownError case .anonymousNotAllowed: text = strongSelf.presentationData.strings.VoiceChat_AnonymousDisabledAlertText } strongSelf.controller?.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) - }, completed: { [weak self] in - dismissStatus?() })) } @@ -4212,7 +4213,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD |> deliverOnMainQueue).start(completed: { [weak self] in if let strongSelf = self, let peer = strongSelf.data?.peer { let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } - strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .info(text: presentationData.strings.Conversation_DeletedFromContacts(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root)) + let controller = UndoOverlayController(presentationData: presentationData, content: .info(text: presentationData.strings.Conversation_DeletedFromContacts(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }) + controller.keepOnParentDismissal = true + strongSelf.controller?.present(controller, in: .window(.root)) strongSelf.controller?.dismiss() } @@ -4348,7 +4351,90 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD controller.push(statsController) } + private func openVoiceChatOptions(defaultJoinAsPeerId: PeerId?, gesture: ContextGesture? = nil, contextController: ContextController? = nil) { + let context = self.context + let peerId = self.peerId + let defaultJoinAsPeerId = defaultJoinAsPeerId ?? self.context.account.peerId + let currentAccountPeer = self.context.account.postbox.loadedPeerWithId(self.context.account.peerId) + |> map { peer in + return [FoundPeer(peer: peer, subscribers: nil)] + } + let _ = (combineLatest(queue: Queue.mainQueue(), currentAccountPeer, self.displayAsPeersPromise.get() |> take(1)) + |> map { currentAccountPeer, availablePeers -> [FoundPeer] in + var result = currentAccountPeer + result.append(contentsOf: availablePeers) + return result + }).start(next: { [weak self] peers in + guard let strongSelf = self else { + return + } + + var items: [ContextMenuItem] = [] + + if peers.count > 1 { + var selectedPeer: FoundPeer? + for peer in peers { + if peer.peer.id == defaultJoinAsPeerId { + selectedPeer = peer + } + } + if let peer = selectedPeer { + let avatarSize = CGSize(width: 28.0, height: 28.0) + items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_DisplayAs, textLayout: .secondLineWithValue(peer.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)), icon: { _ in nil }, iconSource: ContextMenuActionItemIconSource(size: avatarSize, signal: peerAvatarCompleteImage(account: strongSelf.context.account, peer: peer.peer, size: avatarSize)), action: { c, f in + guard let strongSelf = self else { + return + } + + strongSelf.openVoiceChatDisplayAsPeerSelection(completion: { joinAsPeerId in + let _ = updateGroupCallJoinAsPeer(account: context.account, peerId: peerId, joinAs: joinAsPeerId).start() + self?.openVoiceChatOptions(defaultJoinAsPeerId: joinAsPeerId, gesture: nil, contextController: c) + }, gesture: gesture, contextController: c, result: f, backAction: { [weak self] c in + self?.openVoiceChatOptions(defaultJoinAsPeerId: defaultJoinAsPeerId, gesture: nil, contextController: c) + }) + + }))) + items.append(.separator) + } + } + + items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.ChannelInfo_CreateVoiceChat, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/VoiceChat"), color: theme.contextMenu.primaryColor) }, action: { _, f in + f(.dismissWithoutContent) + + self?.createAndJoinGroupCall(peerId: peerId, joinAsPeerId: defaultJoinAsPeerId) + }))) + + items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.ChannelInfo_ScheduleVoiceChat, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Schedule"), color: theme.contextMenu.primaryColor) }, action: { _, f in + f(.dismissWithoutContent) + + self?.scheduleGroupCall() + }))) + + if let contextController = contextController { + contextController.setItems(.single(items)) + } else { + strongSelf.state = strongSelf.state.withHighlightedButton(.voiceChat) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + + if let sourceNode = strongSelf.headerNode.buttonNodes[.voiceChat]?.referenceNode, let controller = strongSelf.controller { + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .reference(PeerInfoContextReferenceContentSource(controller: controller, sourceNode: sourceNode)), items: .single(items), reactionItems: [], gesture: gesture) + contextController.dismissed = { [weak self] in + if let strongSelf = self { + strongSelf.state = strongSelf.state.withHighlightedButton(nil) + if let (layout, navigationHeight) = strongSelf.validLayout { + strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false) + } + } + } + controller.presentInGlobalOverlay(contextController) + } + } + }) + } + private func openVoiceChatDisplayAsPeerSelection(completion: @escaping (PeerId) -> Void, gesture: ContextGesture? = nil, contextController: ContextController? = nil, result: ((ContextMenuActionResult) -> Void)? = nil, backAction: ((ContextController) -> Void)? = nil) { + let dismissOnSelection = contextController == nil let currentAccountPeer = self.context.account.postbox.loadedPeerWithId(context.account.peerId) |> map { peer in return [FoundPeer(peer: peer, subscribers: nil)] @@ -4398,8 +4484,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD let avatarSize = CGSize(width: 28.0, height: 28.0) let avatarSignal = peerAvatarCompleteImage(account: strongSelf.context.account, peer: peer.peer, size: avatarSize) items.append(.action(ContextMenuActionItem(text: peer.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), textLayout: subtitle.flatMap { .secondLineWithValue($0) } ?? .singleLine, icon: { _ in nil }, iconSource: ContextMenuActionItemIconSource(size: avatarSize, signal: avatarSignal), action: { _, f in - f(.dismissWithoutContent) - + if dismissOnSelection { + f(.dismissWithoutContent) + } completion(peer.peer.id) }))) @@ -5353,6 +5440,8 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD })]), in: .window(.root)) case .faq: self.openFaq() + case .tips: + self.openTips() case .phoneNumber: if let user = self.data?.peer as? TelegramUser, let phoneNumber = user.phone { self.controller?.push(ChangePhoneNumberIntroController(context: self.context, phoneNumber: phoneNumber)) @@ -5371,7 +5460,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD } private func openFaq(anchor: String? = nil) { - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil)) + let controller = OverlayStatusController(theme: self.presentationData.theme, type: .loading(cancelled: nil)) self.controller?.present(controller, in: .window(.root)) let _ = (self.cachedFaq.get() |> take(1) @@ -5391,6 +5480,20 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD }) } + private func openTips() { + let controller = OverlayStatusController(theme: self.presentationData.theme, type: .loading(cancelled: nil)) + self.controller?.present(controller, in: .window(.root)) + + let context = self.context + let navigationController = self.controller?.navigationController as? NavigationController + self.tipsPeerDisposable.set((resolvePeerByName(account: context.account, name: self.presentationData.strings.Settings_TipsUsername) |> deliverOnMainQueue).start(next: { [weak controller] peerId in + controller?.dismiss() + if let peerId = peerId, let navigationController = navigationController { + context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId))) + } + })) + } + fileprivate func switchToAccount(id: AccountRecordId) { self.accountsAndPeers.set(.never()) self.context.sharedContext.switchToAccount(id: id, fromSettingsController: nil, withChatListController: nil) @@ -6571,12 +6674,12 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen { private func dismissAllTooltips() { self.window?.forEachController({ controller in - if let controller = controller as? UndoOverlayController { + if let controller = controller as? UndoOverlayController, !controller.keepOnParentDismissal { controller.dismissWithCommitAction() } }) self.forEachController({ controller in - if let controller = controller as? UndoOverlayController { + if let controller = controller as? UndoOverlayController, !controller.keepOnParentDismissal { controller.dismissWithCommitAction() } return true @@ -7168,7 +7271,7 @@ func presentAddMembers(context: AccountContext, parentController: ViewController } contactsController?.dismiss() - },completed: { + }, completed: { contactsController?.dismiss() })) })) diff --git a/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift index 59fbe8fffb..c07f07f6c1 100644 --- a/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift +++ b/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift @@ -29,7 +29,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode { var theme: PresentationTheme - init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) { + init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat) { self.messageId = messageId self.theme = theme @@ -86,7 +86,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode { authorName = author.displayTitle(strings: strings, displayOrder: nameDisplayOrder) } if let message = message { - (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: context.account.peerId) + (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: context.account.peerId) } var updatedMediaReference: AnyMediaReference? @@ -152,7 +152,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode { let isMedia: Bool if let message = message { - switch messageContentKind(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: context.account.peerId) { + switch messageContentKind(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: context.account.peerId) { case .text: isMedia = false default: diff --git a/submodules/TelegramUI/Sources/SharedAccountContext.swift b/submodules/TelegramUI/Sources/SharedAccountContext.swift index e314d79971..7f551fcd19 100644 --- a/submodules/TelegramUI/Sources/SharedAccountContext.swift +++ b/submodules/TelegramUI/Sources/SharedAccountContext.swift @@ -1220,7 +1220,8 @@ public final class SharedAccountContextImpl: SharedAccountContext { let controllerInteraction: ChatControllerInteraction if tapMessage != nil || clickThroughMessage != nil { controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in - return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in + return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, activateMessagePinch: { _ in + }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in }, tapMessage: { message in tapMessage?(message) }, clickThroughMessage: { diff --git a/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift b/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift index f5e71e32b4..1ae9c83d4c 100644 --- a/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift +++ b/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift @@ -15,6 +15,8 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry { public var disableVideoAspectScaling: Bool public var enableVoipTcp: Bool public var demoVideoChats: Bool + public var experimentalCompatibility: Bool + public var enableNoiseSuppression: Bool public static var defaultSettings: ExperimentalUISettings { return ExperimentalUISettings( @@ -29,7 +31,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry { preferredVideoCodec: nil, disableVideoAspectScaling: false, enableVoipTcp: false, - demoVideoChats: false + demoVideoChats: false, + experimentalCompatibility: false, + enableNoiseSuppression: false ) } @@ -45,7 +49,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry { preferredVideoCodec: String?, disableVideoAspectScaling: Bool, enableVoipTcp: Bool, - demoVideoChats: Bool + demoVideoChats: Bool, + experimentalCompatibility: Bool, + enableNoiseSuppression: Bool ) { self.keepChatNavigationStack = keepChatNavigationStack self.skipReadHistory = skipReadHistory @@ -59,6 +65,8 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry { self.disableVideoAspectScaling = disableVideoAspectScaling self.enableVoipTcp = enableVoipTcp self.demoVideoChats = demoVideoChats + self.experimentalCompatibility = experimentalCompatibility + self.enableNoiseSuppression = enableNoiseSuppression } public init(decoder: PostboxDecoder) { @@ -74,6 +82,8 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry { self.disableVideoAspectScaling = decoder.decodeInt32ForKey("disableVideoAspectScaling", orElse: 0) != 0 self.enableVoipTcp = decoder.decodeInt32ForKey("enableVoipTcp", orElse: 0) != 0 self.demoVideoChats = decoder.decodeInt32ForKey("demoVideoChats", orElse: 0) != 0 + self.experimentalCompatibility = decoder.decodeInt32ForKey("experimentalCompatibility", orElse: 0) != 0 + self.enableNoiseSuppression = decoder.decodeInt32ForKey("enableNoiseSuppression", orElse: 0) != 0 } public func encode(_ encoder: PostboxEncoder) { @@ -91,6 +101,8 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry { encoder.encodeInt32(self.disableVideoAspectScaling ? 1 : 0, forKey: "disableVideoAspectScaling") encoder.encodeInt32(self.enableVoipTcp ? 1 : 0, forKey: "enableVoipTcp") encoder.encodeInt32(self.demoVideoChats ? 1 : 0, forKey: "demoVideoChats") + encoder.encodeInt32(self.experimentalCompatibility ? 1 : 0, forKey: "experimentalCompatibility") + encoder.encodeInt32(self.enableNoiseSuppression ? 1 : 0, forKey: "enableNoiseSuppression") } public func isEqual(to: PreferencesEntry) -> Bool { diff --git a/submodules/TelegramVoip/Sources/GroupCallContext.swift b/submodules/TelegramVoip/Sources/GroupCallContext.swift index df588262fc..8beb545dc0 100644 --- a/submodules/TelegramVoip/Sources/GroupCallContext.swift +++ b/submodules/TelegramVoip/Sources/GroupCallContext.swift @@ -180,7 +180,7 @@ public final class OngoingGroupCallContext { private var broadcastPartsSource: BroadcastPartSource? - init(queue: Queue, inputDeviceId: String, outputDeviceId: String, video: OngoingCallVideoCapturer?, participantDescriptionsRequired: @escaping (Set) -> Void, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void, outgoingAudioBitrateKbit: Int32?, enableVideo: Bool) { + init(queue: Queue, inputDeviceId: String, outputDeviceId: String, video: OngoingCallVideoCapturer?, participantDescriptionsRequired: @escaping (Set) -> Void, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void, outgoingAudioBitrateKbit: Int32?, enableVideo: Bool, enableNoiseSuppression: Bool) { self.queue = queue var networkStateUpdatedImpl: ((GroupCallNetworkState) -> Void)? @@ -224,7 +224,7 @@ public final class OngoingGroupCallContext { }, outgoingAudioBitrateKbit: outgoingAudioBitrateKbit ?? 32, enableVideo: enableVideo, - enableNoiseSuppression: true + enableNoiseSuppression: enableNoiseSuppression ) let queue = self.queue @@ -529,10 +529,10 @@ public final class OngoingGroupCallContext { } } - public init(inputDeviceId: String = "", outputDeviceId: String = "", video: OngoingCallVideoCapturer?, participantDescriptionsRequired: @escaping (Set) -> Void, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void, outgoingAudioBitrateKbit: Int32?, enableVideo: Bool) { + public init(inputDeviceId: String = "", outputDeviceId: String = "", video: OngoingCallVideoCapturer?, participantDescriptionsRequired: @escaping (Set) -> Void, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void, outgoingAudioBitrateKbit: Int32?, enableVideo: Bool, enableNoiseSuppression: Bool) { let queue = self.queue self.impl = QueueLocalObject(queue: queue, generate: { - return Impl(queue: queue, inputDeviceId: inputDeviceId, outputDeviceId: outputDeviceId, video: video, participantDescriptionsRequired: participantDescriptionsRequired, audioStreamData: audioStreamData, rejoinNeeded: rejoinNeeded, outgoingAudioBitrateKbit: outgoingAudioBitrateKbit, enableVideo: enableVideo) + return Impl(queue: queue, inputDeviceId: inputDeviceId, outputDeviceId: outputDeviceId, video: video, participantDescriptionsRequired: participantDescriptionsRequired, audioStreamData: audioStreamData, rejoinNeeded: rejoinNeeded, outgoingAudioBitrateKbit: outgoingAudioBitrateKbit, enableVideo: enableVideo, enableNoiseSuppression: enableNoiseSuppression) }) } diff --git a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm index b6682960f6..0496174e33 100644 --- a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm +++ b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm @@ -6,7 +6,7 @@ #import "Instance.h" #import "InstanceImpl.h" -#import "reference/InstanceImplReference.h" +#import "v2/InstanceV2Impl.h" #include "StaticThreads.h" #import "VideoCaptureInterface.h" @@ -332,8 +332,14 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL; return 92; } -+ (NSArray * _Nonnull)versionsWithIncludeReference:(bool)__unused includeReference { - return @[@"2.7.7", @"3.0.0"]; ++ (NSArray * _Nonnull)versionsWithIncludeReference:(bool)includeReference { + NSMutableArray *list = [[NSMutableArray alloc] init]; + [list addObject:@"2.7.7"]; + [list addObject:@"3.0.0"]; + if (includeReference) { + [list addObject:@"4.0.0"]; + } + return list; } + (tgcalls::ProtocolVersion)protocolVersionFromLibraryVersion:(NSString *)version { @@ -444,10 +450,9 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ tgcalls::Register(); + tgcalls::Register(); }); - - _tgVoip = tgcalls::Meta::Create([version UTF8String], (tgcalls::Descriptor){ .config = config, .persistentState = (tgcalls::PersistentState){ derivedStateValue }, diff --git a/submodules/TgVoipWebrtc/tgcalls b/submodules/TgVoipWebrtc/tgcalls index 82d6e2d5a4..cff573909e 160000 --- a/submodules/TgVoipWebrtc/tgcalls +++ b/submodules/TgVoipWebrtc/tgcalls @@ -1 +1 @@ -Subproject commit 82d6e2d5a45135458610ce03dd700143b8e92ad6 +Subproject commit cff573909eb35be75491b6967063b94d81ad0828 diff --git a/submodules/TooltipUI/Sources/TooltipScreen.swift b/submodules/TooltipUI/Sources/TooltipScreen.swift index fab46460a7..49b47ecb42 100644 --- a/submodules/TooltipUI/Sources/TooltipScreen.swift +++ b/submodules/TooltipUI/Sources/TooltipScreen.swift @@ -44,6 +44,8 @@ private final class TooltipScreenNode: ViewControllerTracingNode { private let backgroundContainerNode: ASDisplayNode private let backgroundNode: ASImageNode private var effectView: UIView? + private var gradientNode: ASDisplayNode? + private var arrowGradientNode: ASDisplayNode? private let arrowNode: ASImageNode private let arrowContainer: ASDisplayNode private var arrowEffectView: UIView? @@ -121,7 +123,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode { self.arrowContainer = ASDisplayNode() let fontSize: CGFloat - if style == .light { + if case .light = style { self.effectView = UIVisualEffectView(effect: UIBlurEffect(style: .light)) self.backgroundContainerNode.clipsToBounds = true self.backgroundContainerNode.cornerRadius = 14.0 @@ -133,6 +135,38 @@ private final class TooltipScreenNode: ViewControllerTracingNode { self.arrowEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .light)) self.arrowContainer.view.addSubview(self.arrowEffectView!) + let maskLayer = CAShapeLayer() + if let path = try? svgPath("M85.882251,0 C79.5170552,0 73.4125613,2.52817247 68.9116882,7.02834833 L51.4264069,24.5109211 C46.7401154,29.1964866 39.1421356,29.1964866 34.4558441,24.5109211 L16.9705627,7.02834833 C12.4696897,2.52817247 6.36519576,0 0,0 L85.882251,0 ", scale: CGPoint(x: 0.333333, y: 0.333333), offset: CGPoint()) { + maskLayer.path = path.cgPath + } + maskLayer.frame = CGRect(origin: CGPoint(), size: arrowSize) + self.arrowContainer.layer.mask = maskLayer + } else if case let .gradient(leftColor, rightColor) = style { + self.gradientNode = ASDisplayNode() + self.gradientNode?.setLayerBlock({ + let layer = CAGradientLayer() + layer.colors = [leftColor.cgColor, rightColor.cgColor] + layer.startPoint = CGPoint() + layer.endPoint = CGPoint(x: 1.0, y: 0.0) + return layer + }) + self.arrowGradientNode = ASDisplayNode() + self.arrowGradientNode?.setLayerBlock({ + let layer = CAGradientLayer() + layer.colors = [leftColor.cgColor, rightColor.cgColor] + layer.startPoint = CGPoint() + layer.endPoint = CGPoint(x: 1.0, y: 0.0) + return layer + }) + self.backgroundContainerNode.clipsToBounds = true + self.backgroundContainerNode.cornerRadius = 14.0 + if #available(iOS 13.0, *) { + self.backgroundContainerNode.layer.cornerCurve = .continuous + } + fontSize = 17.0 + + self.arrowContainer.addSubnode(self.arrowGradientNode!) + let maskLayer = CAShapeLayer() if let path = try? svgPath("M85.882251,0 C79.5170552,0 73.4125613,2.52817247 68.9116882,7.02834833 L51.4264069,24.5109211 C46.7401154,29.1964866 39.1421356,29.1964866 34.4558441,24.5109211 L16.9705627,7.02834833 C12.4696897,2.52817247 6.36519576,0 0,0 L85.882251,0 ", scale: CGPoint(x: 0.333333, y: 0.333333), offset: CGPoint()) { maskLayer.path = path.cgPath @@ -178,7 +212,12 @@ private final class TooltipScreenNode: ViewControllerTracingNode { self.containerNode.addSubnode(self.backgroundContainerNode) self.arrowContainer.addSubnode(self.arrowNode) self.backgroundNode.addSubnode(self.arrowContainer) - if let effectView = self.effectView { + if let gradientNode = self.gradientNode { + self.backgroundContainerNode.addSubnode(gradientNode) + self.containerNode.addSubnode(self.arrowContainer) + self.arrowNode.removeFromSupernode() + } + else if let effectView = self.effectView { self.backgroundContainerNode.view.addSubview(effectView) if let _ = self.arrowEffectView { self.containerNode.addSubnode(self.arrowContainer) @@ -259,7 +298,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode { let sideInset: CGFloat = 13.0 + layout.safeInsets.left let bottomInset: CGFloat = 10.0 - let contentInset: CGFloat = 9.0 + let contentInset: CGFloat = 11.0 let contentVerticalInset: CGFloat = 11.0 let animationSize: CGSize let animationInset: CGFloat @@ -288,7 +327,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode { let backgroundHeight: CGFloat switch self.tooltipStyle { - case .default: + case .default, .gradient: backgroundHeight = max(animationSize.height, textSize.height) + contentVerticalInset * 2.0 case .light: backgroundHeight = max(28.0, max(animationSize.height, textSize.height) + 4.0 * 2.0) @@ -331,6 +370,9 @@ private final class TooltipScreenNode: ViewControllerTracingNode { if let effectView = self.effectView { transition.updateFrame(view: effectView, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size)) } + if let gradientNode = self.gradientNode { + transition.updateFrame(node: gradientNode, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size)) + } if let image = self.arrowNode.image, case let .point(rect, arrowPosition) = self.location { let arrowSize = image.size let arrowCenterX = rect.midX @@ -348,8 +390,10 @@ private final class TooltipScreenNode: ViewControllerTracingNode { transition.updateFrame(node: self.arrowContainer, frame: arrowFrame.offsetBy(dx: -backgroundFrame.minX, dy: 0.0)) - self.arrowNode.frame = CGRect(origin: CGPoint(), size: arrowSize) - self.arrowEffectView?.frame = CGRect(origin: CGPoint(), size: arrowSize) + let arrowBounds = CGRect(origin: CGPoint(), size: arrowSize) + self.arrowNode.frame = arrowBounds + self.arrowEffectView?.frame = arrowBounds + self.arrowGradientNode?.frame = CGRect(origin: CGPoint(x: -arrowFrame.minX + backgroundFrame.minX, y: 0.0), size: backgroundFrame.size) case .right: arrowFrame = CGRect(origin: CGPoint(x: backgroundFrame.width + arrowSize.height, y: rect.midY), size: CGSize(width: arrowSize.height, height: arrowSize.width)) @@ -357,8 +401,10 @@ private final class TooltipScreenNode: ViewControllerTracingNode { transition.updateFrame(node: self.arrowContainer, frame: arrowFrame.offsetBy(dx: 0.0, dy: -backgroundFrame.minY - floorToScreenPixels((backgroundFrame.height - arrowSize.width) / 2.0))) - self.arrowNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -0.5), size: arrowSize) - self.arrowEffectView?.frame = CGRect(origin: CGPoint(x: 0.0, y: -0.5), size: arrowSize) + let arrowBounds = CGRect(origin: CGPoint(x: 0.0, y: -0.5), size: arrowSize) + self.arrowNode.frame = arrowBounds + self.arrowEffectView?.frame = arrowBounds + self.arrowGradientNode?.frame = arrowBounds } } else { self.arrowNode.isHidden = true @@ -508,6 +554,7 @@ public final class TooltipScreen: ViewController { public enum Style { case `default` case light + case gradient(UIColor, UIColor) } public let text: String diff --git a/submodules/UndoUI/Sources/UndoOverlayController.swift b/submodules/UndoUI/Sources/UndoOverlayController.swift index bf84710a72..76d927a634 100644 --- a/submodules/UndoUI/Sources/UndoOverlayController.swift +++ b/submodules/UndoUI/Sources/UndoOverlayController.swift @@ -38,6 +38,7 @@ public enum UndoOverlayContent { case sticker(account: Account, file: TelegramMediaFile, text: String) case copy(text: String) case mediaSaved(text: String) + case paymentSent(currencyValue: String, itemTitle: String) } public enum UndoOverlayAction { @@ -56,6 +57,8 @@ public final class UndoOverlayController: ViewController { private var didPlayPresentationAnimation = false private var dismissed = false + public var keepOnParentDismissal = false + public init(presentationData: PresentationData, content: UndoOverlayContent, elevatedLayout: Bool, animateInAsReplacement: Bool = false, action: @escaping (UndoOverlayAction) -> Bool) { self.presentationData = presentationData self.content = content diff --git a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift index 698d0f3e33..cc0f619c84 100644 --- a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift +++ b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift @@ -265,6 +265,23 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode { string.addAttribute(.font, value: Font.regular(14.0), range: range) } + self.textNode.attributedText = string + displayUndo = false + self.originalRemainingSeconds = 5 + case let .paymentSent(currencyValue, itemTitle): + self.avatarNode = nil + self.iconNode = nil + self.iconCheckNode = nil + self.animationNode = AnimationNode(animation: "anim_payment", colors: ["info1.info1.stroke": self.animationBackgroundColor, "info2.info2.Fill": self.animationBackgroundColor], scale: 1.0) + self.animatedStickerNode = nil + + let (rawString, attributes) = presentationData.strings.Checkout_SuccessfulTooltip(currencyValue, itemTitle) + + let string = NSMutableAttributedString(attributedString: NSAttributedString(string: rawString, font: Font.regular(14.0), textColor: .white)) + for (_, range) in attributes { + string.addAttribute(.font, value: Font.semibold(14.0), range: range) + } + self.textNode.attributedText = string displayUndo = false self.originalRemainingSeconds = 5 @@ -738,7 +755,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode { switch content { case .removedChat: self.panelWrapperNode.addSubnode(self.timerTextNode) - case .archivedChat, .hidArchive, .revealedArchive, .autoDelete, .succeed, .emoji, .swipeToReply, .actionSucceeded, .stickersModified, .chatAddedToFolder, .chatRemovedFromFolder, .messagesUnpinned, .setProximityAlert, .invitedToVoiceChat, .linkCopied, .banned, .importedMessage, .audioRate, .forward, .gigagroupConversion, .linkRevoked, .voiceChatRecording, .voiceChatFlag, .voiceChatCanSpeak, .sticker, .copy, .mediaSaved: + case .archivedChat, .hidArchive, .revealedArchive, .autoDelete, .succeed, .emoji, .swipeToReply, .actionSucceeded, .stickersModified, .chatAddedToFolder, .chatRemovedFromFolder, .messagesUnpinned, .setProximityAlert, .invitedToVoiceChat, .linkCopied, .banned, .importedMessage, .audioRate, .forward, .gigagroupConversion, .linkRevoked, .voiceChatRecording, .voiceChatFlag, .voiceChatCanSpeak, .sticker, .copy, .mediaSaved, .paymentSent: break case .dice: self.panelWrapperNode.clipsToBounds = true @@ -864,6 +881,9 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode { let factor: CGFloat = 0.07 verticalOffset = -3.0 preferredSize = CGSize(width: floor(iconSize.width * factor), height: floor(iconSize.height * factor)) + } else if case .paymentSent = self.content { + let factor: CGFloat = 0.08 + preferredSize = CGSize(width: floor(iconSize.width * factor), height: floor(iconSize.height * factor)) } else { preferredSize = iconSize } diff --git a/versions.json b/versions.json index 6071caeab1..e51975cf2f 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,5 @@ { - "app": "7.6.2", + "app": "7.7", "bazel": "4.0.0", "xcode": "12.4" }