diff --git a/.buckconfig b/.buckconfig
index 36f4b583bd..bfe54b4d99 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -17,6 +17,7 @@
generate_missing_umbrella_headers = true
iphonesimulator_target_sdk_version = 9.0
iphoneos_target_sdk_version = 9.0
+ watchos_target_sdk_version = 5.0
provisioning_profile_read_command = security cms -Di
xctool_default_destination_specifier = platform=iOS Simulator,OS=latest
xctool_path = tools/xctool/bin/xctool
diff --git a/BUCK b/BUCK
index d0d297e321..3d6afcc743 100644
--- a/BUCK
+++ b/BUCK
@@ -432,6 +432,14 @@ apple_resource(
visibility = ["PUBLIC"],
)
+apple_resource(
+ name = "WatchAppExtensionResources",
+ files = glob([
+ "Watch/Extension/Resources/**/*",
+ ], exclude = ["Watch/Extension/Resources/**/.*"]),
+ visibility = ["PUBLIC"],
+)
+
apple_binary(
name = "WatchAppExtensionBinary",
srcs = glob([
@@ -467,6 +475,7 @@ apple_binary(
],
deps = [
":WatchAppStringResources",
+ ":WatchAppExtensionResources",
],
)
diff --git a/NotificationService/NotificationService.m b/NotificationService/NotificationService.m
index 8d2df09a25..83f17b94fe 100644
--- a/NotificationService/NotificationService.m
+++ b/NotificationService/NotificationService.m
@@ -111,7 +111,7 @@ static void reportMemory() {
- (void)completeWithBestAttemptContent {
_contentReady = true;
- //_updatedUnreadCount = @(-1);
+ _updatedUnreadCount = @(-1);
if (_contentReady && _updatedUnreadCount) {
[self _internalComplete];
}
@@ -217,9 +217,9 @@ static void reportMemory() {
peerId = makePeerId(PeerNamespaceCloudChannel, [channelIdString intValue]);
}
- if (_countIncomingMessage && _deviceSpecificEncryptionParameters) {
+ /*if (_countIncomingMessage && _deviceSpecificEncryptionParameters) {
_countIncomingMessage(_rootPath, account.accountId, _deviceSpecificEncryptionParameters, peerId, messageId);
- }
+ }*/
NSString *silentString = decryptedPayload[@"silent"];
if ([silentString isKindOfClass:[NSString class]]) {
@@ -229,7 +229,7 @@ static void reportMemory() {
NSData *attachmentData = nil;
id parsedAttachment = nil;
- if (_isLockedValue) {
+ if (!_isLockedValue) {
NSString *attachmentDataString = decryptedPayload[@"attachb64"];
if ([attachmentDataString isKindOfClass:[NSString class]]) {
attachmentData = parseBase64(attachmentDataString);
diff --git a/NotificationService/Serialization.m b/NotificationService/Serialization.m
index 76a2978a00..6f6f9191a5 100644
--- a/NotificationService/Serialization.m
+++ b/NotificationService/Serialization.m
@@ -3,7 +3,7 @@
@implementation Serialization
- (NSUInteger)currentLayer {
- return 107;
+ return 106;
}
- (id _Nullable)parseMessage:(NSData * _Nullable)data {
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index 9f90fbbb21..d77820f815 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -40,7 +40,7 @@
NSExtensionPointIdentifier
com.apple.intents-service
NSExtensionPrincipalClass
- $(PRODUCT_MODULE_NAME).IntentHandler
+ IntentHandler
diff --git a/SiriIntents/IntentHandler.swift b/SiriIntents/IntentHandler.swift
index be3027dd34..694cbce0ae 100644
--- a/SiriIntents/IntentHandler.swift
+++ b/SiriIntents/IntentHandler.swift
@@ -50,7 +50,8 @@ enum IntentHandlingError {
}
@available(iOSApplicationExtension 10.0, *)
-class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessagesIntentHandling, INSetMessageAttributeIntentHandling, INStartAudioCallIntentHandling, INSearchCallHistoryIntentHandling {
+@objc(IntentHandler)
+public class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessagesIntentHandling, INSetMessageAttributeIntentHandling, INStartAudioCallIntentHandling, INSearchCallHistoryIntentHandling {
private let accountPromise = Promise()
private let resolvePersonsDisposable = MetaDisposable()
@@ -133,7 +134,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
self.actionDisposable.dispose()
}
- override func handler(for intent: INIntent) -> Any {
+ override public func handler(for intent: INIntent) -> Any {
return self
}
@@ -264,7 +265,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
// MARK: - INSendMessageIntentHandling
- func resolveRecipients(for intent: INSendMessageIntent, with completion: @escaping ([INPersonResolutionResult]) -> Void) {
+ public func resolveRecipients(for intent: INSendMessageIntent, with completion: @escaping ([INPersonResolutionResult]) -> Void) {
guard CNContactStore.authorizationStatus(for: .contacts) == .authorized else {
completion([INPersonResolutionResult.notRequired()])
return
@@ -275,7 +276,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
}
@available(iOSApplicationExtension 11.0, *)
- func resolveRecipients(for intent: INSendMessageIntent, with completion: @escaping ([INSendMessageRecipientResolutionResult]) -> Void) {
+ public func resolveRecipients(for intent: INSendMessageIntent, with completion: @escaping ([INSendMessageRecipientResolutionResult]) -> Void) {
if let peerId = intent.conversationIdentifier.flatMap(Int64.init) {
let account = self.accountPromise.get()
@@ -318,7 +319,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
}
}
- func resolveContent(for intent: INSendMessageIntent, with completion: @escaping (INStringResolutionResult) -> Void) {
+ public func resolveContent(for intent: INSendMessageIntent, with completion: @escaping (INStringResolutionResult) -> Void) {
guard CNContactStore.authorizationStatus(for: .contacts) == .authorized else {
completion(INStringResolutionResult.notRequired())
return
@@ -330,7 +331,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
}
}
- func confirm(intent: INSendMessageIntent, completion: @escaping (INSendMessageIntentResponse) -> Void) {
+ public func confirm(intent: INSendMessageIntent, completion: @escaping (INSendMessageIntentResponse) -> Void) {
let userActivity = NSUserActivity(activityType: NSStringFromClass(INSendMessageIntent.self))
guard CNContactStore.authorizationStatus(for: .contacts) == .authorized else {
let response = INSendMessageIntentResponse(code: .failureRequiringAppLaunch, userActivity: userActivity)
@@ -341,7 +342,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
completion(response)
}
- func handle(intent: INSendMessageIntent, completion: @escaping (INSendMessageIntentResponse) -> Void) {
+ public func handle(intent: INSendMessageIntent, completion: @escaping (INSendMessageIntentResponse) -> Void) {
self.actionDisposable.set((self.accountPromise.get()
|> castError(IntentHandlingError.self)
|> take(1)
@@ -387,11 +388,11 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
// MARK: - INSearchForMessagesIntentHandling
- func resolveAttributes(for intent: INSearchForMessagesIntent, with completion: @escaping (INMessageAttributeOptionsResolutionResult) -> Void) {
+ public func resolveAttributes(for intent: INSearchForMessagesIntent, with completion: @escaping (INMessageAttributeOptionsResolutionResult) -> Void) {
completion(.success(with: .unread))
}
- func handle(intent: INSearchForMessagesIntent, completion: @escaping (INSearchForMessagesIntentResponse) -> Void) {
+ public func handle(intent: INSearchForMessagesIntent, completion: @escaping (INSearchForMessagesIntentResponse) -> Void) {
self.actionDisposable.set((self.accountPromise.get()
|> take(1)
|> castError(IntentHandlingError.self)
@@ -439,7 +440,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
// MARK: - INSetMessageAttributeIntentHandling
- func resolveAttribute(for intent: INSetMessageAttributeIntent, with completion: @escaping (INMessageAttributeResolutionResult) -> Void) {
+ public func resolveAttribute(for intent: INSetMessageAttributeIntent, with completion: @escaping (INMessageAttributeResolutionResult) -> Void) {
let supportedAttributes: [INMessageAttribute] = [.read, .unread]
var attribute = intent.attribute
if attribute == .flagged {
@@ -452,7 +453,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
}
}
- func handle(intent: INSetMessageAttributeIntent, completion: @escaping (INSetMessageAttributeIntentResponse) -> Void) {
+ public func handle(intent: INSetMessageAttributeIntent, completion: @escaping (INSetMessageAttributeIntentResponse) -> Void) {
self.actionDisposable.set((self.accountPromise.get()
|> castError(IntentHandlingError.self)
|> take(1)
@@ -511,7 +512,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
// MARK: - INStartAudioCallIntentHandling
- func resolveContacts(for intent: INStartAudioCallIntent, with completion: @escaping ([INPersonResolutionResult]) -> Void) {
+ public func resolveContacts(for intent: INStartAudioCallIntent, with completion: @escaping ([INPersonResolutionResult]) -> Void) {
guard CNContactStore.authorizationStatus(for: .contacts) == .authorized else {
completion([INPersonResolutionResult.notRequired()])
return
@@ -522,11 +523,11 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
}
@available(iOSApplicationExtension 11.0, *)
- func resolveDestinationType(for intent: INStartAudioCallIntent, with completion: @escaping (INCallDestinationTypeResolutionResult) -> Void) {
+ public func resolveDestinationType(for intent: INStartAudioCallIntent, with completion: @escaping (INCallDestinationTypeResolutionResult) -> Void) {
completion(.success(with: .normal))
}
- func handle(intent: INStartAudioCallIntent, completion: @escaping (INStartAudioCallIntentResponse) -> Void) {
+ public func handle(intent: INStartAudioCallIntent, completion: @escaping (INStartAudioCallIntentResponse) -> Void) {
self.actionDisposable.set((self.accountPromise.get()
|> castError(IntentHandlingError.self)
|> take(1)
@@ -561,15 +562,15 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
// MARK: - INSearchCallHistoryIntentHandling
@available(iOSApplicationExtension 11.0, *)
- func resolveCallTypes(for intent: INSearchCallHistoryIntent, with completion: @escaping (INCallRecordTypeOptionsResolutionResult) -> Void) {
+ public func resolveCallTypes(for intent: INSearchCallHistoryIntent, with completion: @escaping (INCallRecordTypeOptionsResolutionResult) -> Void) {
completion(.success(with: .missed))
}
- func resolveCallType(for intent: INSearchCallHistoryIntent, with completion: @escaping (INCallRecordTypeResolutionResult) -> Void) {
+ public func resolveCallType(for intent: INSearchCallHistoryIntent, with completion: @escaping (INCallRecordTypeResolutionResult) -> Void) {
completion(.success(with: .missed))
}
- func handle(intent: INSearchCallHistoryIntent, completion: @escaping (INSearchCallHistoryIntentResponse) -> Void) {
+ public func handle(intent: INSearchCallHistoryIntent, completion: @escaping (INSearchCallHistoryIntentResponse) -> Void) {
self.actionDisposable.set((self.accountPromise.get()
|> take(1)
|> castError(IntentHandlingError.self)
diff --git a/Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements b/Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements
index 896fe795c9..a710d1b1fb 100644
--- a/Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements
+++ b/Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements
@@ -33,5 +33,7 @@
merchant.privatbank.test.telergramios
merchant.privatbank.prod.telergram
+ com.apple.developer.pushkit.unrestricted-voip
+
diff --git a/Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements b/Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements
index 2ee56b1a9a..97391bb537 100644
--- a/Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements
+++ b/Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements
@@ -32,5 +32,7 @@
X834Q8SBVP.org.telegram.Telegram-iOS
+ com.apple.developer.pushkit.unrestricted-voip
+
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index 0301c0bd41..78f281f97d 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -599,6 +599,8 @@
"UserInfo.AddContact" = "Add Contact";
"UserInfo.ShareContact" = "Share Contact";
"UserInfo.StartSecretChat" = "Start Secret Chat";
+"UserInfo.StartSecretChatConfirmation" = "Are you sure you want to start a secret chat with %@?";
+"UserInfo.StartSecretChatStart" = "Start";
"UserInfo.DeleteContact" = "Delete Contact";
"UserInfo.CreateNewContact" = "Create New Contact";
"UserInfo.AddToExisting" = "Add to Existing";
@@ -3868,6 +3870,11 @@ Unused sets are archived when you add more.";
"GroupPermission.NotAvailableInPublicGroups" = "This permission is not available in public groups.";
"GroupPermission.AddMembersNotAvailable" = "You don't have persmission to add members.";
+"Channel.EditAdmin.PermissionEnabledByDefault" = "This option is permitted for all members in Group Permissions.";
+
+"GroupPermission.EditingDisabled" = "You cannot edit restrictions of this user.";
+"GroupPermission.PermissionDisabledByDefault" = "This option is disabled for all members in Group Permissions.";
+
"Channel.Management.RemovedBy" = "Removed by %@";
"GroupRemoved.Title" = "Removed Users";
@@ -4497,6 +4504,8 @@ Any member of this group will be able to see messages in the channel.";
"Channel.AdminLog.DisabledSlowmode" = "%@ disabled slowmode";
"Channel.AdminLog.SetSlowmode" = "%1$@ set slowmode to %2$@";
+"GroupInfo.Permissions.EditingDisabled" = "You cannot edit this permission.";
+
"Chat.SlowmodeTooltip" = "Slowmode is enabled. You can send\nyour next message in %@.";
"Chat.SlowmodeTooltipPending" = "Slowmode is enabled. You can't send more than one message at once.";
"Chat.AttachmentLimitReached" = "You can't select more items.";
@@ -5030,7 +5039,7 @@ Any member of this group will be able to see messages in the channel.";
"TwoFactorSetup.Password.Action" = "Create Password";
"TwoFactorSetup.Email.Title" = "Recovery Email";
-"TwoFactorSetup.Email.Text" = "You can set a recovery email to be able to reset you password and restore\n access to your Telegram account.";
+"TwoFactorSetup.Email.Text" = "You can set a recovery email to be able to reset you password and restore access to your Telegram account.";
"TwoFactorSetup.Email.Placeholder" = "Your email address";
"TwoFactorSetup.Email.Action" = "Continue";
"TwoFactorSetup.Email.SkipAction" = "Skip setting email";
@@ -5067,3 +5076,31 @@ Any member of this group will be able to see messages in the channel.";
"Widget.ApplicationLocked" = "Unlock the app to use the widget";
"Group.ErrorSupergroupConversionNotPossible" = "Sorry, you are a member of too many groups and channels. Please leave some before creating a new one.";
+
+"ClearCache.StorageTitle" = "%@ STORAGE";
+"ClearCache.StorageCache" = "Telegram Cache";
+"ClearCache.StorageServiceFiles" = "Telegram Service Files";
+"ClearCache.StorageOtherApps" = "Other Apps";
+"ClearCache.StorageFree" = "Free";
+"ClearCache.ClearCache" = "Clear Telegram Cache";
+"ClearCache.Clear" = "Clear";
+"ClearCache.Forever" = "Forever";
+
+"ChatList.DeletedChats_1" = "Deleted 1 chat";
+"ChatList.DeletedChats_any" = "Deleted %@ chats";
+
+"Appearance.ColorThemeNight" = "COLOR THEME — AUTO-NIGHT MODE";
+
+"UserInfo.StartSecretChatConfirmation" = "Are you sure you want to start a secret chat with\n%@?";
+"UserInfo.StartSecretChatStart" = "Start";
+
+"Wallet.AccessDenied.Title" = "Please Allow Access";
+"Wallet.AccessDenied.Camera" = "TON Wallet needs access to your camera to take photos and videos.\n\nPlease go to Settings > Privacy > Camera and set TON Wallet to ON.";
+"Wallet.AccessDenied.Settings" = "Settings";
+
+"GroupInfo.ShowMoreMembers_0" = "%@ more";
+"GroupInfo.ShowMoreMembers_1" = "%@ more";
+"GroupInfo.ShowMoreMembers_2" = "%@ more";
+"GroupInfo.ShowMoreMembers_3_10" = "%@ more";
+"GroupInfo.ShowMoreMembers_many" = "%@ more";
+"GroupInfo.ShowMoreMembers_any" = "%@ more";
diff --git a/Wallet/Sources/AppDelegate.swift b/Wallet/Sources/AppDelegate.swift
index ac2c91804b..5d00edc19a 100644
--- a/Wallet/Sources/AppDelegate.swift
+++ b/Wallet/Sources/AppDelegate.swift
@@ -402,10 +402,20 @@ private final class WalletContextImpl: NSObject, WalletContext, UIImagePickerCon
}
func authorizeAccessToCamera(completion: @escaping () -> Void) {
- AVCaptureDevice.requestAccess(for: AVMediaType.video) { response in
+ AVCaptureDevice.requestAccess(for: AVMediaType.video) { [weak self] response in
Queue.mainQueue().async {
+ guard let strongSelf = self else {
+ return
+ }
+
if response {
completion()
+ } else {
+ let presentationData = strongSelf.presentationData
+ let controller = standardTextAlertController(theme: presentationData.theme.alert, title: presentationData.strings.Wallet_AccessDenied_Title, text: presentationData.strings.Wallet_AccessDenied_Camera, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Wallet_Intro_NotNow, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.Wallet_AccessDenied_Settings, action: {
+ strongSelf.openPlatformSettings()
+ })])
+ strongSelf.window.present(controller, on: .root)
}
}
}
@@ -540,7 +550,7 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
let presentationData = WalletPresentationData(
theme: WalletTheme(
info: WalletInfoTheme(
- buttonBackgroundColor: accentColor,
+ buttonBackgroundColor: UIColor(rgb: 0x32aafe),
buttonTextColor: .white,
incomingFundsTitleColor: UIColor(rgb: 0x00b12c),
outgoingFundsTitleColor: UIColor(rgb: 0xff3b30)
@@ -696,33 +706,46 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
self.walletContext = walletContext
let beginWithController: (ViewController) -> Void = { controller in
- navigationController.setViewControllers([controller], animated: false)
-
- var previousBlockchainName = initialConfigBlockchainName
-
- let _ = (updatedConfigValue
- |> deliverOnMainQueue).start(next: { resolved, blockchainName in
- let _ = walletContext.tonInstance.validateConfig(config: resolved.value, blockchainName: blockchainName).start(error: { _ in
- }, completed: {
- let _ = walletContext.tonInstance.updateConfig(config: resolved.value, blockchainName: blockchainName).start()
-
- if previousBlockchainName != blockchainName {
- previousBlockchainName = blockchainName
+ let begin: (Bool) -> Void = { animated in
+ navigationController.setViewControllers([controller], animated: false)
+ if animated {
+ navigationController.viewControllers.last?.view.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+ }
+
+ var previousBlockchainName = initialConfigBlockchainName
+
+ let _ = (updatedConfigValue
+ |> deliverOnMainQueue).start(next: { resolved, blockchainName in
+ let _ = walletContext.tonInstance.validateConfig(config: resolved.value, blockchainName: blockchainName).start(error: { _ in
+ }, completed: {
+ let _ = walletContext.tonInstance.updateConfig(config: resolved.value, blockchainName: blockchainName).start()
- let overlayController = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
- mainWindow.present(overlayController, on: .root)
-
- let _ = (deleteAllLocalWalletsData(storage: walletContext.storage, tonInstance: walletContext.tonInstance)
- |> deliverOnMainQueue).start(error: { [weak overlayController] _ in
- overlayController?.dismiss()
- }, completed: { [weak overlayController] in
- overlayController?.dismiss()
+ if previousBlockchainName != blockchainName {
+ previousBlockchainName = blockchainName
- navigationController.setViewControllers([WalletSplashScreen(context: walletContext, mode: .intro, walletCreatedPreloadState: nil)], animated: true)
- })
- }
+ let overlayController = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
+ mainWindow.present(overlayController, on: .root)
+
+ let _ = (deleteAllLocalWalletsData(storage: walletContext.storage, tonInstance: walletContext.tonInstance)
+ |> deliverOnMainQueue).start(error: { [weak overlayController] _ in
+ overlayController?.dismiss()
+ }, completed: { [weak overlayController] in
+ overlayController?.dismiss()
+
+ navigationController.setViewControllers([WalletSplashScreen(context: walletContext, mode: .intro, walletCreatedPreloadState: nil)], animated: true)
+ })
+ }
+ })
})
- })
+ }
+
+ if let splashScreen = navigationController.viewControllers.first as? WalletApplicationSplashScreen, let _ = controller as? WalletSplashScreen {
+ splashScreen.animateOut(completion: {
+ begin(true)
+ })
+ } else {
+ begin(false)
+ }
}
let _ = (combineLatest(queue: .mainQueue(),
diff --git a/Wallet/Strings/en.lproj/Localizable.strings b/Wallet/Strings/en.lproj/Localizable.strings
index 1d9c7d939e..ac579c0e2b 100644
--- a/Wallet/Strings/en.lproj/Localizable.strings
+++ b/Wallet/Strings/en.lproj/Localizable.strings
@@ -218,3 +218,6 @@
"Wallet.Time.PreciseDate_m12" = "Dec %1$@, %2$@ at %3$@";
"Wallet.VoiceOver.Editing.ClearText" = "Clear text";
"Wallet.Receive.ShareInvoiceUrlInfo" = "Share this link with other Gram wallet owners to receive %@ Grams from them.";
+"Wallet.AccessDenied.Title" = "Please Allow Access";
+"Wallet.AccessDenied.Camera" = "TON Wallet needs access to your camera to take photos and videos.\n\nPlease go to Settings > Privacy > Camera and set TON Wallet to ON.";
+"Wallet.AccessDenied.Settings" = "Settings";
diff --git a/Watch/Bridge/TGBridgeMediaSignals.m b/Watch/Bridge/TGBridgeMediaSignals.m
index 2952737d0a..295e13ce61 100644
--- a/Watch/Bridge/TGBridgeMediaSignals.m
+++ b/Watch/Bridge/TGBridgeMediaSignals.m
@@ -131,21 +131,14 @@
+ (SSignal *)_requestImageWithUrl:(NSString *)url subscription:(TGBridgeSubscription *)subscription
{
- SSignal *remoteSignal = [[[[[TGBridgeClient instance] requestSignalWithSubscription:subscription] onStart:^
- {
+ SSignal *remoteSignal = [[[[TGBridgeClient instance] requestSignalWithSubscription:subscription] onStart:^
+ {
if (![[self mediaManager] hasUrl:url])
[[self mediaManager] addUrl:url];
- }] onDispose:^
+ }] then:[[self _downloadedFileWithUrl:url] onNext:^(id next)
{
[[self mediaManager] removeUrl:url];
- }] mapToSignal:^SSignal *(id next)
- {
- return [[self _downloadedFileWithUrl:url] onNext:^(id next)
- {
- [[self mediaManager] removeUrl:url];
- }];
- }];
-
+ }]];
return [[self _cachedOrPendingWithUrl:url] catch:^SSignal *(id error)
{
return remoteSignal;
diff --git a/package_app.sh b/package_app.sh
index e5eea759ae..cbf6961a69 100644
--- a/package_app.sh
+++ b/package_app.sh
@@ -146,6 +146,7 @@ REMOVE_ENTITLEMENT_KEYS=(\
COPY_ENTITLEMENT_KEYS=(\
"com.apple.developer.associated-domains" \
"com.apple.developer.icloud-services" \
+ "com.apple.developer.pushkit.unrestricted-voip" \
)
REPLACE_TO_PRODUCTION_ENTITLEMENT_KEYS=(\
@@ -217,9 +218,12 @@ for ITEM in $APP_ITEMS_WITH_PROVISIONING_PROFILE; do
VALUE=$(/usr/libexec/PlistBuddy -c "Print :$KEY" "$PROFILE_ENTITLEMENTS_PATH" 2>/dev/null || echo "")
if [ ! -z "$VALUE" ]; then
PLUTIL_KEY=$(echo "$KEY" | sed 's/\./\\\./g')
- VALUE=$(plutil -extract "$PLUTIL_KEY" xml1 -o - "${!ENTITLEMENTS_VAR}")
- /usr/libexec/PlistBuddy -c "Delete $KEY" "$PROFILE_ENTITLEMENTS_PATH" 2>/dev/null
- plutil -insert "$PLUTIL_KEY" -xml "$VALUE" "$PROFILE_ENTITLEMENTS_PATH"
+ TEST_VALUE=$(plutil -extract "$PLUTIL_KEY" xml1 -o - "${!ENTITLEMENTS_VAR}" 1>/dev/null || echo "error")
+ if [ "$TEST_VALUE" != "error" ]; then
+ VALUE=$(plutil -extract "$PLUTIL_KEY" xml1 -o - "${!ENTITLEMENTS_VAR}")
+ /usr/libexec/PlistBuddy -c "Delete $KEY" "$PROFILE_ENTITLEMENTS_PATH" 2>/dev/null
+ plutil -insert "$PLUTIL_KEY" -xml "$VALUE" "$PROFILE_ENTITLEMENTS_PATH"
+ fi
fi
done
fi
diff --git a/submodules/AnimationUI/Sources/AnimationNode.swift b/submodules/AnimationUI/Sources/AnimationNode.swift
index f8eb9ba649..026ad71701 100644
--- a/submodules/AnimationUI/Sources/AnimationNode.swift
+++ b/submodules/AnimationUI/Sources/AnimationNode.swift
@@ -30,9 +30,7 @@ public final class AnimationNode : ASDisplayNode {
view.animationSpeed = self.speed
view.backgroundColor = .clear
view.isOpaque = false
-
- view.logHierarchyKeypaths()
-
+
if let colors = colors {
for (key, value) in colors {
let colorCallback = LOTColorValueCallback(color: value.cgColor)
diff --git a/submodules/AppIntents/BUCK b/submodules/AppIntents/BUCK
new file mode 100644
index 0000000000..2bc4100875
--- /dev/null
+++ b/submodules/AppIntents/BUCK
@@ -0,0 +1,23 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+ name = "AppIntents",
+ srcs = glob([
+ "Sources/**/*.swift",
+ ]),
+ deps = [
+ "//submodules/TelegramCore:TelegramCore#shared",
+ "//submodules/SyncCore:SyncCore#shared",
+ "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
+ "//submodules/Display:Display#shared",
+ "//submodules/AccountContext:AccountContext",
+ "//submodules/TelegramPresentationData:TelegramPresentationData",
+ "//submodules/AvatarNode:AvatarNode",
+ ],
+ frameworks = [
+ "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+ ],
+ weak_frameworks = [
+ "Intents",
+ ],
+)
diff --git a/submodules/AppIntents/Info.plist b/submodules/AppIntents/Info.plist
new file mode 100644
index 0000000000..e1fe4cfb7b
--- /dev/null
+++ b/submodules/AppIntents/Info.plist
@@ -0,0 +1,22 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ $(DEVELOPMENT_LANGUAGE)
+ CFBundleExecutable
+ $(EXECUTABLE_NAME)
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ $(PRODUCT_NAME)
+ CFBundlePackageType
+ FMWK
+ CFBundleShortVersionString
+ 1.0
+ CFBundleVersion
+ $(CURRENT_PROJECT_VERSION)
+
+
diff --git a/submodules/AppIntents/Sources/AppIntents.swift b/submodules/AppIntents/Sources/AppIntents.swift
new file mode 100644
index 0000000000..676d2373cc
--- /dev/null
+++ b/submodules/AppIntents/Sources/AppIntents.swift
@@ -0,0 +1,67 @@
+import Foundation
+import UIKit
+import Intents
+import Display
+import Postbox
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+import TelegramPresentationData
+import AvatarNode
+import AccountContext
+
+public func donateSendMessageIntent(account: Account, sharedContext: SharedAccountContext, peerIds: [PeerId]) {
+ if #available(iOSApplicationExtension 13.2, iOS 13.2, *) {
+ let _ = (account.postbox.transaction { transaction -> [Peer] in
+ var peers: [Peer] = []
+ for peerId in peerIds {
+ if peerId.namespace == Namespaces.Peer.CloudUser && peerId != account.peerId, let peer = transaction.getPeer(peerId) {
+ peers.append(peer)
+ }
+ }
+ return peers
+ }
+ |> mapToSignal { peers -> Signal<[(Peer, UIImage?)], NoError> in
+ var signals: [Signal<(Peer, UIImage?), NoError>] = []
+ for peer in peers {
+ let peerAndAvatar = (peerAvatarImage(account: account, peer: peer, authorOfMessage: nil, representation: peer.smallProfileImage, round: false) ?? .single(nil))
+ |> map { avatarImage in
+ return (peer, avatarImage)
+ }
+ signals.append(peerAndAvatar)
+ }
+ return combineLatest(signals)
+ }
+ |> deliverOnMainQueue).start(next: { peers in
+ for (peer, avatarImage) in peers {
+ guard let peer = peer as? TelegramUser, peer.botInfo == nil && !peer.flags.contains(.isSupport) else {
+ continue
+ }
+ let presentationData = sharedContext.currentPresentationData.with { $0 }
+
+ let recipientHandle = INPersonHandle(value: "tg\(peer.id.id)", type: .unknown)
+ var nameComponents = PersonNameComponents()
+ nameComponents.givenName = peer.firstName
+ nameComponents.familyName = peer.lastName
+
+ let displayTitle = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+ let recipient = INPerson(personHandle: recipientHandle, nameComponents: nameComponents, displayName: displayTitle, image: nil, contactIdentifier: nil, customIdentifier: "tg\(peer.id.id)")
+
+ let intent = INSendMessageIntent(recipients: [recipient], content: nil, speakableGroupName: INSpeakableString(spokenPhrase: displayTitle), conversationIdentifier: "tg\(peer.id.id)", serviceName: nil, sender: nil)
+ if let avatarImage = avatarImage, let avatarImageData = avatarImage.jpegData(compressionQuality: 0.8) {
+ intent.setImage(INImage(imageData: avatarImageData), forParameterNamed: \.groupName)
+ }
+ let interaction = INInteraction(intent: intent, response: nil)
+ interaction.direction = .outgoing
+ interaction.groupIdentifier = "sendMessage_\(account.peerId.toInt64())"
+ interaction.donate()
+ }
+ })
+ }
+}
+
+public func deleteAllSendMessageIntents(accountPeerId: PeerId) {
+ if #available(iOS 10.0, *) {
+ INInteraction.delete(with: "sendMessage_\(accountPeerId.toInt64())")
+ }
+}
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm
index 31662bd70b..4efd2b0a79 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm
+++ b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm
@@ -237,7 +237,7 @@ using AS::MutexLocker;
UIImage *image = nil;
if (shouldCreateGraphicsContext && !currentContext) {
- ASDisplayNodeAssert(NO, @"Failed to create a CGContext (size: %@)", NSStringFromCGSize(bounds.size));
+ //ASDisplayNodeAssert(NO, @"Failed to create a CGContext (size: %@)", NSStringFromCGSize(bounds.size));
return nil;
}
diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift
index eddf2da3ce..b53fb53f8e 100644
--- a/submodules/ChatListUI/Sources/ChatListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListController.swift
@@ -1208,35 +1208,62 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
return
}
- let context = strongSelf.context
- let presentationData = strongSelf.presentationData
- let progressSignal = Signal { subscriber in
- let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
- self?.present(controller, in: .window(.root))
- return ActionDisposable { [weak controller] in
- Queue.mainQueue().async() {
- controller?.dismiss()
- }
- }
- }
- |> runOn(Queue.mainQueue())
- |> delay(0.8, queue: Queue.mainQueue())
- let progressDisposable = progressSignal.start()
-
- let signal: Signal = strongSelf.context.account.postbox.transaction { transaction -> Void in
+ strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+ var state = state
for peerId in peerIds {
- removePeerChat(account: context.account, transaction: transaction, mediaBox: context.account.postbox.mediaBox, peerId: peerId, reportChatSpam: false, deleteGloballyIfPossible: false)
+ state.pendingRemovalPeerIds.insert(peerId)
}
- }
- |> afterDisposed {
- Queue.mainQueue().async {
- progressDisposable.dispose()
- }
- }
- let _ = (signal
- |> deliverOnMainQueue).start(completed: {
- self?.donePressed()
+ return state
})
+
+ let text = strongSelf.presentationData.strings.ChatList_DeletedChats(Int32(peerIds.count))
+
+ strongSelf.present(UndoOverlayController(presentationData: strongSelf.context.sharedContext.currentPresentationData.with { $0 }, content: .removedChat(text: text), elevatedLayout: false, animateInAsReplacement: true, action: { shouldCommit in
+ guard let strongSelf = self else {
+ return
+ }
+ if shouldCommit {
+ let context = strongSelf.context
+ let presentationData = strongSelf.presentationData
+ let progressSignal = Signal { subscriber in
+ let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
+ self?.present(controller, in: .window(.root))
+ return ActionDisposable { [weak controller] in
+ Queue.mainQueue().async() {
+ controller?.dismiss()
+ }
+ }
+ }
+ |> runOn(Queue.mainQueue())
+ |> delay(0.8, queue: Queue.mainQueue())
+ let progressDisposable = progressSignal.start()
+
+ let signal: Signal = strongSelf.context.account.postbox.transaction { transaction -> Void in
+ for peerId in peerIds {
+ removePeerChat(account: context.account, transaction: transaction, mediaBox: context.account.postbox.mediaBox, peerId: peerId, reportChatSpam: false, deleteGloballyIfPossible: false)
+ }
+ }
+ |> afterDisposed {
+ Queue.mainQueue().async {
+ progressDisposable.dispose()
+ }
+ }
+ let _ = (signal
+ |> deliverOnMainQueue).start()
+ } else {
+ strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerIds.first!)
+ strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+ var state = state
+ for peerId in peerIds {
+ state.pendingRemovalPeerIds.remove(peerId)
+ }
+ return state
+ })
+ self?.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerIds.first!)
+ }
+ }), in: .current)
+
+ strongSelf.donePressed()
}))
actionSheet.setItemGroups([
diff --git a/submodules/ContextUI/Sources/ContextControllerSourceNode.swift b/submodules/ContextUI/Sources/ContextControllerSourceNode.swift
index 64f798b11b..51b7fca583 100644
--- a/submodules/ContextUI/Sources/ContextControllerSourceNode.swift
+++ b/submodules/ContextUI/Sources/ContextControllerSourceNode.swift
@@ -25,7 +25,7 @@ public final class ContextControllerSourceNode: ASDisplayNode {
guard let strongSelf = self, !strongSelf.bounds.width.isZero else {
return false
}
- return strongSelf.shouldBegin?(point) ?? false
+ return strongSelf.shouldBegin?(point) ?? true
}
contextGesture.activationProgress = { [weak self] progress, update in
diff --git a/submodules/ContextUI/Sources/ContextGesture.swift b/submodules/ContextUI/Sources/ContextGesture.swift
index eb8235a3d2..29b21b1eab 100644
--- a/submodules/ContextUI/Sources/ContextGesture.swift
+++ b/submodules/ContextUI/Sources/ContextGesture.swift
@@ -93,13 +93,23 @@ public final class ContextGesture: UIGestureRecognizer, UIGestureRecognizerDeleg
override public func touchesBegan(_ touches: Set, with event: UIEvent) {
super.touchesBegan(touches, with: event)
- if let shouldBegin = self.shouldBegin, let touch = touches.first {
+ guard let touch = touches.first else {
+ return
+ }
+
+ if let shouldBegin = self.shouldBegin {
if !shouldBegin(touch.location(in: self.view)) {
self.state = .failed
return
}
}
+ let windowLocation = touch.location(in: nil)
+ if windowLocation.x < 8.0 {
+ self.state = .failed
+ return
+ }
+
if self.delayTimer == nil {
let delayTimer = Timer(timeInterval: beginDelay, target: TimerTargetWrapper { [weak self] in
guard let strongSelf = self, let _ = strongSelf.delayTimer else {
diff --git a/submodules/Display/Display/DeviceMetrics.swift b/submodules/Display/Display/DeviceMetrics.swift
index bc78143e2a..ac0304f736 100644
--- a/submodules/Display/Display/DeviceMetrics.swift
+++ b/submodules/Display/Display/DeviceMetrics.swift
@@ -43,7 +43,7 @@ public enum DeviceMetrics: CaseIterable, Equatable {
let additionalSize = CGSize(width: screenSize.width, height: screenSize.height + 20.0)
for device in DeviceMetrics.allCases {
- if let _ = onScreenNavigationHeight, device.onScreenNavigationHeight(inLandscape: false) == nil {
+ if let _ = onScreenNavigationHeight, device.onScreenNavigationHeight(inLandscape: false, systemOnScreenNavigationHeight: nil) == nil {
if case .tablet = device.type {
if screenSize.height == 1024.0 && screenSize.width == 768.0 {
} else {
@@ -111,16 +111,22 @@ public enum DeviceMetrics: CaseIterable, Equatable {
}
}
- func onScreenNavigationHeight(inLandscape: Bool) -> CGFloat? {
+ func onScreenNavigationHeight(inLandscape: Bool, systemOnScreenNavigationHeight: CGFloat?) -> CGFloat? {
switch self {
- case .iPhoneX, .iPhoneXSMax:
- return inLandscape ? 21.0 : 34.0
- case .iPadPro3rdGen, .iPadPro11Inch:
+ case .iPhoneX, .iPhoneXSMax:
+ return inLandscape ? 21.0 : 34.0
+ case .iPadPro3rdGen, .iPadPro11Inch:
+ return 21.0
+ case .iPad, .iPadPro, .iPadPro10Inch:
+ if let systemOnScreenNavigationHeight = systemOnScreenNavigationHeight, !systemOnScreenNavigationHeight.isZero {
return 21.0
- case let .unknown(_, _, onScreenNavigationHeight):
- return onScreenNavigationHeight
- default:
+ } else {
return nil
+ }
+ case let .unknown(_, _, onScreenNavigationHeight):
+ return onScreenNavigationHeight
+ default:
+ return nil
}
}
diff --git a/submodules/Display/Display/ListView.swift b/submodules/Display/Display/ListView.swift
index d7c2c6f63c..96ae110f99 100644
--- a/submodules/Display/Display/ListView.swift
+++ b/submodules/Display/Display/ListView.swift
@@ -1766,7 +1766,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
}, node: {
assert(Queue.mainQueue().isCurrent())
return referenceNode.syncWith({ $0 })!
- }, params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right), previousItem: index == 0 ? nil : self.items[index - 1], nextItem: index == self.items.count - 1 ? nil : self.items[index + 1], animation: updateAnimation, completion: { layout, apply in
+ }, params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right, availableHeight: state.visibleSize.height - state.insets.top - state.insets.bottom), previousItem: index == 0 ? nil : self.items[index - 1], nextItem: index == self.items.count - 1 ? nil : self.items[index + 1], animation: updateAnimation, completion: { layout, apply in
var updatedState = state
var updatedOperations = operations
@@ -1841,7 +1841,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
let index = insertionItemIndexAndDirection.0
let threadId = pthread_self()
var tailRecurse = false
- self.nodeForItem(synchronous: synchronous, synchronousLoads: synchronousLoads, item: self.items[index], previousNode: previousNodes[index], index: index, previousItem: index == 0 ? nil : self.items[index - 1], nextItem: self.items.count == index + 1 ? nil : self.items[index + 1], params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right), updateAnimation: updateAnimation, completion: { (node, layout, apply) in
+ self.nodeForItem(synchronous: synchronous, synchronousLoads: synchronousLoads, item: self.items[index], previousNode: previousNodes[index], index: index, previousItem: index == 0 ? nil : self.items[index - 1], nextItem: self.items.count == index + 1 ? nil : self.items[index + 1], params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right, availableHeight: state.visibleSize.height - state.insets.top - state.insets.bottom), updateAnimation: updateAnimation, completion: { (node, layout, apply) in
if pthread_equal(pthread_self(), threadId) != 0 && !tailRecurse {
tailRecurse = true
@@ -1877,7 +1877,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
} else {
let updateItem = updateIndicesAndItems[0]
if let previousNode = previousNodes[updateItem.index] {
- self.nodeForItem(synchronous: synchronous, synchronousLoads: synchronousLoads, item: updateItem.item, previousNode: previousNode, index: updateItem.index, previousItem: updateItem.index == 0 ? nil : self.items[updateItem.index - 1], nextItem: updateItem.index == (self.items.count - 1) ? nil : self.items[updateItem.index + 1], params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right), updateAnimation: animated ? .System(duration: insertionAnimationDuration) : .None, completion: { _, layout, apply in
+ self.nodeForItem(synchronous: synchronous, synchronousLoads: synchronousLoads, item: updateItem.item, previousNode: previousNode, index: updateItem.index, previousItem: updateItem.index == 0 ? nil : self.items[updateItem.index - 1], nextItem: updateItem.index == (self.items.count - 1) ? nil : self.items[updateItem.index + 1], params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right, availableHeight: state.visibleSize.height - state.insets.top - state.insets.bottom), updateAnimation: animated ? .System(duration: insertionAnimationDuration) : .None, completion: { _, layout, apply in
state.updateNodeAtItemIndex(updateItem.index, layout: layout, direction: updateItem.directionHint, animation: animated ? .System(duration: insertionAnimationDuration) : .None, apply: apply, operations: &operations)
updateIndicesAndItems.remove(at: 0)
diff --git a/submodules/Display/Display/ListViewItemNode.swift b/submodules/Display/Display/ListViewItemNode.swift
index 176edea1d0..9519413195 100644
--- a/submodules/Display/Display/ListViewItemNode.swift
+++ b/submodules/Display/Display/ListViewItemNode.swift
@@ -73,11 +73,13 @@ public struct ListViewItemLayoutParams {
public let width: CGFloat
public let leftInset: CGFloat
public let rightInset: CGFloat
+ public let availableHeight: CGFloat
- public init(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat) {
+ public init(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, availableHeight: CGFloat) {
self.width = width
self.leftInset = leftInset
self.rightInset = rightInset
+ self.availableHeight = availableHeight
}
}
diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Display/Navigation/NavigationController.swift
index 21aa9d51ad..5f2a126c0f 100644
--- a/submodules/Display/Display/Navigation/NavigationController.swift
+++ b/submodules/Display/Display/Navigation/NavigationController.swift
@@ -747,15 +747,19 @@ open class NavigationController: UINavigationController, ContainableController,
case .compact:
if visibleModalCount != 0 {
let effectiveRootModalDismissProgress: CGFloat
+ let visibleRootModalDismissProgress: CGFloat
let additionalModalFrameProgress: CGFloat
if visibleModalCount == 1 {
effectiveRootModalDismissProgress = topModalIsFlat ? 1.0 : topModalDismissProgress
+ visibleRootModalDismissProgress = effectiveRootModalDismissProgress
additionalModalFrameProgress = 0.0
} else if visibleModalCount == 2 {
effectiveRootModalDismissProgress = 0.0
+ visibleRootModalDismissProgress = topModalDismissProgress
additionalModalFrameProgress = 1.0 - topModalDismissProgress
} else {
effectiveRootModalDismissProgress = 0.0
+ visibleRootModalDismissProgress = effectiveRootModalDismissProgress
additionalModalFrameProgress = 1.0
}
@@ -820,8 +824,8 @@ open class NavigationController: UINavigationController, ContainableController,
maxOffset = (topInset + 10.0 - (layout.size.height - layout.size.height * maxScale) / 2.0)
}
- let scale = 1.0 * effectiveRootModalDismissProgress + (1.0 - effectiveRootModalDismissProgress) * maxScale
- let offset = (1.0 - effectiveRootModalDismissProgress) * maxOffset
+ let scale = 1.0 * visibleRootModalDismissProgress + (1.0 - visibleRootModalDismissProgress) * maxScale
+ let offset = (1.0 - visibleRootModalDismissProgress) * maxOffset
transition.updateSublayerTransformScaleAndOffset(node: rootContainerNode, scale: scale, offset: CGPoint(x: 0.0, y: offset))
}
} else {
diff --git a/submodules/Display/Display/Navigation/NavigationModalContainer.swift b/submodules/Display/Display/Navigation/NavigationModalContainer.swift
index 2586e9474f..29703b4222 100644
--- a/submodules/Display/Display/Navigation/NavigationModalContainer.swift
+++ b/submodules/Display/Display/Navigation/NavigationModalContainer.swift
@@ -467,6 +467,11 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes
}
currentParent = currentParent?.superview
}
+ if let controller = self.container.controllers.last {
+ if controller.view.disablesInteractiveModalDismiss {
+ enableScrolling = false
+ }
+ }
self.isInteractiveDimissEnabled = enableScrolling
if let layout = self.validLayout {
if layout.inputHeight != nil && layout.inputHeight != 0.0 {
diff --git a/submodules/Display/Display/PresentationContext.swift b/submodules/Display/Display/PresentationContext.swift
index 78bc9b5d68..651db2cd8e 100644
--- a/submodules/Display/Display/PresentationContext.swift
+++ b/submodules/Display/Display/PresentationContext.swift
@@ -56,7 +56,7 @@ public final class PresentationContext {
private var presentationDisposables = DisposableSet()
- var topLevelSubview: UIView?
+ var topLevelSubview: () -> UIView? = { nil }
var isCurrentlyOpaque: Bool {
for (controller, _) in self.controllers {
@@ -93,7 +93,7 @@ public final class PresentationContext {
if let topController = topController {
return topController.view
} else {
- return self.topLevelSubview
+ return self.topLevelSubview()
}
}
@@ -259,7 +259,7 @@ public final class PresentationContext {
if let view = self.view, let layout = self.layout {
for (controller, _) in self.controllers {
controller.viewWillAppear(false)
- if let topLevelSubview = self.topLevelSubview {
+ if let topLevelSubview = self.topLevelSubview() {
view.insertSubview(controller.view, belowSubview: topLevelSubview)
} else {
view.addSubview(controller.view)
diff --git a/submodules/Display/Display/ViewController.swift b/submodules/Display/Display/ViewController.swift
index a2f2c2c637..a350b1e101 100644
--- a/submodules/Display/Display/ViewController.swift
+++ b/submodules/Display/Display/ViewController.swift
@@ -250,6 +250,9 @@ public enum ViewControllerNavigationPresentation {
return nil
}
+ open func didAppearInContextPreview() {
+ }
+
private func updateScrollToTopView() {
/*if self.scrollToTop != nil {
if let displayNode = self._displayNode , self.scrollToTopView == nil {
diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift
index 872429065c..12426cf2ef 100644
--- a/submodules/Display/Display/WindowContent.swift
+++ b/submodules/Display/Display/WindowContent.swift
@@ -310,7 +310,7 @@ public class Window1 {
let isLandscape = boundsSize.width > boundsSize.height
let safeInsets = self.deviceMetrics.safeInsets(inLandscape: isLandscape)
- let onScreenNavigationHeight = self.deviceMetrics.onScreenNavigationHeight(inLandscape: isLandscape)
+ let onScreenNavigationHeight = self.deviceMetrics.onScreenNavigationHeight(inLandscape: isLandscape, systemOnScreenNavigationHeight: self.hostView.onScreenNavigationHeight)
self.windowLayout = WindowLayout(size: boundsSize, metrics: layoutMetricsForScreenSize(boundsSize), statusBarHeight: statusBarHeight, forceInCallStatusBarText: self.forceInCallStatusBarText, inputHeight: 0.0, safeInsets: safeInsets, onScreenNavigationHeight: onScreenNavigationHeight, upperKeyboardInputPositionBound: nil, inVoiceOver: UIAccessibility.isVoiceOverRunning)
self.updatingLayout = UpdatingLayout(layout: self.windowLayout, transition: .immediate)
@@ -318,6 +318,19 @@ public class Window1 {
self.overlayPresentationContext = GlobalOverlayPresentationContext(statusBarHost: statusBarHost, parentView: self.hostView.containerView)
self.topPresentationContext = PresentationContext()
+ self.presentationContext.topLevelSubview = { [weak self] in
+ guard let strongSelf = self else {
+ return nil
+ }
+ if let first = strongSelf.topPresentationContext.controllers.first {
+ return first.0.displayNode.view
+ }
+ if let first = strongSelf._topLevelOverlayControllers.first {
+ return first.view
+ }
+ return nil
+ }
+
self.presentationContext.updateIsInteractionBlocked = { [weak self] value in
self?.isInteractionBlocked = value
}
@@ -762,8 +775,6 @@ public class Window1 {
}
}
}
-
- self.presentationContext.topLevelSubview = self._topLevelOverlayControllers.first?.view
}
}
@@ -939,7 +950,7 @@ public class Window1 {
statusBarHeight = max(statusBarHeightValue, statusBarHost.statusBarFrame.size.height)
}
- if self.deviceMetrics.type == .tablet, let onScreenNavigationHeight = self.hostView.onScreenNavigationHeight, onScreenNavigationHeight != self.deviceMetrics.onScreenNavigationHeight(inLandscape: false) {
+ if self.deviceMetrics.type == .tablet, let onScreenNavigationHeight = self.hostView.onScreenNavigationHeight, onScreenNavigationHeight != self.deviceMetrics.onScreenNavigationHeight(inLandscape: false, systemOnScreenNavigationHeight: self.hostView.onScreenNavigationHeight) {
self.deviceMetrics = DeviceMetrics(screenSize: UIScreen.main.bounds.size, statusBarHeight: statusBarHeight ?? defaultStatusBarHeight, onScreenNavigationHeight: onScreenNavigationHeight)
}
@@ -956,7 +967,7 @@ public class Window1 {
}
let previousInputOffset = inputHeightOffsetForLayout(self.windowLayout)
- self.windowLayout = WindowLayout(size: updatingLayout.layout.size, metrics: layoutMetricsForScreenSize(updatingLayout.layout.size), statusBarHeight: statusBarHeight, forceInCallStatusBarText: updatingLayout.layout.forceInCallStatusBarText, inputHeight: updatingLayout.layout.inputHeight, safeInsets: updatingLayout.layout.safeInsets, onScreenNavigationHeight: self.deviceMetrics.onScreenNavigationHeight(inLandscape: isLandscape), upperKeyboardInputPositionBound: updatingLayout.layout.upperKeyboardInputPositionBound, inVoiceOver: updatingLayout.layout.inVoiceOver)
+ self.windowLayout = WindowLayout(size: updatingLayout.layout.size, metrics: layoutMetricsForScreenSize(updatingLayout.layout.size), statusBarHeight: statusBarHeight, forceInCallStatusBarText: updatingLayout.layout.forceInCallStatusBarText, inputHeight: updatingLayout.layout.inputHeight, safeInsets: updatingLayout.layout.safeInsets, onScreenNavigationHeight: self.deviceMetrics.onScreenNavigationHeight(inLandscape: isLandscape, systemOnScreenNavigationHeight: self.hostView.onScreenNavigationHeight), upperKeyboardInputPositionBound: updatingLayout.layout.upperKeyboardInputPositionBound, inVoiceOver: updatingLayout.layout.inVoiceOver)
let childLayout = containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics)
let childLayoutUpdated = self.updatedContainerLayout != childLayout
diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift
index e91d5ce149..0f688f18dd 100644
--- a/submodules/GalleryUI/Sources/GalleryController.swift
+++ b/submodules/GalleryUI/Sources/GalleryController.swift
@@ -973,6 +973,22 @@ public class GalleryController: ViewController, StandalonePresentableController
self.accountInUseDisposable.set(self.context.sharedContext.setAccountUserInterfaceInUse(self.context.account.id))
}
+ override public func didAppearInContextPreview() {
+ if let centralItemNode = self.galleryNode.pager.centralItemNode() {
+ let message = self.entries[centralItemNode.index].message
+ self.centralItemTitle.set(centralItemNode.title())
+ self.centralItemTitleView.set(centralItemNode.titleView())
+ self.centralItemRightBarButtonItem.set(centralItemNode.rightBarButtonItem())
+ self.centralItemRightBarButtonItems.set(centralItemNode.rightBarButtonItems())
+ self.centralItemNavigationStyle.set(centralItemNode.navigationStyle())
+ self.centralItemFooterContentNode.set(centralItemNode.footerContent())
+
+ if let (media, _) = mediaForMessage(message: message) {
+ centralItemNode.activateAsInitial()
+ }
+ }
+ }
+
override public func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
diff --git a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
index 06f7e902aa..015efd1e7b 100644
--- a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
+++ b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
@@ -763,7 +763,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
strongSelf.labelArrowNode = updatedLabelArrowNode
strongSelf.containerNode.addSubnode(updatedLabelArrowNode)
if let image = updatedLabelArrowNode.image {
- let labelArrowNodeFrame = CGRect(origin: CGPoint(x: params.width - params.rightInset - rightLabelInset - image.size.width, y: floor((contentSize.height - image.size.height) / 2.0)), size: image.size)
+ let labelArrowNodeFrame = CGRect(origin: CGPoint(x: params.width - params.rightInset - rightLabelInset - image.size.width + 8.0, y: floor((contentSize.height - image.size.height) / 2.0)), size: image.size)
transition.updateFrame(node: updatedLabelArrowNode, frame: labelArrowNodeFrame)
rightLabelInset += 19.0
}
@@ -775,10 +775,10 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
let badgeWidth = max(badgeDiameter, labelLayout.size.width + 10.0)
let labelFrame: CGRect
if case .badge = item.label {
- labelFrame = CGRect(origin: CGPoint(x: revealOffset + params.width - rightLabelInset - badgeWidth + (badgeWidth - labelLayout.size.width) / 2.0, y: floor((contentSize.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
+ labelFrame = CGRect(origin: CGPoint(x: revealOffset + params.width - rightLabelInset - badgeWidth + (badgeWidth - labelLayout.size.width) / 2.0, y: floor((contentSize.height - labelLayout.size.height) / 2.0) + 1.0), size: labelLayout.size)
strongSelf.labelNode.frame = labelFrame
} else {
- labelFrame = CGRect(origin: CGPoint(x: revealOffset + params.width - labelLayout.size.width - rightLabelInset - rightInset, y: floor((contentSize.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
+ labelFrame = CGRect(origin: CGPoint(x: revealOffset + params.width - labelLayout.size.width - rightLabelInset - rightInset, y: floor((contentSize.height - labelLayout.size.height) / 2.0) + 1.0), size: labelLayout.size)
transition.updateFrame(node: strongSelf.labelNode, frame: labelFrame)
}
diff --git a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
index c694baa6d1..f94511e73c 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
@@ -22,9 +22,10 @@ public class ItemListSwitchItem: ListViewItem, ItemListItem {
public let sectionId: ItemListSectionId
let style: ItemListStyle
let updated: (Bool) -> Void
+ let activatedWhileDisabled: () -> Void
public let tag: ItemListItemTag?
- public init(theme: PresentationTheme, title: String, value: Bool, type: ItemListSwitchItemNodeType = .regular, enableInteractiveChanges: Bool = true, enabled: Bool = true, maximumNumberOfLines: Int = 1, sectionId: ItemListSectionId, style: ItemListStyle, updated: @escaping (Bool) -> Void, tag: ItemListItemTag? = nil) {
+ public init(theme: PresentationTheme, title: String, value: Bool, type: ItemListSwitchItemNodeType = .regular, enableInteractiveChanges: Bool = true, enabled: Bool = true, maximumNumberOfLines: Int = 1, sectionId: ItemListSectionId, style: ItemListStyle, updated: @escaping (Bool) -> Void, activatedWhileDisabled: @escaping () -> Void = {}, tag: ItemListItemTag? = nil) {
self.theme = theme
self.title = title
self.value = value
@@ -35,6 +36,7 @@ public class ItemListSwitchItem: ListViewItem, ItemListItem {
self.sectionId = sectionId
self.style = style
self.updated = updated
+ self.activatedWhileDisabled = activatedWhileDisabled
self.tag = tag
}
@@ -259,7 +261,7 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
if let currentDisabledOverlayNode = currentDisabledOverlayNode {
if currentDisabledOverlayNode != strongSelf.disabledOverlayNode {
strongSelf.disabledOverlayNode = currentDisabledOverlayNode
- strongSelf.addSubnode(currentDisabledOverlayNode)
+ strongSelf.insertSubnode(currentDisabledOverlayNode, belowSubnode: strongSelf.switchGestureNode)
currentDisabledOverlayNode.alpha = 0.0
transition.updateAlpha(node: currentDisabledOverlayNode, alpha: 1.0)
currentDisabledOverlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight))
@@ -362,7 +364,7 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
}
switchView.isUserInteractionEnabled = item.enableInteractiveChanges
}
- strongSelf.switchGestureNode.isHidden = item.enableInteractiveChanges
+ strongSelf.switchGestureNode.isHidden = item.enableInteractiveChanges && item.enabled
strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: 44.0 + UIScreenPixel + UIScreenPixel))
}
@@ -442,8 +444,12 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
@objc private func tapGesture(_ recognizer: UITapGestureRecognizer) {
if let item = self.item, let switchView = self.switchNode.view as? UISwitch, case .ended = recognizer.state {
- let value = switchView.isOn
- item.updated(!value)
+ if item.enabled {
+ let value = switchView.isOn
+ item.updated(!value)
+ } else {
+ item.activatedWhileDisabled()
+ }
}
}
}
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraController.h b/submodules/LegacyComponents/LegacyComponents/TGCameraController.h
index 2169853fb3..85bb772f78 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGCameraController.h
+++ b/submodules/LegacyComponents/LegacyComponents/TGCameraController.h
@@ -45,7 +45,7 @@ typedef enum {
@property (nonatomic, strong) NSString *recipientName;
-@property (nonatomic, copy) void(^finishedWithResults)(TGOverlayController *controller, TGMediaSelectionContext *selectionContext, TGMediaEditingContext *editingContext, id currentItem);
+@property (nonatomic, copy) void(^finishedWithResults)(TGOverlayController *controller, TGMediaSelectionContext *selectionContext, TGMediaEditingContext *editingContext, id currentItem, bool silentPosting, int32_t scheduleTime);
@property (nonatomic, copy) void(^finishedWithPhoto)(TGOverlayController *controller, UIImage *resultImage, NSString *caption, NSArray *entities, NSArray *stickers, NSNumber *timer);
@property (nonatomic, copy) void(^finishedWithVideo)(TGOverlayController *controller, NSURL *videoURL, UIImage *previewImage, NSTimeInterval duration, CGSize dimensions, TGVideoEditAdjustments *adjustments, NSString *caption, NSArray *entities, NSArray *stickers, NSNumber *timer);
@@ -55,6 +55,8 @@ typedef enum {
@property (nonatomic, copy) void(^finishedTransitionOut)(void);
@property (nonatomic, copy) void(^customPresentOverlayController)(TGOverlayController *(^)(id));
+@property (nonatomic, copy) void (^presentScheduleController)(void (^)(int32_t));
+
- (instancetype)initWithContext:(id)context saveEditedPhotos:(bool)saveEditedPhotos saveCapturedMedia:(bool)saveCapturedMedia;
- (instancetype)initWithContext:(id)context saveEditedPhotos:(bool)saveEditedPhotos saveCapturedMedia:(bool)saveCapturedMedia intent:(TGCameraControllerIntent)intent;
- (instancetype)initWithContext:(id)context saveEditedPhotos:(bool)saveEditedPhotos saveCapturedMedia:(bool)saveCapturedMedia camera:(PGCamera *)camera previewView:(TGCameraPreviewView *)previewView intent:(TGCameraControllerIntent)intent;
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraController.m b/submodules/LegacyComponents/LegacyComponents/TGCameraController.m
index 37b5a2b97b..8bb1df16ee 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGCameraController.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGCameraController.m
@@ -45,6 +45,7 @@
#import
#import
+#import
#import "TGMediaPickerGallerySelectedItemsModel.h"
#import "TGCameraCapturedPhoto.h"
@@ -1251,6 +1252,128 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
model.controller = galleryController;
model.suggestionContext = self.suggestionContext;
+ __weak TGModernGalleryController *weakGalleryController = galleryController;
+ __weak TGMediaPickerGalleryModel *weakModel = model;
+
+ model.interfaceView.doneLongPressed = ^(TGMediaPickerGalleryItem *item) {
+ __strong TGCameraController *strongSelf = weakSelf;
+ __strong TGMediaPickerGalleryModel *strongModel = weakModel;
+ if (strongSelf == nil || !(strongSelf.hasSilentPosting || strongSelf.hasSchedule) || strongSelf->_shortcut)
+ return;
+
+ if (iosMajorVersion() >= 10) {
+ UIImpactFeedbackGenerator *generator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium];
+ [generator impactOccurred];
+ }
+
+ bool effectiveHasSchedule = strongSelf.hasSchedule;
+ for (id item in strongModel.selectionContext.selectedItems)
+ {
+ if ([item isKindOfClass:[TGMediaAsset class]])
+ {
+ if ([[strongSelf->_editingContext timerForItem:item] integerValue] > 0)
+ {
+ effectiveHasSchedule = false;
+ break;
+ }
+ }
+ }
+
+ TGMediaPickerSendActionSheetController *controller = [[TGMediaPickerSendActionSheetController alloc] initWithContext:strongSelf->_context sendButtonFrame:strongModel.interfaceView.doneButtonFrame canSendSilently:strongSelf->_hasSilentPosting canSchedule:effectiveHasSchedule];
+ controller.send = ^{
+ __strong TGCameraController *strongSelf = weakSelf;
+ __strong TGMediaPickerGalleryModel *strongModel = weakModel;
+
+ if (strongSelf == nil || strongModel == nil)
+ return;
+
+ __strong TGModernGalleryController *strongController = weakGalleryController;
+ if (strongController == nil)
+ return;
+
+ if ([item isKindOfClass:[TGMediaPickerGalleryVideoItem class]])
+ {
+ TGMediaPickerGalleryVideoItemView *itemView = (TGMediaPickerGalleryVideoItemView *)[strongController itemViewForItem:item];
+ [itemView stop];
+ [itemView setPlayButtonHidden:true animated:true];
+ }
+
+ if (strongSelf->_selectionContext.allowGrouping)
+ [[NSUserDefaults standardUserDefaults] setObject:@(!strongSelf->_selectionContext.grouping) forKey:@"TG_mediaGroupingDisabled_v0"];
+
+ if (strongSelf.finishedWithResults != nil)
+ strongSelf.finishedWithResults(strongController, strongSelf->_selectionContext, strongSelf->_editingContext, item.asset, false, 0);
+
+ [strongSelf _dismissTransitionForResultController:strongController];
+ };
+ controller.sendSilently = ^{
+ __strong TGCameraController *strongSelf = weakSelf;
+ __strong TGMediaPickerGalleryModel *strongModel = weakModel;
+
+ if (strongSelf == nil || strongModel == nil)
+ return;
+
+ __strong TGModernGalleryController *strongController = weakGalleryController;
+ if (strongController == nil)
+ return;
+
+ if ([item isKindOfClass:[TGMediaPickerGalleryVideoItem class]])
+ {
+ TGMediaPickerGalleryVideoItemView *itemView = (TGMediaPickerGalleryVideoItemView *)[strongController itemViewForItem:item];
+ [itemView stop];
+ [itemView setPlayButtonHidden:true animated:true];
+ }
+
+ if (strongSelf->_selectionContext.allowGrouping)
+ [[NSUserDefaults standardUserDefaults] setObject:@(!strongSelf->_selectionContext.grouping) forKey:@"TG_mediaGroupingDisabled_v0"];
+
+ if (strongSelf.finishedWithResults != nil)
+ strongSelf.finishedWithResults(strongController, strongSelf->_selectionContext, strongSelf->_editingContext, item.asset, true, 0);
+
+ [strongSelf _dismissTransitionForResultController:strongController];
+ };
+ controller.schedule = ^{
+ __strong TGCameraController *strongSelf = weakSelf;
+ if (strongSelf == nil)
+ return;
+
+ strongSelf.presentScheduleController(^(int32_t time) {
+ __strong TGCameraController *strongSelf = weakSelf;
+ __strong TGMediaPickerGalleryModel *strongModel = weakModel;
+
+ if (strongSelf == nil || strongModel == nil)
+ return;
+
+ __strong TGModernGalleryController *strongController = weakGalleryController;
+ if (strongController == nil)
+ return;
+
+ if ([item isKindOfClass:[TGMediaPickerGalleryVideoItem class]])
+ {
+ TGMediaPickerGalleryVideoItemView *itemView = (TGMediaPickerGalleryVideoItemView *)[strongController itemViewForItem:item];
+ [itemView stop];
+ [itemView setPlayButtonHidden:true animated:true];
+ }
+
+ if (strongSelf->_selectionContext.allowGrouping)
+ [[NSUserDefaults standardUserDefaults] setObject:@(!strongSelf->_selectionContext.grouping) forKey:@"TG_mediaGroupingDisabled_v0"];
+
+ if (strongSelf.finishedWithResults != nil)
+ strongSelf.finishedWithResults(strongController, strongSelf->_selectionContext, strongSelf->_editingContext, item.asset, false, time);
+
+ [strongSelf _dismissTransitionForResultController:strongController];
+ });
+ };
+
+ id windowManager = nil;
+ id windowContext = nil;
+ windowManager = [strongSelf->_context makeOverlayWindowManager];
+ windowContext = [windowManager context];
+
+ TGOverlayControllerWindow *controllerWindow = [[TGOverlayControllerWindow alloc] initWithManager:windowManager parentController:strongSelf contentController:(TGOverlayController *)controller];
+ controllerWindow.hidden = false;
+ };
+
model.willFinishEditingItem = ^(id editableItem, id adjustments, id representation, bool hasChanges)
{
__strong TGCameraController *strongSelf = weakSelf;
@@ -1278,9 +1401,6 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
model.interfaceView.hasSwipeGesture = false;
galleryController.model = model;
-
- __weak TGModernGalleryController *weakGalleryController = galleryController;
- __weak TGMediaPickerGalleryModel *weakModel = model;
if (_items.count > 1)
[model.interfaceView updateSelectionInterface:selectionContext.count counterVisible:(selectionContext.count > 0) animated:false];
@@ -1318,7 +1438,7 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
[[NSUserDefaults standardUserDefaults] setObject:@(!strongSelf->_selectionContext.grouping) forKey:@"TG_mediaGroupingDisabled_v0"];
if (strongSelf.finishedWithResults != nil)
- strongSelf.finishedWithResults(strongController, strongSelf->_selectionContext, strongSelf->_editingContext, item.asset);
+ strongSelf.finishedWithResults(strongController, strongSelf->_selectionContext, strongSelf->_editingContext, item.asset, false, 0);
if (strongSelf->_shortcut)
return;
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m b/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m
index 96800ff556..c622a67afa 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m
@@ -851,7 +851,7 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f };
}];
CLLocationCoordinate2D coordinate = _currentUserLocation.coordinate;
- searchSignal = [self.nearbyPlacesSignal(searchQuery, _currentUserLocation) deliverOn:[SQueue mainQueue]];
+ searchSignal = [searchSignal then:[self.nearbyPlacesSignal(searchQuery, _currentUserLocation) deliverOn:[SQueue mainQueue]]];
if (_searchDisposable == nil)
_searchDisposable = [[SMetaDisposable alloc] init];
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m b/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m
index 084578d1c1..0b8bcd2f27 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m
@@ -1221,7 +1221,7 @@
{
[super scrollViewDidScroll:scrollView];
- _mapView.compassInsets = UIEdgeInsetsMake(TGLocationMapInset + 108.0f + (scrollView.contentOffset.y + scrollView.contentInset.top) / 2.0f, 0.0f, 0.0f, 10.0f + TGScreenPixel);
+ _mapView.compassInsets = UIEdgeInsetsMake(TGLocationMapInset + 120.0f + (scrollView.contentOffset.y + scrollView.contentInset.top) / 2.0f, 0.0f, 0.0f, 10.0f + TGScreenPixel);
}
- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m b/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m
index 18fab4f99c..cc28d40df4 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m
@@ -135,11 +135,19 @@
- (NSString *)fileName
{
- if (self.backingAsset != nil)
- return [self.backingAsset valueForKey:@"filename"];
- else if (self.backingLegacyAsset != nil)
+ if (self.backingAsset != nil) {
+ NSString *fileName = [self.backingAsset valueForKey:@"filename"];
+ if (fileName == nil) {
+ NSArray *resources = [PHAssetResource assetResourcesForAsset:self.backingAsset];
+ PHAssetResource *resource = resources.firstObject;
+ if (resource != nil) {
+ fileName = resource.originalFilename;
+ }
+ }
+ return fileName;
+ } else if (self.backingLegacyAsset != nil) {
return self.backingLegacyAsset.defaultRepresentation.filename;
-
+ }
return nil;
}
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m
index 1f0d178672..3b0cefb595 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m
@@ -295,6 +295,9 @@
if (!found)
fileName = asset.fileName;
}
+ if (fileName == nil) {
+ fileName = asset.fileName;
+ }
if (iosMajorVersion() >= 10 && [dataUTI rangeOfString:@"heic"].location != NSNotFound)
{
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.m b/submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.m
index bd45c12d04..eaca03b4ec 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.m
@@ -1,5 +1,7 @@
#import "TGMediaPickerModernGalleryMixin.h"
+#import "LegacyComponentsInternal.h"
+
#import
#import
@@ -144,8 +146,10 @@
if (strongSelf == nil || !(hasSilentPosting || hasSchedule))
return;
- UIImpactFeedbackGenerator *generator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium];
- [generator impactOccurred];
+ if (iosMajorVersion() >= 10) {
+ UIImpactFeedbackGenerator *generator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium];
+ [generator impactOccurred];
+ }
bool effectiveHasSchedule = hasSchedule;
for (id item in strongSelf->_galleryModel.selectionContext.selectedItems)
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m b/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m
index 12d35852dc..cfe5081397 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m
+++ b/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m
@@ -382,7 +382,7 @@
[strongCameraView attachPreviewViewAnimated:true];
};
- controller.finishedWithResults = ^(__unused TGOverlayController *controller, TGMediaSelectionContext *selectionContext, TGMediaEditingContext *editingContext, id currentItem)
+ controller.finishedWithResults = ^(__unused TGOverlayController *controller, TGMediaSelectionContext *selectionContext, TGMediaEditingContext *editingContext, id currentItem, __unused bool silentPosting, __unused int32_t scheduleTime)
{
__strong TGMenuSheetController *strongMenuController = weakMenuController;
if (strongMenuController == nil)
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyImagePicker.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyImagePicker.swift
index c2ec39a117..00b799c30c 100644
--- a/submodules/LegacyMediaPickerUI/Sources/LegacyImagePicker.swift
+++ b/submodules/LegacyMediaPickerUI/Sources/LegacyImagePicker.swift
@@ -18,6 +18,12 @@ private final class LegacyImagePickerController: LegacyController, TGLegacyCamer
fatalError("init(coder:) has not been implemented")
}
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
+ self.view.disablesInteractiveModalDismiss = true
+ }
+
func legacyCameraControllerCompletedWithNoResult() {
self.completion(nil)
}
diff --git a/submodules/MediaPlayer/Sources/MediaPlayerAudioRenderer.swift b/submodules/MediaPlayer/Sources/MediaPlayerAudioRenderer.swift
index 32cea5361d..f8e3c7efe7 100644
--- a/submodules/MediaPlayer/Sources/MediaPlayerAudioRenderer.swift
+++ b/submodules/MediaPlayer/Sources/MediaPlayerAudioRenderer.swift
@@ -430,7 +430,7 @@ private final class AudioPlayerRendererContext {
return
}
- print("MediaPlayerAudioRenderer initialize audio unit: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+ print("\(CFAbsoluteTimeGetCurrent()) MediaPlayerAudioRenderer initialize audio unit: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
self.audioGraph = audioGraph
self.timePitchAudioUnit = timePitchAudioUnit
@@ -508,7 +508,7 @@ private final class AudioPlayerRendererContext {
return
}
- print("MediaPlayerAudioRenderer start audio unit: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+ print("\(CFAbsoluteTimeGetCurrent()) MediaPlayerAudioRenderer start audio unit: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
}
}
diff --git a/submodules/MtProtoKit/MTBackupAddressSignals.m b/submodules/MtProtoKit/MTBackupAddressSignals.m
index e2464f9161..515c1c90f6 100644
--- a/submodules/MtProtoKit/MTBackupAddressSignals.m
+++ b/submodules/MtProtoKit/MTBackupAddressSignals.m
@@ -59,7 +59,22 @@ static NSData *base64_decode(NSString *str) {
if (addressOverride != nil) {
apvHost = addressOverride;
}
- MTSignal *signal = [[[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:[NSString stringWithFormat:@"https://%@/resolve?name=%@&type=16&random_padding=%@", host, isTesting ? @"tapv3.stel.com" : apvHost, makeRandomPadding()]] headers:headers] mapToSignal:^MTSignal *(NSData *data) {
+ MTSignal *signal = [[[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:[NSString stringWithFormat:@"https://%@/resolve?name=%@&type=16&random_padding=%@", host, isTesting ? @"tapv3.stel.com" : apvHost, makeRandomPadding()]] headers:headers] mapToSignal:^MTSignal *(MTHttpResponse *response) {
+ NSString *dateHeader = response.headers[@"Date"];
+ if ([dateHeader isKindOfClass:[NSString class]]) {
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ NSLocale *usLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+ [formatter setLocale:usLocale];
+ [formatter setDateFormat:@"EEE',' dd' 'MMM' 'yyyy HH':'mm':'ss zzz"];
+ NSDate *date = [formatter dateFromString:dateHeader];
+ if (date != nil) {
+ double difference = [date timeIntervalSince1970] - [[NSDate date] timeIntervalSince1970];
+ [MTContext setFixedTimeDifference:(int32_t)difference];
+ }
+ }
+
+ NSData *data = response.data;
+
NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
if ([dict respondsToSelector:@selector(objectForKey:)]) {
NSArray *answer = dict[@"Answer"];
@@ -145,7 +160,22 @@ static NSString *makeRandomPadding() {
if (addressOverride != nil) {
apvHost = addressOverride;
}
- MTSignal *signal = [[[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:[NSString stringWithFormat:@"https://%@/dns-query?name=%@&type=16&random_padding=%@", host, isTesting ? @"tapv3.stel.com" : apvHost, makeRandomPadding()]] headers:headers] mapToSignal:^MTSignal *(NSData *data) {
+ MTSignal *signal = [[[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:[NSString stringWithFormat:@"https://%@/dns-query?name=%@&type=16&random_padding=%@", host, isTesting ? @"tapv3.stel.com" : apvHost, makeRandomPadding()]] headers:headers] mapToSignal:^MTSignal *(MTHttpResponse *response) {
+ NSString *dateHeader = response.headers[@"Date"];
+ if ([dateHeader isKindOfClass:[NSString class]]) {
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ NSLocale *usLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+ [formatter setLocale:usLocale];
+ [formatter setDateFormat:@"EEE',' dd' 'MMM' 'yyyy HH':'mm':'ss zzz"];
+ NSDate *date = [formatter dateFromString:dateHeader];
+ if (date != nil) {
+ double difference = [date timeIntervalSince1970] - [[NSDate date] timeIntervalSince1970];
+ [MTContext setFixedTimeDifference:(int32_t)difference];
+ }
+ }
+
+ NSData *data = response.data;
+
NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
if ([dict respondsToSelector:@selector(objectForKey:)]) {
NSArray *answer = dict[@"Answer"];
diff --git a/submodules/MtProtoKit/MTDNS.m b/submodules/MtProtoKit/MTDNS.m
index 3e759df9a8..0b99d81516 100644
--- a/submodules/MtProtoKit/MTDNS.m
+++ b/submodules/MtProtoKit/MTDNS.m
@@ -281,7 +281,9 @@
}
NSDictionary *headers = @{@"Host": @"dns.google.com"};
- return [[[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:[NSString stringWithFormat:@"https://google.com/resolve?name=%@", hostname]] headers:headers] mapToSignal:^MTSignal *(NSData *data) {
+ return [[[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:[NSString stringWithFormat:@"https://google.com/resolve?name=%@", hostname]] headers:headers] mapToSignal:^MTSignal *(MTHttpResponse *response) {
+ NSData *data = response.data;
+
NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
if ([dict respondsToSelector:@selector(objectForKey:)]) {
NSArray *answer = dict[@"Answer"];
diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.h b/submodules/MtProtoKit/MTProtoKit/MTContext.h
index 9a80e6f6f1..6f1dfc0f91 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTContext.h
+++ b/submodules/MtProtoKit/MTProtoKit/MTContext.h
@@ -48,6 +48,9 @@
@property (nonatomic, readonly) bool isTestingEnvironment;
@property (nonatomic, readonly) bool useTempAuthKeys;
++ (int32_t)fixedTimeDifference;
++ (void)setFixedTimeDifference:(int32_t)fixedTimeDifference;
+
- (instancetype)initWithSerialization:(id)serialization encryptionProvider:(id)encryptionProvider apiEnvironment:(MTApiEnvironment *)apiEnvironment isTestingEnvironment:(bool)isTestingEnvironment useTempAuthKeys:(bool)useTempAuthKeys;
- (void)performBatchUpdates:(void (^)())block;
diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.m b/submodules/MtProtoKit/MTProtoKit/MTContext.m
index 28311c25b8..4c5b096a30 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTContext.m
+++ b/submodules/MtProtoKit/MTProtoKit/MTContext.m
@@ -161,8 +161,18 @@
@end
+static int32_t fixedTimeDifferenceValue = 0;
+
@implementation MTContext
++ (int32_t)fixedTimeDifference {
+ return fixedTimeDifferenceValue;
+}
+
++ (void)setFixedTimeDifference:(int32_t)fixedTimeDifference {
+ fixedTimeDifferenceValue = fixedTimeDifference;
+}
+
- (instancetype)init
{
self = [super init];
diff --git a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h b/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h
index ad952bf8a4..14d8600859 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h
+++ b/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h
@@ -2,6 +2,13 @@
@class MTSignal;
+@interface MTHttpResponse : NSObject
+
+@property (nonatomic, strong, readonly) NSDictionary *headers;
+@property (nonatomic, strong, readonly) NSData *data;
+
+@end
+
@interface MTHttpRequestOperation : NSObject
+ (MTSignal *)dataForHttpUrl:(NSURL *)url;
diff --git a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m b/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m
index e09912530a..143907175c 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m
+++ b/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m
@@ -4,6 +4,19 @@
#import
#import
+@implementation MTHttpResponse
+
+- (instancetype)initWithHeaders:(NSDictionary *)headers data:(NSData *)data {
+ self = [super init];
+ if (self != nil) {
+ _headers = headers;
+ _data = data;
+ }
+ return self;
+}
+
+@end
+
@implementation MTHttpRequestOperation
+ (MTSignal *)dataForHttpUrl:(NSURL *)url {
@@ -23,7 +36,9 @@
[operation setCompletionBlockWithSuccess:^(__unused NSOperation *operation, __unused id responseObject)
{
- [subscriber putNext:[(AFHTTPRequestOperation *)operation responseData]];
+ AFHTTPRequestOperation *concreteOperation = (AFHTTPRequestOperation *)operation;
+ MTHttpResponse *result = [[MTHttpResponse alloc] initWithHeaders:[concreteOperation response].allHeaderFields data:[concreteOperation responseData]];
+ [subscriber putNext:result];
[subscriber putCompletion];
} failure:^(__unused NSOperation *operation, __unused NSError *error)
{
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m b/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m
index 0f8aca2e2b..f173b9660d 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m
+++ b/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m
@@ -606,7 +606,7 @@ struct ctr_state {
NSData *effectiveSecret = strongSelf->_mtpSecret.secret;
uint8_t cHMAC[CC_SHA256_DIGEST_LENGTH];
CCHmac(kCCHmacAlgSHA256, effectiveSecret.bytes, effectiveSecret.length, helloData.bytes, helloData.length, cHMAC);
- int32_t timestamp = (int32_t)[[NSDate date] timeIntervalSince1970];
+ int32_t timestamp = (int32_t)[[NSDate date] timeIntervalSince1970] + [MTContext fixedTimeDifference];
uint8_t *timestampValue = (uint8_t *)×tamp;
for (int i = 0; i < 4; i++) {
cHMAC[CC_SHA256_DIGEST_LENGTH - 4 + i] ^= timestampValue[i];
diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryController.swift b/submodules/PasscodeUI/Sources/PasscodeEntryController.swift
index e6f5a5062e..ad96c44ada 100644
--- a/submodules/PasscodeUI/Sources/PasscodeEntryController.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeEntryController.swift
@@ -15,12 +15,14 @@ public final class PasscodeEntryControllerPresentationArguments {
let fadeIn: Bool
let lockIconInitialFrame: () -> CGRect
let cancel: (() -> Void)?
+ let modalPresentation: Bool
- public init(animated: Bool = true, fadeIn: Bool = false, lockIconInitialFrame: @escaping () -> CGRect = { return CGRect() }, cancel: (() -> Void)? = nil) {
+ public init(animated: Bool = true, fadeIn: Bool = false, lockIconInitialFrame: @escaping () -> CGRect = { return CGRect() }, cancel: (() -> Void)? = nil, modalPresentation: Bool = false) {
self.animated = animated
self.fadeIn = fadeIn
self.lockIconInitialFrame = lockIconInitialFrame
self.cancel = cancel
+ self.modalPresentation = modalPresentation
}
}
@@ -111,18 +113,22 @@ public final class PasscodeEntryController: ViewController {
let biometricsType: LocalAuthBiometricAuthentication?
if case let .enabled(data) = self.biometrics {
if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
+ #if targetEnvironment(simulator)
+ biometricsType = .touchId
+ #else
if data == LocalAuth.evaluatedPolicyDomainState || (data == nil && !self.applicationBindings.isMainApp) {
biometricsType = LocalAuth.biometricAuthentication
} else {
biometricsType = nil
}
+ #endif
} else {
biometricsType = LocalAuth.biometricAuthentication
}
} else {
biometricsType = nil
}
- self.displayNode = PasscodeEntryControllerNode(accountManager: self.accountManager, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, passcodeType: passcodeType, biometricsType: biometricsType, arguments: self.arguments, statusBar: self.statusBar)
+ self.displayNode = PasscodeEntryControllerNode(accountManager: self.accountManager, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, passcodeType: passcodeType, biometricsType: biometricsType, arguments: self.arguments, statusBar: self.statusBar, modalPresentation: self.arguments.modalPresentation)
self.displayNodeDidLoad()
let _ = (self.appLockContext.invalidAttempts
diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift b/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift
index 3503cbac78..5927a1bd54 100644
--- a/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift
@@ -29,6 +29,8 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
private let statusBar: StatusBar
+ private let modalPresentation: Bool
+
private let backgroundNode: ASImageNode
private let iconNode: PasscodeLockIconNode
private let titleNode: PasscodeEntryLabelNode
@@ -50,7 +52,7 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
var checkPasscode: ((String) -> Void)?
var requestBiometrics: (() -> Void)?
- init(accountManager: AccountManager, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, passcodeType: PasscodeEntryFieldType, biometricsType: LocalAuthBiometricAuthentication?, arguments: PasscodeEntryControllerPresentationArguments, statusBar: StatusBar) {
+ init(accountManager: AccountManager, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, passcodeType: PasscodeEntryFieldType, biometricsType: LocalAuthBiometricAuthentication?, arguments: PasscodeEntryControllerPresentationArguments, statusBar: StatusBar, modalPresentation: Bool) {
self.accountManager = accountManager
self.theme = theme
self.strings = strings
@@ -59,6 +61,7 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
self.biometricsType = biometricsType
self.arguments = arguments
self.statusBar = statusBar
+ self.modalPresentation = modalPresentation
self.backgroundNode = ASImageNode()
self.backgroundNode.contentMode = .scaleToFill
@@ -373,7 +376,7 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
self.iconNode.alpha = 0.0
}
- let passcodeLayout = PasscodeLayout(layout: layout)
+ let passcodeLayout = PasscodeLayout(layout: layout, modalPresentation: self.modalPresentation)
let inputFieldOffset: CGFloat
if isLandscape {
let bottomInset = layout.inputHeight ?? 0.0
diff --git a/submodules/PasscodeUI/Sources/PasscodeLayout.swift b/submodules/PasscodeUI/Sources/PasscodeLayout.swift
index d9ea84cebe..7be6978f49 100644
--- a/submodules/PasscodeUI/Sources/PasscodeLayout.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeLayout.swift
@@ -3,18 +3,25 @@ import UIKit
import Display
struct PasscodeKeyboardLayout {
- let buttonSize: CGFloat
- let horizontalSecond: CGFloat
- let horizontalThird: CGFloat
- let verticalSecond: CGFloat
- let verticalThird: CGFloat
- let verticalFourth: CGFloat
- let size: CGSize
- let topOffset: CGFloat
- let biometricsOffset: CGFloat
- let deleteOffset: CGFloat
+ var buttonSize: CGFloat
+ var horizontalSecond: CGFloat
+ var horizontalThird: CGFloat
+ var verticalSecond: CGFloat
+ var verticalThird: CGFloat
+ var verticalFourth: CGFloat
+ var size: CGSize
+ var topOffset: CGFloat
+ var biometricsOffset: CGFloat
+ var deleteOffset: CGFloat
- fileprivate init(layout: ContainerViewLayout) {
+ fileprivate init(layout: ContainerViewLayout, modalPresentation: Bool) {
+ var modalOffset: CGFloat = 0.0
+ var modalBiometricsOffset: CGFloat = 0.0
+ if modalPresentation {
+ modalOffset -= 20.0
+ modalBiometricsOffset -= 8.0
+ }
+
switch layout.deviceMetrics {
case .iPhone4:
self.buttonSize = 75.0
@@ -105,20 +112,28 @@ struct PasscodeKeyboardLayout {
self.biometricsOffset = 30.0
self.deleteOffset = 20.0
}
+
+ self.topOffset += modalOffset * 2.0
+ self.biometricsOffset += modalBiometricsOffset
}
}
public struct PasscodeLayout {
- let layout: ContainerViewLayout
- let keyboard: PasscodeKeyboardLayout
- let titleOffset: CGFloat
- let subtitleOffset: CGFloat
- let inputFieldOffset: CGFloat
+ var layout: ContainerViewLayout
+ var keyboard: PasscodeKeyboardLayout
+ var titleOffset: CGFloat
+ var subtitleOffset: CGFloat
+ var inputFieldOffset: CGFloat
- init(layout: ContainerViewLayout) {
+ init(layout: ContainerViewLayout, modalPresentation: Bool) {
self.layout = layout
- self.keyboard = PasscodeKeyboardLayout(layout: layout)
+ var modalOffset: CGFloat = 0.0
+ if modalPresentation {
+ modalOffset -= 20.0
+ }
+
+ self.keyboard = PasscodeKeyboardLayout(layout: layout, modalPresentation: modalPresentation)
switch layout.deviceMetrics {
case .iPhone4:
self.titleOffset = 30.0
@@ -153,11 +168,15 @@ public struct PasscodeLayout {
self.subtitleOffset = 0.0
self.inputFieldOffset = 140.0
}
+
+ self.titleOffset += modalOffset
+ self.subtitleOffset += modalOffset
+ self.inputFieldOffset += modalOffset
}
- public init(layout: ContainerViewLayout, titleOffset: CGFloat, subtitleOffset: CGFloat, inputFieldOffset: CGFloat) {
+ public init(layout: ContainerViewLayout, titleOffset: CGFloat, subtitleOffset: CGFloat, inputFieldOffset: CGFloat, modalPresentation: Bool) {
self.layout = layout
- self.keyboard = PasscodeKeyboardLayout(layout: layout)
+ self.keyboard = PasscodeKeyboardLayout(layout: layout, modalPresentation: modalPresentation)
self.titleOffset = titleOffset
self.subtitleOffset = subtitleOffset
self.inputFieldOffset = inputFieldOffset
diff --git a/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift b/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift
index 56a4f4086c..0c1dc472dd 100644
--- a/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift
+++ b/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift
@@ -700,7 +700,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode {
guard let strongSelf = self else {
return
}
- strongSelf.interaction.present(SecureIdPlaintextFormController(context: strongSelf.context, secureIdContext: secureIdContext, type: type, immediatelyAvailableValue: immediatelyAvailableValue, updatedValue: { valueWithContext in
+ strongSelf.interaction.push(SecureIdPlaintextFormController(context: strongSelf.context, secureIdContext: secureIdContext, type: type, immediatelyAvailableValue: immediatelyAvailableValue, updatedValue: { valueWithContext in
if let strongSelf = self {
strongSelf.interaction.updateState { state in
if case let .form(form) = state, let formData = form.formData {
@@ -723,7 +723,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode {
return state
}
}
- }), nil)
+ }))
}
if let currentValue = currentValue {
@@ -941,9 +941,9 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode {
if let peer = list.accountPeer as? TelegramUser, let phone = peer.phone, !phone.isEmpty {
immediatelyAvailableValue = .phone(SecureIdPhoneValue(phone: phone))
}
- self.interaction.present(SecureIdPlaintextFormController(context: self.context, secureIdContext: secureIdContext, type: .phone, immediatelyAvailableValue: immediatelyAvailableValue, updatedValue: { value in
+ self.interaction.push(SecureIdPlaintextFormController(context: self.context, secureIdContext: secureIdContext, type: .phone, immediatelyAvailableValue: immediatelyAvailableValue, updatedValue: { value in
updatedValues(.phone)(value.flatMap({ [$0] }) ?? [])
- }), nil)
+ }))
}
case .email:
if findValue(values, key: .email) != nil {
@@ -953,9 +953,9 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode {
if let email = list.twoStepEmail {
immediatelyAvailableValue = .email(SecureIdEmailValue(email: email))
}
- self.interaction.present(SecureIdPlaintextFormController(context: self.context, secureIdContext: secureIdContext, type: .email, immediatelyAvailableValue: immediatelyAvailableValue, updatedValue: { value in
+ self.interaction.push(SecureIdPlaintextFormController(context: self.context, secureIdContext: secureIdContext, type: .email, immediatelyAvailableValue: immediatelyAvailableValue, updatedValue: { value in
updatedValues(.email)(value.flatMap({ [$0] }) ?? [])
- }), nil)
+ }))
}
}
}
diff --git a/submodules/PassportUI/Sources/SecureIdPlaintextFormController.swift b/submodules/PassportUI/Sources/SecureIdPlaintextFormController.swift
index 4e70b7aecc..f4caf3c70f 100644
--- a/submodules/PassportUI/Sources/SecureIdPlaintextFormController.swift
+++ b/submodules/PassportUI/Sources/SecureIdPlaintextFormController.swift
@@ -37,6 +37,8 @@ public final class SecureIdPlaintextFormController: FormController UIImage? {
@@ -56,34 +57,23 @@ private final class ManagedAnimationState {
}
}
-enum ManagedAnimationActionAtEnd {
- case pause
- case advance
- case loop
-}
-
-struct ManagedAnimationTrack: Equatable {
- let frameRange: Range
+struct ManagedAnimationFrameRange: Equatable {
+ var startFrame: Int
+ var endFrame: Int
}
struct ManagedAnimationItem: Equatable {
let name: String
- var intro: ManagedAnimationTrack?
- var loop: ManagedAnimationTrack?
- var outro: ManagedAnimationTrack?
+ var frames: ManagedAnimationFrameRange
}
-final class ManagedAnimationNode: ASDisplayNode {
+class ManagedAnimationNode: ASDisplayNode {
let intrinsicSize: CGSize
private let imageNode: ASImageNode
private let displayLink: CADisplayLink
- private var items: [ManagedAnimationState] = []
-
- var currentItemName: String? {
- return self.items.first?.item.name
- }
+ private var state: ManagedAnimationState?
init(size: CGSize) {
self.intrinsicSize = size
@@ -121,136 +111,174 @@ final class ManagedAnimationNode: ASDisplayNode {
}
private func updateAnimation() {
- guard let item = self.items.first else {
+ guard let state = self.state else {
return
}
let timestamp = CACurrentMediaTime()
+
var startTime: Double
- let maybeTrackState: ManagedAnimationTrackState?
- if let current = item.startTime {
+ if let current = state.startTime {
startTime = current
} else {
startTime = timestamp
- item.startTime = startTime
- }
- if let current = item.trackState {
- maybeTrackState = current
- } else if let _ = item.item.intro {
- maybeTrackState = .intro
- } else if let _ = item.item.loop {
- maybeTrackState = .loop
- } else if let _ = item.item.outro {
- maybeTrackState = .outro
- } else {
- maybeTrackState = nil
- }
- if item.trackState != maybeTrackState {
- item.trackState = maybeTrackState
- item.startTime = timestamp
- startTime = timestamp
+ state.startTime = startTime
}
- guard let trackState = maybeTrackState else {
- self.items.removeFirst()
- return
- }
+ let fps = state.fps
+ let frameRange = state.item.frames
- var fps = item.fps
+ let duration: Double = 0.3
+ var t = (timestamp - startTime) / duration
+ t = max(0.0, t)
+ t = min(1.0, t)
+ let frameOffset = Int(Double(frameRange.startFrame) * (1.0 - t) + Double(frameRange.startFrame) * t)
+ let lowerBound = min(frameRange.startFrame, state.frameCount - 1)
+ let upperBound = min(frameRange.endFrame, state.frameCount - 1)
+ let frameIndex = max(lowerBound, min(upperBound, frameOffset))
- let track: ManagedAnimationTrack
- switch trackState {
- case .intro:
- track = item.item.intro!
- case .loop:
- track = item.item.loop!
- if self.items.count > 1 {
- //fps *= 2.0
- }
- case .outro:
- track = item.item.outro!
- }
-
- let frameIndex: Int
- if let (startFrame, endFrame) = item.trackingFrameState {
- let duration: Double = 0.3
- var t = (timestamp - startTime) / duration
- t = max(0.0, t)
- t = min(1.0, t)
- let frameOffset = Int(Double(startFrame) * (1.0 - t) + Double(endFrame) * t)
- let lowerBound = min(track.frameRange.lowerBound, item.frameCount - 1)
- let upperBound = min(track.frameRange.upperBound, item.frameCount)
- frameIndex = max(lowerBound, min(upperBound, frameOffset))
- } else {
- let frameOffset = Int((timestamp - startTime) * fps)
- let lowerBound = min(track.frameRange.lowerBound, item.frameCount - 1)
- let upperBound = min(track.frameRange.upperBound, item.frameCount)
- if frameOffset >= upperBound - lowerBound {
- switch trackState {
- case .intro:
- if let _ = item.item.loop {
- item.trackState = .loop
- item.startTime = timestamp
- return
- } else if let _ = item.item.outro {
- item.trackState = .outro
- item.startTime = timestamp
- return
- } else {
- self.items.removeFirst()
- return
- }
- case .loop:
- if self.items.count > 1 {
- if let _ = item.item.outro {
- item.trackState = .outro
- item.startTime = timestamp
- } else {
- self.items.removeFirst()
- }
- return
- } else {
- item.startTime = timestamp
- frameIndex = lowerBound
- }
- case .outro:
- self.items.removeFirst()
- return
- }
- } else {
- frameIndex = lowerBound + frameOffset % (upperBound - lowerBound)
- }
- }
-
- if item.frameIndex != frameIndex {
- item.frameIndex = frameIndex
- if let image = item.draw() {
+ if state.frameIndex != frameIndex {
+ state.frameIndex = frameIndex
+ if let image = state.draw() {
self.imageNode.image = image
}
}
}
- func switchTo(_ item: ManagedAnimationItem, noOutro: Bool = false) {
- if let state = ManagedAnimationState(item: item) {
- if let last = self.items.last {
- if last.item.name == item.name {
- return
- }
- }
- if let first = self.items.first {
- if noOutro {
- first.item.outro = nil
- }
- }
- self.items.append(state)
- self.updateAnimation()
+ func trackTo(item: ManagedAnimationItem, frameIndex: Int) {
+ if let state = self.state, state.item.name == item.name {
+ self.state = ManagedAnimationState(displaySize: self.intrinsicSize, item: item, current: state)
+ } else {
+ self.state = ManagedAnimationState(displaySize: self.intrinsicSize, item: item, current: nil)
}
+ self.updateAnimation()
+ }
+}
+
+enum ManagedMonkeyAnimationState: Equatable {
+ case idle
+ case eyesClosed
+ case peeking
+ case tracking(CGFloat)
+}
+
+/*private let animationIdle = ManagedAnimationItem(name: "TwoFactorSetupMonkeyIdle",
+ intro: nil,
+ loop: ManagedAnimationTrack(frameRange: 0 ..< 1),
+ outro: nil
+)
+
+ private let animationIdle = ManagedAnimationItem(name: "TwoFactorSetupMonkeyIdle",
+ intro: nil,
+ loop: ManagedAnimationTrack(frameRange: 0 ..< 1),
+ outro: nil
+ )
+
+ private let animationTracking = ManagedAnimationItem(name: "TwoFactorSetupMonkeyTracking",
+ intro: nil,
+ loop: ManagedAnimationTrack(frameRange: 0 ..< Int.max),
+ outro: nil
+ )
+
+ private let animationHide = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
+ intro: ManagedAnimationTrack(frameRange: 0 ..< 41),
+ loop: ManagedAnimationTrack(frameRange: 40 ..< 41),
+ outro: ManagedAnimationTrack(frameRange: 60 ..< 99)
+ )
+
+ private let animationHideNoOutro = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
+ intro: ManagedAnimationTrack(frameRange: 0 ..< 41),
+ loop: ManagedAnimationTrack(frameRange: 40 ..< 41),
+ outro: nil
+ )
+
+ private let animationHideNoIntro = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
+ intro: nil,
+ loop: ManagedAnimationTrack(frameRange: 40 ..< 41),
+ outro: ManagedAnimationTrack(frameRange: 60 ..< 99)
+ )
+
+ private let animationHideOutro = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
+ intro: nil,
+ loop: nil,
+ outro: ManagedAnimationTrack(frameRange: 60 ..< 99)
+ )
+
+ private let animationPeek = ManagedAnimationItem(name: "TwoFactorSetupMonkeyPeek",
+ intro: ManagedAnimationTrack(frameRange: 0 ..< 14),
+ loop: ManagedAnimationTrack(frameRange: 13 ..< 14),
+ outro: ManagedAnimationTrack(frameRange: 14 ..< 34)
+ )
+
+ private let animationMail = ManagedAnimationItem(name: "TwoFactorSetupMail",
+ intro: ManagedAnimationTrack(frameRange: 0 ..< Int.max),
+ loop: ManagedAnimationTrack(frameRange: Int.max - 1 ..< Int.max),
+ outro: nil
+ )
+
+ private let animationHint = ManagedAnimationItem(name: "TwoFactorSetupHint",
+ intro: ManagedAnimationTrack(frameRange: 0 ..< Int.max),
+ loop: ManagedAnimationTrack(frameRange: Int.max - 1 ..< Int.max),
+ outro: nil
+ )*/
+
+final class ManagedMonkeyAnimationNode: ManagedAnimationNode {
+ private var state: ManagedMonkeyAnimationState = .idle
+
+ init() {
+ super.init(size: CGSize(width: 136.0, height: 136.0))
+
+ self.trackTo(item: ManagedAnimationItem(name: "TwoFactorSetupMonkeyIdle", frames: ManagedAnimationFrameRange(startFrame: 0, endFrame: 0)), frameIndex: 0)
}
- func trackTo(frameIndex: Int) {
- if let first = self.items.first {
- first.startTime = CACurrentMediaTime()
- first.trackingFrameState = (first.frameIndex ?? 0, frameIndex)
- self.updateAnimation()
+ func setState(_ state: ManagedMonkeyAnimationState) {
+ let previousState = self.state
+ self.state = state
+
+ switch previousState {
+ case .idle:
+ switch state {
+ case .idle:
+ break
+ case .eyesClosed:
+ break
+ case .peeking:
+ break
+ case let .tracking(value):
+ break
+ }
+ case .eyesClosed:
+ switch state {
+ case .idle:
+ break
+ case .eyesClosed:
+ break
+ case .peeking:
+ break
+ case let .tracking(value):
+ break
+ }
+ case .peeking:
+ switch state {
+ case .idle:
+ break
+ case .eyesClosed:
+ break
+ case .peeking:
+ break
+ case let .tracking(value):
+ break
+ }
+ case let .tracking(previousValue):
+ switch state {
+ case .idle:
+ break
+ case .eyesClosed:
+ break
+ case .peeking:
+ break
+ case let .tracking(value):
+ break
+ }
}
}
}
diff --git a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
index 8ed95ba5c8..98b8278fa4 100644
--- a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
+++ b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
@@ -10,76 +10,28 @@ import AccountContext
import TelegramPresentationData
import PresentationDataUtils
import TelegramCore
+import AnimatedStickerNode
public enum TwoFactorDataInputMode {
case password
- case emailAddress(password: String)
- case emailConfirmation(password: String?, emailPattern: String)
+ case emailAddress(password: String, hint: String)
+ case updateEmailAddress(password: String)
+ case emailConfirmation(passwordAndHint: (String, String)?, emailPattern: String, codeLength: Int?)
case passwordHint(password: String)
}
-private let animationIdle = ManagedAnimationItem(name: "TwoFactorSetupMonkeyIdle",
- intro: nil,
- loop: ManagedAnimationTrack(frameRange: 0 ..< 1),
- outro: nil
-)
-private let animationTracking = ManagedAnimationItem(name: "TwoFactorSetupMonkeyTracking",
- intro: nil,
- loop: ManagedAnimationTrack(frameRange: 0 ..< Int.max),
- outro: nil
-)
-
-private let animationHide = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
- intro: ManagedAnimationTrack(frameRange: 0 ..< 41),
- loop: ManagedAnimationTrack(frameRange: 40 ..< 41),
- outro: ManagedAnimationTrack(frameRange: 60 ..< 99)
-)
-
-private let animationHideNoOutro = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
- intro: ManagedAnimationTrack(frameRange: 0 ..< 41),
- loop: ManagedAnimationTrack(frameRange: 40 ..< 41),
- outro: nil
-)
-
-private let animationHideNoIntro = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
- intro: nil,
- loop: ManagedAnimationTrack(frameRange: 40 ..< 41),
- outro: ManagedAnimationTrack(frameRange: 60 ..< 99)
-)
-
-private let animationHideOutro = ManagedAnimationItem(name: "TwoFactorSetupMonkeyClose",
- intro: nil,
- loop: nil,
- outro: ManagedAnimationTrack(frameRange: 60 ..< 99)
-)
-
-private let animationPeek = ManagedAnimationItem(name: "TwoFactorSetupMonkeyPeek",
- intro: ManagedAnimationTrack(frameRange: 0 ..< 14),
- loop: ManagedAnimationTrack(frameRange: 13 ..< 14),
- outro: ManagedAnimationTrack(frameRange: 14 ..< 34)
-)
-
-private let animationMail = ManagedAnimationItem(name: "TwoFactorSetupMail",
- intro: ManagedAnimationTrack(frameRange: 0 ..< Int.max),
- loop: ManagedAnimationTrack(frameRange: Int.max - 1 ..< Int.max),
- outro: nil
-)
-
-private let animationHint = ManagedAnimationItem(name: "TwoFactorSetupHint",
- intro: ManagedAnimationTrack(frameRange: 0 ..< Int.max),
- loop: ManagedAnimationTrack(frameRange: Int.max - 1 ..< Int.max),
- outro: nil
-)
public final class TwoFactorDataInputScreen: ViewController {
private let context: AccountContext
private var presentationData: PresentationData
private let mode: TwoFactorDataInputMode
+ private let stateUpdated: (SetupTwoStepVerificationStateUpdate) -> Void
- public init(context: AccountContext, mode: TwoFactorDataInputMode) {
+ public init(context: AccountContext, mode: TwoFactorDataInputMode, stateUpdated: @escaping (SetupTwoStepVerificationStateUpdate) -> Void) {
self.context = context
self.mode = mode
+ self.stateUpdated = stateUpdated
self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -131,14 +83,82 @@ public final class TwoFactorDataInputScreen: ViewController {
if controller is TwoFactorAuthSplashScreen {
return false
}
- if controller is TwoFactorDataInputScreen {
+ if controller is TwoFactorDataInputScreen && controller !== strongSelf {
return false
}
return true
}
- controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .passwordHint(password: values[0])))
+ controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .passwordHint(password: values[0]), stateUpdated: strongSelf.stateUpdated))
navigationController.setViewControllers(controllers, animated: true)
- case let .emailAddress(password):
+ case let .emailAddress(password, hint):
+ guard let text = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !text.isEmpty else {
+ return
+ }
+ let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
+ strongSelf.present(statusController, in: .window(.root))
+
+ let _ = (updateTwoStepVerificationPassword(network: strongSelf.context.account.network, currentPassword: "", updatedPassword: .password(password: password, hint: hint, email: text))
+ |> deliverOnMainQueue).start(next: { [weak statusController] result in
+ statusController?.dismiss()
+
+ guard let strongSelf = self else {
+ return
+ }
+
+ switch result {
+ case .none:
+ break
+ case let .password(_, pendingEmail):
+ if let pendingEmail = pendingEmail {
+ guard let navigationController = strongSelf.navigationController as? NavigationController else {
+ return
+ }
+ var controllers = navigationController.viewControllers.filter { controller in
+ if controller is TwoFactorAuthSplashScreen {
+ return false
+ }
+ if controller is TwoFactorDataInputScreen {
+ return false
+ }
+ return true
+ }
+ controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailConfirmation(passwordAndHint: (password, hint), emailPattern: text, codeLength: pendingEmail.codeLength.flatMap(Int.init)), stateUpdated: strongSelf.stateUpdated))
+ navigationController.setViewControllers(controllers, animated: true)
+ } else {
+ guard let navigationController = strongSelf.navigationController as? NavigationController else {
+ return
+ }
+ var controllers = navigationController.viewControllers.filter { controller in
+ if controller is TwoFactorAuthSplashScreen {
+ return false
+ }
+ if controller is TwoFactorDataInputScreen {
+ return false
+ }
+ return true
+ }
+ controllers.append(TwoFactorAuthSplashScreen(context: strongSelf.context, mode: .done))
+ navigationController.setViewControllers(controllers, animated: true)
+ }
+ }
+ }, error: { [weak statusController] error in
+ statusController?.dismiss()
+
+ guard let strongSelf = self else {
+ return
+ }
+
+ let presentationData = strongSelf.presentationData
+ let alertText: String
+ switch error {
+ case .generic:
+ alertText = presentationData.strings.Login_UnknownError
+ case .invalidEmail:
+ alertText = presentationData.strings.TwoStepAuth_EmailInvalid
+ }
+ strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+ })
+ case let .updateEmailAddress(password):
guard let text = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !text.isEmpty else {
return
}
@@ -156,7 +176,7 @@ public final class TwoFactorDataInputScreen: ViewController {
switch result {
case .none:
break
- case let .password(password, pendingEmail):
+ case let .password(_, pendingEmail):
if let pendingEmail = pendingEmail {
guard let navigationController = strongSelf.navigationController as? NavigationController else {
return
@@ -170,7 +190,7 @@ public final class TwoFactorDataInputScreen: ViewController {
}
return true
}
- controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailConfirmation(password: password, emailPattern: text)))
+ controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailConfirmation(passwordAndHint: (password, ""), emailPattern: text, codeLength: pendingEmail.codeLength.flatMap(Int.init)), stateUpdated: strongSelf.stateUpdated))
navigationController.setViewControllers(controllers, animated: true)
} else {
guard let navigationController = strongSelf.navigationController as? NavigationController else {
@@ -263,38 +283,71 @@ public final class TwoFactorDataInputScreen: ViewController {
return
}
- strongSelf.setPassword(password: password, hint: value)
+ strongSelf.push(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password, hint: value), stateUpdated: strongSelf.stateUpdated))
}
}, skipAction: { [weak self] in
guard let strongSelf = self else {
return
}
switch strongSelf.mode {
- case .emailAddress:
+ case let .emailAddress(password, hint):
strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: strongSelf.presentationData.theme), title: strongSelf.presentationData.strings.TwoFactorSetup_Email_SkipConfirmationTitle, text: strongSelf.presentationData.strings.TwoFactorSetup_Email_SkipConfirmationText, actions: [
TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.TwoFactorSetup_Email_SkipConfirmationSkip, action: {
guard let strongSelf = self else {
return
}
- guard let navigationController = strongSelf.navigationController as? NavigationController else {
- return
- }
- var controllers = navigationController.viewControllers.filter { controller in
- if controller is TwoFactorAuthSplashScreen {
- return false
+ let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
+ strongSelf.present(statusController, in: .window(.root))
+
+ let _ = (updateTwoStepVerificationPassword(network: strongSelf.context.account.network, currentPassword: "", updatedPassword: .password(password: password, hint: hint, email: nil))
+ |> deliverOnMainQueue).start(next: { [weak statusController] result in
+ statusController?.dismiss()
+
+ guard let strongSelf = self else {
+ return
}
- if controller is TwoFactorDataInputScreen {
- return false
+
+ switch result {
+ case .none:
+ break
+ case .password:
+ guard let navigationController = strongSelf.navigationController as? NavigationController else {
+ return
+ }
+ var controllers = navigationController.viewControllers.filter { controller in
+ if controller is TwoFactorAuthSplashScreen {
+ return false
+ }
+ if controller is TwoFactorDataInputScreen {
+ return false
+ }
+ return true
+ }
+ controllers.append(TwoFactorAuthSplashScreen(context: strongSelf.context, mode: .done))
+ navigationController.setViewControllers(controllers, animated: true)
}
- return true
- }
- controllers.append(TwoFactorAuthSplashScreen(context: strongSelf.context, mode: .done))
- navigationController.setViewControllers(controllers, animated: true)
+ }, error: { [weak statusController] error in
+ statusController?.dismiss()
+
+ guard let strongSelf = self else {
+ return
+ }
+
+ let presentationData = strongSelf.presentationData
+ let alertText: String
+ switch error {
+ case .generic:
+ alertText = presentationData.strings.Login_UnknownError
+ case .invalidEmail:
+ alertText = presentationData.strings.TwoStepAuth_EmailInvalid
+ }
+ strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+ })
}),
TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {})
]), in: .window(.root))
case let .passwordHint(password):
- strongSelf.setPassword(password: password, hint: "")
+ strongSelf.push(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password, hint: ""), stateUpdated: strongSelf.stateUpdated))
default:
break
}
@@ -303,8 +356,8 @@ public final class TwoFactorDataInputScreen: ViewController {
return
}
switch strongSelf.mode {
- case let .emailConfirmation(password, _):
- if let password = password {
+ case let .emailConfirmation(passwordAndHint, _, _):
+ if let (password, hint) = passwordAndHint {
guard let navigationController = strongSelf.navigationController as? NavigationController else {
return
}
@@ -317,7 +370,7 @@ public final class TwoFactorDataInputScreen: ViewController {
}
return true
}
- controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password)))
+ controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password, hint: hint), stateUpdated: strongSelf.stateUpdated))
navigationController.setViewControllers(controllers, animated: true)
} else {
}
@@ -356,41 +409,6 @@ public final class TwoFactorDataInputScreen: ViewController {
self.displayNodeDidLoad()
}
- private func setPassword(password: String, hint: String) {
- let statusController = OverlayStatusController(theme: self.presentationData.theme, type: .loading(cancelled: nil))
- self.present(statusController, in: .window(.root))
-
- let _ = (updateTwoStepVerificationPassword(network: self.context.account.network, currentPassword: nil, updatedPassword: .password(password: password, hint: hint, email: nil))
- |> deliverOnMainQueue).start(next: { [weak self, weak statusController] _ in
- statusController?.dismiss()
-
- guard let strongSelf = self else {
- return
- }
-
- guard let navigationController = strongSelf.navigationController as? NavigationController else {
- return
- }
- var controllers = navigationController.viewControllers.filter { controller in
- if controller is TwoFactorAuthSplashScreen {
- return false
- }
- if controller is TwoFactorDataInputScreen {
- return false
- }
- return true
- }
- controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password)))
- navigationController.setViewControllers(controllers, animated: true)
- }, error: { [weak self, weak statusController] _ in
- statusController?.dismiss()
-
- guard let strongSelf = self else {
- return
- }
- })
- }
-
override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
super.containerLayoutUpdated(layout, transition: transition)
@@ -612,7 +630,8 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
private let navigationBackgroundNode: ASDisplayNode
private let navigationSeparatorNode: ASDisplayNode
private let scrollNode: ASScrollNode
- private let animationNode: ManagedAnimationNode
+ private var animatedStickerNode: AnimatedStickerNode?
+ private var monkeyNode: ManagedMonkeyAnimationNode?
private let titleNode: ImmediateTextNode
private let textNode: ImmediateTextNode
private let skipActionTitleNode: ImmediateTextNode
@@ -647,7 +666,24 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
self.scrollNode = ASScrollNode()
self.scrollNode.canCancelAllTouchesInViews = true
- self.animationNode = ManagedAnimationNode(size: CGSize(width: 136.0, height: 136.0))
+ switch mode {
+ case .password, .emailAddress, .updateEmailAddress:
+ self.monkeyNode = ManagedMonkeyAnimationNode()
+ case .emailConfirmation:
+ if let path = getAppBundle().path(forResource: "TwoFactorSetupMail", ofType: "tgs") {
+ let animatedStickerNode = AnimatedStickerNode()
+ animatedStickerNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 272, height: 272, playbackMode: .once, mode: .direct)
+ animatedStickerNode.visibility = true
+ self.animatedStickerNode = animatedStickerNode
+ }
+ case .passwordHint:
+ if let path = getAppBundle().path(forResource: "TwoFactorSetupHint", ofType: "tgs") {
+ let animatedStickerNode = AnimatedStickerNode()
+ animatedStickerNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 272, height: 272, playbackMode: .once, mode: .direct)
+ animatedStickerNode.visibility = true
+ self.animatedStickerNode = animatedStickerNode
+ }
+ }
let title: String
let text: NSAttributedString
@@ -664,8 +700,6 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
switch mode {
case .password:
- self.animationNode.switchTo(animationIdle)
-
title = presentationData.strings.TwoFactorSetup_Password_Title
text = NSAttributedString(string: "", font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
buttonText = presentationData.strings.TwoFactorSetup_Password_Action
@@ -692,9 +726,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
toggleTextHidden?(node)
})
]
- case .emailAddress:
- self.animationNode.switchTo(animationTracking)
-
+ case .emailAddress, .updateEmailAddress:
title = presentationData.strings.TwoFactorSetup_Email_Title
text = NSAttributedString(string: presentationData.strings.TwoFactorSetup_Email_Text, font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
buttonText = presentationData.strings.TwoFactorSetup_Email_Action
@@ -712,9 +744,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
toggleTextHidden?(node)
}),
]
- case let .emailConfirmation(_, emailPattern):
- self.animationNode.switchTo(animationMail)
-
+ case let .emailConfirmation(_, emailPattern, _):
title = presentationData.strings.TwoFactorSetup_EmailVerification_Title
let (rawText, ranges) = presentationData.strings.TwoFactorSetup_EmailVerification_Text(emailPattern)
@@ -742,8 +772,6 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
}),
]
case .passwordHint:
- self.animationNode.switchTo(animationHint)
-
title = presentationData.strings.TwoFactorSetup_Hint_Title
text = NSAttributedString(string: presentationData.strings.TwoFactorSetup_Hint_Text, font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
@@ -812,7 +840,8 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
self.addSubnode(self.scrollNode)
- self.scrollNode.addSubnode(self.animationNode)
+ self.animatedStickerNode.flatMap(self.scrollNode.addSubnode)
+ self.monkeyNode.flatMap(self.scrollNode.addSubnode)
self.scrollNode.addSubnode(self.titleNode)
self.scrollNode.addSubnode(self.textNode)
self.scrollNode.addSubnode(self.skipActionTitleNode)
@@ -880,7 +909,13 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
guard let strongSelf = self else {
return
}
-
+ if let index = strongSelf.inputNodes.index(where: { $0 === node }) {
+ if index == strongSelf.inputNodes.count - 1 {
+ strongSelf.action()
+ } else if strongSelf.buttonNode.isUserInteractionEnabled {
+ strongSelf.inputNodes[index + 1].focus()
+ }
+ }
}
focused = { [weak self] node in
DispatchQueue.main.async {
@@ -895,7 +930,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
return
}
let hasText = strongSelf.inputNodes.contains(where: { !$0.text.isEmpty })
- switch strongSelf.mode {
+ /*switch strongSelf.mode {
case .password:
if !hasText {
if strongSelf.animationNode.currentItemName == animationPeek.name {
@@ -942,25 +977,30 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
}
default:
break
- }
+ }*/
}
updated = { [weak self] _ in
guard let strongSelf = self else {
return
}
switch strongSelf.mode {
- case .emailAddress:
+ case .emailAddress, .updateEmailAddress:
let hasText = strongSelf.inputNodes.contains(where: { !$0.text.isEmpty })
strongSelf.buttonNode.isHidden = !hasText
strongSelf.skipActionTitleNode.isHidden = hasText
strongSelf.skipActionButtonNode.isHidden = hasText
- case .emailConfirmation:
- let hasText = strongSelf.inputNodes.contains(where: { !$0.text.isEmpty })
+ case let .emailConfirmation(_, _, codeLength):
+ let text = strongSelf.inputNodes[0].text
+ let hasText = !text.isEmpty
strongSelf.buttonNode.isHidden = !hasText
strongSelf.changeEmailActionTitleNode.isHidden = hasText
strongSelf.changeEmailActionButtonNode.isHidden = hasText
strongSelf.resendCodeActionTitleNode.isHidden = hasText
strongSelf.resendCodeActionButtonNode.isHidden = hasText
+
+ if let codeLength = codeLength, text.count == codeLength {
+ action()
+ }
case .passwordHint:
let hasText = strongSelf.inputNodes.contains(where: { !$0.text.isEmpty })
strongSelf.buttonNode.isHidden = !hasText
@@ -1041,7 +1081,14 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: contentAreaSize))
- let iconSize: CGSize = self.animationNode.intrinsicSize
+ let iconSize: CGSize
+ if let animatedStickerNode = self.animatedStickerNode {
+ iconSize = CGSize(width: 136.0, height: 136.0)
+ } else if let monkeyNode = self.monkeyNode {
+ iconSize = monkeyNode.intrinsicSize
+ } else {
+ iconSize = CGSize(width: 100.0, height: 100.0)
+ }
let titleSize = self.titleNode.updateLayout(CGSize(width: contentAreaSize.width - sideInset * 2.0, height: contentAreaSize.height))
let textSize = self.textNode.updateLayout(CGSize(width: contentAreaSize.width - sideInset * 2.0, height: contentAreaSize.height))
@@ -1070,7 +1117,11 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
let contentVerticalOrigin = max(layout.statusBarHeight ?? 0.0, floor((areaHeight - calculatedContentHeight) / 2.0))
let iconFrame = CGRect(origin: CGPoint(x: floor((contentAreaSize.width - iconSize.width) / 2.0), y: contentVerticalOrigin), size: iconSize)
- transition.updateFrame(node: self.animationNode, frame: iconFrame)
+ if let animatedStickerNode = self.animatedStickerNode {
+ transition.updateFrame(node: animatedStickerNode, frame: iconFrame)
+ } else if let monkeyNode = self.monkeyNode {
+ transition.updateFrame(node: monkeyNode, frame: iconFrame)
+ }
let titleFrame = CGRect(origin: CGPoint(x: floor((contentAreaSize.width - titleSize.width) / 2.0), y: iconFrame.maxY + iconSpacing), size: titleSize)
transition.updateFrameAdditive(node: self.titleNode, frame: titleFrame)
let textFrame: CGRect
diff --git a/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift b/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift
index bcffb2adaf..bb5ad1f340 100644
--- a/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift
+++ b/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift
@@ -54,7 +54,8 @@ public final class TwoFactorAuthSplashScreen: ViewController {
}
switch strongSelf.mode {
case .intro:
- strongSelf.push(TwoFactorDataInputScreen(context: strongSelf.context, mode: .password))
+ strongSelf.push(TwoFactorDataInputScreen(context: strongSelf.context, mode: .password, stateUpdated: { _ in
+ }))
case .done:
guard let navigationController = strongSelf.navigationController as? NavigationController else {
return
diff --git a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
index 0d974f8504..5affbc7b42 100644
--- a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
@@ -20,6 +20,7 @@ private let rankMaxLength: Int32 = 16
private final class ChannelAdminControllerArguments {
let account: Account
let toggleRight: (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void
+ let toggleRightWhileDisabled: (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void
let transferOwnership: () -> Void
let updateRank: (String, String) -> Void
let updateFocusedOnRank: (Bool) -> Void
@@ -27,9 +28,10 @@ private final class ChannelAdminControllerArguments {
let dismissInput: () -> Void
let animateError: () -> Void
- init(account: Account, toggleRight: @escaping (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void, transferOwnership: @escaping () -> Void, updateRank: @escaping (String, String) -> Void, updateFocusedOnRank: @escaping (Bool) -> Void, dismissAdmin: @escaping () -> Void, dismissInput: @escaping () -> Void, animateError: @escaping () -> Void) {
+ init(account: Account, toggleRight: @escaping (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void, toggleRightWhileDisabled: @escaping (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void, transferOwnership: @escaping () -> Void, updateRank: @escaping (String, String) -> Void, updateFocusedOnRank: @escaping (Bool) -> Void, dismissAdmin: @escaping () -> Void, dismissInput: @escaping () -> Void, animateError: @escaping () -> Void) {
self.account = account
self.toggleRight = toggleRight
+ self.toggleRightWhileDisabled = toggleRightWhileDisabled
self.transferOwnership = transferOwnership
self.updateRank = updateRank
self.updateFocusedOnRank = updateFocusedOnRank
@@ -397,6 +399,8 @@ private enum ChannelAdminEntry: ItemListNodeEntry {
case let .rightItem(theme, _, text, right, flags, value, enabled):
return ItemListSwitchItem(theme: theme, title: text, value: value, type: .icon, enabled: enabled, sectionId: self.section, style: .blocks, updated: { _ in
arguments.toggleRight(right, flags)
+ }, activatedWhileDisabled: {
+ arguments.toggleRightWhileDisabled(right, flags)
})
case let .addAdminsInfo(theme, text):
return ItemListTextItem(theme: theme, text: .plain(text), sectionId: self.section)
@@ -510,8 +514,8 @@ private func rightDependencies(_ right: TelegramChatAdminRightsFlags) -> [Telegr
}
}
-private func canEditAdminRights(accountPeerId: PeerId, channelView: PeerView, initialParticipant: ChannelParticipant?) -> Bool {
- if let channel = channelView.peers[channelView.peerId] as? TelegramChannel {
+private func canEditAdminRights(accountPeerId: PeerId, channelPeer: Peer, initialParticipant: ChannelParticipant?) -> Bool {
+ if let channel = channelPeer as? TelegramChannel {
if channel.flags.contains(.isCreator) {
return true
} else if let initialParticipant = initialParticipant {
@@ -528,7 +532,7 @@ private func canEditAdminRights(accountPeerId: PeerId, channelView: PeerView, in
} else {
return channel.hasPermission(.addAdmins)
}
- } else if let group = channelView.peers[channelView.peerId] as? TelegramGroup {
+ } else if let group = channelPeer as? TelegramGroup {
if case .creator = group.role {
return true
} else {
@@ -539,6 +543,23 @@ private func canEditAdminRights(accountPeerId: PeerId, channelView: PeerView, in
}
}
+private func rightEnabledByDefault(channelPeer: Peer, right: TelegramChatAdminRightsFlags) -> Bool {
+ if let channel = channelPeer as? TelegramChannel {
+ guard let defaultBannedRights = channel.defaultBannedRights else {
+ return false
+ }
+ switch right {
+ case .canPinMessages:
+ return !defaultBannedRights.flags.contains(.banPinMessages)
+ case .canChangeInfo:
+ return !defaultBannedRights.flags.contains(.banChangeInfo)
+ default:
+ break
+ }
+ }
+ return false
+}
+
private func areAllAdminRightsEnabled(_ flags: TelegramChatAdminRightsFlags, group: Bool) -> Bool {
if group {
return TelegramChatAdminRightsFlags.groupSpecific.intersection(flags) == TelegramChatAdminRightsFlags.groupSpecific
@@ -594,7 +615,7 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
} else {
entries.append(.rightsTitle(presentationData.theme, presentationData.strings.Channel_EditAdmin_PermissionsHeader))
- if canEditAdminRights(accountPeerId: accountPeerId, channelView: channelView, initialParticipant: initialParticipant) {
+ if let channelPeer = channelView.peers[channelView.peerId], canEditAdminRights(accountPeerId: accountPeerId, channelPeer: channelPeer, initialParticipant: initialParticipant) {
let accountUserRightsFlags: TelegramChatAdminRightsFlags
if channel.flags.contains(.isCreator) {
accountUserRightsFlags = maskRightsFlags
@@ -616,7 +637,7 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
var index = 0
for right in rightsOrder {
if accountUserRightsFlags.contains(right) {
- entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: channel.defaultBannedRights), right, currentRightsFlags, currentRightsFlags.contains(right), !state.updating && admin.id != accountPeerId))
+ entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: channel.defaultBannedRights), right, currentRightsFlags, currentRightsFlags.contains(right), !state.updating && admin.id != accountPeerId && !rightEnabledByDefault(channelPeer: channel, right: right)))
index += 1
}
}
@@ -789,6 +810,27 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
}
return current.withUpdatedUpdatedFlags(updated)
}
+ }, toggleRightWhileDisabled: { right, _ in
+ let _ = (context.account.postbox.transaction { transaction -> (peer: Peer?, member: Peer?) in
+ return (peer: transaction.getPeer(peerId), member: transaction.getPeer(adminId))
+ }
+ |> deliverOnMainQueue).start(next: { peer, member in
+ guard let peer = peer, let _ = member as? TelegramUser else {
+ return
+ }
+ let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+
+ let text: String
+ if !canEditAdminRights(accountPeerId: context.account.peerId, channelPeer: peer, initialParticipant: initialParticipant) {
+ text = presentationData.strings.Channel_EditAdmin_CannotEdit
+ } else if rightEnabledByDefault(channelPeer: peer, right: right) {
+ text = presentationData.strings.Channel_EditAdmin_PermissionEnabledByDefault
+ } else {
+ text = presentationData.strings.Channel_EditAdmin_CannotEdit
+ }
+
+ presentControllerImpl?(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: presentationData.theme), title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+ })
}, transferOwnership: {
let _ = (context.account.postbox.transaction { transaction -> (peer: Peer?, member: Peer?) in
return (peer: transaction.getPeer(peerId), member: transaction.getPeer(adminId))
@@ -869,7 +911,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
|> map { presentationData, state, combinedView -> (ItemListControllerState, (ItemListNodeState, Any)) in
let channelView = combinedView.views[.peer(peerId: peerId, components: .all)] as! PeerView
let adminView = combinedView.views[.peer(peerId: adminId, components: .all)] as! PeerView
- let canEdit = canEditAdminRights(accountPeerId: context.account.peerId, channelView: channelView, initialParticipant: initialParticipant)
+ let canEdit = canEditAdminRights(accountPeerId: context.account.peerId, channelPeer: channelView.peers[channelView.peerId]!, initialParticipant: initialParticipant)
let leftNavigationButton: ItemListNavigationButton
if canEdit {
diff --git a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift
index 64c4f16894..8dd8d0e148 100644
--- a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift
@@ -18,16 +18,16 @@ import ItemListAvatarAndNameInfoItem
private final class ChannelBannedMemberControllerArguments {
let account: Account
let toggleRight: (TelegramChatBannedRightsFlags, Bool) -> Void
+ let toggleRightWhileDisabled: (TelegramChatBannedRightsFlags) -> Void
let openTimeout: () -> Void
let delete: () -> Void
- let notifyPermissionGloballyDisabled: () -> Void
- init(account: Account, toggleRight: @escaping (TelegramChatBannedRightsFlags, Bool) -> Void, openTimeout: @escaping () -> Void, delete: @escaping () -> Void, notifyPermissionGloballyDisabled: @escaping () -> Void) {
+ init(account: Account, toggleRight: @escaping (TelegramChatBannedRightsFlags, Bool) -> Void, toggleRightWhileDisabled: @escaping (TelegramChatBannedRightsFlags) -> Void, openTimeout: @escaping () -> Void, delete: @escaping () -> Void) {
self.account = account
self.toggleRight = toggleRight
+ self.toggleRightWhileDisabled = toggleRightWhileDisabled
self.openTimeout = openTimeout
self.delete = delete
- self.notifyPermissionGloballyDisabled = notifyPermissionGloballyDisabled
}
}
@@ -231,12 +231,10 @@ private enum ChannelBannedMemberEntry: ItemListNodeEntry {
case let .rightsHeader(theme, text):
return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
case let .rightItem(theme, _, text, right, value, enabled):
- return ItemListSwitchItem(theme: theme, title: text, value: value, type: .icon, enableInteractiveChanges: enabled, enabled: true, sectionId: self.section, style: .blocks, updated: { value in
- if enabled {
- arguments.toggleRight(right, value)
- } else {
- arguments.notifyPermissionGloballyDisabled()
- }
+ return ItemListSwitchItem(theme: theme, title: text, value: value, type: .icon, enableInteractiveChanges: enabled, enabled: enabled, sectionId: self.section, style: .blocks, updated: { value in
+ arguments.toggleRight(right, value)
+ }, activatedWhileDisabled: {
+ arguments.toggleRightWhileDisabled(right)
})
case let .timeout(theme, text, value):
return ItemListDisclosureItem(theme: theme, title: text, label: value, sectionId: self.section, style: .blocks, action: {
@@ -314,8 +312,8 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation
entries.append(.rightsHeader(presentationData.theme, presentationData.strings.GroupPermission_SectionTitle))
var index = 0
- for right in allGroupPermissionList {
- let defaultEnabled = !defaultBannedRights.flags.contains(right)
+ for (right, _) in allGroupPermissionList {
+ let defaultEnabled = !defaultBannedRights.flags.contains(right) && channel.hasPermission(.banMembers)
entries.append(.rightItem(presentationData.theme, index, stringForGroupPermission(strings: presentationData.strings, right: right), right, defaultEnabled && !currentRightsFlags.contains(right), defaultEnabled && !state.updating))
index += 1
}
@@ -360,7 +358,7 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation
entries.append(.rightsHeader(presentationData.theme, presentationData.strings.GroupPermission_SectionTitle))
var index = 0
- for right in allGroupPermissionList {
+ for (right, _) in allGroupPermissionList {
let defaultEnabled = !defaultBannedRightsFlags.contains(right)
entries.append(.rightItem(presentationData.theme, index, stringForGroupPermission(strings: presentationData.strings, right: right), right, defaultEnabled && !currentRightsFlags.contains(right), defaultEnabled && !state.updating))
index += 1
@@ -428,7 +426,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI
effectiveRightsFlags = effectiveRightsFlags.subtracting(groupPermissionDependencies(rights))
} else {
effectiveRightsFlags.insert(rights)
- for right in allGroupPermissionList {
+ for (right, _) in allGroupPermissionList {
if groupPermissionDependencies(right).contains(rights) {
effectiveRightsFlags.insert(right)
}
@@ -438,6 +436,29 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI
return state
}
})
+ }, toggleRightWhileDisabled: { right in
+ let _ = (peerView.get()
+ |> take(1)
+ |> deliverOnMainQueue).start(next: { view in
+ guard let channel = view.peers[view.peerId] as? TelegramChannel else {
+ return
+ }
+ guard let defaultBannedRights = channel.defaultBannedRights else {
+ return
+ }
+ let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+ let text: String
+ if channel.hasPermission(.banMembers) {
+ if defaultBannedRights.flags.contains(right) {
+ text = presentationData.strings.GroupPermission_PermissionDisabledByDefault
+ } else {
+ text = presentationData.strings.GroupPermission_PermissionGloballyDisabled
+ }
+ } else {
+ text = presentationData.strings.GroupPermission_EditingDisabled
+ }
+ presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+ })
}, openTimeout: {
let presentationData = context.sharedContext.currentPresentationData.with { $0 }
let actionSheet = ActionSheetController(presentationTheme: presentationData.theme)
@@ -501,9 +522,6 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI
})
])])
presentControllerImpl?(actionSheet, nil)
- }, notifyPermissionGloballyDisabled: {
- let presentationData = context.sharedContext.currentPresentationData.with { $0 }
- presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.GroupPermission_PermissionGloballyDisabled, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
})
var keys: [PostboxViewKey] = [.peer(peerId: peerId, components: .all), .peer(peerId: memberId, components: .all)]
diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift
index eae78e8b46..6bca722680 100644
--- a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift
@@ -743,7 +743,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod
case let .member(_, _, _, banInfo, _):
if let banInfo = banInfo {
var exceptionsString = ""
- for rights in allGroupPermissionList {
+ for (rights, _) in allGroupPermissionList {
if banInfo.rights.flags.contains(rights) {
if !exceptionsString.isEmpty {
exceptionsString.append(", ")
@@ -1023,7 +1023,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod
case let .member(_, _, _, banInfo, _):
if let banInfo = banInfo {
var exceptionsString = ""
- for rights in allGroupPermissionList {
+ for (rights, _) in allGroupPermissionList {
if banInfo.rights.flags.contains(rights) {
if !exceptionsString.isEmpty {
exceptionsString.append(", ")
diff --git a/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift b/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift
index 3a9dde05fe..00524a94b3 100644
--- a/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift
@@ -228,6 +228,8 @@ private enum ChannelPermissionsEntry: ItemListNodeEntry {
} else {
arguments.presentRestrictedPermissionAlert(rights)
}
+ }, activatedWhileDisabled: {
+ arguments.presentRestrictedPermissionAlert(rights)
})
case let .slowmodeHeader(theme, value):
return ItemListSectionHeaderItem(theme: theme, text: value, sectionId: self.section)
@@ -253,7 +255,7 @@ private enum ChannelPermissionsEntry: ItemListNodeEntry {
case let .member(_, _, _, banInfo, _):
var exceptionsString = ""
if let banInfo = banInfo {
- for rights in allGroupPermissionList {
+ for (rights, _) in allGroupPermissionList {
if !defaultBannedRights.contains(rights) && banInfo.rights.flags.contains(rights) {
if !exceptionsString.isEmpty {
exceptionsString.append(", ")
@@ -333,15 +335,15 @@ func compactStringForGroupPermission(strings: PresentationStrings, right: Telegr
}
}
-let allGroupPermissionList: [TelegramChatBannedRightsFlags] = [
- .banSendMessages,
- .banSendMedia,
- .banSendGifs,
- .banEmbedLinks,
- .banSendPolls,
- .banAddMembers,
- .banPinMessages,
- .banChangeInfo
+let allGroupPermissionList: [(TelegramChatBannedRightsFlags, TelegramChannelPermission)] = [
+ (.banSendMessages, .sendMessages),
+ (.banSendMedia, .sendMessages),
+ (.banSendGifs, .sendMessages),
+ (.banEmbedLinks, .sendMessages),
+ (.banSendPolls, .sendMessages),
+ (.banAddMembers, .inviteMembers),
+ (.banPinMessages, .pinMessages),
+ (.banChangeInfo, .changeInfo)
]
let publicGroupRestrictedPermissions: TelegramChatBannedRightsFlags = [
@@ -402,16 +404,19 @@ private func channelPermissionsControllerEntries(presentationData: PresentationD
entries.append(.permissionsHeader(presentationData.theme, presentationData.strings.GroupInfo_Permissions_SectionTitle))
var rightIndex: Int = 0
- for rights in allGroupPermissionList {
+ for (rights, correspondingAdminRight) in allGroupPermissionList {
var enabled: Bool? = true
if channel.addressName != nil && publicGroupRestrictedPermissions.contains(rights) {
- enabled = nil
+ enabled = false
}
if !channel.hasPermission(.inviteMembers) {
- if rights.contains(TelegramChatBannedRightsFlags.banAddMembers) {
- enabled = nil
+ if rights.contains(.banAddMembers) {
+ enabled = false
}
}
+ if !channel.hasPermission(correspondingAdminRight) {
+ enabled = false
+ }
entries.append(.permission(presentationData.theme, rightIndex, stringForGroupPermission(strings: presentationData.strings, right: rights), !effectiveRightsFlags.contains(rights), rights, enabled))
rightIndex += 1
}
@@ -441,7 +446,7 @@ private func channelPermissionsControllerEntries(presentationData: PresentationD
entries.append(.permissionsHeader(presentationData.theme, presentationData.strings.GroupInfo_Permissions_SectionTitle))
var rightIndex: Int = 0
- for rights in allGroupPermissionList {
+ for (rights, _) in allGroupPermissionList {
entries.append(.permission(presentationData.theme, rightIndex, stringForGroupPermission(strings: presentationData.strings, right: rights), !effectiveRightsFlags.contains(rights), rights, true))
rightIndex += 1
}
@@ -539,7 +544,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
effectiveRightsFlags = effectiveRightsFlags.subtracting(groupPermissionDependencies(rights))
} else {
effectiveRightsFlags.insert(rights)
- for right in allGroupPermissionList {
+ for (right, _) in allGroupPermissionList {
if groupPermissionDependencies(right).contains(rights) {
effectiveRightsFlags.insert(right)
}
@@ -569,7 +574,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
effectiveRightsFlags = effectiveRightsFlags.subtracting(groupPermissionDependencies(rights))
} else {
effectiveRightsFlags.insert(rights)
- for right in allGroupPermissionList {
+ for (right, _) in allGroupPermissionList {
if groupPermissionDependencies(right).contains(rights) {
effectiveRightsFlags.insert(right)
}
@@ -669,15 +674,29 @@ public func channelPermissionsController(context: AccountContext, peerId origina
|> deliverOnMainQueue).start(next: { peerId, _ in
pushControllerImpl?(channelBlacklistController(context: context, peerId: peerId))
})
- }, presentRestrictedPermissionAlert: { rights in
- let text: String
- let presentationData = context.sharedContext.currentPresentationData.with { $0 }
- if rights.contains(TelegramChatBannedRightsFlags.banAddMembers) {
- text = presentationData.strings.GroupPermission_AddMembersNotAvailable
- } else {
- text = presentationData.strings.GroupPermission_NotAvailableInPublicGroups
- }
- presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+ }, presentRestrictedPermissionAlert: { right in
+ let _ = (peerView.get()
+ |> take(1)
+ |> deliverOnMainQueue).start(next: { view in
+ guard let channel = view.peers[view.peerId] as? TelegramChannel else {
+ return
+ }
+ for (listRight, permission) in allGroupPermissionList {
+ if listRight == right {
+ let text: String
+ let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+ if !channel.hasPermission(permission) {
+ text = presentationData.strings.GroupInfo_Permissions_EditingDisabled
+ } else if right.contains(.banAddMembers) {
+ text = presentationData.strings.GroupPermission_AddMembersNotAvailable
+ } else {
+ text = presentationData.strings.GroupPermission_NotAvailableInPublicGroups
+ }
+ presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+ break
+ }
+ }
+ })
}, updateSlowmode: { value in
let _ = (peerView.get()
|> take(1)
diff --git a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
index 380e6bf9b8..1cda2e9038 100644
--- a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
@@ -465,7 +465,7 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa
} else if let cachedChannelData = view.cachedData as? CachedChannelData, cachedChannelData.peerGeoLocation != nil {
selectedType = .publicChannel
} else {
- selectedType = .privateChannel
+ selectedType = .publicChannel
}
}
}
@@ -512,7 +512,7 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa
case .publicChannel:
var displayAvailability = false
if peer.addressName == nil {
- displayAvailability = publicChannelsToRevoke == nil || !(publicChannelsToRevoke!.isEmpty)
+ displayAvailability = publicChannelsToRevoke != nil && !(publicChannelsToRevoke!.isEmpty)
}
if displayAvailability {
diff --git a/submodules/PeerInfoUI/Sources/GroupInfoController.swift b/submodules/PeerInfoUI/Sources/GroupInfoController.swift
index fad08702fd..0c129226d6 100644
--- a/submodules/PeerInfoUI/Sources/GroupInfoController.swift
+++ b/submodules/PeerInfoUI/Sources/GroupInfoController.swift
@@ -40,6 +40,9 @@ import AppBundle
import Markdown
import LocalizedPeerData
+private let maxParticipantsDisplayedLimit: Int32 = 50
+private let maxParticipantsDisplayedCollapseLimit: Int32 = 60
+
private final class GroupInfoArguments {
let context: AccountContext
@@ -71,8 +74,9 @@ private final class GroupInfoArguments {
let openLocation: (PeerGeoLocation) -> Void
let changeLocation: () -> Void
let displayLocationContextMenu: (String) -> Void
+ let expandParticipants: () -> Void
- init(context: AccountContext, avatarAndNameInfoContext: ItemListAvatarAndNameInfoItemContext, tapAvatarAction: @escaping () -> Void, changeProfilePhoto: @escaping () -> Void, pushController: @escaping (ViewController) -> Void, presentController: @escaping (ViewController, ViewControllerPresentationArguments) -> Void, changeNotificationMuteSettings: @escaping () -> Void, openPreHistory: @escaping () -> Void, openSharedMedia: @escaping () -> Void, openAdministrators: @escaping () -> Void, openPermissions: @escaping () -> Void, updateEditingName: @escaping (ItemListAvatarAndNameInfoItemName) -> Void, updateEditingDescriptionText: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, addMember: @escaping () -> Void, promotePeer: @escaping (RenderedChannelParticipant) -> Void, restrictPeer: @escaping (RenderedChannelParticipant) -> Void, removePeer: @escaping (PeerId) -> Void, leave: @escaping () -> Void, displayUsernameShareMenu: @escaping (String) -> Void, displayUsernameContextMenu: @escaping (String) -> Void, displayAboutContextMenu: @escaping (String) -> Void, aboutLinkAction: @escaping (TextLinkItemActionType, TextLinkItem) -> Void, openStickerPackSetup: @escaping () -> Void, openGroupTypeSetup: @escaping () -> Void, openLinkedChannelSetup: @escaping () -> Void, openLocation: @escaping (PeerGeoLocation) -> Void, changeLocation: @escaping () -> Void, displayLocationContextMenu: @escaping (String) -> Void) {
+ init(context: AccountContext, avatarAndNameInfoContext: ItemListAvatarAndNameInfoItemContext, tapAvatarAction: @escaping () -> Void, changeProfilePhoto: @escaping () -> Void, pushController: @escaping (ViewController) -> Void, presentController: @escaping (ViewController, ViewControllerPresentationArguments) -> Void, changeNotificationMuteSettings: @escaping () -> Void, openPreHistory: @escaping () -> Void, openSharedMedia: @escaping () -> Void, openAdministrators: @escaping () -> Void, openPermissions: @escaping () -> Void, updateEditingName: @escaping (ItemListAvatarAndNameInfoItemName) -> Void, updateEditingDescriptionText: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, addMember: @escaping () -> Void, promotePeer: @escaping (RenderedChannelParticipant) -> Void, restrictPeer: @escaping (RenderedChannelParticipant) -> Void, removePeer: @escaping (PeerId) -> Void, leave: @escaping () -> Void, displayUsernameShareMenu: @escaping (String) -> Void, displayUsernameContextMenu: @escaping (String) -> Void, displayAboutContextMenu: @escaping (String) -> Void, aboutLinkAction: @escaping (TextLinkItemActionType, TextLinkItem) -> Void, openStickerPackSetup: @escaping () -> Void, openGroupTypeSetup: @escaping () -> Void, openLinkedChannelSetup: @escaping () -> Void, openLocation: @escaping (PeerGeoLocation) -> Void, changeLocation: @escaping () -> Void, displayLocationContextMenu: @escaping (String) -> Void, expandParticipants: @escaping () -> Void) {
self.context = context
self.avatarAndNameInfoContext = avatarAndNameInfoContext
self.tapAvatarAction = tapAvatarAction
@@ -102,6 +106,7 @@ private final class GroupInfoArguments {
self.openLocation = openLocation
self.changeLocation = changeLocation
self.displayLocationContextMenu = displayLocationContextMenu
+ self.expandParticipants = expandParticipants
}
}
@@ -189,6 +194,7 @@ private enum GroupInfoEntry: ItemListNodeEntry {
case permissions(PresentationTheme, String, String)
case addMember(PresentationTheme, String, editing: Bool)
case member(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, index: Int, peerId: PeerId, peer: Peer, participant: RenderedChannelParticipant?, presence: PeerPresence?, memberStatus: GroupInfoMemberStatus, editing: ItemListPeerItemEditing, revealActions: [ParticipantRevealAction], enabled: Bool, selectable: Bool)
+ case expand(PresentationTheme, String)
case leave(PresentationTheme, String)
var section: ItemListSectionId {
@@ -203,7 +209,7 @@ private enum GroupInfoEntry: ItemListNodeEntry {
return GroupInfoSection.sharedMediaAndNotifications.rawValue
case .permissions, .administrators:
return GroupInfoSection.memberManagement.rawValue
- case .addMember, .member:
+ case .addMember, .member, .expand:
return GroupInfoSection.members.rawValue
case .leave:
return GroupInfoSection.leave.rawValue
@@ -213,40 +219,40 @@ private enum GroupInfoEntry: ItemListNodeEntry {
static func ==(lhs: GroupInfoEntry, rhs: GroupInfoEntry) -> Bool {
switch lhs {
case let .info(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsPeer, lhsCachedData, lhsState, lhsUpdatingAvatar):
- if case let .info(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsPeer, rhsCachedData, rhsState, rhsUpdatingAvatar) = rhs {
- if lhsTheme !== rhsTheme {
- return false
- }
- if lhsStrings !== rhsStrings {
- return false
- }
- if lhsDateTimeFormat != rhsDateTimeFormat {
- return false
- }
- if let lhsPeer = lhsPeer, let rhsPeer = rhsPeer {
- if !lhsPeer.isEqual(rhsPeer) {
- return false
- }
- } else if (lhsPeer == nil) != (rhsPeer != nil) {
- return false
- }
- if let lhsCachedData = lhsCachedData, let rhsCachedData = rhsCachedData {
- if !lhsCachedData.isEqual(to: rhsCachedData) {
- return false
- }
- } else if (lhsCachedData != nil) != (rhsCachedData != nil) {
- return false
- }
- if lhsState != rhsState {
- return false
- }
- if lhsUpdatingAvatar != rhsUpdatingAvatar {
- return false
- }
- return true
- } else {
+ if case let .info(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsPeer, rhsCachedData, rhsState, rhsUpdatingAvatar) = rhs {
+ if lhsTheme !== rhsTheme {
return false
}
+ if lhsStrings !== rhsStrings {
+ return false
+ }
+ if lhsDateTimeFormat != rhsDateTimeFormat {
+ return false
+ }
+ if let lhsPeer = lhsPeer, let rhsPeer = rhsPeer {
+ if !lhsPeer.isEqual(rhsPeer) {
+ return false
+ }
+ } else if (lhsPeer == nil) != (rhsPeer != nil) {
+ return false
+ }
+ if let lhsCachedData = lhsCachedData, let rhsCachedData = rhsCachedData {
+ if !lhsCachedData.isEqual(to: rhsCachedData) {
+ return false
+ }
+ } else if (lhsCachedData != nil) != (rhsCachedData != nil) {
+ return false
+ }
+ if lhsState != rhsState {
+ return false
+ }
+ if lhsUpdatingAvatar != rhsUpdatingAvatar {
+ return false
+ }
+ return true
+ } else {
+ return false
+ }
case let .setGroupPhoto(lhsTheme, lhsText):
if case let .setGroupPhoto(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
return true
@@ -419,6 +425,12 @@ private enum GroupInfoEntry: ItemListNodeEntry {
} else {
return false
}
+ case let .expand(lhsTheme, lhsText):
+ if case let .expand(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
+ return true
+ } else {
+ return false
+ }
}
}
@@ -469,8 +481,10 @@ private enum GroupInfoEntry: ItemListNodeEntry {
return 16
case let .member(_, _, _, _, index, _, _, _, _, _, _, _, _, _):
return 20 + index
- case .leave:
+ case .expand:
return 200000 + 1
+ case .leave:
+ return 200000 + 2
}
}
@@ -592,6 +606,10 @@ private enum GroupInfoEntry: ItemListNodeEntry {
}, removePeer: { peerId in
arguments.removePeer(peerId)
})
+ case let .expand(theme, title):
+ return ItemListPeerActionItem(theme: theme, icon: PresentationResourcesItemList.downArrowImage(theme), title: title, sectionId: self.section, editing: false, action: {
+ arguments.expandParticipants()
+ })
case let .leave(theme, title):
return ItemListActionItem(theme: theme, title: title, kind: .destructive, alignment: .center, sectionId: self.section, style: .blocks, action: {
arguments.leave()
@@ -627,6 +645,7 @@ private struct GroupInfoState: Equatable {
let editingState: GroupInfoEditingState?
let updatingName: ItemListAvatarAndNameInfoItemName?
let peerIdWithRevealedOptions: PeerId?
+ let expandedParticipants: Bool
let temporaryParticipants: [TemporaryParticipant]
let successfullyAddedParticipantIds: Set
@@ -649,6 +668,9 @@ private struct GroupInfoState: Equatable {
if lhs.peerIdWithRevealedOptions != rhs.peerIdWithRevealedOptions {
return false
}
+ if lhs.expandedParticipants != rhs.expandedParticipants {
+ return false
+ }
if lhs.temporaryParticipants != rhs.temporaryParticipants {
return false
}
@@ -668,39 +690,43 @@ private struct GroupInfoState: Equatable {
}
func withUpdatedUpdatingAvatar(_ updatingAvatar: ItemListAvatarAndNameInfoItemUpdatingAvatar?) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
}
func withUpdatedEditingState(_ editingState: GroupInfoEditingState?) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
}
func withUpdatedUpdatingName(_ updatingName: ItemListAvatarAndNameInfoItemName?) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
}
func withUpdatedPeerIdWithRevealedOptions(_ peerIdWithRevealedOptions: PeerId?) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
}
+ func withUpdatedExpandedParticipants(_ expandedParticipants: Bool) -> GroupInfoState {
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ }
+
func withUpdatedTemporaryParticipants(_ temporaryParticipants: [TemporaryParticipant]) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
}
func withUpdatedSuccessfullyAddedParticipantIds(_ successfullyAddedParticipantIds: Set) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
}
func withUpdatedRemovingParticipantIds(_ removingParticipantIds: Set) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: removingParticipantIds, savingData: self.savingData, searchingMembers: self.searchingMembers)
}
func withUpdatedSavingData(_ savingData: Bool) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: savingData, searchingMembers: self.searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: savingData, searchingMembers: self.searchingMembers)
}
func withUpdatedSearchingMembers(_ searchingMembers: Bool) -> GroupInfoState {
- return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: searchingMembers)
+ return GroupInfoState(updatingAvatar: self.updatingAvatar, editingState: self.editingState, updatingName: self.updatingName, peerIdWithRevealedOptions: self.peerIdWithRevealedOptions, expandedParticipants: self.expandedParticipants, temporaryParticipants: self.temporaryParticipants, successfullyAddedParticipantIds: self.successfullyAddedParticipantIds, removingParticipantIds: self.removingParticipantIds, savingData: self.savingData, searchingMembers: searchingMembers)
}
}
@@ -842,7 +868,7 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa
var activePermissionCount: Int?
if let defaultBannedRights = group.defaultBannedRights {
var count = 0
- for right in allGroupPermissionList {
+ for (right, _) in allGroupPermissionList {
if !defaultBannedRights.flags.contains(right) {
count += 1
}
@@ -902,7 +928,7 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa
var activePermissionCount: Int?
if let defaultBannedRights = channel.defaultBannedRights {
var count = 0
- for right in allGroupPermissionList {
+ for (right, _) in allGroupPermissionList {
if !defaultBannedRights.flags.contains(right) {
count += 1
}
@@ -1157,8 +1183,21 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa
sortedParticipants = updatedParticipants
}
- for i in 0 ..< sortedParticipants.count {
- let participant = sortedParticipants[i]
+ var expanded = state.expandedParticipants
+ let participants: [RenderedChannelParticipant]
+ if expanded {
+ participants = sortedParticipants
+ } else {
+ if sortedParticipants.count > maxParticipantsDisplayedCollapseLimit {
+ participants = Array(sortedParticipants.prefix(Int(maxParticipantsDisplayedLimit)))
+ } else {
+ participants = sortedParticipants
+ expanded = true
+ }
+ }
+
+ for i in 0 ..< participants.count {
+ let participant = participants[i]
let memberStatus: GroupInfoMemberStatus
switch participant.participant {
case let .creator(_, rank):
@@ -1220,6 +1259,10 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa
entries.append(GroupInfoEntry.member(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, index: i, peerId: participant.peer.id, peer: participant.peer, participant: participant, presence: participant.presences[participant.peer.id], memberStatus: memberStatus, editing: ItemListPeerItemEditing(editable: !peerActions.isEmpty, editing: state.editingState != nil && canRemoveAnyMember, revealed: state.peerIdWithRevealedOptions == participant.peer.id), revealActions: peerActions, enabled: true, selectable: participant.peer.id != account.peerId))
}
+
+ if !expanded {
+ entries.append(GroupInfoEntry.expand(presentationData.theme, presentationData.strings.GroupInfo_ShowMoreMembers(Int32(memberCount - maxParticipantsDisplayedLimit))))
+ }
}
if let group = view.peers[view.peerId] as? TelegramGroup {
@@ -1288,8 +1331,8 @@ private func valuesRequiringUpdate(state: GroupInfoState, view: PeerView) -> (ti
}
public func groupInfoController(context: AccountContext, peerId originalPeerId: PeerId, membersLoaded: @escaping () -> Void = {}) -> ViewController {
- let statePromise = ValuePromise(GroupInfoState(updatingAvatar: nil, editingState: nil, updatingName: nil, peerIdWithRevealedOptions: nil, temporaryParticipants: [], successfullyAddedParticipantIds: Set(), removingParticipantIds: Set(), savingData: false, searchingMembers: false), ignoreRepeated: true)
- let stateValue = Atomic(value: GroupInfoState(updatingAvatar: nil, editingState: nil, updatingName: nil, peerIdWithRevealedOptions: nil, temporaryParticipants: [], successfullyAddedParticipantIds: Set(), removingParticipantIds: Set(), savingData: false, searchingMembers: false))
+ let statePromise = ValuePromise(GroupInfoState(updatingAvatar: nil, editingState: nil, updatingName: nil, peerIdWithRevealedOptions: nil, expandedParticipants: false, temporaryParticipants: [], successfullyAddedParticipantIds: Set(), removingParticipantIds: Set(), savingData: false, searchingMembers: false), ignoreRepeated: true)
+ let stateValue = Atomic(value: GroupInfoState(updatingAvatar: nil, editingState: nil, updatingName: nil, peerIdWithRevealedOptions: nil, expandedParticipants: false, temporaryParticipants: [], successfullyAddedParticipantIds: Set(), removingParticipantIds: Set(), savingData: false, searchingMembers: false))
let updateState: ((GroupInfoState) -> GroupInfoState) -> Void = { f in
statePromise.set(stateValue.modify { f($0) })
}
@@ -2077,6 +2120,10 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId:
})
}, displayLocationContextMenu: { text in
displayCopyContextMenuImpl?(text, .location)
+ }, expandParticipants: {
+ updateState {
+ $0.withUpdatedExpandedParticipants(true)
+ }
})
let loadMoreControl = Atomic<(PeerId, PeerChannelMemberCategoryControl)?>(value: nil)
@@ -2203,9 +2250,13 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId:
updateDescription = .complete()
}
- let signal = combineLatest(updateTitle, updateDescription)
+ let signal = combineLatest(queue: .mainQueue(),
+ updateTitle,
+ updateDescription
+ )
- updatePeerNameDisposable.set((signal |> deliverOnMainQueue).start(error: { _ in
+ updatePeerNameDisposable.set((signal
+ |> deliverOnMainQueue).start(error: { _ in
updateState { state in
return state.withUpdatedSavingData(false)
}
@@ -2449,7 +2500,9 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId:
controller.visibleBottomContentOffsetChanged = { offset in
if let (peerId, loadMoreControl) = loadMoreControl.with({ $0 }), case let .known(value) = offset, value < 40.0 {
- context.peerChannelMemberCategoriesContextsManager.loadMore(peerId: peerId, control: loadMoreControl)
+ if stateValue.with({ $0 }).expandedParticipants {
+ context.peerChannelMemberCategoriesContextsManager.loadMore(peerId: peerId, control: loadMoreControl)
+ }
}
}
return controller
diff --git a/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift b/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift
index 74c77fff71..9cfa007e61 100644
--- a/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift
+++ b/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift
@@ -148,33 +148,35 @@ class ItemListCallListItemNode: ListViewItemNode {
let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
let currentItem = self.item
- return { item, params, neighbors in
- if self.callNodes.count != item.messages.count {
- for pair in self.callNodes {
+ return { [weak self] item, params, neighbors in
+ if let strongSelf = self, strongSelf.callNodes.count != item.messages.count {
+ for pair in strongSelf.callNodes {
pair.0.removeFromSupernode()
pair.1.removeFromSupernode()
}
- self.callNodes = []
+ strongSelf.callNodes = []
for _ in item.messages {
let timeNode = TextNode()
timeNode.isUserInteractionEnabled = false
- self.addSubnode(timeNode)
+ strongSelf.addSubnode(timeNode)
let typeNode = TextNode()
typeNode.isUserInteractionEnabled = false
- self.addSubnode(typeNode)
+ strongSelf.addSubnode(typeNode)
- self.callNodes.append((timeNode, typeNode))
+ strongSelf.callNodes.append((timeNode, typeNode))
}
}
var makeNodesLayout: [((TextNodeLayoutArguments) -> (TextNodeLayout, () -> TextNode), (TextNodeLayoutArguments) -> (TextNodeLayout, () -> TextNode))] = []
- for nodes in self.callNodes {
- let makeTimeLayout = TextNode.asyncLayout(nodes.0)
- let makeTypeLayout = TextNode.asyncLayout(nodes.1)
- makeNodesLayout.append((makeTimeLayout, makeTypeLayout))
+ if let strongSelf = self {
+ for nodes in strongSelf.callNodes {
+ let makeTimeLayout = TextNode.asyncLayout(nodes.0)
+ let makeTypeLayout = TextNode.asyncLayout(nodes.1)
+ makeNodesLayout.append((makeTimeLayout, makeTypeLayout))
+ }
}
var updatedTheme: PresentationTheme?
diff --git a/submodules/PeerInfoUI/Sources/UserInfoController.swift b/submodules/PeerInfoUI/Sources/UserInfoController.swift
index bc8fc5f2bc..8497888085 100644
--- a/submodules/PeerInfoUI/Sources/UserInfoController.swift
+++ b/submodules/PeerInfoUI/Sources/UserInfoController.swift
@@ -1361,7 +1361,8 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe
})
}
startSecretChatImpl = { [weak controller] in
- let _ = (context.account.postbox.transaction { transaction -> PeerId? in
+ let _ = (context.account.postbox.transaction { transaction -> (Peer?, PeerId?) in
+ let peer = transaction.getPeer(peerId)
let filteredPeerIds = Array(transaction.getAssociatedPeerIds(peerId)).filter { $0.namespace == Namespaces.Peer.SecretChat }
var activeIndices: [ChatListIndex] = []
for associatedId in filteredPeerIds {
@@ -1378,54 +1379,57 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe
}
activeIndices.sort()
if let index = activeIndices.last {
- return index.messageIndex.id.peerId
+ return (peer, index.messageIndex.id.peerId)
} else {
- return nil
+ return (peer, nil)
}
- } |> deliverOnMainQueue).start(next: { currentPeerId in
+ } |> deliverOnMainQueue).start(next: { peer, currentPeerId in
if let currentPeerId = currentPeerId {
if let navigationController = (controller?.navigationController as? NavigationController) {
context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(currentPeerId)))
}
- } else {
- var createSignal = createSecretChat(account: context.account, peerId: peerId)
- var cancelImpl: (() -> Void)?
- let progressSignal = Signal { subscriber in
- let presentationData = context.sharedContext.currentPresentationData.with { $0 }
- let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
- cancelImpl?()
- }))
- presentControllerImpl?(controller, nil)
- return ActionDisposable { [weak controller] in
- Queue.mainQueue().async() {
- controller?.dismiss()
+ } else if let controller = controller {
+ let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+ let displayTitle = peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) ?? ""
+ controller.present(textAlertController(context: context, title: nil, text: presentationData.strings.UserInfo_StartSecretChatConfirmation(displayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.UserInfo_StartSecretChatStart, action: {
+ var createSignal = createSecretChat(account: context.account, peerId: peerId)
+ var cancelImpl: (() -> Void)?
+ let progressSignal = Signal { subscriber in
+ let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+ cancelImpl?()
+ }))
+ presentControllerImpl?(controller, nil)
+ return ActionDisposable { [weak controller] in
+ Queue.mainQueue().async() {
+ controller?.dismiss()
+ }
}
}
- }
- |> runOn(Queue.mainQueue())
- |> delay(0.15, queue: Queue.mainQueue())
- let progressDisposable = progressSignal.start()
-
- createSignal = createSignal
- |> afterDisposed {
- Queue.mainQueue().async {
- progressDisposable.dispose()
+ |> runOn(Queue.mainQueue())
+ |> delay(0.15, queue: Queue.mainQueue())
+ let progressDisposable = progressSignal.start()
+
+ createSignal = createSignal
+ |> afterDisposed {
+ Queue.mainQueue().async {
+ progressDisposable.dispose()
+ }
}
- }
- cancelImpl = {
- createSecretChatDisposable.set(nil)
- }
-
- createSecretChatDisposable.set((createSignal |> deliverOnMainQueue).start(next: { peerId in
- if let navigationController = (controller?.navigationController as? NavigationController) {
- context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
+ cancelImpl = {
+ createSecretChatDisposable.set(nil)
}
- }, error: { _ in
- if let controller = controller {
- let presentationData = context.sharedContext.currentPresentationData.with { $0 }
- controller.present(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
- }
- }))
+
+ createSecretChatDisposable.set((createSignal |> deliverOnMainQueue).start(next: { [weak controller] peerId in
+ if let navigationController = (controller?.navigationController as? NavigationController) {
+ context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
+ }
+ }, error: { [weak controller] _ in
+ if let controller = controller {
+ let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+ controller.present(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+ }
+ }))
+ })]), in: .window(.root))
}
})
}
diff --git a/submodules/Postbox/Sources/AccountManager.swift b/submodules/Postbox/Sources/AccountManager.swift
index 7fd29dd977..7ec6028f6d 100644
--- a/submodules/Postbox/Sources/AccountManager.swift
+++ b/submodules/Postbox/Sources/AccountManager.swift
@@ -430,14 +430,17 @@ final class AccountManagerImpl {
}
}
+private let sharedQueue = Queue()
+
public final class AccountManager {
public let basePath: String
public let mediaBox: MediaBox
- private let queue = Queue()
+ private let queue: Queue
private let impl: QueueLocalObject
public let temporarySessionId: Int64
public init(basePath: String) {
+ self.queue = sharedQueue
self.basePath = basePath
var temporarySessionId: Int64 = 0
arc4random_buf(&temporarySessionId, 8)
diff --git a/submodules/Postbox/Sources/MediaBox.swift b/submodules/Postbox/Sources/MediaBox.swift
index 7e6fac7fcc..a12e7a9b8f 100644
--- a/submodules/Postbox/Sources/MediaBox.swift
+++ b/submodules/Postbox/Sources/MediaBox.swift
@@ -202,11 +202,16 @@ public final class MediaBox {
return "\(self.basePath)/\(cacheString)/\(fileNameForId(id)):\(representation.uniqueId)"
}
- public func storeResourceData(_ id: MediaResourceId, data: Data) {
- self.dataQueue.async {
+ public func storeResourceData(_ id: MediaResourceId, data: Data, synchronous: Bool = false) {
+ let begin = {
let paths = self.storePathsForId(id)
let _ = try? data.write(to: URL(fileURLWithPath: paths.complete), options: [.atomic])
}
+ if synchronous {
+ begin()
+ } else {
+ self.dataQueue.async(begin)
+ }
}
public func moveResourceData(_ id: MediaResourceId, fromTempPath: String) {
diff --git a/submodules/Postbox/Sources/Postbox.swift b/submodules/Postbox/Sources/Postbox.swift
index 5de768cab7..1c8abe8ff9 100644
--- a/submodules/Postbox/Sources/Postbox.swift
+++ b/submodules/Postbox/Sources/Postbox.swift
@@ -3102,7 +3102,9 @@ public final class Postbox {
return nil
}
if let messages = self.messageHistoryTable.getMessageFailedGroup(at: index, limit: 100) {
- return messages.map(self.renderIntermediateMessage)
+ return messages.sorted(by: { lhs, rhs in
+ return lhs.index < rhs.index
+ }).map(self.renderIntermediateMessage)
} else {
return nil
}
diff --git a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift
index 531ae161d0..2a9b8983ee 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift
@@ -31,7 +31,7 @@ enum AutomaticDownloadDataUsage: Int {
}
}
-class AutodownloadDataUsagePickerItem: ListViewItem, ItemListItem {
+final class AutodownloadDataUsagePickerItem: ListViewItem, ItemListItem {
let theme: PresentationTheme
let strings: PresentationStrings
let value: AutomaticDownloadDataUsage
@@ -93,7 +93,7 @@ private func generateKnobImage() -> UIImage? {
})
}
-class AutodownloadDataUsagePickerItemNode: ListViewItemNode {
+private final class AutodownloadDataUsagePickerItemNode: ListViewItemNode {
private let backgroundNode: ASDisplayNode
private let topStripeNode: ASDisplayNode
private let bottomStripeNode: ASDisplayNode
diff --git a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift
index 8640aab742..af3fe51a26 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift
@@ -49,7 +49,7 @@ private func sizeValue(for sliderValue: CGFloat) -> Int32 {
return 0
}
-class AutodownloadSizeLimitItem: ListViewItem, ItemListItem {
+final class AutodownloadSizeLimitItem: ListViewItem, ItemListItem {
let theme: PresentationTheme
let decimalSeparator: String
let text: String
@@ -109,7 +109,7 @@ private func generateKnobImage() -> UIImage? {
})
}
-class AutodownloadSizeLimitItemNode: ListViewItemNode {
+private final class AutodownloadSizeLimitItemNode: ListViewItemNode {
private let backgroundNode: ASDisplayNode
private let topStripeNode: ASDisplayNode
private let bottomStripeNode: ASDisplayNode
diff --git a/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift b/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift
index 53d791f08b..f157ff5893 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift
@@ -8,7 +8,7 @@ import ItemListUI
import PresentationDataUtils
import ActivityIndicator
-class CalculatingCacheSizeItem: ListViewItem, ItemListItem {
+final class CalculatingCacheSizeItem: ListViewItem, ItemListItem {
let theme: PresentationTheme
let title: String
let sectionId: ItemListSectionId
@@ -57,7 +57,7 @@ class CalculatingCacheSizeItem: ListViewItem, ItemListItem {
private let titleFont = Font.regular(14.0)
-class CalculatingCacheSizeItemNode: ListViewItemNode {
+private final class CalculatingCacheSizeItemNode: ListViewItemNode {
private let backgroundNode: ASDisplayNode
private let topStripeNode: ASDisplayNode
private let bottomStripeNode: ASDisplayNode
diff --git a/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift b/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift
index 37f409244a..0df0bedfd0 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift
@@ -485,6 +485,9 @@ func dataAndStorageController(context: AccountContext, focusOnItemTag: DataAndSt
let actionsDisposable = DisposableSet()
+ let cacheUsagePromise = Promise()
+ cacheUsagePromise.set(cacheUsageStats(context: context))
+
let dataAndStorageDataPromise = Promise()
dataAndStorageDataPromise.set(context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.autodownloadSettings, ApplicationSpecificSharedDataKeys.automaticMediaDownloadSettings, ApplicationSpecificSharedDataKeys.generatedMediaStoreSettings, ApplicationSpecificSharedDataKeys.voiceCallSettings, SharedDataKeys.proxySettings])
|> map { sharedData -> DataAndStorageData in
@@ -526,7 +529,7 @@ func dataAndStorageController(context: AccountContext, focusOnItemTag: DataAndSt
})
let arguments = DataAndStorageControllerArguments(openStorageUsage: {
- pushControllerImpl?(storageUsageController(context: context))
+ pushControllerImpl?(storageUsageController(context: context, cacheUsagePromise: cacheUsagePromise))
}, openNetworkUsage: {
pushControllerImpl?(networkUsageStatsController(context: context))
}, openProxy: {
diff --git a/submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift
new file mode 100644
index 0000000000..fbdb36c8fd
--- /dev/null
+++ b/submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift
@@ -0,0 +1,315 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import TelegramCore
+import SyncCore
+import TelegramUIPreferences
+import TelegramPresentationData
+import LegacyComponents
+import ItemListUI
+import PresentationDataUtils
+
+private func stringForKeepMediaTimeout(strings: PresentationStrings, timeout: Int32) -> String {
+ if timeout > 1 * 31 * 24 * 60 * 60 {
+ return strings.ClearCache_Forever
+ } else {
+ return timeIntervalString(strings: strings, value: timeout)
+ }
+}
+
+private let keepMediaTimeoutValues: [Int32] = [
+ 3 * 24 * 60 * 60,
+ 7 * 24 * 60 * 60,
+ 1 * 31 * 24 * 60 * 60,
+ Int32.max
+]
+
+final class KeepMediaDurationPickerItem: ListViewItem, ItemListItem {
+ let theme: PresentationTheme
+ let strings: PresentationStrings
+ let value: Int32
+ let sectionId: ItemListSectionId
+ let updated: (Int32) -> Void
+
+ init(theme: PresentationTheme, strings: PresentationStrings, value: Int32, sectionId: ItemListSectionId, updated: @escaping (Int32) -> Void) {
+ self.theme = theme
+ self.strings = strings
+ self.value = value
+ self.sectionId = sectionId
+ self.updated = updated
+ }
+
+ 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 = KeepMediaDurationPickerItemNode()
+ 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? KeepMediaDurationPickerItemNode {
+ let makeLayout = nodeValue.asyncLayout()
+
+ async {
+ let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+ Queue.mainQueue().async {
+ completion(layout, { _ in
+ apply()
+ })
+ }
+ }
+ }
+ }
+ }
+}
+
+private func generateKnobImage() -> UIImage? {
+ return generateImage(CGSize(width: 40.0, height: 40.0), rotatedContext: { size, context in
+ context.clear(CGRect(origin: CGPoint(), size: size))
+ context.setShadow(offset: CGSize(width: 0.0, height: -2.0), blur: 3.5, color: UIColor(white: 0.0, alpha: 0.35).cgColor)
+ context.setFillColor(UIColor.white.cgColor)
+ context.fillEllipse(in: CGRect(origin: CGPoint(x: 6.0, y: 6.0), size: CGSize(width: 28.0, height: 28.0)))
+ })
+}
+
+private final class KeepMediaDurationPickerItemNode: ListViewItemNode {
+ private let backgroundNode: ASDisplayNode
+ private let topStripeNode: ASDisplayNode
+ private let bottomStripeNode: ASDisplayNode
+ private let maskNode: ASImageNode
+
+ private let textNodes: [TextNode]
+ private var sliderView: TGPhotoEditorSliderView?
+
+ private var item: KeepMediaDurationPickerItem?
+ private var layoutParams: ListViewItemLayoutParams?
+
+ init() {
+ self.backgroundNode = ASDisplayNode()
+ self.backgroundNode.isLayerBacked = true
+
+ self.topStripeNode = ASDisplayNode()
+ self.topStripeNode.isLayerBacked = true
+
+ self.bottomStripeNode = ASDisplayNode()
+ self.bottomStripeNode.isLayerBacked = true
+
+ self.maskNode = ASImageNode()
+
+ var textNodes: [TextNode] = []
+ for i in 0 ..< 4 {
+ let textNode = TextNode()
+ textNode.isUserInteractionEnabled = false
+ textNode.displaysAsynchronously = false
+ textNodes.append(textNode)
+ }
+ self.textNodes = textNodes
+
+ super.init(layerBacked: false, dynamicBounce: false)
+
+ for textNode in textNodes {
+ self.addSubnode(textNode)
+ }
+ }
+
+ func updateSliderView() {
+ if let sliderView = self.sliderView, let item = self.item {
+ sliderView.maximumValue = 3.0
+ sliderView.positionsCount = 4
+
+ let value = keepMediaTimeoutValues.firstIndex(where: { $0 == item.value }) ?? 0
+ sliderView.value = CGFloat(value)
+ }
+ }
+
+ override func didLoad() {
+ super.didLoad()
+
+ let sliderView = TGPhotoEditorSliderView()
+ sliderView.enablePanHandling = true
+ sliderView.trackCornerRadius = 1.0
+ sliderView.lineSize = 2.0
+ sliderView.dotSize = 5.0
+ sliderView.minimumValue = 0.0
+ sliderView.maximumValue = 3.0
+ sliderView.startValue = 0.0
+ sliderView.disablesInteractiveTransitionGestureRecognizer = true
+ sliderView.positionsCount = 4
+ sliderView.useLinesForPositions = true
+ if let item = self.item, let params = self.layoutParams {
+ let value = keepMediaTimeoutValues.firstIndex(where: { $0 == item.value }) ?? 0
+
+ sliderView.value = CGFloat(value)
+ sliderView.backgroundColor = item.theme.list.itemBlocksBackgroundColor
+ sliderView.backColor = item.theme.list.disclosureArrowColor
+ sliderView.startColor = item.theme.list.disclosureArrowColor
+ sliderView.trackColor = item.theme.list.itemAccentColor
+ sliderView.knobImage = generateKnobImage()
+
+ sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + 15.0, y: 37.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - 15.0 * 2.0, height: 44.0))
+ sliderView.hitTestEdgeInsets = UIEdgeInsets(top: -sliderView.frame.minX, left: 0.0, bottom: 0.0, right: -sliderView.frame.minX)
+ }
+ self.view.addSubview(sliderView)
+ sliderView.addTarget(self, action: #selector(self.sliderValueChanged), for: .valueChanged)
+ self.sliderView = sliderView
+
+ self.updateSliderView()
+ }
+
+ func asyncLayout() -> (_ item: KeepMediaDurationPickerItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
+ let currentItem = self.item
+ var makeTextLayouts: [(TextNodeLayoutArguments) -> (TextNodeLayout, () -> TextNode)] = []
+ for textNode in self.textNodes {
+ makeTextLayouts.append(TextNode.asyncLayout(textNode))
+ }
+
+ return { item, params, neighbors in
+ var themeUpdated = false
+ if currentItem?.theme !== item.theme {
+ themeUpdated = true
+ }
+
+ let contentSize: CGSize
+ let insets: UIEdgeInsets
+ let separatorHeight = UIScreenPixel
+
+ var textLayouts: [TextNodeLayout] = []
+ var textApplies: [() -> TextNode] = []
+
+ for i in 0 ..< makeTextLayouts.count {
+ let makeTextLayout = makeTextLayouts[i]
+ let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: stringForKeepMediaTimeout(strings: item.strings, timeout: keepMediaTimeoutValues[i]), font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets()))
+ textLayouts.append(textLayout)
+ textApplies.append(textApply)
+ }
+
+ contentSize = CGSize(width: params.width, height: 88.0)
+ insets = itemListNeighborsGroupedInsets(neighbors)
+
+ let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
+ let layoutSize = layout.size
+
+ return (layout, { [weak self] in
+ if let strongSelf = self {
+ strongSelf.item = item
+ strongSelf.layoutParams = params
+
+ strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor
+ strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
+ strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
+
+ if strongSelf.backgroundNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
+ }
+ if strongSelf.topStripeNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1)
+ }
+ if strongSelf.bottomStripeNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2)
+ }
+ if strongSelf.maskNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.maskNode, at: 3)
+ }
+
+ let hasCorners = itemListHasRoundedBlockLayout(params)
+ var hasTopCorners = false
+ var hasBottomCorners = false
+ switch neighbors.top {
+ case .sameSection(false):
+ strongSelf.topStripeNode.isHidden = true
+ default:
+ hasTopCorners = true
+ strongSelf.topStripeNode.isHidden = hasCorners
+ }
+ let bottomStripeInset: CGFloat
+ let bottomStripeOffset: CGFloat
+ switch neighbors.bottom {
+ case .sameSection(false):
+ bottomStripeInset = 0.0
+ bottomStripeOffset = -separatorHeight
+ default:
+ bottomStripeInset = 0.0
+ bottomStripeOffset = 0.0
+ hasBottomCorners = true
+ strongSelf.bottomStripeNode.isHidden = hasCorners
+ }
+
+ strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil
+
+ strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight)))
+ strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0)
+ strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight))
+ strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))
+
+ for apply in textApplies {
+ let _ = apply()
+ }
+
+ var textNodes: [(TextNode, CGSize)] = []
+ for (node, size) in zip(strongSelf.textNodes, textLayouts.map { $0.size }) {
+ textNodes.append((node, size))
+ }
+
+ let delta = (params.width - params.leftInset - params.rightInset - 18.0 * 2.0) / CGFloat(textNodes.count - 1)
+ for i in 0 ..< textNodes.count {
+ let (textNode, textSize) = textNodes[i]
+
+ var position = params.leftInset + 18.0 + delta * CGFloat(i)
+ if i == textNodes.count - 1 {
+ position -= textSize.width
+ } else if i > 0 {
+ position -= textSize.width / 2.0
+ }
+
+ textNode.frame = CGRect(origin: CGPoint(x: position, y: 15.0), size: textSize)
+ }
+
+ if let sliderView = strongSelf.sliderView {
+ if themeUpdated {
+ sliderView.backgroundColor = item.theme.list.itemBlocksBackgroundColor
+ sliderView.backColor = item.theme.list.disclosureArrowColor
+ sliderView.trackColor = item.theme.list.itemAccentColor
+ sliderView.knobImage = generateKnobImage()
+ }
+
+ sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + 15.0, y: 37.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - 15.0 * 2.0, height: 44.0))
+ sliderView.hitTestEdgeInsets = UIEdgeInsets(top: -sliderView.frame.minX, left: 0.0, bottom: 0.0, right: -sliderView.frame.minX)
+
+ strongSelf.updateSliderView()
+ }
+ }
+ })
+ }
+ }
+
+ override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+ self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+ }
+
+ override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+ self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+ }
+
+ @objc private func sliderValueChanged() {
+ guard let sliderView = self.sliderView else {
+ return
+ }
+
+ let position = Int(sliderView.value)
+ let value = keepMediaTimeoutValues[position]
+ self.item?.updated(value)
+ }
+}
+
diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift
index 4cf98c625a..abdf20b086 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift
@@ -12,7 +12,7 @@ enum ProxySettingsActionIcon {
case add
}
-class ProxySettingsActionItem: ListViewItem, ItemListItem {
+final class ProxySettingsActionItem: ListViewItem, ItemListItem {
let theme: PresentationTheme
let title: String
let icon: ProxySettingsActionIcon
@@ -77,7 +77,7 @@ class ProxySettingsActionItem: ListViewItem, ItemListItem {
private let titleFont = Font.regular(17.0)
-class ProxySettingsActionItemNode: ListViewItemNode {
+private final class ProxySettingsActionItemNode: ListViewItemNode {
private let backgroundNode: ASDisplayNode
private let topStripeNode: ASDisplayNode
private let bottomStripeNode: ASDisplayNode
diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift
index 1813eafe7d..3cbecc17e9 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift
@@ -101,7 +101,7 @@ final class ProxySettingsServerItem: ListViewItem, ItemListItem {
private let titleFont = Font.regular(17.0)
private let statusFont = Font.regular(14.0)
-class ProxySettingsServerItemNode: ItemListRevealOptionsItemNode {
+private final class ProxySettingsServerItemNode: ItemListRevealOptionsItemNode {
private let backgroundNode: ASDisplayNode
private let topStripeNode: ASDisplayNode
private let bottomStripeNode: ASDisplayNode
diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift
index 4d63f9d81f..02736f64b7 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift
@@ -7,6 +7,7 @@ import TelegramCore
import SyncCore
import TelegramPresentationData
import TelegramUIPreferences
+import TelegramStringFormatting
import ItemListUI
import PresentationDataUtils
import OverlayStatusController
@@ -15,48 +16,67 @@ import ItemListPeerItem
import DeleteChatPeerActionSheetItem
import UndoUI
+private func totalDiskSpace() -> Int64 {
+ do {
+ let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: NSHomeDirectory() as String)
+ return (systemAttributes[FileAttributeKey.systemSize] as? NSNumber)?.int64Value ?? 0
+ } catch {
+ return 0
+ }
+}
+
+private func freeDiskSpace() -> Int64 {
+ do {
+ let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: NSHomeDirectory() as String)
+ return (systemAttributes[FileAttributeKey.systemFreeSize] as? NSNumber)?.int64Value ?? 0
+ } catch {
+ return 0
+ }
+}
+
private final class StorageUsageControllerArguments {
let account: Account
- let updateKeepMedia: () -> Void
+ let updateKeepMediaTimeout: (Int32) -> Void
let openClearAll: () -> Void
let openPeerMedia: (PeerId) -> Void
+ let clearPeerMedia: (PeerId) -> Void
+ let setPeerIdWithRevealedOptions: (PeerId?, PeerId?) -> Void
- init(account: Account, updateKeepMedia: @escaping () -> Void, openClearAll: @escaping () -> Void, openPeerMedia: @escaping (PeerId) -> Void) {
+ init(account: Account, updateKeepMediaTimeout: @escaping (Int32) -> Void, openClearAll: @escaping () -> Void, openPeerMedia: @escaping (PeerId) -> Void, clearPeerMedia: @escaping (PeerId) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void) {
self.account = account
- self.updateKeepMedia = updateKeepMedia
+ self.updateKeepMediaTimeout = updateKeepMediaTimeout
self.openClearAll = openClearAll
self.openPeerMedia = openPeerMedia
+ self.clearPeerMedia = clearPeerMedia
+ self.setPeerIdWithRevealedOptions = setPeerIdWithRevealedOptions
}
}
private enum StorageUsageSection: Int32 {
case keepMedia
- case immutableSize
- case all
+ case storage
case peers
}
private enum StorageUsageEntry: ItemListNodeEntry {
- case keepMedia(PresentationTheme, String, String)
+ case keepMediaHeader(PresentationTheme, String)
+ case keepMedia(PresentationTheme, PresentationStrings, Int32)
case keepMediaInfo(PresentationTheme, String)
+ case storageHeader(PresentationTheme, String)
+ case storageUsage(PresentationTheme, PresentationDateTimeFormat, [StorageUsageCategory])
case collecting(PresentationTheme, String)
-
- case immutableSize(PresentationTheme, String, String)
-
- case clearAll(PresentationTheme, String, String, Bool)
+ case clearAll(PresentationTheme, String, Bool)
case peersHeader(PresentationTheme, String)
- case peer(Int32, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, Peer, Peer?, String)
+ case peer(Int32, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, Peer, Peer?, String, Bool)
var section: ItemListSectionId {
switch self {
- case .keepMedia, .keepMediaInfo:
+ case .keepMediaHeader, .keepMedia, .keepMediaInfo:
return StorageUsageSection.keepMedia.rawValue
- case .immutableSize:
- return StorageUsageSection.immutableSize.rawValue
- case .collecting, .clearAll:
- return StorageUsageSection.all.rawValue
+ case .storageHeader, .storageUsage, .collecting, .clearAll:
+ return StorageUsageSection.storage.rawValue
case .peersHeader, .peer:
return StorageUsageSection.peers.rawValue
}
@@ -64,27 +84,37 @@ private enum StorageUsageEntry: ItemListNodeEntry {
var stableId: Int32 {
switch self {
- case .keepMedia:
+ case .keepMediaHeader:
return 0
- case .keepMediaInfo:
+ case .keepMedia:
return 1
- case .collecting:
+ case .keepMediaInfo:
return 2
- case .immutableSize:
+ case .storageHeader:
return 3
- case .clearAll:
+ case .storageUsage:
return 4
- case .peersHeader:
+ case .collecting:
return 5
- case let .peer(index, _, _, _, _, _, _, _):
- return 6 + index
+ case .clearAll:
+ return 6
+ case .peersHeader:
+ return 7
+ case let .peer(index, _, _, _, _, _, _, _, _):
+ return 8 + index
}
}
static func ==(lhs: StorageUsageEntry, rhs: StorageUsageEntry) -> Bool {
switch lhs {
- case let .keepMedia(lhsTheme, lhsText, lhsValue):
- if case let .keepMedia(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
+ case let .keepMediaHeader(lhsTheme, lhsText):
+ if case let .keepMediaHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
+ return true
+ } else {
+ return false
+ }
+ case let .keepMedia(lhsTheme, lhsStrings, lhsValue):
+ if case let .keepMedia(rhsTheme, rhsStrings, rhsValue) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsValue == rhsValue {
return true
} else {
return false
@@ -95,20 +125,26 @@ private enum StorageUsageEntry: ItemListNodeEntry {
} else {
return false
}
+ case let .storageHeader(lhsTheme, lhsText):
+ if case let .storageHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
+ return true
+ } else {
+ return false
+ }
+ case let .storageUsage(lhsTheme, lhsDateTimeFormat, lhsCategories):
+ if case let .storageUsage(rhsTheme, rhsDateTimeFormat, rhsCategories) = rhs, lhsTheme === rhsTheme, lhsDateTimeFormat == rhsDateTimeFormat, lhsCategories == rhsCategories {
+ return true
+ } else {
+ return false
+ }
case let .collecting(lhsTheme, lhsText):
if case let .collecting(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
return true
} else {
return false
}
- case let .immutableSize(lhsTheme, lhsText, lhsValue):
- if case let .immutableSize(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
- return true
- } else {
- return false
- }
- case let .clearAll(lhsTheme, lhsText, lhsValue, lhsEnabled):
- if case let .clearAll(rhsTheme, rhsText, rhsValue, rhsEnabled) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue, lhsEnabled == rhsEnabled {
+ case let .clearAll(lhsTheme, lhsText, lhsEnabled):
+ if case let .clearAll(rhsTheme, rhsText, rhsEnabled) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsEnabled == rhsEnabled {
return true
} else {
return false
@@ -119,8 +155,8 @@ private enum StorageUsageEntry: ItemListNodeEntry {
} else {
return false
}
- case let .peer(lhsIndex, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsNameOrder, lhsPeer, lhsChatPeer, lhsValue):
- if case let .peer(rhsIndex, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsNameOrder, rhsPeer, rhsChatPeer, rhsValue) = rhs {
+ case let .peer(lhsIndex, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsNameOrder, lhsPeer, lhsChatPeer, lhsValue, lhsRevealed):
+ if case let .peer(rhsIndex, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsNameOrder, rhsPeer, rhsChatPeer, rhsValue, rhsRevealed) = rhs {
if lhsIndex != rhsIndex {
return false
}
@@ -145,6 +181,9 @@ private enum StorageUsageEntry: ItemListNodeEntry {
if lhsValue != rhsValue {
return false
}
+ if lhsRevealed != rhsRevealed {
+ return false
+ }
return true
} else {
return false
@@ -159,54 +198,62 @@ private enum StorageUsageEntry: ItemListNodeEntry {
func item(_ arguments: Any) -> ListViewItem {
let arguments = arguments as! StorageUsageControllerArguments
switch self {
- case let .keepMedia(theme, text, value):
- return ItemListDisclosureItem(theme: theme, title: text, label: value, sectionId: self.section, style: .blocks, action: {
- arguments.updateKeepMedia()
- })
+ case let .keepMediaHeader(theme, text):
+ return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
+ case let .keepMedia(theme, strings, value):
+ return KeepMediaDurationPickerItem(theme: theme, strings: strings, value: value, sectionId: self.section, updated: { updatedValue in
+ arguments.updateKeepMediaTimeout(updatedValue)
+ })
case let .keepMediaInfo(theme, text):
return ItemListTextItem(theme: theme, text: .markdown(text), sectionId: self.section)
+ case let .storageHeader(theme, text):
+ return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
+ case let .storageUsage(theme, dateTimeFormat, categories):
+ return StorageUsageItem(theme: theme, dateTimeFormat: dateTimeFormat, categories: categories, sectionId: self.section)
case let .collecting(theme, text):
return CalculatingCacheSizeItem(theme: theme, title: text, sectionId: self.section, style: .blocks)
- case let .immutableSize(theme, title, value):
- return ItemListDisclosureItem(theme: theme, icon: nil, title: title, enabled: false, titleColor: .primary, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil)
+ case let .clearAll(theme, text, enabled):
+ return ItemListActionItem(theme: theme, title: text, kind: enabled ? .generic : .disabled, alignment: .natural, sectionId: self.section, style: .blocks, action: {
+ if enabled {
+ arguments.openClearAll()
+ }
+ })
case let .peersHeader(theme, text):
return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
- case let .clearAll(theme, text, value, enabled):
- return ItemListDisclosureItem(theme: theme, icon: nil, title: text, enabled: enabled, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
- arguments.openClearAll()
- })
- case let .peer(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer, chatPeer, value):
- return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.account, peer: peer, aliasHandling: .threatSelfAsSaved, nameColor: chatPeer == nil ? .primary : .secret, presence: nil, text: .none, label: .disclosure(value), editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: {
+ case let .peer(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer, chatPeer, value, revealed):
+ var options: [ItemListPeerItemRevealOption] = [ItemListPeerItemRevealOption(type: .destructive, title: strings.ClearCache_Clear, action: {
+ arguments.clearPeerMedia(peer.id)
+ })]
+ return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.account, peer: peer, aliasHandling: .threatSelfAsSaved, nameColor: chatPeer == nil ? .primary : .secret, presence: nil, text: .none, label: .disclosure(value), editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: revealed), revealOptions: ItemListPeerItemRevealOptions(options: options), switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: {
let resolvedPeer = chatPeer ?? peer
arguments.openPeerMedia(resolvedPeer.id)
- }, setPeerIdWithRevealedOptions: { previousId, id in
-
+ }, setPeerIdWithRevealedOptions: { peerId, fromPeerId in
+ arguments.setPeerIdWithRevealedOptions(peerId, fromPeerId)
}, removePeer: { _ in
-
})
}
}
}
-private func stringForKeepMediaTimeout(strings: PresentationStrings, timeout: Int32) -> String {
- if timeout > 1 * 31 * 24 * 60 * 60 {
- return strings.MessageTimer_Forever
- } else {
- return timeIntervalString(strings: strings, value: timeout)
+private struct StoragUsageState: Equatable {
+ let peerIdWithRevealedOptions: PeerId?
+
+ func withUpdatedPeerIdWithRevealedOptions(_ peerIdWithRevealedOptions: PeerId?) -> StoragUsageState {
+ return StoragUsageState(peerIdWithRevealedOptions: peerIdWithRevealedOptions)
}
}
-private func storageUsageControllerEntries(presentationData: PresentationData, cacheSettings: CacheStorageSettings, cacheStats: CacheUsageStatsResult?) -> [StorageUsageEntry] {
+private func storageUsageControllerEntries(presentationData: PresentationData, cacheSettings: CacheStorageSettings, cacheStats: CacheUsageStatsResult?, state: StoragUsageState) -> [StorageUsageEntry] {
var entries: [StorageUsageEntry] = []
- entries.append(.keepMedia(presentationData.theme, presentationData.strings.Cache_KeepMedia, stringForKeepMediaTimeout(strings: presentationData.strings, timeout: cacheSettings.defaultCacheStorageTimeout)))
+ entries.append(.keepMediaHeader(presentationData.theme, presentationData.strings.Cache_KeepMedia.uppercased()))
+ entries.append(.keepMedia(presentationData.theme, presentationData.strings, cacheSettings.defaultCacheStorageTimeout))
entries.append(.keepMediaInfo(presentationData.theme, presentationData.strings.Cache_Help))
var addedHeader = false
+ entries.append(.storageHeader(presentationData.theme, presentationData.strings.ClearCache_StorageTitle(stringForDeviceType().uppercased()).0))
if let cacheStats = cacheStats, case let .result(stats) = cacheStats {
- entries.append(.immutableSize(presentationData.theme, presentationData.strings.Cache_ServiceFiles, dataSizeString(stats.immutableSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-
var peerSizes: Int64 = 0
var statsByPeerId: [(PeerId, Int64)] = []
var peerIndices: [PeerId: Int] = [:]
@@ -230,9 +277,27 @@ private func storageUsageControllerEntries(presentationData: PresentationData, c
peerSizes += combinedSize
}
- let totalSize = Int64(peerSizes + stats.otherSize + stats.cacheSize + stats.tempSize)
+ let telegramCacheSize = Int64(peerSizes + stats.otherSize + stats.cacheSize + stats.tempSize)
+ let totalTelegramSize = telegramCacheSize + stats.immutableSize
- entries.append(.clearAll(presentationData.theme, presentationData.strings.Cache_ClearCache, totalSize > 0 ? dataSizeString(totalSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator) : presentationData.strings.Cache_ClearEmpty, totalSize > 0))
+ var categories: [StorageUsageCategory] = []
+ let totalSpace = max(totalDiskSpace(), 1)
+ let freeSpace = freeDiskSpace()
+ let otherAppsSpace = totalSpace - freeSpace - totalTelegramSize
+
+ let totalSpaceValue = CGFloat(totalSpace)
+
+ if telegramCacheSize > 0 {
+ categories.append(StorageUsageCategory(title: presentationData.strings.ClearCache_StorageCache, size: totalTelegramSize, fraction: CGFloat(totalTelegramSize) / totalSpaceValue, color: presentationData.theme.list.itemBarChart.color1))
+ } else {
+ categories.append(StorageUsageCategory(title: presentationData.strings.ClearCache_StorageServiceFiles, size: totalTelegramSize, fraction: CGFloat(totalTelegramSize) / totalSpaceValue, color: presentationData.theme.list.itemBarChart.color1))
+ }
+ categories.append(StorageUsageCategory(title: presentationData.strings.ClearCache_StorageOtherApps, size: otherAppsSpace, fraction: CGFloat(otherAppsSpace) / totalSpaceValue, color: presentationData.theme.list.itemBarChart.color2))
+ categories.append(StorageUsageCategory(title: presentationData.strings.ClearCache_StorageFree, size: freeSpace, fraction: CGFloat(freeSpace) / totalSpaceValue, color: presentationData.theme.list.itemBarChart.color3))
+
+ entries.append(.storageUsage(presentationData.theme, presentationData.dateTimeFormat, categories))
+
+ entries.append(.clearAll(presentationData.theme, presentationData.strings.ClearCache_ClearCache, telegramCacheSize > 0))
var index: Int32 = 0
for (peerId, size) in statsByPeerId.sorted(by: { $0.1 > $1.1 }) {
@@ -248,7 +313,7 @@ private func storageUsageControllerEntries(presentationData: PresentationData, c
chatPeer = mainPeer
mainPeer = associatedPeer
}
- entries.append(.peer(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, mainPeer, chatPeer, dataSizeString(size, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+ entries.append(.peer(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, mainPeer, chatPeer, dataSizeString(size, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator), state.peerIdWithRevealedOptions == peer.id))
index += 1
}
}
@@ -273,7 +338,28 @@ private func stringForCategory(strings: PresentationStrings, category: PeerCache
}
}
-public func storageUsageController(context: AccountContext, isModal: Bool = false) -> ViewController {
+func cacheUsageStats(context: AccountContext) -> Signal {
+ let containerPath = context.sharedContext.applicationBindings.containerPath
+ let additionalPaths: [String] = [
+ NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0],
+ containerPath + "/Documents/files",
+ containerPath + "/Documents/video",
+ containerPath + "/Documents/audio",
+ containerPath + "/Documents/mediacache",
+ containerPath + "/Documents/tempcache_v1/store",
+ ]
+ return .single(nil)
+ |> then(collectCacheUsageStats(account: context.account, additionalCachePaths: additionalPaths, logFilesPath: context.sharedContext.applicationBindings.containerPath + "/telegram-data/logs")
+ |> map(Optional.init))
+}
+
+public func storageUsageController(context: AccountContext, cacheUsagePromise: Promise? = nil, isModal: Bool = false) -> ViewController {
+ let statePromise = ValuePromise(StoragUsageState(peerIdWithRevealedOptions: nil))
+ let stateValue = Atomic(value: StoragUsageState(peerIdWithRevealedOptions: nil))
+ let updateState: ((StoragUsageState) -> StoragUsageState) -> Void = { f in
+ statePromise.set(stateValue.modify { f($0) })
+ }
+
let cacheSettingsPromise = Promise()
cacheSettingsPromise.set(context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.cacheStorageSettings])
|> map { sharedData -> CacheStorageSettings in
@@ -289,59 +375,27 @@ public func storageUsageController(context: AccountContext, isModal: Bool = fals
var presentControllerImpl: ((ViewController, PresentationContextType, Any?) -> Void)?
- let statsPromise = Promise()
- let resetStats: () -> Void = {
- let containerPath = context.sharedContext.applicationBindings.containerPath
- let additionalPaths: [String] = [
- NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0],
- containerPath + "/Documents/files",
- containerPath + "/Documents/video",
- containerPath + "/Documents/audio",
- containerPath + "/Documents/mediacache",
- containerPath + "/Documents/tempcache_v1/store",
- ]
- statsPromise.set(.single(nil)
- |> then(collectCacheUsageStats(account: context.account, additionalCachePaths: additionalPaths, logFilesPath: context.sharedContext.applicationBindings.containerPath + "/telegram-data/logs")
- |> map(Optional.init)))
+ var statsPromise: Promise
+ if let cacheUsagePromise = cacheUsagePromise {
+ statsPromise = cacheUsagePromise
+ } else {
+ statsPromise = Promise()
+ statsPromise.set(cacheUsageStats(context: context))
+ }
+
+ let resetStats: () -> Void = {
+ statsPromise.set(cacheUsageStats(context: context))
}
- resetStats()
let actionDisposables = DisposableSet()
let clearDisposable = MetaDisposable()
actionDisposables.add(clearDisposable)
- let arguments = StorageUsageControllerArguments(account: context.account, updateKeepMedia: {
- let presentationData = context.sharedContext.currentPresentationData.with { $0 }
- let controller = ActionSheetController(presentationTheme: presentationData.theme)
- let dismissAction: () -> Void = { [weak controller] in
- controller?.dismissAnimated()
- }
- let timeoutAction: (Int32) -> Void = { timeout in
- let _ = updateCacheStorageSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in
- return current.withUpdatedDefaultCacheStorageTimeout(timeout)
- }).start()
- }
- var values: [Int32] = [
- 3 * 24 * 60 * 60,
- 7 * 24 * 60 * 60,
- 1 * 31 * 24 * 60 * 60,
- Int32.max
- ]
- #if DEBUG
- values.insert(60 * 60, at: 0)
- #endif
- let timeoutItems: [ActionSheetItem] = values.map { value in
- return ActionSheetButtonItem(title: stringForKeepMediaTimeout(strings: presentationData.strings, timeout: value), action: {
- dismissAction()
- timeoutAction(value)
- })
- }
- controller.setItemGroups([
- ActionSheetItemGroup(items: timeoutItems),
- ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })])
- ])
- presentControllerImpl?(controller, .window(.root), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+ let arguments = StorageUsageControllerArguments(account: context.account, updateKeepMediaTimeout: { value in
+ let _ = updateCacheStorageSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in
+ return current.withUpdatedDefaultCacheStorageTimeout(value)
+ }).start()
}, openClearAll: {
let _ = (statsPromise.get()
|> take(1)
@@ -379,11 +433,10 @@ public func storageUsageController(context: AccountContext, isModal: Bool = fals
controller?.updateItem(groupIndex: 0, itemIndex: itemIndex, { item in
let title: String
var filteredSize = sizeIndex.values.reduce(0, { $0 + ($1.0 ? $1.1 : 0) })
- selectedSize = filteredSize
-
if otherSize.0 {
filteredSize += otherSize.1
}
+ selectedSize = filteredSize
if filteredSize == 0 {
title = presentationData.strings.Cache_ClearNone
@@ -535,8 +588,7 @@ public func storageUsageController(context: AccountContext, isModal: Bool = fals
clearDisposable.set((signal
|> deliverOnMainQueue).start(completed: {
statsPromise.set(.single(.result(resultStats)))
- let deviceName = UIDevice.current.userInterfaceIdiom == .pad ? "iPad" : "iPhone"
- presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", deviceName).0), elevatedLayout: false, action: { _ in }), .current, nil)
+ presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in }), .current, nil)
}))
}
@@ -717,8 +769,7 @@ public func storageUsageController(context: AccountContext, isModal: Bool = fals
clearDisposable.set((signal
|> deliverOnMainQueue).start(completed: {
statsPromise.set(.single(.result(resultStats)))
- let deviceName = UIDevice.current.userInterfaceIdiom == .pad ? "iPad" : "iPhone"
- presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", deviceName).0), elevatedLayout: false, action: { _ in }), .current, nil)
+ presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in }), .current, nil)
}))
}
@@ -734,18 +785,147 @@ public func storageUsageController(context: AccountContext, isModal: Bool = fals
}
}
})
+ }, clearPeerMedia: { peerId in
+ let _ = (statsPromise.get() |> take(1) |> deliverOnMainQueue).start(next: { [weak statsPromise] result in
+ if let result = result, case let .result(stats) = result {
+ var additionalPeerId: PeerId?
+ if var categories = stats.media[peerId], let peer = stats.peers[peerId] {
+ if let channel = peer as? TelegramChannel, case .group = channel.info {
+ for (_, peer) in stats.peers {
+ if let group = peer as? TelegramGroup, let migrationReference = group.migrationReference, migrationReference.peerId == peerId {
+ if let additionalCategories = stats.media[group.id] {
+ additionalPeerId = group.id
+ categories.merge(additionalCategories, uniquingKeysWith: { lhs, rhs in
+ return lhs.merging(rhs, uniquingKeysWith: { lhs, rhs in
+ return lhs + rhs
+ })
+ })
+ }
+ }
+ }
+ }
+
+ var sizeIndex: [PeerCacheUsageCategory: (Bool, Int64)] = [:]
+ let validCategories: [PeerCacheUsageCategory] = [.image, .video, .audio, .file]
+
+ var totalSize: Int64 = 0
+
+ for categoryId in validCategories {
+ if let media = categories[categoryId] {
+ var categorySize: Int64 = 0
+ for (_, size) in media {
+ categorySize += size
+ }
+ sizeIndex[categoryId] = (true, categorySize)
+ totalSize += categorySize
+ }
+ }
+
+ if let statsPromise = statsPromise {
+ let clearCategories = sizeIndex.keys.filter({ sizeIndex[$0]!.0 })
+ var clearMediaIds = Set()
+
+ var media = stats.media
+ if var categories = media[peerId] {
+ for category in clearCategories {
+ if let contents = categories[category] {
+ for (mediaId, _) in contents {
+ clearMediaIds.insert(mediaId)
+ }
+ }
+ categories.removeValue(forKey: category)
+ }
+
+ media[peerId] = categories
+ }
+ if let additionalPeerId = additionalPeerId {
+ if var categories = media[additionalPeerId] {
+ for category in clearCategories {
+ if let contents = categories[category] {
+ for (mediaId, _) in contents {
+ clearMediaIds.insert(mediaId)
+ }
+ }
+ categories.removeValue(forKey: category)
+ }
+
+ media[additionalPeerId] = categories
+ }
+ }
+
+ var clearResourceIds = Set()
+ for id in clearMediaIds {
+ if let ids = stats.mediaResourceIds[id] {
+ for resourceId in ids {
+ clearResourceIds.insert(WrappedMediaResourceId(resourceId))
+ }
+ }
+ }
+
+ var signal = clearCachedMediaResources(account: context.account, mediaResourceIds: clearResourceIds)
+
+ let resultStats = CacheUsageStats(media: media, mediaResourceIds: stats.mediaResourceIds, peers: stats.peers, otherSize: stats.otherSize, otherPaths: stats.otherPaths, cacheSize: stats.cacheSize, tempPaths: stats.tempPaths, tempSize: stats.tempSize, immutableSize: stats.immutableSize)
+
+ var cancelImpl: (() -> Void)?
+ let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+ let progressSignal = Signal { subscriber in
+ let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+ cancelImpl?()
+ }))
+ presentControllerImpl?(controller, .window(.root), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+ return ActionDisposable { [weak controller] in
+ Queue.mainQueue().async() {
+ controller?.dismiss()
+ }
+ }
+ }
+ |> runOn(Queue.mainQueue())
+ |> delay(0.15, queue: Queue.mainQueue())
+ let progressDisposable = progressSignal.start()
+
+ signal = signal
+ |> afterDisposed {
+ Queue.mainQueue().async {
+ progressDisposable.dispose()
+ }
+ }
+ cancelImpl = {
+ clearDisposable.set(nil)
+ resetStats()
+ }
+ clearDisposable.set((signal
+ |> deliverOnMainQueue).start(completed: {
+ statsPromise.set(.single(.result(resultStats)))
+ presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(totalSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in }), .current, nil)
+ }))
+ }
+ }
+ }
+ })
+
+ updateState { state in
+ return state.withUpdatedPeerIdWithRevealedOptions(nil)
+ }
+ }, setPeerIdWithRevealedOptions: { peerId, fromPeerId in
+ updateState { state in
+ if (peerId == nil && fromPeerId == state.peerIdWithRevealedOptions) || (peerId != nil && fromPeerId == nil) {
+ return state.withUpdatedPeerIdWithRevealedOptions(peerId)
+ } else {
+ return state
+ }
+ }
})
var dismissImpl: (() -> Void)?
- let signal = combineLatest(context.sharedContext.presentationData, cacheSettingsPromise.get(), statsPromise.get()) |> deliverOnMainQueue
- |> map { presentationData, cacheSettings, cacheStats -> (ItemListControllerState, (ItemListNodeState, Any)) in
+ let signal = combineLatest(context.sharedContext.presentationData, cacheSettingsPromise.get(), statsPromise.get(), statePromise.get()) |> deliverOnMainQueue
+ |> map { presentationData, cacheSettings, cacheStats, state -> (ItemListControllerState, (ItemListNodeState, Any)) in
let leftNavigationButton = isModal ? ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: {
dismissImpl?()
}) : nil
let controllerState = ItemListControllerState(theme: presentationData.theme, title: .text(presentationData.strings.Cache_Title), leftNavigationButton: leftNavigationButton, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
- let listState = ItemListNodeState(entries: storageUsageControllerEntries(presentationData: presentationData, cacheSettings: cacheSettings, cacheStats: cacheStats), style: .blocks, emptyStateItem: nil, animateChanges: false)
+ let listState = ItemListNodeState(entries: storageUsageControllerEntries(presentationData: presentationData, cacheSettings: cacheSettings, cacheStats: cacheStats, state: state), style: .blocks, emptyStateItem: nil, animateChanges: false)
return (controllerState, (listState, arguments))
} |> afterDisposed {
@@ -753,6 +933,10 @@ public func storageUsageController(context: AccountContext, isModal: Bool = fals
}
let controller = ItemListController(context: context, state: signal)
+ if isModal {
+ controller.navigationPresentation = .modal
+ controller.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
+ }
presentControllerImpl = { [weak controller] c, contextType, a in
controller?.present(c, in: contextType, with: a)
}
diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift
new file mode 100644
index 0000000000..03ca00282f
--- /dev/null
+++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift
@@ -0,0 +1,318 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import TelegramCore
+import SyncCore
+import TelegramUIPreferences
+import TelegramPresentationData
+import ItemListUI
+import PresentationDataUtils
+
+struct StorageUsageCategory: Equatable {
+ let title: String
+ let size: Int64
+ let fraction: CGFloat
+ let color: UIColor
+}
+
+final class StorageUsageItem: ListViewItem, ItemListItem {
+ let theme: PresentationTheme
+ let dateTimeFormat: PresentationDateTimeFormat
+ let categories: [StorageUsageCategory]
+ let sectionId: ItemListSectionId
+
+ init(theme: PresentationTheme, dateTimeFormat: PresentationDateTimeFormat, categories: [StorageUsageCategory], sectionId: ItemListSectionId) {
+ self.theme = theme
+ self.dateTimeFormat = dateTimeFormat
+ self.categories = categories
+ 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 = StorageUsageItemNode()
+ 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? StorageUsageItemNode {
+ let makeLayout = nodeValue.asyncLayout()
+
+ async {
+ let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+ Queue.mainQueue().async {
+ completion(layout, { _ in
+ apply()
+ })
+ }
+ }
+ }
+ }
+ }
+}
+
+private func generateDotImage(color: UIColor) -> UIImage? {
+ return generateImage(CGSize(width: 8.0, height: 8.0), rotatedContext: { size, context in
+ let bounds = CGRect(origin: CGPoint(), size: size)
+ context.clear(bounds)
+ context.setFillColor(color.cgColor)
+ context.fillEllipse(in: bounds)
+ })
+}
+
+private func generateLineMaskImage(color: UIColor) -> UIImage? {
+ return generateImage(CGSize(width: 8.0, height: 8.0), rotatedContext: { size, context in
+ let bounds = CGRect(origin: CGPoint(), size: size)
+ context.setFillColor(color.cgColor)
+ context.fill(bounds)
+
+ context.setBlendMode(.clear)
+ context.setFillColor(UIColor.clear.cgColor)
+ context.fillEllipse(in: bounds)
+ })?.stretchableImage(withLeftCapWidth: 4, topCapHeight: 4)
+}
+
+private final class StorageUsageItemNode: ListViewItemNode {
+ private let backgroundNode: ASDisplayNode
+ private let topStripeNode: ASDisplayNode
+ private let bottomStripeNode: ASDisplayNode
+ private let maskNode: ASImageNode
+
+ private let lineMaskNode: ASImageNode
+ private var lineNodes: [ASDisplayNode]
+ private var descriptionNodes: [(ASImageNode, TextNode)]
+
+ private var item: StorageUsageItem?
+ private var layoutParams: ListViewItemLayoutParams?
+
+ init() {
+ self.backgroundNode = ASDisplayNode()
+ self.backgroundNode.isLayerBacked = true
+
+ self.topStripeNode = ASDisplayNode()
+ self.topStripeNode.isLayerBacked = true
+
+ self.bottomStripeNode = ASDisplayNode()
+ self.bottomStripeNode.isLayerBacked = true
+
+ self.maskNode = ASImageNode()
+
+ self.lineMaskNode = ASImageNode()
+ self.lineMaskNode.displaysAsynchronously = false
+ self.lineMaskNode.displayWithoutProcessing = true
+ self.lineMaskNode.contentMode = .scaleToFill
+
+ self.lineNodes = []
+ self.descriptionNodes = []
+
+ super.init(layerBacked: false, dynamicBounce: false)
+
+ self.addSubnode(self.lineMaskNode)
+ }
+
+ func asyncLayout() -> (_ item: StorageUsageItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
+ let currentItem = self.item
+
+ return { [weak self] item, params, neighbors in
+ if let strongSelf = self, strongSelf.lineNodes.count != item.categories.count {
+ for node in strongSelf.lineNodes {
+ node.removeFromSupernode()
+ }
+
+ strongSelf.lineNodes = []
+
+ for pair in strongSelf.descriptionNodes {
+ pair.0.removeFromSupernode()
+ pair.1.removeFromSupernode()
+ }
+
+ strongSelf.descriptionNodes = []
+
+ for _ in item.categories {
+ let lineNode = ASDisplayNode()
+ strongSelf.insertSubnode(lineNode, belowSubnode: strongSelf.lineMaskNode)
+ strongSelf.lineNodes.append(lineNode)
+
+ let dotNode = ASImageNode()
+ dotNode.displaysAsynchronously = false
+ dotNode.displayWithoutProcessing = true
+ strongSelf.addSubnode(dotNode)
+
+ let textNode = TextNode()
+ strongSelf.addSubnode(textNode)
+
+ strongSelf.descriptionNodes.append((dotNode, textNode))
+ }
+ }
+
+ var makeNodesLayout: [(TextNodeLayoutArguments) -> (TextNodeLayout, () -> TextNode)] = []
+ if let strongSelf = self {
+ for nodes in strongSelf.descriptionNodes {
+ let makeTextLayout = TextNode.asyncLayout(nodes.1)
+ makeNodesLayout.append(makeTextLayout)
+ }
+ }
+
+ var themeUpdated = false
+ if currentItem?.theme !== item.theme {
+ themeUpdated = true
+ }
+
+ let contentSize: CGSize
+ let insets: UIEdgeInsets
+ let separatorHeight = UIScreenPixel
+
+ var textFramesApplies: [(CGRect, () -> TextNode)] = []
+
+ let inset: CGFloat = 16.0
+ let horizontalSpacing: CGFloat = 32.0
+ let verticalSpacing: CGFloat = 22.0
+ var textOrigin: CGPoint = CGPoint(x: params.leftInset + horizontalSpacing, y: 52.0)
+
+ for i in 0 ..< item.categories.count {
+ let makeTextLayout = makeNodesLayout[i]
+ let category = item.categories[i]
+
+ let attributedString = NSMutableAttributedString(string: category.title, font: Font.regular(14.0), textColor: item.theme.list.itemPrimaryTextColor, paragraphAlignment: .natural)
+ attributedString.append(NSAttributedString(string: " • \(dataSizeString(category.size, forceDecimal: true, decimalSeparator: item.dateTimeFormat.decimalSeparator))", font: Font.bold(14.0), textColor: item.theme.list.itemPrimaryTextColor))
+
+ let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: attributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 60.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+
+ var textFrame = CGRect(origin: textOrigin, size: textLayout.size)
+ if textFrame.maxX > params.width - params.rightInset - inset {
+ textFrame.origin = CGPoint(x: horizontalSpacing, y: textOrigin.y + verticalSpacing)
+ }
+
+ textOrigin = CGPoint(x: textFrame.maxX + horizontalSpacing, y: textFrame.minY)
+
+ textFramesApplies.append((textFrame, textApply))
+ }
+
+ contentSize = CGSize(width: params.width, height: textOrigin.y + 34.0)
+ insets = itemListNeighborsGroupedInsets(neighbors)
+
+ let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
+ let layoutSize = layout.size
+
+ return (layout, { [weak self] in
+ if let strongSelf = self {
+ strongSelf.item = item
+ strongSelf.layoutParams = params
+
+ strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor
+ strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
+ strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
+
+ if themeUpdated {
+ strongSelf.lineMaskNode.image = generateLineMaskImage(color: item.theme.list.itemBlocksBackgroundColor)
+ }
+
+ for (_, textApply) in textFramesApplies {
+ let _ = textApply()
+ }
+
+ if strongSelf.backgroundNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
+ }
+ if strongSelf.topStripeNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1)
+ }
+ if strongSelf.bottomStripeNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2)
+ }
+ if strongSelf.maskNode.supernode == nil {
+ strongSelf.insertSubnode(strongSelf.maskNode, at: 3)
+ }
+
+ let hasCorners = itemListHasRoundedBlockLayout(params)
+ var hasTopCorners = false
+ var hasBottomCorners = false
+ switch neighbors.top {
+ case .sameSection(false):
+ strongSelf.topStripeNode.isHidden = true
+ default:
+ hasTopCorners = true
+ strongSelf.topStripeNode.isHidden = hasCorners
+ }
+ let bottomStripeInset: CGFloat
+ let bottomStripeOffset: CGFloat
+ switch neighbors.bottom {
+ case .sameSection(false):
+ bottomStripeInset = 0.0
+ bottomStripeOffset = -separatorHeight
+ default:
+ bottomStripeInset = 0.0
+ bottomStripeOffset = 0.0
+ hasBottomCorners = true
+ strongSelf.bottomStripeNode.isHidden = hasCorners
+ }
+
+ strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil
+
+ strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight)))
+ strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0)
+ strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight))
+ strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))
+
+ let lineInset: CGFloat = params.leftInset + 12.0
+ var lineOrigin = CGPoint(x: lineInset, y: 16.0)
+ let lineWidth = params.width - lineOrigin.x * 2.0
+
+ strongSelf.lineMaskNode.frame = CGRect(origin: lineOrigin, size: CGSize(width: lineWidth, height: 21.0))
+
+ for i in 0 ..< strongSelf.lineNodes.count {
+ let lineNode = strongSelf.lineNodes[i]
+ let category = item.categories[i]
+
+ lineNode.backgroundColor = category.color
+
+ var categoryWidth = max(floor(lineWidth * category.fraction), 2.0)
+ if i == strongSelf.lineNodes.count - 1 {
+ categoryWidth = max(0.0, lineWidth - (lineOrigin.x - lineInset))
+ }
+
+ let lineRect = CGRect(origin: lineOrigin, size: CGSize(width: categoryWidth, height: 21.0))
+ lineNode.frame = lineRect
+
+ lineOrigin.x += lineRect.width + 1.0
+ }
+
+ for i in 0 ..< strongSelf.descriptionNodes.count {
+ let dotNode = strongSelf.descriptionNodes[i].0
+ let textNode = strongSelf.descriptionNodes[i].1
+ let textFrame = textFramesApplies[i].0
+ let category = item.categories[i]
+
+ if dotNode.image == nil || themeUpdated {
+ dotNode.image = generateDotImage(color: category.color)
+ }
+ dotNode.frame = CGRect(x: textFrame.minX - 16.0, y: textFrame.minY + 4.0, width: 8.0, height: 8.0)
+
+ textNode.frame = textFrame
+ }
+ }
+ })
+ }
+ }
+
+ override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+ self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+ }
+
+ override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+ self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+ }
+}
diff --git a/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift b/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift
index 2bca8674f5..65fb2750a9 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift
+++ b/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift
@@ -9,7 +9,7 @@ import ItemListUI
import PhotoResources
import OpenInExternalAppUI
-public class WebBrowserItem: ListViewItem, ItemListItem {
+class WebBrowserItem: ListViewItem, ItemListItem {
let account: Account
let theme: PresentationTheme
let title: String
@@ -71,7 +71,7 @@ public class WebBrowserItem: ListViewItem, ItemListItem {
private let titleFont = Font.regular(17.0)
-public class WebBrowserItemNode: ListViewItemNode {
+private final class WebBrowserItemNode: ListViewItemNode {
private let backgroundNode: ASDisplayNode
private let topStripeNode: ASDisplayNode
private let bottomStripeNode: ASDisplayNode
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift
index 336599c918..3b4c1fe359 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift
+++ b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift
@@ -441,7 +441,7 @@ public func passcodeOptionsAccessController(context: AccountContext, animateIn:
}
}
-public func passcodeEntryController(context: AccountContext, animateIn: Bool = true, completion: @escaping (Bool) -> Void) -> Signal {
+public func passcodeEntryController(context: AccountContext, animateIn: Bool = true, modalPresentation: Bool = false, completion: @escaping (Bool) -> Void) -> Signal {
return context.sharedContext.accountManager.transaction { transaction -> PostboxAccessChallengeData in
return transaction.getAccessChallengeData()
}
@@ -458,14 +458,18 @@ public func passcodeEntryController(context: AccountContext, animateIn: Bool = t
return nil
} else {
let biometrics: PasscodeEntryControllerBiometricsMode
+ #if targetEnvironment(simulator)
+ biometrics = .enabled(nil)
+ #else
if let passcodeSettings = passcodeSettings, passcodeSettings.enableBiometrics {
biometrics = .enabled(context.sharedContext.applicationBindings.isMainApp ? passcodeSettings.biometricsDomainState : passcodeSettings.shareBiometricsDomainState)
} else {
biometrics = .none
}
+ #endif
let controller = PasscodeEntryController(applicationBindings: context.sharedContext.applicationBindings, accountManager: context.sharedContext.accountManager, appLockContext: context.sharedContext.appLockContext, presentationData: context.sharedContext.currentPresentationData.with { $0 }, presentationDataSignal: context.sharedContext.presentationData, challengeData: challenge, biometrics: biometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: false, fadeIn: true, cancel: {
completion(false)
- }))
+ }, modalPresentation: modalPresentation))
controller.presentationCompleted = { [weak controller] in
Queue.mainQueue().after(0.5, { [weak controller] in
controller?.requestBiometrics()
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift
index e1440701ed..013c7b52b0 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift
+++ b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift
@@ -641,14 +641,14 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
case .set:
break
case let .notSet(pendingEmail):
- if pendingEmail == nil {
+ break
+ //intro = pendingEmail == nil
+ /*if pendingEmail == nil {
let controller = TwoFactorAuthSplashScreen(context: context, mode: .intro)
pushControllerImpl?(controller, true)
} else {
- }
- //intro = pendingEmail == nil
- return
+ }*/
}
}
if intro {
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift b/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift
index 6c74094176..e2e79c9341 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift
+++ b/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift
@@ -268,6 +268,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
var replaceControllerImpl: ((ViewController, Bool) -> Void)?
var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)?
+ var dismissImpl: (() -> Void)?
let actionsDisposable = DisposableSet()
@@ -629,7 +630,8 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
state.checking = false
return state
}
- dataPromise.set(.single(TwoStepVerificationUnlockSettingsControllerData.access(configuration: .notSet(pendingEmail: nil))))
+ //dataPromise.set(.single(TwoStepVerificationUnlockSettingsControllerData.access(configuration: .notSet(pendingEmail: nil))))
+ dismissImpl?()
}))
}
})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
@@ -642,33 +644,35 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
|> take(1)
|> deliverOnMainQueue).start(next: { data in
switch data {
- case .access:
- break
- case let .manage(password, emailSet, _, hasSecureValues):
- let controller = SetupTwoStepVerificationController(context: context, initialState: .addEmail(hadRecoveryEmail: emailSet, hasSecureValues: hasSecureValues, password: password), stateUpdated: { update, shouldDismiss, controller in
- switch update {
- case .noPassword:
- assertionFailure()
- break
- case let .awaitingEmailConfirmation(password, pattern, codeLength):
- let data: TwoStepVerificationUnlockSettingsControllerData = .manage(password: password, emailSet: emailSet, pendingEmail: TwoStepVerificationPendingEmail(pattern: pattern, codeLength: codeLength), hasSecureValues: hasSecureValues)
+ case .access:
+ break
+ case let .manage(password, emailSet, _, hasSecureValues):
+ //let controller = TwoFactorDataInputScreen(context: context, mode: .updateEmailAddress(password: password))
+
+ let controller = SetupTwoStepVerificationController(context: context, initialState: .addEmail(hadRecoveryEmail: emailSet, hasSecureValues: hasSecureValues, password: password), stateUpdated: { update, shouldDismiss, controller in
+ switch update {
+ case .noPassword:
+ assertionFailure()
+ break
+ case let .awaitingEmailConfirmation(password, pattern, codeLength):
+ let data: TwoStepVerificationUnlockSettingsControllerData = .manage(password: password, emailSet: emailSet, pendingEmail: TwoStepVerificationPendingEmail(pattern: pattern, codeLength: codeLength), hasSecureValues: hasSecureValues)
+ dataPromise.set(.single(data))
+ case let .passwordSet(password, hasRecoveryEmail, hasSecureValues):
+ if let password = password {
+ let data: TwoStepVerificationUnlockSettingsControllerData = .manage(password: password, emailSet: hasRecoveryEmail, pendingEmail: nil, hasSecureValues: hasSecureValues)
dataPromise.set(.single(data))
- case let .passwordSet(password, hasRecoveryEmail, hasSecureValues):
- if let password = password {
- let data: TwoStepVerificationUnlockSettingsControllerData = .manage(password: password, emailSet: hasRecoveryEmail, pendingEmail: nil, hasSecureValues: hasSecureValues)
- dataPromise.set(.single(data))
- let presentationData = context.sharedContext.currentPresentationData.with { $0 }
- presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(emailSet ? presentationData.strings.TwoStepAuth_EmailChangeSuccess : presentationData.strings.TwoStepAuth_EmailAddSuccess, false)), nil)
- } else {
- dataPromise.set(.single(.access(configuration: nil))
- |> then(twoStepVerificationConfiguration(account: context.account) |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
- }
- }
- if shouldDismiss {
- controller.dismiss()
- }
- })
- presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+ let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+ presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(emailSet ? presentationData.strings.TwoStepAuth_EmailChangeSuccess : presentationData.strings.TwoStepAuth_EmailAddSuccess, false)), nil)
+ } else {
+ dataPromise.set(.single(.access(configuration: nil))
+ |> then(twoStepVerificationConfiguration(account: context.account) |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
+ }
+ }
+ if shouldDismiss {
+ controller.dismiss()
+ }
+ })
+ presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
}
}))
}, openResetPendingEmail: {
@@ -822,6 +826,9 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
controller.present(c, in: .window(.root), with: p)
}
}
+ dismissImpl = { [weak controller] in
+ controller?.dismiss()
+ }
initialFocusImpl = { [weak controller] in
guard let controller = controller, controller.didAppearOnce else {
return
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
index 350cc4e929..c8f4087e97 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
@@ -239,7 +239,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
let timestamp4 = timestamp + 3000
items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer4.id, namespace: 0, id: 0), timestamp: timestamp4)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp4, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer4, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer4), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction))
- let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right)
+ let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height)
if let chatNodes = self.chatNodes {
for i in 0 ..< items.count {
let itemNode = chatNodes[i]
@@ -308,7 +308,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
let message4 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message4, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.theme.chat.defaultWallpaper, fontSize: self.presentationData.fontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil))
- let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right)
+ let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height)
if let messageNodes = self.messageNodes {
for i in 0 ..< items.count {
let itemNode = messageNodes[i]
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift
index 7991e6df91..a4274e606c 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift
@@ -291,7 +291,7 @@ final class ThemeColorsGridControllerNode: ASDisplayNode {
}
let makeColorLayout = self.customColorItemNode.asyncLayout()
- let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: listInsets.left, rightInset: listInsets.right)
+ let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: listInsets.left, rightInset: listInsets.right, availableHeight: layout.size.height)
let (colorLayout, colorApply) = makeColorLayout(self.customColorItem, params, ItemListNeighbors(top: .none, bottom: .none))
colorApply()
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift
index d47d294107..2cc1a23405 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift
@@ -476,7 +476,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
transition.updateFrame(node: strongSelf.bottomBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: gridLayout.contentSize.height), size: CGSize(width: layout.size.width, height: 500.0)))
transition.updateFrame(node: strongSelf.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: gridLayout.contentSize.height), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
- let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right)
+ let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height)
let makeResetLayout = strongSelf.resetItemNode.asyncLayout()
let makeResetDescriptionLayout = strongSelf.resetDescriptionItemNode.asyncLayout()
@@ -640,7 +640,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
}
}
- let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: listInsets.left, rightInset: listInsets.right)
+ let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: listInsets.left, rightInset: listInsets.right, availableHeight: layout.size.height)
let (colorLayout, colorApply) = makeColorLayout(self.colorItem, params, ItemListNeighbors(top: .none, bottom: .sameSection(alwaysPlain: false)))
let (galleryLayout, galleryApply) = makeGalleryLayout(self.galleryItem, params, ItemListNeighbors(top: .sameSection(alwaysPlain: false), bottom: .sameSection(alwaysPlain: true)))
let (descriptionLayout, descriptionApply) = makeDescriptionLayout(self.descriptionItem, params, ItemListNeighbors(top: .none, bottom: .none))
diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
index 1142708ff4..b8bd4b6c89 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
@@ -372,7 +372,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
width = layout.size.width
}
- let params = ListViewItemLayoutParams(width: width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right)
+ let params = ListViewItemLayoutParams(width: width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height)
if let chatNodes = self.chatNodes {
for i in 0 ..< items.count {
let itemNode = chatNodes[i]
@@ -452,7 +452,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
width = layout.size.width
}
- let params = ListViewItemLayoutParams(width: width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right)
+ let params = ListViewItemLayoutParams(width: width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height)
if let messageNodes = self.messageNodes {
for i in 0 ..< items.count {
let itemNode = messageNodes[i]
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
index 714faf1251..9c90bff6f7 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
@@ -360,7 +360,8 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
private func themeSettingsControllerEntries(presentationData: PresentationData, theme: PresentationTheme, themeReference: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], availableThemes: [PresentationThemeReference], autoNightSettings: AutomaticThemeSwitchSetting, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, largeEmoji: Bool, disableAnimations: Bool, availableAppIcons: [PresentationAppIcon], currentAppIconName: String?) -> [ThemeSettingsControllerEntry] {
var entries: [ThemeSettingsControllerEntry] = []
- entries.append(.themeListHeader(presentationData.theme, strings.Appearance_ColorTheme.uppercased()))
+ let title = presentationData.autoNightModeTriggered ? strings.Appearance_ColorThemeNight.uppercased() : strings.Appearance_ColorTheme.uppercased()
+ entries.append(.themeListHeader(presentationData.theme, title))
entries.append(.chatPreview(presentationData.theme, theme, wallpaper, fontSize, presentationData.strings, dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (presentationData.strings.Appearance_PreviewReplyAuthor, presentationData.strings.Appearance_PreviewReplyText), text: presentationData.strings.Appearance_PreviewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: presentationData.strings.Appearance_PreviewOutgoingText)]))
entries.append(.themeItem(presentationData.theme, presentationData.strings, availableThemes, themeReference, themeSpecificAccentColors, themeSpecificAccentColors[themeReference.index]))
@@ -371,22 +372,22 @@ private func themeSettingsControllerEntries(presentationData: PresentationData,
entries.append(.wallpaper(presentationData.theme, strings.Settings_ChatBackground))
- let title: String
+ let autoNightMode: String
switch autoNightSettings.trigger {
case .system:
if #available(iOSApplicationExtension 13.0, iOS 13.0, *) {
- title = strings.AutoNightTheme_System
+ autoNightMode = strings.AutoNightTheme_System
} else {
- title = strings.AutoNightTheme_Disabled
+ autoNightMode = strings.AutoNightTheme_Disabled
}
case .explicitNone:
- title = strings.AutoNightTheme_Disabled
+ autoNightMode = strings.AutoNightTheme_Disabled
case .timeBased:
- title = strings.AutoNightTheme_Scheduled
+ autoNightMode = strings.AutoNightTheme_Scheduled
case .brightness:
- title = strings.AutoNightTheme_Automatic
+ autoNightMode = strings.AutoNightTheme_Automatic
}
- entries.append(.autoNightTheme(presentationData.theme, strings.Appearance_AutoNightTheme, title))
+ entries.append(.autoNightTheme(presentationData.theme, strings.Appearance_AutoNightTheme, autoNightMode))
entries.append(.fontSizeHeader(presentationData.theme, strings.Appearance_TextSize.uppercased()))
entries.append(.fontSize(presentationData.theme, fontSize))
@@ -567,32 +568,39 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
let dateTimeFormat = presentationData.dateTimeFormat
let largeEmoji = presentationData.largeEmoji
let disableAnimations = presentationData.disableAnimations
-
- let accentColor = settings.themeSpecificAccentColors[settings.theme.index]?.color
- let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: settings.theme, accentColor: accentColor, serviceBackgroundColor: defaultServiceBackgroundColor, baseColor: settings.themeSpecificAccentColors[settings.theme.index]?.baseColor ?? .blue, preview: true) ?? defaultPresentationTheme
-
- let wallpaper: TelegramWallpaper
- if let themeSpecificWallpaper = settings.themeSpecificChatWallpapers[settings.theme.index] {
- wallpaper = themeSpecificWallpaper
+
+ let themeReference: PresentationThemeReference
+ if presentationData.autoNightModeTriggered {
+ themeReference = settings.automaticThemeSwitchSetting.theme
} else {
- wallpaper = settings.chatWallpaper
+ themeReference = settings.theme
}
+ let theme = presentationData.theme
+ let accentColor = settings.themeSpecificAccentColors[themeReference.index]?.color
+ let wallpaper = settings.themeSpecificChatWallpapers[themeReference.index] ?? settings.chatWallpaper
+
let rightNavigationButton = ItemListNavigationButton(content: .icon(.action), style: .regular, enabled: true, action: {
moreImpl?()
})
- let defaultThemes: [PresentationThemeReference] = [.builtin(.dayClassic), .builtin(.day), .builtin(.night), .builtin(.nightAccent)]
+ var defaultThemes: [PresentationThemeReference] = []
+ if presentationData.autoNightModeTriggered {
+ } else {
+ defaultThemes.append(contentsOf: [.builtin(.dayClassic), .builtin(.day)])
+ }
+ defaultThemes.append(contentsOf: [.builtin(.night), .builtin(.nightAccent)])
+
let cloudThemes: [PresentationThemeReference] = cloudThemes.map { .cloud(PresentationCloudTheme(theme: $0, resolvedWallpaper: nil)) }
var availableThemes = defaultThemes
- if defaultThemes.first(where: { $0.index == settings.theme.index }) == nil && cloudThemes.first(where: { $0.index == settings.theme.index }) == nil {
- availableThemes.append(settings.theme)
+ if defaultThemes.first(where: { $0.index == themeReference.index }) == nil && cloudThemes.first(where: { $0.index == themeReference.index }) == nil {
+ availableThemes.append(themeReference)
}
availableThemes.append(contentsOf: cloudThemes)
let controllerState = ItemListControllerState(theme: presentationData.theme, title: .text(presentationData.strings.Appearance_Title), leftNavigationButton: nil, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back))
- let listState = ItemListNodeState(entries: themeSettingsControllerEntries(presentationData: presentationData, theme: theme, themeReference: settings.theme, themeSpecificAccentColors: settings.themeSpecificAccentColors, availableThemes: availableThemes, autoNightSettings: settings.automaticThemeSwitchSetting, strings: presentationData.strings, wallpaper: wallpaper, fontSize: fontSize, dateTimeFormat: dateTimeFormat, largeEmoji: largeEmoji, disableAnimations: disableAnimations, availableAppIcons: availableAppIcons, currentAppIconName: currentAppIconName), style: .blocks, ensureVisibleItemTag: focusOnItemTag, animateChanges: false)
+ let listState = ItemListNodeState(entries: themeSettingsControllerEntries(presentationData: presentationData, theme: theme, themeReference: themeReference, themeSpecificAccentColors: settings.themeSpecificAccentColors, availableThemes: availableThemes, autoNightSettings: settings.automaticThemeSwitchSetting, strings: presentationData.strings, wallpaper: wallpaper, fontSize: fontSize, dateTimeFormat: dateTimeFormat, largeEmoji: largeEmoji, disableAnimations: disableAnimations, availableAppIcons: availableAppIcons, currentAppIconName: currentAppIconName), style: .blocks, ensureVisibleItemTag: focusOnItemTag, animateChanges: false)
return (controllerState, (listState, arguments))
}
@@ -616,6 +624,8 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
return
}
+ let autoNightModeTriggered = context.sharedContext.currentPresentationData.with { $0 }.autoNightModeTriggered
+
let resolvedWallpaper: Signal
if case let .file(file) = presentationTheme.chat.defaultWallpaper, file.id == 0 {
resolvedWallpaper = cachedWallpaper(account: context.account, slug: file.slug, settings: file.settings)
@@ -647,6 +657,14 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
current = PresentationThemeSettings.defaultSettings
}
+ var theme = current.theme
+ var automaticThemeSwitchSetting = current.automaticThemeSwitchSetting
+ if autoNightModeTriggered {
+ automaticThemeSwitchSetting.theme = updatedTheme
+ } else {
+ theme = updatedTheme
+ }
+
let chatWallpaper: TelegramWallpaper
if let themeSpecificWallpaper = current.themeSpecificChatWallpapers[updatedTheme.index] {
chatWallpaper = themeSpecificWallpaper
@@ -654,8 +672,8 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
let presentationTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: updatedTheme, accentColor: current.themeSpecificAccentColors[updatedTheme.index]?.color, serviceBackgroundColor: .black, baseColor: nil) ?? defaultPresentationTheme
chatWallpaper = resolvedWallpaper ?? presentationTheme.chat.defaultWallpaper
}
-
- return PresentationThemeSettings(chatWallpaper: chatWallpaper, theme: updatedTheme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+
+ return PresentationThemeSettings(chatWallpaper: chatWallpaper, theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, fontSize: current.fontSize, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
})
})
}).start()
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift
index 46347f7d5f..f3304f3499 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift
@@ -112,7 +112,7 @@ private func updatedFileWallpaper(id: Int64? = nil, accessHash: Int64? = nil, sl
if let color = color {
colorValue = Int32(bitPattern: color.rgb)
intensityValue = intensity
- } else {
+ } else if isPattern {
colorValue = 0xd6e2ee
intensityValue = 50
}
@@ -384,10 +384,11 @@ public class WallpaperGalleryController: ViewController {
let updatedSettings = WallpaperSettings(blur: options.contains(.blur), motion: options.contains(.motion), color: baseSettings?.color, intensity: baseSettings?.intensity)
let wallpaper = wallpaper.withUpdatedSettings(updatedSettings)
+ let autoNightModeTriggered = strongSelf.presentationData.autoNightModeTriggered
let _ = (updatePresentationThemeSettingsInteractively(accountManager: strongSelf.context.sharedContext.accountManager, { current in
var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers
var chatWallpaper = current.chatWallpaper
- if automaticThemeShouldSwitchNow(settings: current.automaticThemeSwitchSetting, systemUserInterfaceStyle: .light) {
+ if autoNightModeTriggered {
themeSpecificChatWallpapers[current.automaticThemeSwitchSetting.theme.index] = wallpaper
} else {
themeSpecificChatWallpapers[current.theme.index] = wallpaper
@@ -412,23 +413,41 @@ public class WallpaperGalleryController: ViewController {
if options.contains(.blur) {
if let resource = resource {
let representation = CachedBlurredWallpaperRepresentation()
- let _ = strongSelf.context.account.postbox.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true).start()
+
+ var data: Data?
+ if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
+ data = maybeData
+ } else if let path = strongSelf.context.sharedContext.accountManager.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
+ data = maybeData
+ }
- if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
- strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data)
- let _ = strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true).start(completed: {
+ if let data = data {
+ strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
+ let _ = (strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true)
+ |> filter({ $0.complete })
+ |> take(1)
+ |> deliverOnMainQueue).start(next: { _ in
completion(wallpaper)
})
}
}
- } else if case let .file(file) = wallpaper {
+ } else if case let .file(file) = wallpaper, let resource = resource {
if file.isPattern, let color = file.settings.color, let intensity = file.settings.intensity {
let representation = CachedPatternWallpaperRepresentation(color: color, intensity: intensity)
- let _ = strongSelf.context.account.postbox.mediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true).start()
- if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(file.file.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
- strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(file.file.resource.id, data: data)
- let _ = strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true).start(completed: {
+ var data: Data?
+ if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
+ data = maybeData
+ } else if let path = strongSelf.context.sharedContext.accountManager.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
+ data = maybeData
+ }
+
+ if let data = data {
+ strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
+ let _ = (strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true)
+ |> filter({ $0.complete })
+ |> take(1)
+ |> deliverOnMainQueue).start(next: { _ in
completion(wallpaper)
})
}
@@ -629,7 +648,7 @@ public class WallpaperGalleryController: ViewController {
items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.fontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil))
- let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right)
+ let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height)
if let messageNodes = self.messageNodes {
for i in 0 ..< items.count {
let itemNode = messageNodes[i]
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift
index ec60b55351..16c46210e4 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift
@@ -292,8 +292,8 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
signal = wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: fileReference, representations: convertedRepresentations, alwaysShowThumbnailFirst: true, autoFetchFullSize: false)
}
fetchSignal = fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, reference: convertedRepresentations[convertedRepresentations.count - 1].reference)
- let account = context.account
- statusSignal = context.sharedContext.accountManager.mediaBox.resourceStatus(file.file.resource)
+ let account = self.context.account
+ statusSignal = self.context.sharedContext.accountManager.mediaBox.resourceStatus(file.file.resource)
|> take(1)
|> mapToSignal { status -> Signal in
if case .Local = status {
diff --git a/submodules/ShareController/BUCK b/submodules/ShareController/BUCK
index e67eab7f9c..9a5616a4e9 100644
--- a/submodules/ShareController/BUCK
+++ b/submodules/ShareController/BUCK
@@ -23,6 +23,7 @@ static_library(
"//submodules/ActivityIndicator:ActivityIndicator",
"//submodules/AppBundle:AppBundle",
"//submodules/TelegramStringFormatting:TelegramStringFormatting",
+ "//submodules/AppIntents:AppIntents",
],
frameworks = [
"$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/ShareController/Sources/ShareControllerNode.swift b/submodules/ShareController/Sources/ShareControllerNode.swift
index ce4adcd07e..1f5bfd5785 100644
--- a/submodules/ShareController/Sources/ShareControllerNode.swift
+++ b/submodules/ShareController/Sources/ShareControllerNode.swift
@@ -8,6 +8,7 @@ import TelegramCore
import SyncCore
import TelegramPresentationData
import AccountContext
+import AppIntents
enum ShareState {
case preparing
@@ -26,6 +27,7 @@ func openExternalShare(state: () -> Signal) {
final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate {
private let sharedContext: SharedAccountContext
+ private var account: Account?
private var presentationData: PresentationData
private let externalShare: Bool
private let immediateExternalShare: Bool
@@ -537,6 +539,10 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
peerIds = self.controllerInteraction!.selectedPeers.map { $0.peerId }
}
+ if let account = self.account {
+ donateSendMessageIntent(account: account, sharedContext: self.sharedContext, peerIds: peerIds)
+ }
+
if let signal = self.share?(self.inputFieldNode.text, peerIds) {
self.transitionToContentNode(ShareLoadingContainerNode(theme: self.presentationData.theme, forceNativeAppearance: true), fastOut: true)
let timestamp = CACurrentMediaTime()
@@ -629,6 +635,8 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
}
func updatePeers(account: Account, switchableAccounts: [AccountWithInfo], peers: [(RenderedPeer, PeerPresence?)], accountPeer: Peer, defaultAction: ShareControllerAction?) {
+ self.account = account
+
if let peersContentNode = self.peersContentNode, peersContentNode.accountPeer.id == accountPeer.id {
peersContentNode.peersValue.set(.single(peers))
return
diff --git a/submodules/ShareItems/Sources/TGShareLocationSignals.m b/submodules/ShareItems/Sources/TGShareLocationSignals.m
index 423536ab91..84544edba6 100644
--- a/submodules/ShareItems/Sources/TGShareLocationSignals.m
+++ b/submodules/ShareItems/Sources/TGShareLocationSignals.m
@@ -219,8 +219,10 @@ NSArray * TGQueryStringComponentsFromKeyAndArrayValue(NSString *key, NSArray *va
NSString *urlString = [NSString stringWithFormat:@"%@?%@", [TGShareFoursquareVenueEndpointUrl stringByAppendingPathComponent:venueId], TGQueryStringFromParametersWithEncoding([self _defaultParametersForFoursquare], NSUTF8StringEncoding)];
- return [[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:urlString]] mapToSignal:^id(NSData *data)
+ return [[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:urlString]] mapToSignal:^id(MTHttpResponse *response)
{
+ NSData *data = response.data;
+
id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
if (![json respondsToSelector:@selector(objectForKey:)])
@@ -258,8 +260,10 @@ NSArray * TGQueryStringComponentsFromKeyAndArrayValue(NSString *key, NSArray *va
{
NSString *shortenerUrl = [NSString stringWithFormat:@"%@?fields=longUrl,status&shortUrl=%@&key=%@", TGShareGoogleShortenerEndpointUrl, TGURLEncodedStringFromStringWithEncoding(url.absoluteString, NSUTF8StringEncoding), TGShareGoogleAPIKey];
- MTSignal *shortenerSignal = [[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:shortenerUrl]] mapToSignal:^MTSignal *(NSData *data)
+ MTSignal *shortenerSignal = [[MTHttpRequestOperation dataForHttpUrl:[NSURL URLWithString:shortenerUrl]] mapToSignal:^MTSignal *(MTHttpResponse *response)
{
+ NSData *data = response.data;
+
id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
if (![json respondsToSelector:@selector(objectForKey:)])
return [MTSignal fail:nil];
diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift
index da6e2194bf..11218fef0c 100644
--- a/submodules/TelegramApi/Sources/Api0.swift
+++ b/submodules/TelegramApi/Sources/Api0.swift
@@ -5,7 +5,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
dict[570911930] = { return $0.readInt64() }
dict[571523412] = { return $0.readDouble() }
dict[-1255641564] = { return parseString($0) }
- dict[-475111160] = { return Api.MessageReactionsList.parse_messageReactionsList($0) }
dict[-1240849242] = { return Api.messages.StickerSet.parse_stickerSet($0) }
dict[-457104426] = { return Api.InputGeoPoint.parse_inputGeoPointEmpty($0) }
dict[-206066487] = { return Api.InputGeoPoint.parse_inputGeoPoint($0) }
@@ -241,7 +240,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
dict[967122427] = { return Api.Update.parse_updateNewScheduledMessage($0) }
dict[-1870238482] = { return Api.Update.parse_updateDeleteScheduledMessages($0) }
dict[-2112423005] = { return Api.Update.parse_updateTheme($0) }
- dict[357013699] = { return Api.Update.parse_updateMessageReactions($0) }
dict[1558266229] = { return Api.PopularContact.parse_popularContact($0) }
dict[-373643672] = { return Api.FolderPeer.parse_folderPeer($0) }
dict[367766557] = { return Api.ChannelParticipant.parse_channelParticipant($0) }
@@ -283,7 +281,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
dict[1012306921] = { return Api.InputTheme.parse_inputTheme($0) }
dict[-175567375] = { return Api.InputTheme.parse_inputThemeSlug($0) }
dict[1158290442] = { return Api.messages.FoundGifs.parse_foundGifs($0) }
- dict[-1199954735] = { return Api.MessageReactions.parse_messageReactions($0) }
dict[-1132476723] = { return Api.FileLocation.parse_fileLocationToBeDeprecated($0) }
dict[-716006138] = { return Api.Poll.parse_poll($0) }
dict[423314455] = { return Api.InputNotifyPeer.parse_inputNotifyUsers($0) }
@@ -562,7 +559,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
dict[-1820043071] = { return Api.User.parse_user($0) }
dict[-2082087340] = { return Api.Message.parse_messageEmpty($0) }
dict[-1642487306] = { return Api.Message.parse_messageService($0) }
- dict[-1752573244] = { return Api.Message.parse_message($0) }
+ dict[1160515173] = { return Api.Message.parse_message($0) }
dict[186120336] = { return Api.messages.RecentStickers.parse_recentStickersNotModified($0) }
dict[586395571] = { return Api.messages.RecentStickers.parse_recentStickers($0) }
dict[-182231723] = { return Api.InputFileLocation.parse_inputEncryptedFileLocation($0) }
@@ -616,7 +613,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
dict[-1625153079] = { return Api.InputWebFileLocation.parse_inputWebFileGeoPointLocation($0) }
dict[-332168592] = { return Api.MessageFwdHeader.parse_messageFwdHeader($0) }
dict[398898678] = { return Api.help.Support.parse_support($0) }
- dict[1873957073] = { return Api.ReactionCount.parse_reactionCount($0) }
dict[1474492012] = { return Api.MessagesFilter.parse_inputMessagesFilterEmpty($0) }
dict[-1777752804] = { return Api.MessagesFilter.parse_inputMessagesFilterPhotos($0) }
dict[-1614803355] = { return Api.MessagesFilter.parse_inputMessagesFilterVideo($0) }
@@ -644,7 +640,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
dict[-1449145777] = { return Api.upload.CdnFile.parse_cdnFile($0) }
dict[1984136919] = { return Api.wallet.LiteResponse.parse_liteResponse($0) }
dict[415997816] = { return Api.help.InviteText.parse_inviteText($0) }
- dict[-764945220] = { return Api.MessageUserReaction.parse_messageUserReaction($0) }
dict[-1937807902] = { return Api.BotInlineMessage.parse_botInlineMessageText($0) }
dict[982505656] = { return Api.BotInlineMessage.parse_botInlineMessageMediaGeo($0) }
dict[1984755728] = { return Api.BotInlineMessage.parse_botInlineMessageMediaAuto($0) }
@@ -844,8 +839,6 @@ public struct Api {
public static func serializeObject(_ object: Any, buffer: Buffer, boxed: Swift.Bool) {
switch object {
- case let _1 as Api.MessageReactionsList:
- _1.serialize(buffer, boxed)
case let _1 as Api.messages.StickerSet:
_1.serialize(buffer, boxed)
case let _1 as Api.InputGeoPoint:
@@ -978,8 +971,6 @@ public struct Api {
_1.serialize(buffer, boxed)
case let _1 as Api.messages.FoundGifs:
_1.serialize(buffer, boxed)
- case let _1 as Api.MessageReactions:
- _1.serialize(buffer, boxed)
case let _1 as Api.FileLocation:
_1.serialize(buffer, boxed)
case let _1 as Api.Poll:
@@ -1270,8 +1261,6 @@ public struct Api {
_1.serialize(buffer, boxed)
case let _1 as Api.help.Support:
_1.serialize(buffer, boxed)
- case let _1 as Api.ReactionCount:
- _1.serialize(buffer, boxed)
case let _1 as Api.MessagesFilter:
_1.serialize(buffer, boxed)
case let _1 as Api.messages.Dialogs:
@@ -1284,8 +1273,6 @@ public struct Api {
_1.serialize(buffer, boxed)
case let _1 as Api.help.InviteText:
_1.serialize(buffer, boxed)
- case let _1 as Api.MessageUserReaction:
- _1.serialize(buffer, boxed)
case let _1 as Api.BotInlineMessage:
_1.serialize(buffer, boxed)
case let _1 as Api.InputPeerNotifySettings:
diff --git a/submodules/TelegramApi/Sources/Api1.swift b/submodules/TelegramApi/Sources/Api1.swift
index dea26f3ed2..c564b24423 100644
--- a/submodules/TelegramApi/Sources/Api1.swift
+++ b/submodules/TelegramApi/Sources/Api1.swift
@@ -1,66 +1,4 @@
public extension Api {
- public enum MessageReactionsList: TypeConstructorDescription {
- case messageReactionsList(flags: Int32, count: Int32, reactions: [Api.MessageUserReaction], users: [Api.User], nextOffset: String?)
-
- public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
- switch self {
- case .messageReactionsList(let flags, let count, let reactions, let users, let nextOffset):
- if boxed {
- buffer.appendInt32(-475111160)
- }
- serializeInt32(flags, buffer: buffer, boxed: false)
- serializeInt32(count, buffer: buffer, boxed: false)
- buffer.appendInt32(481674261)
- buffer.appendInt32(Int32(reactions.count))
- for item in reactions {
- item.serialize(buffer, true)
- }
- buffer.appendInt32(481674261)
- buffer.appendInt32(Int32(users.count))
- for item in users {
- item.serialize(buffer, true)
- }
- if Int(flags) & Int(1 << 0) != 0 {serializeString(nextOffset!, buffer: buffer, boxed: false)}
- break
- }
- }
-
- public func descriptionFields() -> (String, [(String, Any)]) {
- switch self {
- case .messageReactionsList(let flags, let count, let reactions, let users, let nextOffset):
- return ("messageReactionsList", [("flags", flags), ("count", count), ("reactions", reactions), ("users", users), ("nextOffset", nextOffset)])
- }
- }
-
- public static func parse_messageReactionsList(_ reader: BufferReader) -> MessageReactionsList? {
- var _1: Int32?
- _1 = reader.readInt32()
- var _2: Int32?
- _2 = reader.readInt32()
- var _3: [Api.MessageUserReaction]?
- if let _ = reader.readInt32() {
- _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.MessageUserReaction.self)
- }
- var _4: [Api.User]?
- if let _ = reader.readInt32() {
- _4 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
- }
- var _5: String?
- if Int(_1!) & Int(1 << 0) != 0 {_5 = parseString(reader) }
- let _c1 = _1 != nil
- let _c2 = _2 != nil
- let _c3 = _3 != nil
- let _c4 = _4 != nil
- let _c5 = (Int(_1!) & Int(1 << 0) == 0) || _5 != nil
- if _c1 && _c2 && _c3 && _c4 && _c5 {
- return Api.MessageReactionsList.messageReactionsList(flags: _1!, count: _2!, reactions: _3!, users: _4!, nextOffset: _5)
- }
- else {
- return nil
- }
- }
-
- }
public enum InputGeoPoint: TypeConstructorDescription {
case inputGeoPointEmpty
case inputGeoPoint(lat: Double, long: Double)
@@ -4144,7 +4082,6 @@ public extension Api {
case updateNewScheduledMessage(message: Api.Message)
case updateDeleteScheduledMessages(peer: Api.Peer, messages: [Int32])
case updateTheme(theme: Api.Theme)
- case updateMessageReactions(peer: Api.Peer, msgId: Int32, reactions: Api.MessageReactions)
public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
switch self {
@@ -4769,14 +4706,6 @@ public extension Api {
}
theme.serialize(buffer, true)
break
- case .updateMessageReactions(let peer, let msgId, let reactions):
- if boxed {
- buffer.appendInt32(357013699)
- }
- peer.serialize(buffer, true)
- serializeInt32(msgId, buffer: buffer, boxed: false)
- reactions.serialize(buffer, true)
- break
}
}
@@ -4930,8 +4859,6 @@ public extension Api {
return ("updateDeleteScheduledMessages", [("peer", peer), ("messages", messages)])
case .updateTheme(let theme):
return ("updateTheme", [("theme", theme)])
- case .updateMessageReactions(let peer, let msgId, let reactions):
- return ("updateMessageReactions", [("peer", peer), ("msgId", msgId), ("reactions", reactions)])
}
}
@@ -6190,27 +6117,6 @@ public extension Api {
return nil
}
}
- public static func parse_updateMessageReactions(_ reader: BufferReader) -> Update? {
- var _1: Api.Peer?
- if let signature = reader.readInt32() {
- _1 = Api.parse(reader, signature: signature) as? Api.Peer
- }
- var _2: Int32?
- _2 = reader.readInt32()
- var _3: Api.MessageReactions?
- if let signature = reader.readInt32() {
- _3 = Api.parse(reader, signature: signature) as? Api.MessageReactions
- }
- let _c1 = _1 != nil
- let _c2 = _2 != nil
- let _c3 = _3 != nil
- if _c1 && _c2 && _c3 {
- return Api.Update.updateMessageReactions(peer: _1!, msgId: _2!, reactions: _3!)
- }
- else {
- return nil
- }
- }
}
public enum PopularContact: TypeConstructorDescription {
@@ -7166,50 +7072,6 @@ public extension Api {
}
}
- }
- public enum MessageReactions: TypeConstructorDescription {
- case messageReactions(flags: Int32, results: [Api.ReactionCount])
-
- public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
- switch self {
- case .messageReactions(let flags, let results):
- if boxed {
- buffer.appendInt32(-1199954735)
- }
- serializeInt32(flags, buffer: buffer, boxed: false)
- buffer.appendInt32(481674261)
- buffer.appendInt32(Int32(results.count))
- for item in results {
- item.serialize(buffer, true)
- }
- break
- }
- }
-
- public func descriptionFields() -> (String, [(String, Any)]) {
- switch self {
- case .messageReactions(let flags, let results):
- return ("messageReactions", [("flags", flags), ("results", results)])
- }
- }
-
- public static func parse_messageReactions(_ reader: BufferReader) -> MessageReactions? {
- var _1: Int32?
- _1 = reader.readInt32()
- var _2: [Api.ReactionCount]?
- if let _ = reader.readInt32() {
- _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.ReactionCount.self)
- }
- let _c1 = _1 != nil
- let _c2 = _2 != nil
- if _c1 && _c2 {
- return Api.MessageReactions.messageReactions(flags: _1!, results: _2!)
- }
- else {
- return nil
- }
- }
-
}
public enum FileLocation: TypeConstructorDescription {
case fileLocationToBeDeprecated(volumeId: Int64, localId: Int32)
@@ -14322,7 +14184,7 @@ public extension Api {
public enum Message: TypeConstructorDescription {
case messageEmpty(id: Int32)
case messageService(flags: Int32, id: Int32, fromId: Int32?, toId: Api.Peer, replyToMsgId: Int32?, date: Int32, action: Api.MessageAction)
- case message(flags: Int32, id: Int32, fromId: Int32?, toId: Api.Peer, fwdFrom: Api.MessageFwdHeader?, viaBotId: Int32?, replyToMsgId: Int32?, date: Int32, message: String, media: Api.MessageMedia?, replyMarkup: Api.ReplyMarkup?, entities: [Api.MessageEntity]?, views: Int32?, editDate: Int32?, postAuthor: String?, groupedId: Int64?, reactions: Api.MessageReactions?, restrictionReason: [Api.RestrictionReason]?)
+ case message(flags: Int32, id: Int32, fromId: Int32?, toId: Api.Peer, fwdFrom: Api.MessageFwdHeader?, viaBotId: Int32?, replyToMsgId: Int32?, date: Int32, message: String, media: Api.MessageMedia?, replyMarkup: Api.ReplyMarkup?, entities: [Api.MessageEntity]?, views: Int32?, editDate: Int32?, postAuthor: String?, groupedId: Int64?, restrictionReason: [Api.RestrictionReason]?)
public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
switch self {
@@ -14344,9 +14206,9 @@ public extension Api {
serializeInt32(date, buffer: buffer, boxed: false)
action.serialize(buffer, true)
break
- case .message(let flags, let id, let fromId, let toId, let fwdFrom, let viaBotId, let replyToMsgId, let date, let message, let media, let replyMarkup, let entities, let views, let editDate, let postAuthor, let groupedId, let reactions, let restrictionReason):
+ case .message(let flags, let id, let fromId, let toId, let fwdFrom, let viaBotId, let replyToMsgId, let date, let message, let media, let replyMarkup, let entities, let views, let editDate, let postAuthor, let groupedId, let restrictionReason):
if boxed {
- buffer.appendInt32(-1752573244)
+ buffer.appendInt32(1160515173)
}
serializeInt32(flags, buffer: buffer, boxed: false)
serializeInt32(id, buffer: buffer, boxed: false)
@@ -14368,7 +14230,6 @@ public extension Api {
if Int(flags) & Int(1 << 15) != 0 {serializeInt32(editDate!, buffer: buffer, boxed: false)}
if Int(flags) & Int(1 << 16) != 0 {serializeString(postAuthor!, buffer: buffer, boxed: false)}
if Int(flags) & Int(1 << 17) != 0 {serializeInt64(groupedId!, buffer: buffer, boxed: false)}
- if Int(flags) & Int(1 << 20) != 0 {reactions!.serialize(buffer, true)}
if Int(flags) & Int(1 << 22) != 0 {buffer.appendInt32(481674261)
buffer.appendInt32(Int32(restrictionReason!.count))
for item in restrictionReason! {
@@ -14384,8 +14245,8 @@ public extension Api {
return ("messageEmpty", [("id", id)])
case .messageService(let flags, let id, let fromId, let toId, let replyToMsgId, let date, let action):
return ("messageService", [("flags", flags), ("id", id), ("fromId", fromId), ("toId", toId), ("replyToMsgId", replyToMsgId), ("date", date), ("action", action)])
- case .message(let flags, let id, let fromId, let toId, let fwdFrom, let viaBotId, let replyToMsgId, let date, let message, let media, let replyMarkup, let entities, let views, let editDate, let postAuthor, let groupedId, let reactions, let restrictionReason):
- return ("message", [("flags", flags), ("id", id), ("fromId", fromId), ("toId", toId), ("fwdFrom", fwdFrom), ("viaBotId", viaBotId), ("replyToMsgId", replyToMsgId), ("date", date), ("message", message), ("media", media), ("replyMarkup", replyMarkup), ("entities", entities), ("views", views), ("editDate", editDate), ("postAuthor", postAuthor), ("groupedId", groupedId), ("reactions", reactions), ("restrictionReason", restrictionReason)])
+ case .message(let flags, let id, let fromId, let toId, let fwdFrom, let viaBotId, let replyToMsgId, let date, let message, let media, let replyMarkup, let entities, let views, let editDate, let postAuthor, let groupedId, let restrictionReason):
+ return ("message", [("flags", flags), ("id", id), ("fromId", fromId), ("toId", toId), ("fwdFrom", fwdFrom), ("viaBotId", viaBotId), ("replyToMsgId", replyToMsgId), ("date", date), ("message", message), ("media", media), ("replyMarkup", replyMarkup), ("entities", entities), ("views", views), ("editDate", editDate), ("postAuthor", postAuthor), ("groupedId", groupedId), ("restrictionReason", restrictionReason)])
}
}
@@ -14476,13 +14337,9 @@ public extension Api {
if Int(_1!) & Int(1 << 16) != 0 {_15 = parseString(reader) }
var _16: Int64?
if Int(_1!) & Int(1 << 17) != 0 {_16 = reader.readInt64() }
- var _17: Api.MessageReactions?
- if Int(_1!) & Int(1 << 20) != 0 {if let signature = reader.readInt32() {
- _17 = Api.parse(reader, signature: signature) as? Api.MessageReactions
- } }
- var _18: [Api.RestrictionReason]?
+ var _17: [Api.RestrictionReason]?
if Int(_1!) & Int(1 << 22) != 0 {if let _ = reader.readInt32() {
- _18 = Api.parseVector(reader, elementSignature: 0, elementType: Api.RestrictionReason.self)
+ _17 = Api.parseVector(reader, elementSignature: 0, elementType: Api.RestrictionReason.self)
} }
let _c1 = _1 != nil
let _c2 = _2 != nil
@@ -14500,10 +14357,9 @@ public extension Api {
let _c14 = (Int(_1!) & Int(1 << 15) == 0) || _14 != nil
let _c15 = (Int(_1!) & Int(1 << 16) == 0) || _15 != nil
let _c16 = (Int(_1!) & Int(1 << 17) == 0) || _16 != nil
- let _c17 = (Int(_1!) & Int(1 << 20) == 0) || _17 != nil
- let _c18 = (Int(_1!) & Int(1 << 22) == 0) || _18 != nil
- if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 && _c12 && _c13 && _c14 && _c15 && _c16 && _c17 && _c18 {
- return Api.Message.message(flags: _1!, id: _2!, fromId: _3, toId: _4!, fwdFrom: _5, viaBotId: _6, replyToMsgId: _7, date: _8!, message: _9!, media: _10, replyMarkup: _11, entities: _12, views: _13, editDate: _14, postAuthor: _15, groupedId: _16, reactions: _17, restrictionReason: _18)
+ let _c17 = (Int(_1!) & Int(1 << 22) == 0) || _17 != nil
+ if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 && _c12 && _c13 && _c14 && _c15 && _c16 && _c17 {
+ return Api.Message.message(flags: _1!, id: _2!, fromId: _3, toId: _4!, fwdFrom: _5, viaBotId: _6, replyToMsgId: _7, date: _8!, message: _9!, media: _10, replyMarkup: _11, entities: _12, views: _13, editDate: _14, postAuthor: _15, groupedId: _16, restrictionReason: _17)
}
else {
return nil
@@ -15996,48 +15852,6 @@ public extension Api {
}
}
- }
- public enum ReactionCount: TypeConstructorDescription {
- case reactionCount(flags: Int32, reaction: String, count: Int32)
-
- public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
- switch self {
- case .reactionCount(let flags, let reaction, let count):
- if boxed {
- buffer.appendInt32(1873957073)
- }
- serializeInt32(flags, buffer: buffer, boxed: false)
- serializeString(reaction, buffer: buffer, boxed: false)
- serializeInt32(count, buffer: buffer, boxed: false)
- break
- }
- }
-
- public func descriptionFields() -> (String, [(String, Any)]) {
- switch self {
- case .reactionCount(let flags, let reaction, let count):
- return ("reactionCount", [("flags", flags), ("reaction", reaction), ("count", count)])
- }
- }
-
- public static func parse_reactionCount(_ reader: BufferReader) -> ReactionCount? {
- var _1: Int32?
- _1 = reader.readInt32()
- var _2: String?
- _2 = parseString(reader)
- var _3: Int32?
- _3 = reader.readInt32()
- let _c1 = _1 != nil
- let _c2 = _2 != nil
- let _c3 = _3 != nil
- if _c1 && _c2 && _c3 {
- return Api.ReactionCount.reactionCount(flags: _1!, reaction: _2!, count: _3!)
- }
- else {
- return nil
- }
- }
-
}
public enum MessagesFilter: TypeConstructorDescription {
case inputMessagesFilterEmpty
@@ -16350,44 +16164,6 @@ public extension Api {
}
}
- }
- public enum MessageUserReaction: TypeConstructorDescription {
- case messageUserReaction(userId: Int32, reaction: String)
-
- public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
- switch self {
- case .messageUserReaction(let userId, let reaction):
- if boxed {
- buffer.appendInt32(-764945220)
- }
- serializeInt32(userId, buffer: buffer, boxed: false)
- serializeString(reaction, buffer: buffer, boxed: false)
- break
- }
- }
-
- public func descriptionFields() -> (String, [(String, Any)]) {
- switch self {
- case .messageUserReaction(let userId, let reaction):
- return ("messageUserReaction", [("userId", userId), ("reaction", reaction)])
- }
- }
-
- public static func parse_messageUserReaction(_ reader: BufferReader) -> MessageUserReaction? {
- var _1: Int32?
- _1 = reader.readInt32()
- var _2: String?
- _2 = parseString(reader)
- let _c1 = _1 != nil
- let _c2 = _2 != nil
- if _c1 && _c2 {
- return Api.MessageUserReaction.messageUserReaction(userId: _1!, reaction: _2!)
- }
- else {
- return nil
- }
- }
-
}
public enum BotInlineMessage: TypeConstructorDescription {
case botInlineMessageText(flags: Int32, message: String, entities: [Api.MessageEntity]?, replyMarkup: Api.ReplyMarkup?)
diff --git a/submodules/TelegramApi/Sources/Api3.swift b/submodules/TelegramApi/Sources/Api3.swift
index 172bd06c92..15affdff86 100644
--- a/submodules/TelegramApi/Sources/Api3.swift
+++ b/submodules/TelegramApi/Sources/Api3.swift
@@ -3161,61 +3161,6 @@ public extension Api {
return result
})
}
-
- public static func sendReaction(flags: Int32, peer: Api.InputPeer, msgId: Int32, reaction: String?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) {
- let buffer = Buffer()
- buffer.appendInt32(627641572)
- serializeInt32(flags, buffer: buffer, boxed: false)
- peer.serialize(buffer, true)
- serializeInt32(msgId, buffer: buffer, boxed: false)
- if Int(flags) & Int(1 << 0) != 0 {serializeString(reaction!, buffer: buffer, boxed: false)}
- return (FunctionDescription(name: "messages.sendReaction", parameters: [("flags", flags), ("peer", peer), ("msgId", msgId), ("reaction", reaction)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
- let reader = BufferReader(buffer)
- var result: Api.Updates?
- if let signature = reader.readInt32() {
- result = Api.parse(reader, signature: signature) as? Api.Updates
- }
- return result
- })
- }
-
- public static func getMessagesReactions(peer: Api.InputPeer, id: [Int32]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) {
- let buffer = Buffer()
- buffer.appendInt32(-1950707482)
- peer.serialize(buffer, true)
- buffer.appendInt32(481674261)
- buffer.appendInt32(Int32(id.count))
- for item in id {
- serializeInt32(item, buffer: buffer, boxed: false)
- }
- return (FunctionDescription(name: "messages.getMessagesReactions", parameters: [("peer", peer), ("id", id)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
- let reader = BufferReader(buffer)
- var result: Api.Updates?
- if let signature = reader.readInt32() {
- result = Api.parse(reader, signature: signature) as? Api.Updates
- }
- return result
- })
- }
-
- public static func getMessageReactionsList(flags: Int32, peer: Api.InputPeer, id: Int32, reaction: String?, offset: String?, limit: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) {
- let buffer = Buffer()
- buffer.appendInt32(363935594)
- serializeInt32(flags, buffer: buffer, boxed: false)
- peer.serialize(buffer, true)
- serializeInt32(id, buffer: buffer, boxed: false)
- if Int(flags) & Int(1 << 0) != 0 {serializeString(reaction!, buffer: buffer, boxed: false)}
- if Int(flags) & Int(1 << 1) != 0 {serializeString(offset!, buffer: buffer, boxed: false)}
- serializeInt32(limit, buffer: buffer, boxed: false)
- return (FunctionDescription(name: "messages.getMessageReactionsList", parameters: [("flags", flags), ("peer", peer), ("id", id), ("reaction", reaction), ("offset", offset), ("limit", limit)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.MessageReactionsList? in
- let reader = BufferReader(buffer)
- var result: Api.MessageReactionsList?
- if let signature = reader.readInt32() {
- result = Api.parse(reader, signature: signature) as? Api.MessageReactionsList
- }
- return result
- })
- }
}
public struct channels {
public static func readHistory(channel: Api.InputChannel, maxId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) {
diff --git a/submodules/TelegramAudio/Sources/ManagedAudioSession.swift b/submodules/TelegramAudio/Sources/ManagedAudioSession.swift
index e6a81f2810..058077e14e 100644
--- a/submodules/TelegramAudio/Sources/ManagedAudioSession.swift
+++ b/submodules/TelegramAudio/Sources/ManagedAudioSession.swift
@@ -19,18 +19,23 @@ public enum ManagedAudioSessionType: Equatable {
}
}
-private func nativeCategoryForType(_ type: ManagedAudioSessionType, headphones: Bool) -> AVAudioSession.Category {
+private func nativeCategoryForType(_ type: ManagedAudioSessionType, headphones: Bool, outputMode: AudioSessionOutputMode) -> AVAudioSession.Category {
switch type {
- case .play:
+ case .play:
+ return .playback
+ case .record, .voiceCall:
+ return .playAndRecord
+ case .playWithPossiblePortOverride:
+ if headphones {
return .playback
- case .record, .voiceCall:
- return .playAndRecord
- case .playWithPossiblePortOverride:
- if headphones {
- return .playback
- } else {
+ } else {
+ switch outputMode {
+ case .custom(.speaker), .system:
return .playAndRecord
+ default:
+ return .playback
}
+ }
}
}
@@ -159,7 +164,7 @@ public class ManagedAudioSessionControl {
public final class ManagedAudioSession {
private var nextId: Int32 = 0
- private let queue = Queue()
+ private let queue: Queue
private let hasLoudspeaker: Bool
private var holders: [HolderRecord] = []
private var currentTypeAndOutputMode: (ManagedAudioSessionType, AudioSessionOutputMode)?
@@ -175,6 +180,8 @@ public final class ManagedAudioSession {
private let isPlaybackActiveSubscribers = Bag<(Bool) -> Void>()
public init() {
+ self.queue = Queue()
+
self.hasLoudspeaker = UIDevice.current.model == "iPhone"
let queue = self.queue
@@ -522,21 +529,23 @@ public final class ManagedAudioSession {
if deactivate {
self.holders[activeIndex].active = false
let id = self.holders[activeIndex].id
- self.holders[activeIndex].deactivatingDisposable = (self.holders[activeIndex].deactivate() |> deliverOn(self.queue)).start(completed: { [weak self] in
- if let strongSelf = self {
- var index = 0
- for currentRecord in strongSelf.holders {
- if currentRecord.id == id {
- currentRecord.deactivatingDisposable = nil
- if currentRecord.once {
- strongSelf.holders.remove(at: index)
- }
- break
- }
- index += 1
- }
- strongSelf.updateHolders()
+ self.holders[activeIndex].deactivatingDisposable = (self.holders[activeIndex].deactivate()
+ |> deliverOn(self.queue)).start(completed: { [weak self] in
+ guard let strongSelf = self else {
+ return
}
+ var index = 0
+ for currentRecord in strongSelf.holders {
+ if currentRecord.id == id {
+ currentRecord.deactivatingDisposable = nil
+ if currentRecord.once {
+ strongSelf.holders.remove(at: index)
+ }
+ break
+ }
+ index += 1
+ }
+ strongSelf.updateHolders()
})
}
} else if activeIndex == nil {
@@ -634,25 +643,29 @@ public final class ManagedAudioSession {
self.currentTypeAndOutputMode = (type, outputMode)
do {
- print("ManagedAudioSession setting category for \(type)")
+ let nativeCategory = nativeCategoryForType(type, headphones: self.isHeadsetPluggedInValue, outputMode: outputMode)
+
+ print("ManagedAudioSession setting category for \(type) (native: \(nativeCategory))")
var options: AVAudioSession.CategoryOptions = []
switch type {
case .play:
break
case .playWithPossiblePortOverride:
- if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
- options.insert(.allowBluetoothA2DP)
- } else {
- options.insert(.allowBluetooth)
+ if case .playAndRecord = nativeCategory {
+ if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
+ options.insert(.allowBluetoothA2DP)
+ } else {
+ options.insert(.allowBluetooth)
+ }
}
case .record, .voiceCall:
options.insert(.allowBluetooth)
}
print("ManagedAudioSession setting active true")
if #available(iOSApplicationExtension 11.0, iOS 11.0, *) {
- try AVAudioSession.sharedInstance().setCategory(nativeCategoryForType(type, headphones: self.isHeadsetPluggedInValue), mode: type == .voiceCall ? .voiceChat : .default, policy: .default, options: options)
+ try AVAudioSession.sharedInstance().setCategory(nativeCategory, mode: type == .voiceCall ? .voiceChat : .default, policy: .default, options: options)
} else {
- AVAudioSession.sharedInstance().perform(NSSelectorFromString("setCategory:error:"), with: nativeCategoryForType(type, headphones: self.isHeadsetPluggedInValue))
+ AVAudioSession.sharedInstance().perform(NSSelectorFromString("setCategory:error:"), with: nativeCategory)
try AVAudioSession.sharedInstance().setMode(type == .voiceCall ? .voiceChat : .default)
}
} catch let error {
@@ -680,43 +693,39 @@ public final class ManagedAudioSession {
print("ManagedAudioSession setup \(outputMode) for \(type)")
var resetToBuiltin = false
switch outputMode {
- case .system:
- resetToBuiltin = true
- case let .custom(output):
- switch output {
- case .builtin:
- resetToBuiltin = true
- case .speaker:
- if type == .voiceCall {
- if let routes = AVAudioSession.sharedInstance().availableInputs {
- for route in routes {
- if route.portType == .builtInMic {
- let _ = try? AVAudioSession.sharedInstance().setPreferredInput(route)
- break
- }
- }
- }
- }
- try AVAudioSession.sharedInstance().overrideOutputAudioPort(.speaker)
- case .headphones:
- break
- case let .port(port):
- try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
+ case .system:
+ resetToBuiltin = true
+ case let .custom(output):
+ switch output {
+ case .builtin:
+ resetToBuiltin = true
+ case .speaker:
+ if type == .voiceCall {
if let routes = AVAudioSession.sharedInstance().availableInputs {
for route in routes {
- if route.uid == port.uid {
+ if route.portType == .builtInMic {
let _ = try? AVAudioSession.sharedInstance().setPreferredInput(route)
break
}
}
}
- }
- case .speakerIfNoHeadphones:
- if !self.isHeadsetPluggedInValue {
+ }
try AVAudioSession.sharedInstance().overrideOutputAudioPort(.speaker)
- } else {
+ case .headphones:
+ break
+ case let .port(port):
try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
- }
+ if let routes = AVAudioSession.sharedInstance().availableInputs {
+ for route in routes {
+ if route.uid == port.uid {
+ let _ = try? AVAudioSession.sharedInstance().setPreferredInput(route)
+ break
+ }
+ }
+ }
+ }
+ case .speakerIfNoHeadphones:
+ try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
}
if resetToBuiltin {
@@ -753,15 +762,15 @@ public final class ManagedAudioSession {
try AVAudioSession.sharedInstance().setActive(true, options: [.notifyOthersOnDeactivation])
- print("AudioSession activate: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+ print("\(CFAbsoluteTimeGetCurrent()) AudioSession activate: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
self.updateCurrentAudioRouteInfo()
- print("AudioSession updateCurrentAudioRouteInfo: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+ print("\(CFAbsoluteTimeGetCurrent()) AudioSession updateCurrentAudioRouteInfo: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
try self.setupOutputMode(outputMode, type: type)
- print("AudioSession setupOutputMode: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+ print("\(CFAbsoluteTimeGetCurrent()) AudioSession setupOutputMode: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
if case .voiceCall = type {
try AVAudioSession.sharedInstance().setPreferredIOBufferDuration(0.005)
@@ -774,9 +783,11 @@ public final class ManagedAudioSession {
private func updateOutputMode(_ outputMode: AudioSessionOutputMode) {
if let (type, currentOutputMode) = self.currentTypeAndOutputMode, currentOutputMode != outputMode {
- self.currentTypeAndOutputMode = (type, outputMode)
+ //self.currentTypeAndOutputMode = (type, outputMode)
do {
- try self.setupOutputMode(outputMode, type: type)
+ try self.setup(type: type, outputMode: outputMode, activateNow: true)
+ //try self.setupOutputMode(outputMode, type: type)
+ //try self.activate()
} catch let error {
print("ManagedAudioSession overrideOutputAudioPort error \(error)")
}
diff --git a/submodules/TelegramCore/Sources/FetchHttpResource.swift b/submodules/TelegramCore/Sources/FetchHttpResource.swift
index 2f706e618a..d5588aeb3e 100644
--- a/submodules/TelegramCore/Sources/FetchHttpResource.swift
+++ b/submodules/TelegramCore/Sources/FetchHttpResource.swift
@@ -9,10 +9,13 @@ public func fetchHttpResource(url: String) -> Signal UInt {
- return 107
+ return 106
}
public func parseMessage(_ data: Data!) -> Any! {
diff --git a/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift b/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift
index 302f5ceefd..c4f24f6dec 100644
--- a/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift
+++ b/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift
@@ -136,7 +136,7 @@ func apiMessagePeerId(_ messsage: Api.Message) -> PeerId? {
func apiMessagePeerIds(_ message: Api.Message) -> [PeerId] {
switch message {
- case let .message(flags, _, fromId, toId, fwdHeader, viaBotId, _, _, _, media, _, entities, _, _, _, _, _, _):
+ case let .message(flags, _, fromId, toId, fwdHeader, viaBotId, _, _, _, media, _, entities, _, _, _, _, _):
let peerId: PeerId
switch toId {
case let .peerUser(userId):
@@ -240,7 +240,7 @@ func apiMessagePeerIds(_ message: Api.Message) -> [PeerId] {
func apiMessageAssociatedMessageIds(_ message: Api.Message) -> [MessageId]? {
switch message {
- case let .message(flags, _, fromId, toId, _, _, replyToMsgId, _, _, _, _, _, _, _, _, _, _, _):
+ case let .message(flags, _, fromId, toId, _, _, replyToMsgId, _, _, _, _, _, _, _, _, _, _):
if let replyToMsgId = replyToMsgId {
let peerId: PeerId
switch toId {
@@ -382,7 +382,7 @@ func messageTextEntitiesFromApiEntities(_ entities: [Api.MessageEntity]) -> [Mes
extension StoreMessage {
convenience init?(apiMessage: Api.Message, namespace: MessageId.Namespace = Namespaces.Message.Cloud) {
switch apiMessage {
- case let .message(flags, id, fromId, toId, fwdFrom, viaBotId, replyToMsgId, date, message, media, replyMarkup, entities, views, editDate, postAuthor, groupingId, _, restrictionReason):
+ case let .message(flags, id, fromId, toId, fwdFrom, viaBotId, replyToMsgId, date, message, media, replyMarkup, entities, views, editDate, postAuthor, groupingId, restrictionReason):
let peerId: PeerId
var authorId: PeerId?
switch toId {
diff --git a/submodules/TelegramCore/Sources/UpdateMessageService.swift b/submodules/TelegramCore/Sources/UpdateMessageService.swift
index fe537679f7..34cd793682 100644
--- a/submodules/TelegramCore/Sources/UpdateMessageService.swift
+++ b/submodules/TelegramCore/Sources/UpdateMessageService.swift
@@ -58,7 +58,7 @@ class UpdateMessageService: NSObject, MTMessageService {
self.putNext(groups)
}
case let .updateShortChatMessage(flags, id, fromId, chatId, message, pts, ptsCount, date, fwdFrom, viaBotId, replyToMsgId, entities):
- let generatedMessage = Api.Message.message(flags: flags, id: id, fromId: fromId, toId: Api.Peer.peerChat(chatId: chatId), fwdFrom: fwdFrom, viaBotId: viaBotId, replyToMsgId: replyToMsgId, date: date, message: message, media: Api.MessageMedia.messageMediaEmpty, replyMarkup: nil, entities: entities, views: nil, editDate: nil, postAuthor: nil, groupedId: nil, reactions: nil, restrictionReason: nil)
+ let generatedMessage = Api.Message.message(flags: flags, id: id, fromId: fromId, toId: Api.Peer.peerChat(chatId: chatId), fwdFrom: fwdFrom, viaBotId: viaBotId, replyToMsgId: replyToMsgId, date: date, message: message, media: Api.MessageMedia.messageMediaEmpty, replyMarkup: nil, entities: entities, views: nil, editDate: nil, postAuthor: nil, groupedId: nil, restrictionReason: nil)
let update = Api.Update.updateNewMessage(message: generatedMessage, pts: pts, ptsCount: ptsCount)
let groups = groupUpdates([update], users: [], chats: [], date: date, seqRange: nil)
if groups.count != 0 {
@@ -75,7 +75,7 @@ class UpdateMessageService: NSObject, MTMessageService {
generatedToId = Api.Peer.peerUser(userId: self.peerId.id)
}
- let generatedMessage = Api.Message.message(flags: flags, id: id, fromId: generatedFromId, toId: generatedToId, fwdFrom: fwdFrom, viaBotId: viaBotId, replyToMsgId: replyToMsgId, date: date, message: message, media: Api.MessageMedia.messageMediaEmpty, replyMarkup: nil, entities: entities, views: nil, editDate: nil, postAuthor: nil, groupedId: nil, reactions: nil, restrictionReason: nil)
+ let generatedMessage = Api.Message.message(flags: flags, id: id, fromId: generatedFromId, toId: generatedToId, fwdFrom: fwdFrom, viaBotId: viaBotId, replyToMsgId: replyToMsgId, date: date, message: message, media: Api.MessageMedia.messageMediaEmpty, replyMarkup: nil, entities: entities, views: nil, editDate: nil, postAuthor: nil, groupedId: nil, restrictionReason: nil)
let update = Api.Update.updateNewMessage(message: generatedMessage, pts: pts, ptsCount: ptsCount)
let groups = groupUpdates([update], users: [], chats: [], date: date, seqRange: nil)
if groups.count != 0 {
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
index 39c514af69..4c7361ef0c 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
@@ -179,7 +179,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta
mediaPlaceholderColor: UIColor(rgb: 0x1c1c1d),
scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3),
pageIndicatorInactiveColor: UIColor(white: 1.0, alpha: 0.3),
- inputClearButtonColor: UIColor(rgb: 0x8b9197)
+ inputClearButtonColor: UIColor(rgb: 0x8b9197),
+ itemBarChart: PresentationThemeItemBarChart(color1: accentColor, color2: UIColor(rgb: 0x929196), color3: UIColor(rgb: 0x333333))
)
let chatList = PresentationThemeChatList(
@@ -219,8 +220,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta
)
let message = PresentationThemeChatMessage(
- incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628))), primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.4), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: accentColor, fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: UIColor(rgb: 0x000000), bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
- outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleHighlightedFillColor, stroke: outgoingBubbleFillColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleHighlightedFillColor, stroke: outgoingBubbleFillColor)), primaryTextColor: outgoingPrimaryTextColor, secondaryTextColor: outgoingSecondaryTextColor, linkTextColor: outgoingLinkTextColor, linkHighlightColor: UIColor.white.withAlphaComponent(0.5), scamColor: outgoingScamColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: outgoingPrimaryTextColor, accentControlColor: outgoingPrimaryTextColor, mediaActiveControlColor: outgoingPrimaryTextColor, mediaInactiveControlColor: outgoingSecondaryTextColor, pendingActivityColor: outgoingSecondaryTextColor, fileTitleColor: outgoingPrimaryTextColor, fileDescriptionColor: outgoingSecondaryTextColor, fileDurationColor: outgoingSecondaryTextColor, mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: outgoingPrimaryTextColor, radioProgress: outgoingPrimaryTextColor, highlight: outgoingPrimaryTextColor.withAlphaComponent(0.12), separator: outgoingSecondaryTextColor, bar: outgoingPrimaryTextColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor.white.withAlphaComponent(0.2), textSelectionKnobColor: UIColor.white),
+ incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628))), primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.4), mediaControlInnerBackgroundColor: UIColor(rgb: 0x262628), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: accentColor, fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: UIColor(rgb: 0x000000), bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
+ outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleHighlightedFillColor, stroke: outgoingBubbleFillColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleHighlightedFillColor, stroke: outgoingBubbleFillColor)), primaryTextColor: outgoingPrimaryTextColor, secondaryTextColor: outgoingSecondaryTextColor, linkTextColor: outgoingLinkTextColor, linkHighlightColor: UIColor.white.withAlphaComponent(0.5), scamColor: outgoingScamColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: outgoingPrimaryTextColor, accentControlColor: outgoingPrimaryTextColor, mediaActiveControlColor: outgoingPrimaryTextColor, mediaInactiveControlColor: outgoingSecondaryTextColor, mediaControlInnerBackgroundColor: outgoingBubbleFillColor, pendingActivityColor: outgoingSecondaryTextColor, fileTitleColor: outgoingPrimaryTextColor, fileDescriptionColor: outgoingSecondaryTextColor, fileDurationColor: outgoingSecondaryTextColor, mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: outgoingPrimaryTextColor, radioProgress: outgoingPrimaryTextColor, highlight: outgoingPrimaryTextColor.withAlphaComponent(0.12), separator: outgoingSecondaryTextColor, bar: outgoingPrimaryTextColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor.white.withAlphaComponent(0.2), textSelectionKnobColor: UIColor.white),
freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f))),
infoPrimaryTextColor: .white,
infoLinkTextColor: accentColor,
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
index 72d25e7efb..eb591bd818 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
@@ -155,7 +155,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta
mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23),
scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3),
pageIndicatorInactiveColor: mainSecondaryTextColor.withAlphaComponent(0.4),
- inputClearButtonColor: mainSecondaryColor
+ inputClearButtonColor: mainSecondaryColor,
+ itemBarChart: PresentationThemeItemBarChart(color1: accentColor, color2: mainSecondaryTextColor.withAlphaComponent(0.5), color3: accentColor.withMultiplied(hue: 1.038, saturation: 0.329, brightness: 0.33))
)
let chatList = PresentationThemeChatList(
@@ -197,8 +198,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta
let buttonStrokeColor = accentColor.withMultiplied(hue: 1.014, saturation: 0.56, brightness: 0.64).withAlphaComponent(0.15)
let message = PresentationThemeChatMessage(
- incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.5), pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: accentColor, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23), polls: PresentationThemeChatBubblePolls(radioButton: accentColor.withMultiplied(hue: 0.995, saturation: 0.317, brightness: 0.51), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: mainSeparatorColor, bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
- outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: .white, mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.5), pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: .white, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.804, brightness: 0.51), polls: PresentationThemeChatBubblePolls(radioButton: .white, radioProgress: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0), highlight: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0).withAlphaComponent(0.12), separator: mainSeparatorColor, bar: .white), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: UIColor.white.withAlphaComponent(0.2), textSelectionKnobColor: UIColor.white),
+ incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.5), mediaControlInnerBackgroundColor: mainBackgroundColor, pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: accentColor, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23), polls: PresentationThemeChatBubblePolls(radioButton: accentColor.withMultiplied(hue: 0.995, saturation: 0.317, brightness: 0.51), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: mainSeparatorColor, bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
+ outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: .white, mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaControlInnerBackgroundColor: outgoingBubbleColor, pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: .white, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.804, brightness: 0.51), polls: PresentationThemeChatBubblePolls(radioButton: .white, radioProgress: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0), highlight: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0).withAlphaComponent(0.12), separator: mainSeparatorColor, bar: .white), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: UIColor.white.withAlphaComponent(0.2), textSelectionKnobColor: UIColor.white),
freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor)),
infoPrimaryTextColor: UIColor(rgb: 0xffffff),
infoLinkTextColor: accentColor,
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
index 654fdfec2a..94dfd4913c 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
@@ -163,7 +163,8 @@ private func makeDefaultDayPresentationTheme(accentColor: UIColor, serviceBackgr
mediaPlaceholderColor: UIColor(rgb: 0xe4e4e4),
scrollIndicatorColor: UIColor(white: 0.0, alpha: 0.3),
pageIndicatorInactiveColor: UIColor(rgb: 0xe3e3e7),
- inputClearButtonColor: UIColor(rgb: 0xcccccc)
+ inputClearButtonColor: UIColor(rgb: 0xcccccc),
+ itemBarChart: PresentationThemeItemBarChart(color1: accentColor, color2: UIColor(rgb: 0xc8c7cc), color3: UIColor(rgb: 0xf2f1f7))
)
let chatList = PresentationThemeChatList(
@@ -203,8 +204,8 @@ private func makeDefaultDayPresentationTheme(accentColor: UIColor, serviceBackgr
)
let message = PresentationThemeChatMessage(
- incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86A9C9, alpha: 0.5)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86A9C9, alpha: 0.5))), primaryTextColor: .black, secondaryTextColor: UIColor(rgb: 0x525252, alpha: 0.6), linkTextColor: UIColor(rgb: 0x004bad), linkHighlightColor: accentColor.withAlphaComponent(0.3), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: UIColor(rgb: 0x007ee5), accentControlColor: UIColor(rgb: 0x007ee5), mediaActiveControlColor: UIColor(rgb: 0x007ee5), mediaInactiveControlColor: UIColor(rgb: 0xcacaca), pendingActivityColor: UIColor(rgb: 0x525252, alpha: 0.6), fileTitleColor: UIColor(rgb: 0x0b8bed), fileDescriptionColor: UIColor(rgb: 0x999999), fileDurationColor: UIColor(rgb: 0x525252, alpha: 0.6), mediaPlaceholderColor: UIColor(rgb: 0xe8ecf0), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xc8c7cc), radioProgress: UIColor(rgb: 0x007ee5), highlight: UIColor(rgb: 0x007ee5).withAlphaComponent(0.08), separator: UIColor(rgb: 0xc8c7cc), bar: UIColor(rgb: 0x007ee5)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0x596e89, alpha: 0.35)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: .clear), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
- outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xE1FFC7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe1ffc7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5))), primaryTextColor: .black, secondaryTextColor: UIColor(rgb: 0x008c09, alpha: 0.8), linkTextColor: UIColor(rgb: 0x004bad), linkHighlightColor: accentColor.withAlphaComponent(0.3), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: UIColor(rgb: 0x00a700), accentControlColor: UIColor(rgb: 0x3fc33b), mediaActiveControlColor: UIColor(rgb: 0x3fc33b), mediaInactiveControlColor: UIColor(rgb: 0x93d987), pendingActivityColor: UIColor(rgb: 0x42b649), fileTitleColor: UIColor(rgb: 0x3faa3c), fileDescriptionColor: UIColor(rgb: 0x6fb26a), fileDurationColor: UIColor(rgb: 0x008c09, alpha: 0.8), mediaPlaceholderColor: UIColor(rgb: 0xd2f2b6), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x93d987), radioProgress: UIColor(rgb: 0x3fc33b), highlight: UIColor(rgb: 0x3fc33b).withAlphaComponent(0.08), separator: UIColor(rgb: 0x93d987), bar: UIColor(rgb: 0x3fc33b)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0x596e89, alpha: 0.35)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: .clear), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: UIColor(rgb: 0xBBDE9F), textSelectionKnobColor: UIColor(rgb: 0x3FC33B)),
+ incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86A9C9, alpha: 0.5)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86A9C9, alpha: 0.5))), primaryTextColor: .black, secondaryTextColor: UIColor(rgb: 0x525252, alpha: 0.6), linkTextColor: UIColor(rgb: 0x004bad), linkHighlightColor: accentColor.withAlphaComponent(0.3), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: UIColor(rgb: 0x007ee5), accentControlColor: UIColor(rgb: 0x007ee5), mediaActiveControlColor: UIColor(rgb: 0x007ee5), mediaInactiveControlColor: UIColor(rgb: 0xcacaca), mediaControlInnerBackgroundColor: UIColor(rgb: 0xffffff), pendingActivityColor: UIColor(rgb: 0x525252, alpha: 0.6), fileTitleColor: UIColor(rgb: 0x0b8bed), fileDescriptionColor: UIColor(rgb: 0x999999), fileDurationColor: UIColor(rgb: 0x525252, alpha: 0.6), mediaPlaceholderColor: UIColor(rgb: 0xe8ecf0), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xc8c7cc), radioProgress: UIColor(rgb: 0x007ee5), highlight: UIColor(rgb: 0x007ee5).withAlphaComponent(0.08), separator: UIColor(rgb: 0xc8c7cc), bar: UIColor(rgb: 0x007ee5)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0x596e89, alpha: 0.35)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: .clear), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
+ outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe1ffc7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xe1ffc7), highlightedFill: UIColor(rgb: 0xc8ffa6), stroke: UIColor(rgb: 0x86a9c9, alpha: 0.5))), primaryTextColor: .black, secondaryTextColor: UIColor(rgb: 0x008c09, alpha: 0.8), linkTextColor: UIColor(rgb: 0x004bad), linkHighlightColor: accentColor.withAlphaComponent(0.3), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: UIColor(rgb: 0x00a700), accentControlColor: UIColor(rgb: 0x3fc33b), mediaActiveControlColor: UIColor(rgb: 0x3fc33b), mediaInactiveControlColor: UIColor(rgb: 0x93d987), mediaControlInnerBackgroundColor: UIColor(rgb: 0xe1ffc7), pendingActivityColor: UIColor(rgb: 0x42b649), fileTitleColor: UIColor(rgb: 0x3faa3c), fileDescriptionColor: UIColor(rgb: 0x6fb26a), fileDurationColor: UIColor(rgb: 0x008c09, alpha: 0.8), mediaPlaceholderColor: UIColor(rgb: 0xd2f2b6), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x93d987), radioProgress: UIColor(rgb: 0x3fc33b), highlight: UIColor(rgb: 0x3fc33b).withAlphaComponent(0.08), separator: UIColor(rgb: 0x93d987), bar: UIColor(rgb: 0x3fc33b)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0x596e89, alpha: 0.35)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: .clear), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: UIColor(rgb: 0xBBDE9F), textSelectionKnobColor: UIColor(rgb: 0x3FC33B)),
freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86A9C9, alpha: 0.5)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xd9f4ff), stroke: UIColor(rgb: 0x86A9C9, alpha: 0.5))),
infoPrimaryTextColor: UIColor(rgb: 0x000000),
infoLinkTextColor: UIColor(rgb: 0x004bad),
@@ -221,8 +222,8 @@ private func makeDefaultDayPresentationTheme(accentColor: UIColor, serviceBackgr
)
let messageDay = PresentationThemeChatMessage(
- incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xffffff)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xf1f1f4), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xf1f1f4))), primaryTextColor: .black, secondaryTextColor: UIColor(rgb: 0x525252, alpha: 0.6), linkTextColor: UIColor(rgb: 0x004bad), linkHighlightColor: accentColor.withAlphaComponent(0.3), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffc738), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: UIColor(rgb: 0xcacaca), pendingActivityColor: UIColor(rgb: 0x525252, alpha: 0.6), fileTitleColor: accentColor, fileDescriptionColor: UIColor(rgb: 0x999999), fileDurationColor: UIColor(rgb: 0x525252, alpha: 0.6), mediaPlaceholderColor: UIColor(rgb: 0xffffff).withMultipliedBrightnessBy(0.95), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xc8c7cc), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: UIColor(rgb: 0xc8c7cc), bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0xffffff, alpha: 0.8)), actionButtonsStrokeColor: PresentationThemeVariableColor(withWallpaper: .clear, withoutWallpaper: accentColor), actionButtonsTextColor: PresentationThemeVariableColor(withWallpaper: .white, withoutWallpaper: accentColor), textSelectionColor: accentColor.withAlphaComponent(0.3), textSelectionKnobColor: accentColor),
- outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleFillColor.withMultipliedBrightnessBy(0.7), stroke: outgoingBubbleFillColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleFillColor.withMultipliedBrightnessBy(0.7), stroke: outgoingBubbleStrokeColor)), primaryTextColor: outgoingPrimaryTextColor, secondaryTextColor: outgoingSecondaryTextColor, linkTextColor: outgoingLinkTextColor, linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.3), scamColor: outgoingPrimaryTextColor, textHighlightColor: UIColor(rgb: 0xffc738), accentTextColor: outgoingPrimaryTextColor, accentControlColor: outgoingPrimaryTextColor, mediaActiveControlColor: outgoingPrimaryTextColor, mediaInactiveControlColor: outgoingSecondaryTextColor, pendingActivityColor: outgoingSecondaryTextColor, fileTitleColor: outgoingPrimaryTextColor, fileDescriptionColor: outgoingSecondaryTextColor, fileDurationColor: outgoingSecondaryTextColor, mediaPlaceholderColor: accentColor.withMultipliedBrightnessBy(0.95), polls: PresentationThemeChatBubblePolls(radioButton: outgoingSecondaryTextColor, radioProgress: outgoingPrimaryTextColor, highlight: outgoingPrimaryTextColor.withAlphaComponent(0.12), separator: outgoingSecondaryTextColor, bar: outgoingPrimaryTextColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0xffffff, alpha: 0.8)), actionButtonsStrokeColor: PresentationThemeVariableColor(withWallpaper: .clear, withoutWallpaper: accentColor), actionButtonsTextColor: PresentationThemeVariableColor(withWallpaper: .white, withoutWallpaper: accentColor), textSelectionColor: outgoingSelectionBaseColor.withAlphaComponent(0.2), textSelectionKnobColor: outgoingSelectionBaseColor),
+ incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xffffff), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xffffff)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xf1f1f4), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xf1f1f4))), primaryTextColor: .black, secondaryTextColor: UIColor(rgb: 0x525252, alpha: 0.6), linkTextColor: UIColor(rgb: 0x004bad), linkHighlightColor: accentColor.withAlphaComponent(0.3), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffc738), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: UIColor(rgb: 0xcacaca), mediaControlInnerBackgroundColor: UIColor(rgb: 0xffffff), pendingActivityColor: UIColor(rgb: 0x525252, alpha: 0.6), fileTitleColor: accentColor, fileDescriptionColor: UIColor(rgb: 0x999999), fileDurationColor: UIColor(rgb: 0x525252, alpha: 0.6), mediaPlaceholderColor: UIColor(rgb: 0xffffff).withMultipliedBrightnessBy(0.95), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xc8c7cc), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: UIColor(rgb: 0xc8c7cc), bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0xffffff, alpha: 0.8)), actionButtonsStrokeColor: PresentationThemeVariableColor(withWallpaper: .clear, withoutWallpaper: accentColor), actionButtonsTextColor: PresentationThemeVariableColor(withWallpaper: .white, withoutWallpaper: accentColor), textSelectionColor: accentColor.withAlphaComponent(0.3), textSelectionKnobColor: accentColor),
+ outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleFillColor.withMultipliedBrightnessBy(0.7), stroke: outgoingBubbleFillColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleFillColor.withMultipliedBrightnessBy(0.7), stroke: outgoingBubbleStrokeColor)), primaryTextColor: outgoingPrimaryTextColor, secondaryTextColor: outgoingSecondaryTextColor, linkTextColor: outgoingLinkTextColor, linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.3), scamColor: outgoingPrimaryTextColor, textHighlightColor: UIColor(rgb: 0xffc738), accentTextColor: outgoingPrimaryTextColor, accentControlColor: outgoingPrimaryTextColor, mediaActiveControlColor: outgoingPrimaryTextColor, mediaInactiveControlColor: outgoingSecondaryTextColor, mediaControlInnerBackgroundColor: outgoingBubbleFillColor, pendingActivityColor: outgoingSecondaryTextColor, fileTitleColor: outgoingPrimaryTextColor, fileDescriptionColor: outgoingSecondaryTextColor, fileDurationColor: outgoingSecondaryTextColor, mediaPlaceholderColor: accentColor.withMultipliedBrightnessBy(0.95), polls: PresentationThemeChatBubblePolls(radioButton: outgoingSecondaryTextColor, radioProgress: outgoingPrimaryTextColor, highlight: outgoingPrimaryTextColor.withAlphaComponent(0.12), separator: outgoingSecondaryTextColor, bar: outgoingPrimaryTextColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0xffffff, alpha: 0.8)), actionButtonsStrokeColor: PresentationThemeVariableColor(withWallpaper: .clear, withoutWallpaper: accentColor), actionButtonsTextColor: PresentationThemeVariableColor(withWallpaper: .white, withoutWallpaper: accentColor), textSelectionColor: outgoingSelectionBaseColor.withAlphaComponent(0.2), textSelectionKnobColor: outgoingSelectionBaseColor),
freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xE5E5EA), highlightedFill: UIColor(rgb: 0xDADADE), stroke: UIColor(rgb: 0xE5E5EA)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0xE5E5EA), highlightedFill: UIColor(rgb: 0xdadade), stroke: UIColor(rgb: 0xE5E5EA))),
infoPrimaryTextColor: UIColor(rgb: 0x000000),
infoLinkTextColor: UIColor(rgb: 0x004bad),
diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift
index 51ee5e37df..ffeb2c0335 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationData.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift
@@ -26,16 +26,6 @@ public struct PresentationDateTimeFormat: Equatable {
}
}
-public struct PresentationVolumeControlStatusBarIcons: Equatable {
- public let offIcon: UIImage
- public let halfIcon: UIImage
- public let fullIcon: UIImage
-
- public var images: (UIImage, UIImage, UIImage) {
- return (self.offIcon, self.halfIcon, self.fullIcon)
- }
-}
-
public struct PresentationAppIcon: Equatable {
public let name: String
public let imageName: String
@@ -61,8 +51,8 @@ public enum PresentationDateFormat {
public final class PresentationData: Equatable {
public let strings: PresentationStrings
public let theme: PresentationTheme
+ public let autoNightModeTriggered: Bool
public let chatWallpaper: TelegramWallpaper
- public let volumeControlStatusBarIcons: PresentationVolumeControlStatusBarIcons
public let fontSize: PresentationFontSize
public let dateTimeFormat: PresentationDateTimeFormat
public let nameDisplayOrder: PresentationPersonNameOrder
@@ -70,11 +60,11 @@ public final class PresentationData: Equatable {
public let disableAnimations: Bool
public let largeEmoji: Bool
- public init(strings: PresentationStrings, theme: PresentationTheme, chatWallpaper: TelegramWallpaper, volumeControlStatusBarIcons: PresentationVolumeControlStatusBarIcons, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool) {
+ public init(strings: PresentationStrings, theme: PresentationTheme, autoNightModeTriggered: Bool, chatWallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool) {
self.strings = strings
self.theme = theme
+ self.autoNightModeTriggered = autoNightModeTriggered
self.chatWallpaper = chatWallpaper
- self.volumeControlStatusBarIcons = volumeControlStatusBarIcons
self.fontSize = fontSize
self.dateTimeFormat = dateTimeFormat
self.nameDisplayOrder = nameDisplayOrder
@@ -84,7 +74,7 @@ public final class PresentationData: Equatable {
}
public static func ==(lhs: PresentationData, rhs: PresentationData) -> Bool {
- return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.chatWallpaper == rhs.chatWallpaper && lhs.volumeControlStatusBarIcons == rhs.volumeControlStatusBarIcons && lhs.fontSize == rhs.fontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.disableAnimations == rhs.disableAnimations && lhs.largeEmoji == rhs.largeEmoji
+ return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.autoNightModeTriggered == rhs.autoNightModeTriggered && lhs.chatWallpaper == rhs.chatWallpaper && lhs.fontSize == rhs.fontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.disableAnimations == rhs.disableAnimations && lhs.largeEmoji == rhs.largeEmoji
}
}
@@ -116,11 +106,6 @@ public func dictFromLocalization(_ value: Localization) -> [String: String] {
return dict
}
-private func volumeControlStatusBarIcons() -> PresentationVolumeControlStatusBarIcons {
- let bundle = getAppBundle()
- return PresentationVolumeControlStatusBarIcons(offIcon: UIImage(named: "Components/Volume/VolumeOff", in: bundle, compatibleWith: nil)!, halfIcon: UIImage(named: "Components/Volume/VolumeHalf", in: bundle, compatibleWith: nil)!, fullIcon: UIImage(named: "Components/Volume/VolumeFull", in: bundle, compatibleWith: nil)!)
-}
-
private func currentDateTimeFormat() -> PresentationDateTimeFormat {
let locale = Locale.current
let dateFormatter = DateFormatter()
@@ -249,10 +234,13 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager, s
var effectiveChatWallpaper: TelegramWallpaper = themeSettings.chatWallpaper
let parameters = AutomaticThemeSwitchParameters(settings: themeSettings.automaticThemeSwitchSetting)
+ let autoNightModeTriggered: Bool
if automaticThemeShouldSwitchNow(parameters, systemUserInterfaceStyle: systemUserInterfaceStyle) {
effectiveTheme = themeSettings.automaticThemeSwitchSetting.theme
+ autoNightModeTriggered = true
} else {
effectiveTheme = themeSettings.theme
+ autoNightModeTriggered = false
}
let effectiveAccentColor = themeSettings.themeSpecificAccentColors[effectiveTheme.index]?.color
@@ -276,7 +264,7 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager, s
}
let nameDisplayOrder = contactSettings.nameDisplayOrder
let nameSortOrder = currentPersonNameSortOrder()
- return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: themeValue, chatWallpaper: effectiveChatWallpaper, volumeControlStatusBarIcons: volumeControlStatusBarIcons(), fontSize: themeSettings.fontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings)
+ return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, fontSize: themeSettings.fontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings)
}
}
@@ -499,11 +487,11 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI
if inForeground {
return automaticThemeShouldSwitch(themeSettings.automaticThemeSwitchSetting, systemUserInterfaceStyle: systemUserInterfaceStyle)
|> distinctUntilChanged
- |> map { shouldSwitch in
+ |> map { autoNightModeTriggered in
var effectiveTheme: PresentationThemeReference
var effectiveChatWallpaper: TelegramWallpaper = currentWallpaper
- if shouldSwitch {
+ if autoNightModeTriggered {
let automaticTheme = themeSettings.automaticThemeSwitchSetting.theme
if let themeSpecificWallpaper = themeSettings.themeSpecificChatWallpapers[automaticTheme.index] {
effectiveChatWallpaper = themeSpecificWallpaper
@@ -546,7 +534,7 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI
let nameDisplayOrder = contactSettings.nameDisplayOrder
let nameSortOrder = currentPersonNameSortOrder()
- return PresentationData(strings: stringsValue, theme: themeValue, chatWallpaper: effectiveChatWallpaper, volumeControlStatusBarIcons: volumeControlStatusBarIcons(), fontSize: themeSettings.fontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji)
+ return PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, fontSize: themeSettings.fontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji)
}
} else {
return .complete()
@@ -562,5 +550,5 @@ public func defaultPresentationData() -> PresentationData {
let nameSortOrder = currentPersonNameSortOrder()
let themeSettings = PresentationThemeSettings.defaultSettings
- return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, chatWallpaper: .builtin(WallpaperSettings()), volumeControlStatusBarIcons: volumeControlStatusBarIcons(), fontSize: themeSettings.fontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji)
+ return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, autoNightModeTriggered: false, chatWallpaper: .builtin(WallpaperSettings()), fontSize: themeSettings.fontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji)
}
diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
index fd5450fd36..4fd4d06b1d 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
@@ -233,4876 +233,4908 @@ public final class PresentationStrings: Equatable {
public var SettingsSearch_Synonyms_Privacy_AuthSessions: String { return self._s[42]! }
public var GroupInfo_LabelOwner: String { return self._s[43]! }
public var Conversation_Moderate_Delete: String { return self._s[44]! }
- public var Conversation_DeleteMessagesForEveryone: String { return self._s[45]! }
- public var WatchRemote_AlertOpen: String { return self._s[46]! }
+ public var ClearCache_ClearCache: String { return self._s[45]! }
+ public var Conversation_DeleteMessagesForEveryone: String { return self._s[46]! }
+ public var WatchRemote_AlertOpen: String { return self._s[47]! }
public func MediaPicker_Nof(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[47]!, self._r[47]!, [_0])
+ return formatWithArgumentRanges(self._s[48]!, self._r[48]!, [_0])
}
- public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[48]! }
- public var AutoDownloadSettings_MediaTypes: String { return self._s[50]! }
- public var Watch_GroupInfo_Title: String { return self._s[51]! }
- public var Passport_Identity_AddPersonalDetails: String { return self._s[52]! }
- public var Channel_Info_Members: String { return self._s[53]! }
- public var LoginPassword_InvalidPasswordError: String { return self._s[55]! }
- public var Conversation_LiveLocation: String { return self._s[56]! }
- public var Wallet_Month_ShortNovember: String { return self._s[57]! }
- public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[58]! }
- public var NetworkUsageSettings_BytesReceived: String { return self._s[60]! }
- public var Stickers_Search: String { return self._s[62]! }
- public var NotificationsSound_Synth: String { return self._s[63]! }
- public var LogoutOptions_LogOutInfo: String { return self._s[64]! }
+ public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[49]! }
+ public var AutoDownloadSettings_MediaTypes: String { return self._s[51]! }
+ public var Watch_GroupInfo_Title: String { return self._s[52]! }
+ public var Passport_Identity_AddPersonalDetails: String { return self._s[53]! }
+ public var Channel_Info_Members: String { return self._s[54]! }
+ public var LoginPassword_InvalidPasswordError: String { return self._s[56]! }
+ public var Conversation_LiveLocation: String { return self._s[57]! }
+ public var Wallet_Month_ShortNovember: String { return self._s[58]! }
+ public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[59]! }
+ public var NetworkUsageSettings_BytesReceived: String { return self._s[61]! }
+ public var Stickers_Search: String { return self._s[63]! }
+ public var NotificationsSound_Synth: String { return self._s[64]! }
+ public var LogoutOptions_LogOutInfo: String { return self._s[65]! }
public func VoiceOver_Chat_ForwardedFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[66]!, self._r[66]!, [_0])
+ return formatWithArgumentRanges(self._s[67]!, self._r[67]!, [_0])
}
- public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[67]! }
- public var ChatList_Context_HideArchive: String { return self._s[69]! }
- public var AutoNightTheme_UseSunsetSunrise: String { return self._s[70]! }
- public var FastTwoStepSetup_Title: String { return self._s[71]! }
- public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[72]! }
- public var Channel_Info_BlackList: String { return self._s[73]! }
- public var Channel_AdminLog_InfoPanelTitle: String { return self._s[74]! }
- public var Conversation_OpenFile: String { return self._s[75]! }
- public var SecretTimer_ImageDescription: String { return self._s[76]! }
- public var StickerSettings_ContextInfo: String { return self._s[77]! }
- public var TwoStepAuth_GenericHelp: String { return self._s[79]! }
- public var AutoDownloadSettings_Unlimited: String { return self._s[80]! }
- public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[81]! }
- public var AutoDownloadSettings_DataUsageHigh: String { return self._s[82]! }
+ public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[68]! }
+ public var ChatList_Context_HideArchive: String { return self._s[70]! }
+ public var AutoNightTheme_UseSunsetSunrise: String { return self._s[71]! }
+ public var FastTwoStepSetup_Title: String { return self._s[72]! }
+ public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[73]! }
+ public var Channel_Info_BlackList: String { return self._s[74]! }
+ public var Channel_AdminLog_InfoPanelTitle: String { return self._s[75]! }
+ public var Conversation_OpenFile: String { return self._s[77]! }
+ public var SecretTimer_ImageDescription: String { return self._s[78]! }
+ public var StickerSettings_ContextInfo: String { return self._s[79]! }
+ public var TwoStepAuth_GenericHelp: String { return self._s[81]! }
+ public var AutoDownloadSettings_Unlimited: String { return self._s[82]! }
+ public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[83]! }
+ public var AutoDownloadSettings_DataUsageHigh: String { return self._s[84]! }
public func PUSH_CHAT_MESSAGE_VIDEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[83]!, self._r[83]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[85]!, self._r[85]!, [_1, _2])
}
- public var Notifications_AddExceptionTitle: String { return self._s[84]! }
- public var Watch_MessageView_Reply: String { return self._s[85]! }
- public var Tour_Text6: String { return self._s[86]! }
- public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[87]! }
+ public var Notifications_AddExceptionTitle: String { return self._s[86]! }
+ public var Watch_MessageView_Reply: String { return self._s[87]! }
+ public var Tour_Text6: String { return self._s[88]! }
+ public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[89]! }
public func Notification_PinnedAnimationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[88]!, self._r[88]!, [_0])
+ return formatWithArgumentRanges(self._s[90]!, self._r[90]!, [_0])
}
public func ShareFileTip_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[89]!, self._r[89]!, [_0])
+ return formatWithArgumentRanges(self._s[91]!, self._r[91]!, [_0])
}
- public var Wallet_Configuration_BlockchainIdPlaceholder: String { return self._s[90]! }
- public var AccessDenied_LocationDenied: String { return self._s[91]! }
- public var CallSettings_RecentCalls: String { return self._s[92]! }
- public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[93]! }
- public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[94]! }
- public var Passport_Authorize: String { return self._s[95]! }
- public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[96]! }
- public var AutoDownloadSettings_Videos: String { return self._s[97]! }
- public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[98]! }
- public var Wallet_Info_Send: String { return self._s[99]! }
- public var Wallet_TransactionInfo_SendGrams: String { return self._s[100]! }
- public var Tour_StartButton: String { return self._s[101]! }
- public var Watch_AppName: String { return self._s[103]! }
- public var StickerPack_ErrorNotFound: String { return self._s[104]! }
- public var Channel_Info_Subscribers: String { return self._s[105]! }
+ public var Wallet_Configuration_BlockchainIdPlaceholder: String { return self._s[92]! }
+ public var AccessDenied_LocationDenied: String { return self._s[93]! }
+ public var CallSettings_RecentCalls: String { return self._s[94]! }
+ public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[95]! }
+ public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[96]! }
+ public var Passport_Authorize: String { return self._s[97]! }
+ public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[98]! }
+ public var AutoDownloadSettings_Videos: String { return self._s[99]! }
+ public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[100]! }
+ public var Wallet_Info_Send: String { return self._s[101]! }
+ public var Wallet_TransactionInfo_SendGrams: String { return self._s[102]! }
+ public var Tour_StartButton: String { return self._s[103]! }
+ public var Watch_AppName: String { return self._s[105]! }
+ public var StickerPack_ErrorNotFound: String { return self._s[106]! }
+ public var Channel_Info_Subscribers: String { return self._s[107]! }
public func Channel_AdminLog_MessageGroupPreHistoryVisible(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[106]!, self._r[106]!, [_0])
+ return formatWithArgumentRanges(self._s[108]!, self._r[108]!, [_0])
}
public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[107]!, self._r[107]!, [_0])
- }
- public var Appearance_RemoveTheme: String { return self._s[108]! }
- public func Wallet_Info_TransactionBlockchainFee(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[109]!, self._r[109]!, [_0])
}
- public var Conversation_StopLiveLocation: String { return self._s[111]! }
- public var Channel_AdminLogFilter_EventsAll: String { return self._s[112]! }
- public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[114]! }
- public var Username_LinkCopied: String { return self._s[116]! }
- public var GroupRemoved_Title: String { return self._s[117]! }
- public var SecretVideo_Title: String { return self._s[118]! }
+ public var Appearance_RemoveTheme: String { return self._s[110]! }
+ public func Wallet_Info_TransactionBlockchainFee(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[111]!, self._r[111]!, [_0])
+ }
+ public var Conversation_StopLiveLocation: String { return self._s[113]! }
+ public var Channel_AdminLogFilter_EventsAll: String { return self._s[114]! }
+ public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[116]! }
+ public var Username_LinkCopied: String { return self._s[118]! }
+ public var GroupRemoved_Title: String { return self._s[119]! }
+ public var SecretVideo_Title: String { return self._s[120]! }
public func PUSH_PINNED_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[119]!, self._r[119]!, [_1])
+ return formatWithArgumentRanges(self._s[121]!, self._r[121]!, [_1])
}
- public var AccessDenied_PhotosAndVideos: String { return self._s[120]! }
- public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[121]! }
+ public var AccessDenied_PhotosAndVideos: String { return self._s[122]! }
+ public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[123]! }
public func PUSH_CHANNEL_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[123]!, self._r[123]!, [_1])
+ return formatWithArgumentRanges(self._s[125]!, self._r[125]!, [_1])
}
- public var Map_OpenInGoogleMaps: String { return self._s[124]! }
+ public var Map_OpenInGoogleMaps: String { return self._s[126]! }
public func Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[125]!, self._r[125]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[127]!, self._r[127]!, [_1, _2, _3])
}
public func Channel_AdminLog_MessageKickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[126]!, self._r[126]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[128]!, self._r[128]!, [_1, _2])
}
- public var Call_StatusRinging: String { return self._s[127]! }
- public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[128]! }
- public var Group_Username_InvalidStartsWithNumber: String { return self._s[129]! }
- public var UserInfo_NotificationsEnabled: String { return self._s[130]! }
- public var Map_Search: String { return self._s[131]! }
- public var Login_TermsOfServiceHeader: String { return self._s[133]! }
+ public var Call_StatusRinging: String { return self._s[129]! }
+ public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[130]! }
+ public var Group_Username_InvalidStartsWithNumber: String { return self._s[131]! }
+ public var UserInfo_NotificationsEnabled: String { return self._s[132]! }
+ public var Map_Search: String { return self._s[133]! }
+ public var ClearCache_StorageFree: String { return self._s[135]! }
+ public var Login_TermsOfServiceHeader: String { return self._s[136]! }
public func Notification_PinnedVideoMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[134]!, self._r[134]!, [_0])
+ return formatWithArgumentRanges(self._s[137]!, self._r[137]!, [_0])
}
public func Channel_AdminLog_MessageToggleSignaturesOn(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[135]!, self._r[135]!, [_0])
+ return formatWithArgumentRanges(self._s[138]!, self._r[138]!, [_0])
}
- public var Wallet_Sent_Title: String { return self._s[136]! }
- public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[137]! }
- public var Weekday_Today: String { return self._s[138]! }
+ public var Wallet_Sent_Title: String { return self._s[139]! }
+ public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[140]! }
+ public var Weekday_Today: String { return self._s[141]! }
public func InstantPage_AuthorAndDateTitle(_ _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 Conversation_MessageDialogRetryAll(_ _1: Int) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[141]!, self._r[141]!, ["\(_1)"])
+ return formatWithArgumentRanges(self._s[144]!, self._r[144]!, ["\(_1)"])
}
- public var Notification_PassportValuePersonalDetails: String { return self._s[143]! }
- public var Channel_AdminLog_MessagePreviousLink: String { return self._s[144]! }
- public var ChangePhoneNumberNumber_NewNumber: String { return self._s[145]! }
- public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[146]! }
- public var TwoStepAuth_ChangePasswordDescription: String { return self._s[147]! }
- public var PhotoEditor_BlurToolLinear: String { return self._s[148]! }
- public var Contacts_PermissionsAllowInSettings: String { return self._s[149]! }
- public var Weekday_ShortMonday: String { return self._s[150]! }
- public var Cache_KeepMedia: String { return self._s[151]! }
- public var Passport_FieldIdentitySelfieHelp: String { return self._s[152]! }
+ public var Notification_PassportValuePersonalDetails: String { return self._s[146]! }
+ public var Channel_AdminLog_MessagePreviousLink: String { return self._s[147]! }
+ public var ChangePhoneNumberNumber_NewNumber: String { return self._s[148]! }
+ public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[149]! }
+ public var TwoStepAuth_ChangePasswordDescription: String { return self._s[150]! }
+ public var PhotoEditor_BlurToolLinear: String { return self._s[151]! }
+ public var Contacts_PermissionsAllowInSettings: String { return self._s[152]! }
+ public var Weekday_ShortMonday: String { return self._s[153]! }
+ public var Cache_KeepMedia: String { return self._s[154]! }
+ public var Passport_FieldIdentitySelfieHelp: String { return self._s[155]! }
public func PUSH_PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[153]!, self._r[153]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[156]!, self._r[156]!, [_1, _2])
}
public func Chat_SlowmodeTooltip(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[154]!, self._r[154]!, [_0])
+ return formatWithArgumentRanges(self._s[157]!, self._r[157]!, [_0])
}
- public var Wallet_Receive_ShareUrlInfo: String { return self._s[155]! }
- public var Conversation_ClousStorageInfo_Description4: String { return self._s[156]! }
- public var Wallet_RestoreFailed_Title: String { return self._s[157]! }
- public var Passport_Language_ru: String { return self._s[158]! }
+ public var Wallet_Receive_ShareUrlInfo: String { return self._s[158]! }
+ public var Conversation_ClousStorageInfo_Description4: String { return self._s[159]! }
+ public var Wallet_RestoreFailed_Title: String { return self._s[160]! }
+ public var Passport_Language_ru: String { return self._s[161]! }
public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[159]!, self._r[159]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[162]!, self._r[162]!, [_0, _1])
}
- public var WallpaperPreview_PatternIntensity: String { return self._s[160]! }
- public var WebBrowser_InAppSafari: String { return self._s[161]! }
- public var TwoStepAuth_RecoveryUnavailable: String { return self._s[162]! }
- public var EnterPasscode_TouchId: String { return self._s[163]! }
- public var PhotoEditor_QualityVeryHigh: String { return self._s[166]! }
- public var Checkout_NewCard_SaveInfo: String { return self._s[168]! }
- public var Gif_NoGifsPlaceholder: String { return self._s[170]! }
- public var Conversation_OpenBotLinkTitle: String { return self._s[172]! }
- public var ChatSettings_AutoDownloadEnabled: String { return self._s[173]! }
- public var NetworkUsageSettings_BytesSent: String { return self._s[174]! }
- public var Checkout_PasswordEntry_Pay: String { return self._s[175]! }
- public var AuthSessions_TerminateSession: String { return self._s[176]! }
- public var Message_File: String { return self._s[177]! }
- public var MediaPicker_VideoMuteDescription: String { return self._s[178]! }
- public var SocksProxySetup_ProxyStatusConnected: String { return self._s[179]! }
- public var TwoStepAuth_RecoveryCode: String { return self._s[180]! }
- public var EnterPasscode_EnterCurrentPasscode: String { return self._s[181]! }
+ public var WallpaperPreview_PatternIntensity: String { return self._s[163]! }
+ public var WebBrowser_InAppSafari: String { return self._s[166]! }
+ public var TwoStepAuth_RecoveryUnavailable: String { return self._s[167]! }
+ public var EnterPasscode_TouchId: String { return self._s[168]! }
+ public var PhotoEditor_QualityVeryHigh: String { return self._s[171]! }
+ public var Checkout_NewCard_SaveInfo: String { return self._s[173]! }
+ public var Gif_NoGifsPlaceholder: String { return self._s[175]! }
+ public var Conversation_OpenBotLinkTitle: String { return self._s[177]! }
+ public var ChatSettings_AutoDownloadEnabled: String { return self._s[178]! }
+ public var NetworkUsageSettings_BytesSent: String { return self._s[179]! }
+ public var Checkout_PasswordEntry_Pay: String { return self._s[180]! }
+ public var AuthSessions_TerminateSession: String { return self._s[181]! }
+ public var Message_File: String { return self._s[182]! }
+ public var MediaPicker_VideoMuteDescription: String { return self._s[183]! }
+ public var SocksProxySetup_ProxyStatusConnected: String { return self._s[184]! }
+ public var TwoStepAuth_RecoveryCode: String { return self._s[185]! }
+ public var EnterPasscode_EnterCurrentPasscode: String { return self._s[186]! }
public func TwoStepAuth_EnterPasswordHint(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[182]!, self._r[182]!, [_0])
+ return formatWithArgumentRanges(self._s[187]!, self._r[187]!, [_0])
}
- public var Conversation_Moderate_Report: String { return self._s[184]! }
- public var TwoStepAuth_EmailInvalid: String { return self._s[185]! }
- public var Passport_Language_ms: String { return self._s[186]! }
- public var Channel_Edit_AboutItem: String { return self._s[188]! }
- public var DialogList_SearchSectionGlobal: String { return self._s[192]! }
- public var AttachmentMenu_WebSearch: String { return self._s[193]! }
- public var PasscodeSettings_TurnPasscodeOn: String { return self._s[194]! }
- public var Channel_BanUser_Title: String { return self._s[195]! }
- public var WallpaperPreview_SwipeTopText: String { return self._s[196]! }
- public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[197]! }
- public var ArchivedChats_IntroText2: String { return self._s[198]! }
- public var Notification_Exceptions_DeleteAll: String { return self._s[199]! }
- public var ChatSearch_SearchPlaceholder: String { return self._s[201]! }
+ public var Conversation_Moderate_Report: String { return self._s[189]! }
+ public var TwoStepAuth_EmailInvalid: String { return self._s[190]! }
+ public var Passport_Language_ms: String { return self._s[191]! }
+ public var Channel_Edit_AboutItem: String { return self._s[193]! }
+ public var DialogList_SearchSectionGlobal: String { return self._s[197]! }
+ public var AttachmentMenu_WebSearch: String { return self._s[198]! }
+ public var PasscodeSettings_TurnPasscodeOn: String { return self._s[199]! }
+ public var Channel_BanUser_Title: String { return self._s[200]! }
+ public var WallpaperPreview_SwipeTopText: String { return self._s[201]! }
+ public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[202]! }
+ public var ArchivedChats_IntroText2: String { return self._s[203]! }
+ public var Notification_Exceptions_DeleteAll: String { return self._s[204]! }
+ public var ChatSearch_SearchPlaceholder: String { return self._s[206]! }
public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[202]!, self._r[202]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[207]!, self._r[207]!, [_1, _2])
}
- public var Passport_FieldAddressTranslationHelp: String { return self._s[203]! }
- public var NotificationsSound_Aurora: String { return self._s[204]! }
+ public var Passport_FieldAddressTranslationHelp: String { return self._s[208]! }
+ public var NotificationsSound_Aurora: String { return self._s[209]! }
public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[205]!, self._r[205]!, [_0])
+ return formatWithArgumentRanges(self._s[210]!, self._r[210]!, [_0])
}
- public var AuthSessions_LoggedInWithTelegram: String { return self._s[208]! }
+ public var AuthSessions_LoggedInWithTelegram: String { return self._s[213]! }
public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[209]!, self._r[209]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[214]!, self._r[214]!, [_0, _1])
}
- public var Passport_PasswordNext: String { return self._s[210]! }
- public var Bot_GroupStatusReadsHistory: String { return self._s[211]! }
- public var EmptyGroupInfo_Line2: String { return self._s[212]! }
- public var VoiceOver_Chat_SeenByRecipients: String { return self._s[213]! }
- public var Settings_FAQ_Intro: String { return self._s[216]! }
- public var PrivacySettings_PasscodeAndTouchId: String { return self._s[218]! }
- public var FeaturedStickerPacks_Title: String { return self._s[219]! }
- public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[221]! }
- public var Username_Title: String { return self._s[222]! }
+ public var Passport_PasswordNext: String { return self._s[215]! }
+ public var Bot_GroupStatusReadsHistory: String { return self._s[216]! }
+ public var EmptyGroupInfo_Line2: String { return self._s[217]! }
+ public var VoiceOver_Chat_SeenByRecipients: String { return self._s[218]! }
+ public var Settings_FAQ_Intro: String { return self._s[221]! }
+ public var PrivacySettings_PasscodeAndTouchId: String { return self._s[223]! }
+ public var FeaturedStickerPacks_Title: String { return self._s[224]! }
+ public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[226]! }
+ public var Username_Title: String { return self._s[227]! }
public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[223]!, self._r[223]!, [_0])
+ return formatWithArgumentRanges(self._s[228]!, self._r[228]!, [_0])
}
- public var PasscodeSettings_AlphanumericCode: String { return self._s[224]! }
- public var Localization_LanguageOther: String { return self._s[225]! }
- public var Stickers_SuggestStickers: String { return self._s[226]! }
+ public var PasscodeSettings_AlphanumericCode: String { return self._s[229]! }
+ public var Localization_LanguageOther: String { return self._s[230]! }
+ public var Stickers_SuggestStickers: String { return self._s[231]! }
public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[227]!, self._r[227]!, [_0])
+ return formatWithArgumentRanges(self._s[232]!, self._r[232]!, [_0])
}
- public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[228]! }
- public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[229]! }
- public var Conversation_DefaultRestrictedStickers: String { return self._s[230]! }
+ public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[233]! }
+ public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[234]! }
+ public var Conversation_DefaultRestrictedStickers: String { return self._s[235]! }
public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[231]!, self._r[231]!, [_0])
+ return formatWithArgumentRanges(self._s[236]!, self._r[236]!, [_0])
}
- public var Wallet_TransactionInfo_CopyAddress: String { return self._s[233]! }
- public var Group_UpgradeConfirmation: String { return self._s[234]! }
- public var DialogList_Unpin: String { return self._s[235]! }
- public var Passport_Identity_DateOfBirth: String { return self._s[236]! }
- public var Month_ShortOctober: String { return self._s[237]! }
- public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[238]! }
- public var TwoFactorSetup_Done_Text: String { return self._s[239]! }
- public var Notification_CallCanceledShort: String { return self._s[240]! }
- public var Passport_Phone_Help: String { return self._s[241]! }
- public var Passport_Language_az: String { return self._s[243]! }
- public var CreatePoll_TextPlaceholder: String { return self._s[245]! }
- public var VoiceOver_Chat_AnonymousPoll: String { return self._s[246]! }
- public var Passport_Identity_DocumentNumber: String { return self._s[247]! }
- public var PhotoEditor_CurvesRed: String { return self._s[248]! }
- public var PhoneNumberHelp_Alert: String { return self._s[250]! }
- public var SocksProxySetup_Port: String { return self._s[251]! }
- public var Checkout_PayNone: String { return self._s[252]! }
- public var AutoDownloadSettings_WiFi: String { return self._s[253]! }
- public var GroupInfo_GroupType: String { return self._s[254]! }
- public var StickerSettings_ContextHide: String { return self._s[255]! }
- public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[256]! }
- public var Group_Setup_HistoryTitle: String { return self._s[258]! }
- public var Passport_Identity_FilesUploadNew: String { return self._s[259]! }
- public var PasscodeSettings_AutoLock: String { return self._s[260]! }
- public var Passport_Title: String { return self._s[261]! }
- public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[262]! }
- public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[263]! }
- public var GroupPermission_NoSendGifs: String { return self._s[264]! }
- public var PrivacySettings_PasscodeOn: String { return self._s[265]! }
+ public var Wallet_TransactionInfo_CopyAddress: String { return self._s[238]! }
+ public var Group_UpgradeConfirmation: String { return self._s[239]! }
+ public var DialogList_Unpin: String { return self._s[240]! }
+ public var Passport_Identity_DateOfBirth: String { return self._s[241]! }
+ public var Month_ShortOctober: String { return self._s[242]! }
+ public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[243]! }
+ public var TwoFactorSetup_Done_Text: String { return self._s[244]! }
+ public var Notification_CallCanceledShort: String { return self._s[245]! }
+ public var Passport_Phone_Help: String { return self._s[246]! }
+ public var Passport_Language_az: String { return self._s[248]! }
+ public var CreatePoll_TextPlaceholder: String { return self._s[250]! }
+ public var VoiceOver_Chat_AnonymousPoll: String { return self._s[251]! }
+ public var Passport_Identity_DocumentNumber: String { return self._s[252]! }
+ public var PhotoEditor_CurvesRed: String { return self._s[253]! }
+ public var PhoneNumberHelp_Alert: String { return self._s[255]! }
+ public var SocksProxySetup_Port: String { return self._s[256]! }
+ public var Checkout_PayNone: String { return self._s[257]! }
+ public var AutoDownloadSettings_WiFi: String { return self._s[258]! }
+ public var GroupInfo_GroupType: String { return self._s[259]! }
+ public var StickerSettings_ContextHide: String { return self._s[260]! }
+ public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[261]! }
+ public var Group_Setup_HistoryTitle: String { return self._s[263]! }
+ public var Passport_Identity_FilesUploadNew: String { return self._s[264]! }
+ public var PasscodeSettings_AutoLock: String { return self._s[265]! }
+ public var Passport_Title: String { return self._s[266]! }
+ public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[267]! }
+ public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[268]! }
+ public var GroupPermission_NoSendGifs: String { return self._s[269]! }
+ public var PrivacySettings_PasscodeOn: String { return self._s[270]! }
public func Conversation_ScheduleMessage_SendTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[266]!, self._r[266]!, [_0])
+ return formatWithArgumentRanges(self._s[271]!, self._r[271]!, [_0])
}
- public var State_WaitingForNetwork: String { return self._s[268]! }
+ public var State_WaitingForNetwork: String { return self._s[273]! }
public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[269]!, self._r[269]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[274]!, self._r[274]!, [_0, _1])
}
- public var Calls_NotNow: String { return self._s[271]! }
+ public var Calls_NotNow: String { return self._s[276]! }
public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[272]!, self._r[272]!, [_0])
+ return formatWithArgumentRanges(self._s[277]!, self._r[277]!, [_0])
}
- public var UserInfo_SendMessage: String { return self._s[273]! }
- public var TwoStepAuth_PasswordSet: String { return self._s[274]! }
- public var Passport_DeleteDocument: String { return self._s[275]! }
- public var SocksProxySetup_AddProxyTitle: String { return self._s[276]! }
+ public var UserInfo_SendMessage: String { return self._s[278]! }
+ public var TwoStepAuth_PasswordSet: String { return self._s[279]! }
+ public var Passport_DeleteDocument: String { return self._s[280]! }
+ public var SocksProxySetup_AddProxyTitle: String { return self._s[281]! }
public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[277]!, self._r[277]!, [_1])
+ return formatWithArgumentRanges(self._s[282]!, self._r[282]!, [_1])
}
- public var GroupRemoved_Remove: String { return self._s[278]! }
- public var Passport_FieldIdentity: String { return self._s[279]! }
- public var Group_Setup_TypePrivateHelp: String { return self._s[280]! }
- public var Conversation_Processing: String { return self._s[283]! }
- public var Wallet_Settings_BackupWallet: String { return self._s[285]! }
- public var ChatSettings_AutoPlayAnimations: String { return self._s[286]! }
- public var AuthSessions_LogOutApplicationsHelp: String { return self._s[289]! }
- public var Month_GenFebruary: String { return self._s[290]! }
- public var Wallet_Send_NetworkErrorTitle: String { return self._s[291]! }
+ public var GroupRemoved_Remove: String { return self._s[283]! }
+ public var Passport_FieldIdentity: String { return self._s[284]! }
+ public var Group_Setup_TypePrivateHelp: String { return self._s[285]! }
+ public var Conversation_Processing: String { return self._s[288]! }
+ public var Wallet_Settings_BackupWallet: String { return self._s[290]! }
+ public var ChatSettings_AutoPlayAnimations: String { return self._s[291]! }
+ public var AuthSessions_LogOutApplicationsHelp: String { return self._s[294]! }
+ public var Month_GenFebruary: String { return self._s[295]! }
+ public var Wallet_Send_NetworkErrorTitle: String { return self._s[296]! }
public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[293]!, self._r[293]!, [_1, _2, _3, _4, _5])
+ return formatWithArgumentRanges(self._s[298]!, self._r[298]!, [_1, _2, _3, _4, _5])
}
- public var Passport_Identity_TypeIdentityCard: String { return self._s[294]! }
- public var Wallet_Month_ShortJune: String { return self._s[296]! }
- public var AutoDownloadSettings_DataUsageMedium: String { return self._s[297]! }
- public var GroupInfo_AddParticipant: String { return self._s[298]! }
- public var KeyCommand_SendMessage: String { return self._s[299]! }
- public var VoiceOver_Chat_YourContact: String { return self._s[301]! }
- public var Map_LiveLocationShowAll: String { return self._s[302]! }
- public var WallpaperSearch_ColorOrange: String { return self._s[304]! }
- public var Appearance_AppIconDefaultX: String { return self._s[305]! }
- public var Checkout_Receipt_Title: String { return self._s[306]! }
- public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[307]! }
- public var WallpaperPreview_PreviewTopText: String { return self._s[308]! }
- public var Message_Contact: String { return self._s[309]! }
- public var Call_StatusIncoming: String { return self._s[310]! }
- public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[311]! }
+ public var Passport_Identity_TypeIdentityCard: String { return self._s[299]! }
+ public var Wallet_Month_ShortJune: String { return self._s[301]! }
+ public var AutoDownloadSettings_DataUsageMedium: String { return self._s[302]! }
+ public var GroupInfo_AddParticipant: String { return self._s[303]! }
+ public var KeyCommand_SendMessage: String { return self._s[304]! }
+ public var VoiceOver_Chat_YourContact: String { return self._s[306]! }
+ public var Map_LiveLocationShowAll: String { return self._s[307]! }
+ public var WallpaperSearch_ColorOrange: String { return self._s[309]! }
+ public var Appearance_AppIconDefaultX: String { return self._s[310]! }
+ public var Checkout_Receipt_Title: String { return self._s[311]! }
+ public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[312]! }
+ public var WallpaperPreview_PreviewTopText: String { return self._s[313]! }
+ public var Message_Contact: String { return self._s[314]! }
+ public var Call_StatusIncoming: String { return self._s[315]! }
+ public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[316]! }
public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[312]!, self._r[312]!, [_1])
+ return formatWithArgumentRanges(self._s[317]!, self._r[317]!, [_1])
}
public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[314]!, self._r[314]!, [_1])
+ return formatWithArgumentRanges(self._s[319]!, self._r[319]!, [_1])
}
- public var VoiceOver_Media_PlaybackRate: String { return self._s[315]! }
- public var Passport_FieldIdentityDetailsHelp: String { return self._s[316]! }
- public var Conversation_ViewChannel: String { return self._s[317]! }
+ public var VoiceOver_Media_PlaybackRate: String { return self._s[320]! }
+ public var Passport_FieldIdentityDetailsHelp: String { return self._s[321]! }
+ public var Conversation_ViewChannel: String { return self._s[322]! }
public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[318]!, self._r[318]!, [_0])
+ return formatWithArgumentRanges(self._s[323]!, self._r[323]!, [_0])
}
- public var Passport_Language_nl: String { return self._s[320]! }
- public var Camera_Retake: String { return self._s[321]! }
+ public var Passport_Language_nl: String { return self._s[325]! }
+ public var Camera_Retake: String { return self._s[326]! }
public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[322]!, self._r[322]!, [_0])
+ return formatWithArgumentRanges(self._s[327]!, self._r[327]!, [_0])
}
- public var AuthSessions_LogOutApplications: String { return self._s[323]! }
- public var ApplyLanguage_ApplySuccess: String { return self._s[324]! }
- public var Tour_Title6: String { return self._s[325]! }
- public var Map_ChooseAPlace: String { return self._s[326]! }
- public var CallSettings_Never: String { return self._s[328]! }
+ public var AuthSessions_LogOutApplications: String { return self._s[328]! }
+ public var ApplyLanguage_ApplySuccess: String { return self._s[329]! }
+ public var Tour_Title6: String { return self._s[330]! }
+ public var Map_ChooseAPlace: String { return self._s[331]! }
+ public var CallSettings_Never: String { return self._s[333]! }
public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[329]!, self._r[329]!, [_0])
+ return formatWithArgumentRanges(self._s[334]!, self._r[334]!, [_0])
}
- public var ChannelRemoved_RemoveInfo: String { return self._s[330]! }
+ public var ChannelRemoved_RemoveInfo: String { return self._s[335]! }
public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[331]!, self._r[331]!, [_0])
+ return formatWithArgumentRanges(self._s[336]!, self._r[336]!, [_0])
}
- public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[332]! }
+ public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[337]! }
public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[333]!, self._r[333]!, [_0])
+ return formatWithArgumentRanges(self._s[338]!, self._r[338]!, [_0])
}
- public var GroupInfo_InviteLink_Title: String { return self._s[334]! }
+ public var GroupInfo_InviteLink_Title: String { return self._s[339]! }
public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[335]!, self._r[335]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[340]!, self._r[340]!, [_1, _2])
}
- public var KeyCommand_ScrollUp: String { return self._s[336]! }
- public var ContactInfo_URLLabelHomepage: String { return self._s[337]! }
- public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[338]! }
+ public var KeyCommand_ScrollUp: String { return self._s[341]! }
+ public var ContactInfo_URLLabelHomepage: String { return self._s[342]! }
+ public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[343]! }
public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[339]!, self._r[339]!, [_0])
+ return formatWithArgumentRanges(self._s[344]!, self._r[344]!, [_0])
}
- public var TwoFactorSetup_Done_Title: String { return self._s[340]! }
+ public var TwoFactorSetup_Done_Title: String { return self._s[345]! }
public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[341]!, self._r[341]!, [_0])
+ return formatWithArgumentRanges(self._s[346]!, self._r[346]!, [_0])
}
- public var CallFeedback_ReasonDistortedSpeech: String { return self._s[342]! }
- public var Watch_LastSeen_WithinAWeek: String { return self._s[343]! }
- public var ContactList_Context_SendMessage: String { return self._s[345]! }
- public var Weekday_Tuesday: String { return self._s[346]! }
- public var Wallet_Created_Title: String { return self._s[348]! }
- public var ScheduledMessages_Delete: String { return self._s[349]! }
- public var UserInfo_StartSecretChat: String { return self._s[350]! }
- public var Passport_Identity_FilesTitle: String { return self._s[351]! }
- public var Permissions_NotificationsAllow_v0: String { return self._s[352]! }
- public var DialogList_DeleteConversationConfirmation: String { return self._s[354]! }
- public var ChatList_UndoArchiveRevealedTitle: String { return self._s[355]! }
+ public var CallFeedback_ReasonDistortedSpeech: String { return self._s[347]! }
+ public var Watch_LastSeen_WithinAWeek: String { return self._s[348]! }
+ public var ContactList_Context_SendMessage: String { return self._s[350]! }
+ public var Weekday_Tuesday: String { return self._s[351]! }
+ public var Wallet_Created_Title: String { return self._s[353]! }
+ public var ScheduledMessages_Delete: String { return self._s[354]! }
+ public var UserInfo_StartSecretChat: String { return self._s[355]! }
+ public var Passport_Identity_FilesTitle: String { return self._s[356]! }
+ public var Permissions_NotificationsAllow_v0: String { return self._s[357]! }
+ public var DialogList_DeleteConversationConfirmation: String { return self._s[359]! }
+ public var ChatList_UndoArchiveRevealedTitle: String { return self._s[360]! }
public func Wallet_Configuration_ApplyErrorTextURLUnreachable(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[356]!, self._r[356]!, [_0])
+ return formatWithArgumentRanges(self._s[361]!, self._r[361]!, [_0])
}
- public var AuthSessions_Sessions: String { return self._s[357]! }
+ public var AuthSessions_Sessions: String { return self._s[362]! }
public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[359]!, self._r[359]!, [_0])
+ return formatWithArgumentRanges(self._s[364]!, self._r[364]!, [_0])
}
- public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[360]! }
- public var Call_StatusWaiting: String { return self._s[361]! }
- public var CreateGroup_SoftUserLimitAlert: String { return self._s[362]! }
- public var FastTwoStepSetup_HintHelp: String { return self._s[363]! }
- public var WallpaperPreview_CustomColorBottomText: String { return self._s[364]! }
- public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[365]! }
- public var LogoutOptions_AddAccountText: String { return self._s[366]! }
- public var PasscodeSettings_6DigitCode: String { return self._s[367]! }
- public var Settings_LogoutConfirmationText: String { return self._s[368]! }
- public var Passport_Identity_TypePassport: String { return self._s[370]! }
+ public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[365]! }
+ public var Call_StatusWaiting: String { return self._s[366]! }
+ public var CreateGroup_SoftUserLimitAlert: String { return self._s[367]! }
+ public var FastTwoStepSetup_HintHelp: String { return self._s[368]! }
+ public var WallpaperPreview_CustomColorBottomText: String { return self._s[369]! }
+ public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[370]! }
+ public var LogoutOptions_AddAccountText: String { return self._s[371]! }
+ public var PasscodeSettings_6DigitCode: String { return self._s[372]! }
+ public var Settings_LogoutConfirmationText: String { return self._s[373]! }
+ public var Passport_Identity_TypePassport: String { return self._s[375]! }
public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[373]!, self._r[373]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[378]!, self._r[378]!, [_1, _2])
}
- public var SocksProxySetup_SaveProxy: String { return self._s[374]! }
- public var AccessDenied_SaveMedia: String { return self._s[375]! }
- public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[377]! }
- public var Settings_Title: String { return self._s[379]! }
- public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[380]! }
- public var Contacts_InviteSearchLabel: String { return self._s[382]! }
- public var ConvertToSupergroup_Title: String { return self._s[383]! }
+ public var SocksProxySetup_SaveProxy: String { return self._s[379]! }
+ public var AccessDenied_SaveMedia: String { return self._s[380]! }
+ public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[382]! }
+ public var Settings_Title: String { return self._s[384]! }
+ public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[385]! }
+ public var Contacts_InviteSearchLabel: String { return self._s[387]! }
+ public var ConvertToSupergroup_Title: String { return self._s[388]! }
public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[384]!, self._r[384]!, [_0])
+ return formatWithArgumentRanges(self._s[389]!, self._r[389]!, [_0])
}
- public var TwoFactorSetup_Hint_Text: String { return self._s[385]! }
- public var InfoPlist_NSSiriUsageDescription: String { return self._s[386]! }
+ public var TwoFactorSetup_Hint_Text: String { return self._s[390]! }
+ public var InfoPlist_NSSiriUsageDescription: String { return self._s[391]! }
public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[387]!, self._r[387]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[392]!, self._r[392]!, [_1, _2, _3])
}
- public var ChatSettings_AutomaticPhotoDownload: String { return self._s[388]! }
- public var UserInfo_BotHelp: String { return self._s[389]! }
- public var PrivacySettings_LastSeenEverybody: String { return self._s[390]! }
- public var Checkout_Name: String { return self._s[391]! }
- public var AutoDownloadSettings_DataUsage: String { return self._s[392]! }
- public var Channel_BanUser_BlockFor: String { return self._s[393]! }
- public var Checkout_ShippingAddress: String { return self._s[394]! }
- public var AutoDownloadSettings_MaxVideoSize: String { return self._s[395]! }
- public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[396]! }
- public var Privacy_Forwards: String { return self._s[397]! }
- public var Channel_BanUser_PermissionSendPolls: String { return self._s[398]! }
- public var Appearance_ThemeCarouselNewNight: String { return self._s[399]! }
+ public var ChatSettings_AutomaticPhotoDownload: String { return self._s[393]! }
+ public var UserInfo_BotHelp: String { return self._s[394]! }
+ public var PrivacySettings_LastSeenEverybody: String { return self._s[395]! }
+ public var Checkout_Name: String { return self._s[396]! }
+ public var AutoDownloadSettings_DataUsage: String { return self._s[397]! }
+ public var Channel_BanUser_BlockFor: String { return self._s[398]! }
+ public var Checkout_ShippingAddress: String { return self._s[399]! }
+ public var AutoDownloadSettings_MaxVideoSize: String { return self._s[400]! }
+ public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[401]! }
+ public var Privacy_Forwards: String { return self._s[402]! }
+ public var Channel_BanUser_PermissionSendPolls: String { return self._s[403]! }
+ public var Appearance_ThemeCarouselNewNight: String { return self._s[404]! }
public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[402]!, self._r[402]!, [_0])
+ return formatWithArgumentRanges(self._s[407]!, self._r[407]!, [_0])
}
- public var Contacts_SortedByName: String { return self._s[403]! }
- public var Group_OwnershipTransfer_Title: String { return self._s[404]! }
- public var VoiceOver_Chat_OpenHint: String { return self._s[405]! }
- public var Group_LeaveGroup: String { return self._s[406]! }
- public var Settings_UsernameEmpty: String { return self._s[407]! }
+ public var Contacts_SortedByName: String { return self._s[408]! }
+ public var Group_OwnershipTransfer_Title: String { return self._s[409]! }
+ public var VoiceOver_Chat_OpenHint: String { return self._s[410]! }
+ public var Group_LeaveGroup: String { return self._s[411]! }
+ public var Settings_UsernameEmpty: String { return self._s[412]! }
public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[408]!, self._r[408]!, [_0])
+ return formatWithArgumentRanges(self._s[413]!, self._r[413]!, [_0])
}
public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[409]!, self._r[409]!, [_1])
+ return formatWithArgumentRanges(self._s[414]!, self._r[414]!, [_1])
}
public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[410]!, self._r[410]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[415]!, self._r[415]!, [_1, _2])
}
- public var Message_ImageExpired: String { return self._s[411]! }
- public var TwoStepAuth_RecoveryFailed: String { return self._s[413]! }
- public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[414]! }
- public var UserInfo_AddToExisting: String { return self._s[415]! }
- public var TwoStepAuth_EnabledSuccess: String { return self._s[416]! }
- public var Wallet_Send_SyncInProgress: String { return self._s[417]! }
- public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[418]! }
+ public var Message_ImageExpired: String { return self._s[416]! }
+ public var TwoStepAuth_RecoveryFailed: String { return self._s[418]! }
+ public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[419]! }
+ public var UserInfo_AddToExisting: String { return self._s[420]! }
+ public var TwoStepAuth_EnabledSuccess: String { return self._s[421]! }
+ public var Wallet_Send_SyncInProgress: String { return self._s[422]! }
+ public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[423]! }
public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[419]!, self._r[419]!, [_1])
+ return formatWithArgumentRanges(self._s[424]!, self._r[424]!, [_1])
}
- public var Notifications_GroupNotificationsAlert: String { return self._s[420]! }
- public var Passport_Language_km: String { return self._s[421]! }
- public var SocksProxySetup_AdNoticeHelp: String { return self._s[423]! }
- public var VoiceOver_Media_PlaybackPlay: String { return self._s[424]! }
- public var Notification_CallMissedShort: String { return self._s[425]! }
- public var Wallet_Info_YourBalance: String { return self._s[426]! }
- public var ReportPeer_ReasonOther_Send: String { return self._s[427]! }
- public var Watch_Compose_Send: String { return self._s[428]! }
- public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[431]! }
- public var TwoFactorSetup_Email_Action: String { return self._s[432]! }
- public var Conversation_HoldForVideo: String { return self._s[433]! }
- public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[434]! }
- public var Wallet_TransactionInfo_CommentHeader: String { return self._s[435]! }
- public var CheckoutInfo_ErrorCityInvalid: String { return self._s[437]! }
- public var Appearance_AutoNightThemeDisabled: String { return self._s[439]! }
- public var Channel_LinkItem: String { return self._s[440]! }
+ public var Notifications_GroupNotificationsAlert: String { return self._s[425]! }
+ public var Passport_Language_km: String { return self._s[426]! }
+ public var SocksProxySetup_AdNoticeHelp: String { return self._s[428]! }
+ public var VoiceOver_Media_PlaybackPlay: String { return self._s[429]! }
+ public var Notification_CallMissedShort: String { return self._s[430]! }
+ public var Wallet_Info_YourBalance: String { return self._s[431]! }
+ public var ReportPeer_ReasonOther_Send: String { return self._s[432]! }
+ public var Watch_Compose_Send: String { return self._s[433]! }
+ public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[436]! }
+ public var TwoFactorSetup_Email_Action: String { return self._s[437]! }
+ public var Conversation_HoldForVideo: String { return self._s[438]! }
+ public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[439]! }
+ public var Wallet_TransactionInfo_CommentHeader: String { return self._s[440]! }
+ public var CheckoutInfo_ErrorCityInvalid: String { return self._s[442]! }
+ public var Appearance_AutoNightThemeDisabled: String { return self._s[444]! }
+ public var Channel_LinkItem: String { return self._s[445]! }
public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[441]!, self._r[441]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[446]!, self._r[446]!, [_0, _1])
}
public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[444]!, self._r[444]!, [_0])
+ return formatWithArgumentRanges(self._s[449]!, self._r[449]!, [_0])
}
- public var VoiceOver_Recording_StopAndPreview: String { return self._s[445]! }
- public var Passport_Language_dv: String { return self._s[446]! }
- public var Undo_LeftChannel: String { return self._s[447]! }
- public var Notifications_ExceptionsMuted: String { return self._s[448]! }
- public var ChatList_UnhideAction: String { return self._s[449]! }
- public var Conversation_ContextMenuShare: String { return self._s[450]! }
- public var Conversation_ContextMenuStickerPackInfo: String { return self._s[451]! }
- public var ShareFileTip_Title: String { return self._s[452]! }
- public var NotificationsSound_Chord: String { return self._s[453]! }
- public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[454]! }
+ public var VoiceOver_Recording_StopAndPreview: String { return self._s[450]! }
+ public var Passport_Language_dv: String { return self._s[451]! }
+ public var Undo_LeftChannel: String { return self._s[452]! }
+ public var Notifications_ExceptionsMuted: String { return self._s[453]! }
+ public var ChatList_UnhideAction: String { return self._s[454]! }
+ public var Conversation_ContextMenuShare: String { return self._s[455]! }
+ public var Conversation_ContextMenuStickerPackInfo: String { return self._s[456]! }
+ public var ShareFileTip_Title: String { return self._s[457]! }
+ public var NotificationsSound_Chord: String { return self._s[458]! }
+ public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[459]! }
public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[455]!, self._r[455]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[460]!, self._r[460]!, [_1, _2])
}
- public var Passport_Address_EditTemporaryRegistration: String { return self._s[456]! }
+ public var Passport_Address_EditTemporaryRegistration: String { return self._s[461]! }
public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[457]!, self._r[457]!, [_0])
+ return formatWithArgumentRanges(self._s[462]!, self._r[462]!, [_0])
}
public func Wallet_Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[458]!, self._r[458]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[463]!, self._r[463]!, [_1, _2, _3])
}
- public var Wallet_Settings_ConfigurationInfo: String { return self._s[459]! }
- public var Wallpaper_ErrorNotFound: String { return self._s[460]! }
- public var Notification_CallOutgoingShort: String { return self._s[462]! }
- public var Wallet_WordImport_IncorrectText: String { return self._s[463]! }
+ public var Wallet_Settings_ConfigurationInfo: String { return self._s[464]! }
+ public var Wallpaper_ErrorNotFound: String { return self._s[465]! }
+ public var Notification_CallOutgoingShort: String { return self._s[467]! }
+ public var Wallet_WordImport_IncorrectText: String { return self._s[468]! }
public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[464]!, self._r[464]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[469]!, self._r[469]!, [_1, _2])
}
- public var Passport_Address_TypeUtilityBill: String { return self._s[465]! }
- public var Privacy_Forwards_LinkIfAllowed: String { return self._s[466]! }
- public var ReportPeer_Report: String { return self._s[467]! }
- public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[468]! }
- public var GroupInfo_DeactivatedStatus: String { return self._s[469]! }
+ public var Passport_Address_TypeUtilityBill: String { return self._s[470]! }
+ public var Privacy_Forwards_LinkIfAllowed: String { return self._s[471]! }
+ public var ReportPeer_Report: String { return self._s[472]! }
+ public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[473]! }
+ public var GroupInfo_DeactivatedStatus: String { return self._s[474]! }
public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[470]!, self._r[470]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[475]!, self._r[475]!, [_1, _2])
}
- public var StickerPack_Send: String { return self._s[471]! }
- public var Login_CodeSentInternal: String { return self._s[472]! }
- public var Wallet_Month_GenJanuary: String { return self._s[473]! }
- public var GroupInfo_InviteLink_LinkSection: String { return self._s[474]! }
+ public var StickerPack_Send: String { return self._s[476]! }
+ public var Login_CodeSentInternal: String { return self._s[477]! }
+ public var Wallet_Month_GenJanuary: String { return self._s[478]! }
+ public var GroupInfo_InviteLink_LinkSection: String { return self._s[479]! }
public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[475]!, self._r[475]!, [_0])
+ return formatWithArgumentRanges(self._s[480]!, self._r[480]!, [_0])
}
public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[477]!, self._r[477]!, [_0])
+ return formatWithArgumentRanges(self._s[482]!, self._r[482]!, [_0])
}
- public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[478]! }
+ public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[483]! }
public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[479]!, self._r[479]!, [_1])
- }
- public var ReportPeer_ReasonViolence: String { return self._s[481]! }
- public var Map_Locating: String { return self._s[482]! }
- public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[483]!, self._r[483]!, [_0])
- }
- public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_1])
}
- public var AutoDownloadSettings_GroupChats: String { return self._s[486]! }
- public var CheckoutInfo_SaveInfo: String { return self._s[487]! }
- public var SharedMedia_EmptyLinksText: String { return self._s[489]! }
- public var Passport_Address_CityPlaceholder: String { return self._s[490]! }
- public var CheckoutInfo_ErrorStateInvalid: String { return self._s[491]! }
- public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[492]! }
- public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[494]! }
- public var Channel_AdminLog_CanAddAdmins: String { return self._s[495]! }
+ public var ReportPeer_ReasonViolence: String { return self._s[486]! }
+ public var Map_Locating: String { return self._s[487]! }
+ public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[488]!, self._r[488]!, [_0])
+ }
+ public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[489]!, self._r[489]!, [_1])
+ }
+ public var AutoDownloadSettings_GroupChats: String { return self._s[491]! }
+ public var CheckoutInfo_SaveInfo: String { return self._s[492]! }
+ public var SharedMedia_EmptyLinksText: String { return self._s[494]! }
+ public var Passport_Address_CityPlaceholder: String { return self._s[495]! }
+ public var CheckoutInfo_ErrorStateInvalid: String { return self._s[496]! }
+ public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[497]! }
+ public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[499]! }
+ public var Channel_AdminLog_CanAddAdmins: String { return self._s[500]! }
public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[496]!, self._r[496]!, [_1])
+ return formatWithArgumentRanges(self._s[501]!, self._r[501]!, [_1])
}
public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[497]!, self._r[497]!, [_0])
- }
- public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[498]! }
- public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[499]! }
- public var ChangePhoneNumberCode_Code: String { return self._s[500]! }
- public var Appearance_CreateTheme: String { return self._s[501]! }
- public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[502]!, self._r[502]!, [_0])
}
- public var TwoStepAuth_SetupEmail: String { return self._s[503]! }
- public var HashtagSearch_AllChats: String { return self._s[504]! }
- public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[506]! }
- public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) {
+ public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[503]! }
+ public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[504]! }
+ public var ChangePhoneNumberCode_Code: String { return self._s[505]! }
+ public var Appearance_CreateTheme: String { return self._s[506]! }
+ public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[507]!, self._r[507]!, [_0])
}
- public var PhotoEditor_QualityHigh: String { return self._s[509]! }
+ public var TwoStepAuth_SetupEmail: String { return self._s[508]! }
+ public var HashtagSearch_AllChats: String { return self._s[509]! }
+ public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[511]! }
+ public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[512]!, self._r[512]!, [_0])
+ }
+ public var PhotoEditor_QualityHigh: String { return self._s[514]! }
public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[510]!, self._r[510]!, [_0])
+ return formatWithArgumentRanges(self._s[515]!, self._r[515]!, [_0])
}
- public var ApplyLanguage_ApplyLanguageAction: String { return self._s[511]! }
- public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[512]! }
- public var Message_LiveLocation: String { return self._s[513]! }
- public var Cache_LowDiskSpaceText: String { return self._s[514]! }
- public var Wallet_Receive_ShareAddress: String { return self._s[515]! }
- public var EditTheme_ErrorLinkTaken: String { return self._s[516]! }
- public var Conversation_SendMessage: String { return self._s[517]! }
- public var AuthSessions_EmptyTitle: String { return self._s[518]! }
- public var Privacy_PhoneNumber: String { return self._s[519]! }
- public var PeopleNearby_CreateGroup: String { return self._s[520]! }
- public var CallSettings_UseLessData: String { return self._s[521]! }
- public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[522]! }
- public var Stickers_AddToFavorites: String { return self._s[523]! }
- public var Wallet_WordImport_Title: String { return self._s[524]! }
- public var PhotoEditor_QualityLow: String { return self._s[525]! }
- public var Watch_UserInfo_Unblock: String { return self._s[526]! }
- public var Settings_Logout: String { return self._s[527]! }
+ public var ApplyLanguage_ApplyLanguageAction: String { return self._s[516]! }
+ public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[517]! }
+ public var Message_LiveLocation: String { return self._s[518]! }
+ public var Cache_LowDiskSpaceText: String { return self._s[519]! }
+ public var Wallet_Receive_ShareAddress: String { return self._s[520]! }
+ public var EditTheme_ErrorLinkTaken: String { return self._s[521]! }
+ public var Conversation_SendMessage: String { return self._s[522]! }
+ public var AuthSessions_EmptyTitle: String { return self._s[523]! }
+ public var Privacy_PhoneNumber: String { return self._s[524]! }
+ public var PeopleNearby_CreateGroup: String { return self._s[525]! }
+ public var CallSettings_UseLessData: String { return self._s[526]! }
+ public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[527]! }
+ public var Stickers_AddToFavorites: String { return self._s[528]! }
+ public var Wallet_WordImport_Title: String { return self._s[529]! }
+ public var PhotoEditor_QualityLow: String { return self._s[530]! }
+ public var Watch_UserInfo_Unblock: String { return self._s[531]! }
+ public var Settings_Logout: String { return self._s[532]! }
public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[528]!, self._r[528]!, [_1])
+ return formatWithArgumentRanges(self._s[533]!, self._r[533]!, [_1])
}
- public var ContactInfo_PhoneLabelWork: String { return self._s[529]! }
- public var ChannelInfo_Stats: String { return self._s[530]! }
- public var TextFormat_Link: String { return self._s[531]! }
+ public var ContactInfo_PhoneLabelWork: String { return self._s[534]! }
+ public var ChannelInfo_Stats: String { return self._s[535]! }
+ public var TextFormat_Link: String { return self._s[536]! }
public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[532]!, self._r[532]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[537]!, self._r[537]!, [_1, _2])
}
- public var Wallet_TransactionInfo_Title: String { return self._s[533]! }
+ public var Wallet_TransactionInfo_Title: String { return self._s[538]! }
public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[534]!, self._r[534]!, [_0])
+ return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_0])
}
- public var Watch_Notification_Joined: String { return self._s[535]! }
- public var Group_Setup_TypePublicHelp: String { return self._s[536]! }
- public var Passport_Scans_UploadNew: String { return self._s[537]! }
- public var Checkout_LiabilityAlertTitle: String { return self._s[538]! }
- public var DialogList_Title: String { return self._s[541]! }
- public var NotificationSettings_ContactJoined: String { return self._s[542]! }
- public var GroupInfo_LabelAdmin: String { return self._s[543]! }
- public var KeyCommand_ChatInfo: String { return self._s[544]! }
- public var Conversation_EditingCaptionPanelTitle: String { return self._s[545]! }
- public var Call_ReportIncludeLog: String { return self._s[546]! }
+ public var Watch_Notification_Joined: String { return self._s[540]! }
+ public var Group_Setup_TypePublicHelp: String { return self._s[541]! }
+ public var Passport_Scans_UploadNew: String { return self._s[542]! }
+ public var Checkout_LiabilityAlertTitle: String { return self._s[543]! }
+ public var DialogList_Title: String { return self._s[546]! }
+ public var NotificationSettings_ContactJoined: String { return self._s[547]! }
+ public var GroupInfo_LabelAdmin: String { return self._s[548]! }
+ public var KeyCommand_ChatInfo: String { return self._s[549]! }
+ public var Conversation_EditingCaptionPanelTitle: String { return self._s[550]! }
+ public var Call_ReportIncludeLog: String { return self._s[551]! }
public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[549]!, self._r[549]!, [_0])
+ return formatWithArgumentRanges(self._s[554]!, self._r[554]!, [_0])
}
- public var LocalGroup_IrrelevantWarning: String { return self._s[550]! }
- public var ChatAdmins_AllMembersAreAdmins: String { return self._s[551]! }
- public var Conversation_DefaultRestrictedInline: String { return self._s[552]! }
- public var Message_Sticker: String { return self._s[553]! }
- public var LastSeen_JustNow: String { return self._s[555]! }
- public var Passport_Email_EmailPlaceholder: String { return self._s[557]! }
- public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[558]! }
- public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[559]! }
- public var Channel_EditAdmin_PermissionsHeader: String { return self._s[560]! }
- public var TwoStepAuth_Email: String { return self._s[561]! }
- public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[562]! }
- public var PhotoEditor_BlurToolOff: String { return self._s[563]! }
- public var Message_PinnedStickerMessage: String { return self._s[564]! }
- public var ContactInfo_PhoneLabelPager: String { return self._s[565]! }
- public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[566]! }
- public var Passport_DiscardMessageTitle: String { return self._s[567]! }
- public var Privacy_PaymentsTitle: String { return self._s[568]! }
- public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[569]! }
- public var Channel_DiscussionGroup_Header: String { return self._s[571]! }
- public var VoiceOver_Chat_OptionSelected: String { return self._s[572]! }
- public var Appearance_ColorTheme: String { return self._s[573]! }
- public var UserInfo_ShareContact: String { return self._s[574]! }
- public var Passport_Address_TypePassportRegistration: String { return self._s[575]! }
- public var Common_More: String { return self._s[576]! }
- public var Watch_Message_Call: String { return self._s[577]! }
- public var Profile_EncryptionKey: String { return self._s[580]! }
- public var Privacy_TopPeers: String { return self._s[581]! }
- public var Conversation_StopPollConfirmation: String { return self._s[582]! }
- public var Wallet_Words_NotDoneText: String { return self._s[584]! }
- public var Privacy_TopPeersWarning: String { return self._s[586]! }
- public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[587]! }
- public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[588]! }
- public var Wallet_RestoreFailed_EnterWords: String { return self._s[591]! }
- public var DialogList_SearchSectionMessages: String { return self._s[592]! }
- public var Notifications_ChannelNotifications: String { return self._s[593]! }
- public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[594]! }
- public var Passport_Language_sk: String { return self._s[595]! }
- public var Notification_MessageLifetime1h: String { return self._s[596]! }
- public var Wallpaper_ResetWallpapersInfo: String { return self._s[597]! }
- public var Call_ReportSkip: String { return self._s[599]! }
- public var Cache_ServiceFiles: String { return self._s[600]! }
- public var Group_ErrorAddTooMuchAdmins: String { return self._s[601]! }
- public var VoiceOver_Chat_YourFile: String { return self._s[602]! }
- public var Map_Hybrid: String { return self._s[603]! }
- public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[605]! }
- public var ChatSettings_AutoDownloadVideos: String { return self._s[607]! }
- public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[608]! }
- public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[609]! }
- public var SocksProxySetup_ProxyTelegram: String { return self._s[612]! }
+ public var LocalGroup_IrrelevantWarning: String { return self._s[555]! }
+ public var ChatAdmins_AllMembersAreAdmins: String { return self._s[556]! }
+ public var Conversation_DefaultRestrictedInline: String { return self._s[557]! }
+ public var Message_Sticker: String { return self._s[558]! }
+ public var LastSeen_JustNow: String { return self._s[560]! }
+ public var Passport_Email_EmailPlaceholder: String { return self._s[562]! }
+ public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[563]! }
+ public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[564]! }
+ public var Channel_EditAdmin_PermissionsHeader: String { return self._s[565]! }
+ public var TwoStepAuth_Email: String { return self._s[566]! }
+ public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[567]! }
+ public var PhotoEditor_BlurToolOff: String { return self._s[568]! }
+ public var Message_PinnedStickerMessage: String { return self._s[569]! }
+ public var ContactInfo_PhoneLabelPager: String { return self._s[570]! }
+ public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[571]! }
+ public var Passport_DiscardMessageTitle: String { return self._s[572]! }
+ public var Privacy_PaymentsTitle: String { return self._s[573]! }
+ public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[574]! }
+ public var ClearCache_StorageCache: String { return self._s[575]! }
+ public var Channel_DiscussionGroup_Header: String { return self._s[577]! }
+ public var VoiceOver_Chat_OptionSelected: String { return self._s[578]! }
+ public var Appearance_ColorTheme: String { return self._s[579]! }
+ public var UserInfo_ShareContact: String { return self._s[580]! }
+ public var Passport_Address_TypePassportRegistration: String { return self._s[581]! }
+ public var Common_More: String { return self._s[582]! }
+ public var Watch_Message_Call: String { return self._s[583]! }
+ public var Profile_EncryptionKey: String { return self._s[586]! }
+ public var Privacy_TopPeers: String { return self._s[587]! }
+ public var Conversation_StopPollConfirmation: String { return self._s[588]! }
+ public var Wallet_Words_NotDoneText: String { return self._s[590]! }
+ public var Privacy_TopPeersWarning: String { return self._s[592]! }
+ public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[593]! }
+ public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[594]! }
+ public var Wallet_RestoreFailed_EnterWords: String { return self._s[597]! }
+ public var DialogList_SearchSectionMessages: String { return self._s[598]! }
+ public var Notifications_ChannelNotifications: String { return self._s[599]! }
+ public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[600]! }
+ public var Passport_Language_sk: String { return self._s[601]! }
+ public var Notification_MessageLifetime1h: String { return self._s[602]! }
+ public var Wallpaper_ResetWallpapersInfo: String { return self._s[603]! }
+ public var Call_ReportSkip: String { return self._s[605]! }
+ public var Cache_ServiceFiles: String { return self._s[606]! }
+ public var Group_ErrorAddTooMuchAdmins: String { return self._s[607]! }
+ public var VoiceOver_Chat_YourFile: String { return self._s[608]! }
+ public var Map_Hybrid: String { return self._s[609]! }
+ public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[611]! }
+ public var ChatSettings_AutoDownloadVideos: String { return self._s[613]! }
+ public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[614]! }
+ public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[615]! }
+ public var SocksProxySetup_ProxyTelegram: String { return self._s[618]! }
public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[613]!, self._r[613]!, [_1])
+ return formatWithArgumentRanges(self._s[619]!, self._r[619]!, [_1])
}
- public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[615]! }
- public var ScheduledMessages_ScheduledToday: String { return self._s[616]! }
+ public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[621]! }
+ public var ScheduledMessages_ScheduledToday: String { return self._s[622]! }
public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[617]!, self._r[617]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[623]!, self._r[623]!, [_1, _2])
}
- public var Conversation_LiveLocationYou: String { return self._s[618]! }
- public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[619]! }
- public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[620]! }
- public var UserInfo_ShareBot: String { return self._s[623]! }
+ public var Conversation_LiveLocationYou: String { return self._s[624]! }
+ public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[625]! }
+ public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[626]! }
+ public var UserInfo_ShareBot: String { return self._s[629]! }
public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[624]!, self._r[624]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[630]!, self._r[630]!, [_1, _2])
}
- public var Conversation_ClearCache: String { return self._s[625]! }
- public var PhotoEditor_ShadowsTint: String { return self._s[626]! }
- public var Message_Audio: String { return self._s[627]! }
- public var Passport_Language_lt: String { return self._s[628]! }
+ public var Conversation_ClearCache: String { return self._s[631]! }
+ public var PhotoEditor_ShadowsTint: String { return self._s[632]! }
+ public var Message_Audio: String { return self._s[633]! }
+ public var Passport_Language_lt: String { return self._s[634]! }
public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[629]!, self._r[629]!, [_0])
+ return formatWithArgumentRanges(self._s[635]!, self._r[635]!, [_0])
}
- public var Permissions_SiriText_v0: String { return self._s[630]! }
- public var Conversation_FileICloudDrive: String { return self._s[631]! }
- public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[632]! }
- public var Notifications_Badge_IncludeMutedChats: String { return self._s[633]! }
+ public var Permissions_SiriText_v0: String { return self._s[636]! }
+ public var Conversation_FileICloudDrive: String { return self._s[637]! }
+ public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[638]! }
+ public var Notifications_Badge_IncludeMutedChats: String { return self._s[639]! }
public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[634]!, self._r[634]!, [_1, _2, _3, _4, _5, _6])
+ return formatWithArgumentRanges(self._s[640]!, self._r[640]!, [_1, _2, _3, _4, _5, _6])
}
- public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[635]! }
+ public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[641]! }
public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[636]!, self._r[636]!, [_0])
+ return formatWithArgumentRanges(self._s[642]!, self._r[642]!, [_0])
}
- public var Channel_SignMessages: String { return self._s[637]! }
+ public var Channel_SignMessages: String { return self._s[643]! }
public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[638]!, self._r[638]!, [_1])
+ return formatWithArgumentRanges(self._s[644]!, self._r[644]!, [_1])
}
- public var Compose_ChannelTokenListPlaceholder: String { return self._s[639]! }
- public var Passport_ScanPassport: String { return self._s[640]! }
- public var Watch_Suggestion_Thanks: String { return self._s[641]! }
- public var BlockedUsers_AddNew: String { return self._s[642]! }
+ public var Compose_ChannelTokenListPlaceholder: String { return self._s[645]! }
+ public var Passport_ScanPassport: String { return self._s[646]! }
+ public var Watch_Suggestion_Thanks: String { return self._s[647]! }
+ public var BlockedUsers_AddNew: String { return self._s[648]! }
public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[643]!, self._r[643]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[649]!, self._r[649]!, [_1, _2])
}
- public var Watch_Message_Invoice: String { return self._s[644]! }
- public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[645]! }
- public var Month_GenJuly: String { return self._s[646]! }
- public var SocksProxySetup_ProxySocks5: String { return self._s[647]! }
- public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[649]! }
- public var Notification_ChannelInviterSelf: String { return self._s[650]! }
- public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[651]! }
+ public var Watch_Message_Invoice: String { return self._s[650]! }
+ public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[651]! }
+ public var Month_GenJuly: String { return self._s[652]! }
+ public var UserInfo_StartSecretChatStart: String { return self._s[653]! }
+ public var SocksProxySetup_ProxySocks5: String { return self._s[654]! }
+ public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[656]! }
+ public var Notification_ChannelInviterSelf: String { return self._s[657]! }
+ public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[658]! }
public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[659]!, self._r[659]!, [_1, _2])
}
- public var CheckoutInfo_Title: String { return self._s[653]! }
- public var Watch_Stickers_RecentPlaceholder: String { return self._s[654]! }
+ public var CheckoutInfo_Title: String { return self._s[660]! }
+ public var Watch_Stickers_RecentPlaceholder: String { return self._s[661]! }
public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[655]!, self._r[655]!, [_0])
+ return formatWithArgumentRanges(self._s[662]!, self._r[662]!, [_0])
}
- public var Passport_Identity_MainPage: String { return self._s[656]! }
- public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[657]! }
- public var Passport_Language_de: String { return self._s[658]! }
- public var Update_Title: String { return self._s[659]! }
- public var ContactInfo_PhoneLabelWorkFax: String { return self._s[660]! }
- public var Channel_AdminLog_BanEmbedLinks: String { return self._s[661]! }
- public var Passport_Email_UseTelegramEmailHelp: String { return self._s[662]! }
- public var Notifications_ChannelNotificationsPreview: String { return self._s[663]! }
- public var NotificationsSound_Telegraph: String { return self._s[664]! }
- public var Watch_LastSeen_ALongTimeAgo: String { return self._s[665]! }
- public var ChannelMembers_WhoCanAddMembers: String { return self._s[666]! }
+ public var Passport_Identity_MainPage: String { return self._s[663]! }
+ public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[664]! }
+ public var Passport_Language_de: String { return self._s[665]! }
+ public var Update_Title: String { return self._s[666]! }
+ public var ContactInfo_PhoneLabelWorkFax: String { return self._s[667]! }
+ public var Channel_AdminLog_BanEmbedLinks: String { return self._s[668]! }
+ public var Passport_Email_UseTelegramEmailHelp: String { return self._s[669]! }
+ public var Notifications_ChannelNotificationsPreview: String { return self._s[670]! }
+ public var NotificationsSound_Telegraph: String { return self._s[671]! }
+ public var Watch_LastSeen_ALongTimeAgo: String { return self._s[672]! }
+ public var ChannelMembers_WhoCanAddMembers: String { return self._s[673]! }
public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[667]!, self._r[667]!, [_0])
+ return formatWithArgumentRanges(self._s[674]!, self._r[674]!, [_0])
}
- public var ClearCache_Description: String { return self._s[668]! }
- public var Stickers_SuggestAll: String { return self._s[669]! }
- public var Conversation_ForwardTitle: String { return self._s[670]! }
- public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[671]! }
+ public var ClearCache_Description: String { return self._s[675]! }
+ public var Stickers_SuggestAll: String { return self._s[676]! }
+ public var Conversation_ForwardTitle: String { return self._s[677]! }
+ public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[678]! }
public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[672]!, self._r[672]!, [_0])
+ return formatWithArgumentRanges(self._s[679]!, self._r[679]!, [_0])
}
- public var Calls_NewCall: String { return self._s[673]! }
- public var Call_StatusEnded: String { return self._s[674]! }
- public var AutoDownloadSettings_DataUsageLow: String { return self._s[675]! }
- public var Settings_ProxyConnected: String { return self._s[676]! }
- public var Channel_AdminLogFilter_EventsPinned: String { return self._s[677]! }
- public var PhotoEditor_QualityVeryLow: String { return self._s[678]! }
- public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[679]! }
- public var Passport_PasswordPlaceholder: String { return self._s[680]! }
- public var Message_PinnedInvoice: String { return self._s[681]! }
- public var Passport_Identity_IssueDate: String { return self._s[682]! }
- public var Passport_Language_pl: String { return self._s[683]! }
+ public var Calls_NewCall: String { return self._s[680]! }
+ public var Call_StatusEnded: String { return self._s[681]! }
+ public var AutoDownloadSettings_DataUsageLow: String { return self._s[682]! }
+ public var Settings_ProxyConnected: String { return self._s[683]! }
+ public var Channel_AdminLogFilter_EventsPinned: String { return self._s[684]! }
+ public var PhotoEditor_QualityVeryLow: String { return self._s[685]! }
+ public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[686]! }
+ public var Passport_PasswordPlaceholder: String { return self._s[687]! }
+ public var Message_PinnedInvoice: String { return self._s[688]! }
+ public var Passport_Identity_IssueDate: String { return self._s[689]! }
+ public var Passport_Language_pl: String { return self._s[690]! }
public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[684]!, self._r[684]!, [_0])
+ return formatWithArgumentRanges(self._s[691]!, self._r[691]!, [_0])
}
- public var SocksProxySetup_PasteFromClipboard: String { return self._s[685]! }
- public var Call_StatusConnecting: String { return self._s[686]! }
+ public var SocksProxySetup_PasteFromClipboard: String { return self._s[692]! }
+ public var Call_StatusConnecting: String { return self._s[693]! }
public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[687]!, self._r[687]!, [_0])
+ return formatWithArgumentRanges(self._s[694]!, self._r[694]!, [_0])
}
- public var ChatSettings_ConnectionType_UseProxy: String { return self._s[689]! }
- public var Common_Edit: String { return self._s[690]! }
- public var PrivacySettings_LastSeenNobody: String { return self._s[691]! }
+ public var ChatSettings_ConnectionType_UseProxy: String { return self._s[696]! }
+ public var Common_Edit: String { return self._s[697]! }
+ public var PrivacySettings_LastSeenNobody: String { return self._s[698]! }
public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[692]!, self._r[692]!, [_0])
+ return formatWithArgumentRanges(self._s[699]!, self._r[699]!, [_0])
}
- public var GroupInfo_ChatAdmins: String { return self._s[693]! }
- public var PrivateDataSettings_Title: String { return self._s[694]! }
- public var Login_CancelPhoneVerificationStop: String { return self._s[695]! }
- public var ChatList_Read: String { return self._s[696]! }
- public var Wallet_WordImport_Text: String { return self._s[697]! }
- public var Undo_ChatClearedForBothSides: String { return self._s[698]! }
- public var GroupPermission_SectionTitle: String { return self._s[699]! }
- public var TwoFactorSetup_Intro_Title: String { return self._s[701]! }
+ public var GroupInfo_ChatAdmins: String { return self._s[700]! }
+ public var PrivateDataSettings_Title: String { return self._s[701]! }
+ public var Login_CancelPhoneVerificationStop: String { return self._s[702]! }
+ public var ChatList_Read: String { return self._s[703]! }
+ public var Wallet_WordImport_Text: String { return self._s[704]! }
+ public var Undo_ChatClearedForBothSides: String { return self._s[705]! }
+ public var GroupPermission_SectionTitle: String { return self._s[706]! }
+ public var TwoFactorSetup_Intro_Title: String { return self._s[708]! }
public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[702]!, self._r[702]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[709]!, self._r[709]!, [_1, _2])
}
- public var Checkout_ErrorPaymentFailed: String { return self._s[703]! }
- public var Update_UpdateApp: String { return self._s[704]! }
- public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[705]! }
- public var Settings_Appearance: String { return self._s[706]! }
- public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[710]! }
- public var Watch_Location_Access: String { return self._s[711]! }
- public var ShareMenu_CopyShareLink: String { return self._s[713]! }
- public var TwoStepAuth_SetupHintTitle: String { return self._s[714]! }
- public var Conversation_Theme: String { return self._s[716]! }
+ public var Checkout_ErrorPaymentFailed: String { return self._s[710]! }
+ public var Update_UpdateApp: String { return self._s[711]! }
+ public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[712]! }
+ public var Settings_Appearance: String { return self._s[713]! }
+ public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[717]! }
+ public var Watch_Location_Access: String { return self._s[718]! }
+ public var ShareMenu_CopyShareLink: String { return self._s[720]! }
+ public var TwoStepAuth_SetupHintTitle: String { return self._s[721]! }
+ public var Conversation_Theme: String { return self._s[723]! }
public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[717]!, self._r[717]!, [_0])
+ return formatWithArgumentRanges(self._s[724]!, self._r[724]!, [_0])
}
- public var Notifications_ClassicTones: String { return self._s[718]! }
- public var Weekday_ShortWednesday: String { return self._s[719]! }
- public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[720]! }
- public var Undo_LeftGroup: String { return self._s[723]! }
- public var Wallet_RestoreFailed_Text: String { return self._s[724]! }
- public var Conversation_LinkDialogCopy: String { return self._s[725]! }
- public var Wallet_TransactionInfo_NoAddress: String { return self._s[727]! }
- public var Wallet_Navigation_Back: String { return self._s[728]! }
- public var KeyCommand_FocusOnInputField: String { return self._s[729]! }
- public var Contacts_SelectAll: String { return self._s[730]! }
- public var Preview_SaveToCameraRoll: String { return self._s[731]! }
- public var PrivacySettings_PasscodeOff: String { return self._s[732]! }
- public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[733]! }
- public var Wallpaper_Title: String { return self._s[734]! }
- public var Conversation_FilePhotoOrVideo: String { return self._s[735]! }
- public var AccessDenied_Camera: String { return self._s[736]! }
- public var Watch_Compose_CurrentLocation: String { return self._s[737]! }
- public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[739]! }
+ public var Notifications_ClassicTones: String { return self._s[725]! }
+ public var Weekday_ShortWednesday: String { return self._s[726]! }
+ public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[727]! }
+ public var Undo_LeftGroup: String { return self._s[730]! }
+ public var Wallet_RestoreFailed_Text: String { return self._s[731]! }
+ public var Conversation_LinkDialogCopy: String { return self._s[732]! }
+ public var Wallet_TransactionInfo_NoAddress: String { return self._s[734]! }
+ public var Wallet_Navigation_Back: String { return self._s[735]! }
+ public var KeyCommand_FocusOnInputField: String { return self._s[736]! }
+ public var Contacts_SelectAll: String { return self._s[737]! }
+ public var Preview_SaveToCameraRoll: String { return self._s[738]! }
+ public var PrivacySettings_PasscodeOff: String { return self._s[739]! }
+ public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[740]! }
+ public var Wallpaper_Title: String { return self._s[741]! }
+ public var Conversation_FilePhotoOrVideo: String { return self._s[742]! }
+ public var AccessDenied_Camera: String { return self._s[743]! }
+ public var Watch_Compose_CurrentLocation: String { return self._s[744]! }
+ public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[746]! }
public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[740]!, self._r[740]!, [_0])
+ return formatWithArgumentRanges(self._s[747]!, self._r[747]!, [_0])
}
- public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[741]! }
- public var Passport_Language_ro: String { return self._s[742]! }
- public var EditTheme_UploadNewTheme: String { return self._s[743]! }
- public var CheckoutInfo_SaveInfoHelp: String { return self._s[744]! }
- public var Wallet_Intro_Terms: String { return self._s[745]! }
+ public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[748]! }
+ public var Passport_Language_ro: String { return self._s[749]! }
+ public var EditTheme_UploadNewTheme: String { return self._s[750]! }
+ public var CheckoutInfo_SaveInfoHelp: String { return self._s[751]! }
+ public var Wallet_Intro_Terms: String { return self._s[752]! }
public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[746]!, self._r[746]!, [_0])
- }
- public var Login_CancelPhoneVerification: String { return self._s[747]! }
- public var State_ConnectingToProxy: String { return self._s[748]! }
- public var Calls_RatingTitle: String { return self._s[749]! }
- public var Generic_ErrorMoreInfo: String { return self._s[750]! }
- public var Appearance_PreviewReplyText: String { return self._s[751]! }
- public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[752]! }
- public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[753]!, self._r[753]!, [_0])
}
- public var SharedMedia_CategoryLinks: String { return self._s[754]! }
- public var Calls_Missed: String { return self._s[755]! }
- public var Cache_Photos: String { return self._s[759]! }
- public var GroupPermission_NoAddMembers: String { return self._s[760]! }
- public var ScheduledMessages_Title: String { return self._s[761]! }
- public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[762]!, self._r[762]!, [_0])
+ public var Login_CancelPhoneVerification: String { return self._s[754]! }
+ public var State_ConnectingToProxy: String { return self._s[755]! }
+ public var Calls_RatingTitle: String { return self._s[756]! }
+ public var Generic_ErrorMoreInfo: String { return self._s[757]! }
+ public var Appearance_PreviewReplyText: String { return self._s[758]! }
+ public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[759]! }
+ public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[760]!, self._r[760]!, [_0])
}
- public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[763]! }
- public var Settings_ProxyDisabled: String { return self._s[764]! }
+ public var SharedMedia_CategoryLinks: String { return self._s[761]! }
+ public var Calls_Missed: String { return self._s[762]! }
+ public var Cache_Photos: String { return self._s[766]! }
+ public var GroupPermission_NoAddMembers: String { return self._s[767]! }
+ public var ScheduledMessages_Title: String { return self._s[768]! }
+ public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[769]!, self._r[769]!, [_0])
+ }
+ public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[770]! }
+ public var Settings_ProxyDisabled: String { return self._s[771]! }
public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[765]!, self._r[765]!, [_1, _2, _3, _4])
+ return formatWithArgumentRanges(self._s[772]!, self._r[772]!, [_1, _2, _3, _4])
}
public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[766]!, self._r[766]!, [_0])
+ return formatWithArgumentRanges(self._s[773]!, self._r[773]!, [_0])
}
- public var ChatList_Context_RemoveFromRecents: String { return self._s[768]! }
- public var Appearance_Title: String { return self._s[769]! }
+ public var ChatList_Context_RemoveFromRecents: String { return self._s[775]! }
+ public var Appearance_Title: String { return self._s[776]! }
public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[771]!, self._r[771]!, [_0])
+ return formatWithArgumentRanges(self._s[778]!, self._r[778]!, [_0])
}
- public var Conversation_WalletRequiredText: String { return self._s[772]! }
- public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[773]! }
- public var Channel_EditMessageErrorGeneric: String { return self._s[774]! }
- public var Privacy_Calls_IntegrationHelp: String { return self._s[775]! }
- public var Preview_DeletePhoto: String { return self._s[776]! }
- public var Appearance_AppIconFilledX: String { return self._s[777]! }
- public var PrivacySettings_PrivacyTitle: String { return self._s[778]! }
+ public var Conversation_WalletRequiredText: String { return self._s[779]! }
+ public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[780]! }
+ public var Channel_EditMessageErrorGeneric: String { return self._s[781]! }
+ public var Privacy_Calls_IntegrationHelp: String { return self._s[782]! }
+ public var Preview_DeletePhoto: String { return self._s[783]! }
+ public var Appearance_AppIconFilledX: String { return self._s[784]! }
+ public var PrivacySettings_PrivacyTitle: String { return self._s[785]! }
public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[779]!, self._r[779]!, [_0])
+ return formatWithArgumentRanges(self._s[786]!, self._r[786]!, [_0])
}
- public var Coub_TapForSound: String { return self._s[781]! }
- public var Map_LocatingError: String { return self._s[782]! }
- public var TwoStepAuth_EmailChangeSuccess: String { return self._s[784]! }
- public var Conversation_SendMessage_SendSilently: String { return self._s[785]! }
- public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[786]! }
+ public var Coub_TapForSound: String { return self._s[788]! }
+ public var Map_LocatingError: String { return self._s[789]! }
+ public var TwoStepAuth_EmailChangeSuccess: String { return self._s[791]! }
+ public var Conversation_SendMessage_SendSilently: String { return self._s[792]! }
+ public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[793]! }
public func Wallet_Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[787]!, self._r[787]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[794]!, self._r[794]!, [_1, _2, _3])
}
- public var Passport_ForgottenPassword: String { return self._s[788]! }
- public var GroupInfo_InviteLink_RevokeLink: String { return self._s[789]! }
- public var StickerPacksSettings_ArchivedPacks: String { return self._s[790]! }
- public var Login_TermsOfServiceSignupDecline: String { return self._s[792]! }
- public var Channel_Moderator_AccessLevelRevoke: String { return self._s[793]! }
- public var Message_Location: String { return self._s[794]! }
- public var Passport_Identity_NamePlaceholder: String { return self._s[795]! }
- public var Channel_Management_Title: String { return self._s[796]! }
- public var DialogList_SearchSectionDialogs: String { return self._s[798]! }
- public var Compose_NewChannel_Members: String { return self._s[799]! }
+ public var Passport_ForgottenPassword: String { return self._s[795]! }
+ public var GroupInfo_InviteLink_RevokeLink: String { return self._s[796]! }
+ public var StickerPacksSettings_ArchivedPacks: String { return self._s[797]! }
+ public var Login_TermsOfServiceSignupDecline: String { return self._s[799]! }
+ public var Channel_Moderator_AccessLevelRevoke: String { return self._s[800]! }
+ public var Message_Location: String { return self._s[801]! }
+ public var Passport_Identity_NamePlaceholder: String { return self._s[802]! }
+ public var Channel_Management_Title: String { return self._s[803]! }
+ public var DialogList_SearchSectionDialogs: String { return self._s[805]! }
+ public var Compose_NewChannel_Members: String { return self._s[806]! }
public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[800]!, self._r[800]!, [_0])
+ return formatWithArgumentRanges(self._s[807]!, self._r[807]!, [_0])
}
- public var GroupInfo_Location: String { return self._s[801]! }
- public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[802]! }
- public var AutoNightTheme_ScheduledFrom: String { return self._s[803]! }
- public var PhotoEditor_WarmthTool: String { return self._s[804]! }
- public var Passport_Language_tr: String { return self._s[805]! }
+ public var GroupInfo_Location: String { return self._s[808]! }
+ public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[809]! }
+ public var ClearCache_Clear: String { return self._s[810]! }
+ public var AutoNightTheme_ScheduledFrom: String { return self._s[811]! }
+ public var PhotoEditor_WarmthTool: String { return self._s[812]! }
+ public var Passport_Language_tr: String { return self._s[813]! }
public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[806]!, self._r[806]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_1, _2, _3])
}
- public var Login_ResetAccountProtected_Reset: String { return self._s[808]! }
- public var Watch_PhotoView_Title: String { return self._s[809]! }
- public var Passport_Phone_Delete: String { return self._s[810]! }
- public var Undo_ChatDeletedForBothSides: String { return self._s[811]! }
- public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[812]! }
- public var GroupInfo_Permissions: String { return self._s[813]! }
- public var PasscodeSettings_TurnPasscodeOff: String { return self._s[814]! }
- public var Profile_ShareContactButton: String { return self._s[815]! }
- public var ChatSettings_Other: String { return self._s[816]! }
- public var UserInfo_NotificationsDisabled: String { return self._s[817]! }
- public var CheckoutInfo_ShippingInfoCity: String { return self._s[818]! }
- public var LastSeen_WithinAMonth: String { return self._s[819]! }
- public var VoiceOver_Chat_PlayHint: String { return self._s[820]! }
- public var Conversation_ReportGroupLocation: String { return self._s[821]! }
- public var Conversation_EncryptionCanceled: String { return self._s[822]! }
- public var MediaPicker_GroupDescription: String { return self._s[823]! }
- public var WebSearch_Images: String { return self._s[824]! }
+ public var Login_ResetAccountProtected_Reset: String { return self._s[816]! }
+ public var Watch_PhotoView_Title: String { return self._s[817]! }
+ public var Passport_Phone_Delete: String { return self._s[818]! }
+ public var Undo_ChatDeletedForBothSides: String { return self._s[819]! }
+ public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[820]! }
+ public var GroupInfo_Permissions: String { return self._s[821]! }
+ public var PasscodeSettings_TurnPasscodeOff: String { return self._s[822]! }
+ public var Profile_ShareContactButton: String { return self._s[823]! }
+ public var ChatSettings_Other: String { return self._s[824]! }
+ public var UserInfo_NotificationsDisabled: String { return self._s[825]! }
+ public var CheckoutInfo_ShippingInfoCity: String { return self._s[826]! }
+ public var LastSeen_WithinAMonth: String { return self._s[827]! }
+ public var VoiceOver_Chat_PlayHint: String { return self._s[828]! }
+ public var Conversation_ReportGroupLocation: String { return self._s[829]! }
+ public var Conversation_EncryptionCanceled: String { return self._s[830]! }
+ public var MediaPicker_GroupDescription: String { return self._s[831]! }
+ public var WebSearch_Images: String { return self._s[832]! }
public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[825]!, self._r[825]!, [_0])
+ return formatWithArgumentRanges(self._s[833]!, self._r[833]!, [_0])
}
- public var Message_Photo: String { return self._s[826]! }
- public var PasscodeSettings_HelpBottom: String { return self._s[827]! }
- public var AutoDownloadSettings_VideosTitle: String { return self._s[828]! }
- public var VoiceOver_Media_PlaybackRateChange: String { return self._s[829]! }
- public var Passport_Identity_AddDriversLicense: String { return self._s[830]! }
- public var TwoStepAuth_EnterPasswordPassword: String { return self._s[831]! }
- public var NotificationsSound_Calypso: String { return self._s[832]! }
- public var Map_Map: String { return self._s[833]! }
- public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[835]! }
- public var ChatSettings_TextSizeUnits: String { return self._s[836]! }
+ public var Message_Photo: String { return self._s[834]! }
+ public var PasscodeSettings_HelpBottom: String { return self._s[835]! }
+ public var AutoDownloadSettings_VideosTitle: String { return self._s[836]! }
+ public var VoiceOver_Media_PlaybackRateChange: String { return self._s[837]! }
+ public var Passport_Identity_AddDriversLicense: String { return self._s[838]! }
+ public var TwoStepAuth_EnterPasswordPassword: String { return self._s[839]! }
+ public var NotificationsSound_Calypso: String { return self._s[840]! }
+ public var Map_Map: String { return self._s[841]! }
+ public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[843]! }
+ public var ChatSettings_TextSizeUnits: String { return self._s[844]! }
public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[837]!, self._r[837]!, [_0])
+ return formatWithArgumentRanges(self._s[845]!, self._r[845]!, [_0])
}
- public var Common_of: String { return self._s[838]! }
- public var Conversation_ForwardContacts: String { return self._s[841]! }
+ public var Common_of: String { return self._s[846]! }
+ public var Conversation_ForwardContacts: String { return self._s[849]! }
public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[843]!, self._r[843]!, [_0])
+ return formatWithArgumentRanges(self._s[851]!, self._r[851]!, [_0])
}
- public var Passport_Language_hy: String { return self._s[844]! }
- public var Notifications_MessageNotificationsHelp: String { return self._s[845]! }
- public var AutoDownloadSettings_Reset: String { return self._s[846]! }
- public var Wallet_TransactionInfo_AddressCopied: String { return self._s[847]! }
- public var Paint_ClearConfirm: String { return self._s[848]! }
- public var Camera_VideoMode: String { return self._s[849]! }
+ public var Passport_Language_hy: String { return self._s[852]! }
+ public var Notifications_MessageNotificationsHelp: String { return self._s[853]! }
+ public var AutoDownloadSettings_Reset: String { return self._s[854]! }
+ public var Wallet_TransactionInfo_AddressCopied: String { return self._s[855]! }
+ public var Paint_ClearConfirm: String { return self._s[856]! }
+ public var Camera_VideoMode: String { return self._s[857]! }
public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[850]!, self._r[850]!, [_0])
+ return formatWithArgumentRanges(self._s[858]!, self._r[858]!, [_0])
}
- public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[851]! }
- public var Conversation_ViewBackground: String { return self._s[852]! }
+ public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[859]! }
+ public var Conversation_ViewBackground: String { return self._s[860]! }
public func Wallet_Info_TransactionDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[853]!, self._r[853]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[861]!, self._r[861]!, [_1, _2, _3])
}
- public var Passport_Language_el: String { return self._s[854]! }
- public var PhotoEditor_Original: String { return self._s[855]! }
- public var Settings_FAQ_Button: String { return self._s[857]! }
- public var Channel_Setup_PublicNoLink: String { return self._s[859]! }
- public var Conversation_UnsupportedMedia: String { return self._s[860]! }
- public var Conversation_SlideToCancel: String { return self._s[861]! }
- public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[862]! }
- public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[863]! }
- public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[864]! }
- public var Conversation_ReportSpamChannelConfirmation: String { return self._s[865]! }
- public var AutoNightTheme_NotAvailable: String { return self._s[866]! }
- public var Conversation_Owner: String { return self._s[867]! }
- public var Common_Create: String { return self._s[868]! }
- public var Settings_ApplyProxyAlertEnable: String { return self._s[869]! }
- public var ContactList_Context_Call: String { return self._s[870]! }
- public var Localization_ChooseLanguage: String { return self._s[872]! }
- public var ChatList_Context_AddToContacts: String { return self._s[874]! }
- public var Settings_Proxy: String { return self._s[876]! }
- public var Privacy_TopPeersHelp: String { return self._s[877]! }
- public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[878]! }
- public var Chat_UnsendMyMessages: String { return self._s[879]! }
+ public var Passport_Language_el: String { return self._s[862]! }
+ public var PhotoEditor_Original: String { return self._s[863]! }
+ public var Settings_FAQ_Button: String { return self._s[865]! }
+ public var Channel_Setup_PublicNoLink: String { return self._s[867]! }
+ public var Conversation_UnsupportedMedia: String { return self._s[868]! }
+ public var Conversation_SlideToCancel: String { return self._s[869]! }
+ public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[870]! }
+ public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[871]! }
+ public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[872]! }
+ public var Conversation_ReportSpamChannelConfirmation: String { return self._s[873]! }
+ public var AutoNightTheme_NotAvailable: String { return self._s[874]! }
+ public var Conversation_Owner: String { return self._s[875]! }
+ public var Common_Create: String { return self._s[876]! }
+ public var Settings_ApplyProxyAlertEnable: String { return self._s[877]! }
+ public var ContactList_Context_Call: String { return self._s[878]! }
+ public var Localization_ChooseLanguage: String { return self._s[880]! }
+ public var ChatList_Context_AddToContacts: String { return self._s[882]! }
+ public var Settings_Proxy: String { return self._s[884]! }
+ public var Privacy_TopPeersHelp: String { return self._s[885]! }
+ public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[886]! }
+ public var Chat_UnsendMyMessages: String { return self._s[887]! }
public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[880]!, self._r[880]!, [_0])
+ return formatWithArgumentRanges(self._s[888]!, self._r[888]!, [_0])
}
- public var TwoStepAuth_ConfirmationAbort: String { return self._s[881]! }
+ public var TwoStepAuth_ConfirmationAbort: String { return self._s[889]! }
public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[883]!, self._r[883]!, [_0])
+ return formatWithArgumentRanges(self._s[891]!, self._r[891]!, [_0])
}
- public var Contacts_SortedByPresence: String { return self._s[884]! }
- public var Passport_Identity_SurnamePlaceholder: String { return self._s[885]! }
- public var Cache_Title: String { return self._s[886]! }
+ public var Contacts_SortedByPresence: String { return self._s[892]! }
+ public var Passport_Identity_SurnamePlaceholder: String { return self._s[893]! }
+ public var Cache_Title: String { return self._s[894]! }
public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[887]!, self._r[887]!, [_0])
+ return formatWithArgumentRanges(self._s[895]!, self._r[895]!, [_0])
}
- public var TwoStepAuth_EmailCodeExpired: String { return self._s[888]! }
- public var Channel_Moderator_Title: String { return self._s[889]! }
- public var InstantPage_AutoNightTheme: String { return self._s[891]! }
+ public var TwoStepAuth_EmailCodeExpired: String { return self._s[896]! }
+ public var Channel_Moderator_Title: String { return self._s[897]! }
+ public var InstantPage_AutoNightTheme: String { return self._s[899]! }
public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[894]!, self._r[894]!, [_1])
+ return formatWithArgumentRanges(self._s[902]!, self._r[902]!, [_1])
}
- public var Passport_Scans_Upload: String { return self._s[895]! }
- public var Undo_Undo: String { return self._s[897]! }
- public var Contacts_AccessDeniedHelpON: String { return self._s[898]! }
- public var TwoStepAuth_RemovePassword: String { return self._s[899]! }
- public var Common_Delete: String { return self._s[900]! }
- public var Contacts_AddPeopleNearby: String { return self._s[902]! }
- public var Conversation_ContextMenuDelete: String { return self._s[903]! }
- public var SocksProxySetup_Credentials: String { return self._s[904]! }
- public var Appearance_EditTheme: String { return self._s[906]! }
- public var PasscodeSettings_AutoLock_Disabled: String { return self._s[907]! }
- public var Wallet_Send_NetworkErrorText: String { return self._s[908]! }
- public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[911]! }
- public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[912]! }
- public var Passport_Language_id: String { return self._s[914]! }
- public var WallpaperSearch_ColorTeal: String { return self._s[915]! }
- public var ChannelIntro_Title: String { return self._s[916]! }
+ public var Passport_Scans_Upload: String { return self._s[903]! }
+ public var Undo_Undo: String { return self._s[905]! }
+ public var Contacts_AccessDeniedHelpON: String { return self._s[906]! }
+ public var TwoStepAuth_RemovePassword: String { return self._s[907]! }
+ public var Common_Delete: String { return self._s[908]! }
+ public var Contacts_AddPeopleNearby: String { return self._s[910]! }
+ public var Conversation_ContextMenuDelete: String { return self._s[911]! }
+ public var SocksProxySetup_Credentials: String { return self._s[912]! }
+ public var Appearance_EditTheme: String { return self._s[914]! }
+ public var ClearCache_StorageOtherApps: String { return self._s[915]! }
+ public var PasscodeSettings_AutoLock_Disabled: String { return self._s[916]! }
+ public var Wallet_Send_NetworkErrorText: String { return self._s[917]! }
+ public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[920]! }
+ public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[921]! }
+ public var Passport_Language_id: String { return self._s[923]! }
+ public var WallpaperSearch_ColorTeal: String { return self._s[924]! }
+ public var ChannelIntro_Title: String { return self._s[925]! }
public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[917]!, self._r[917]!, [_0])
+ return formatWithArgumentRanges(self._s[926]!, self._r[926]!, [_0])
}
- public var VoiceOver_Chat_OpenLinkHint: String { return self._s[919]! }
- public var VoiceOver_Chat_Reply: String { return self._s[920]! }
- public var ScheduledMessages_BotActionUnavailable: String { return self._s[921]! }
- public var Channel_Info_Description: String { return self._s[922]! }
- public var Stickers_FavoriteStickers: String { return self._s[923]! }
- public var Channel_BanUser_PermissionAddMembers: String { return self._s[924]! }
- public var Notifications_DisplayNamesOnLockScreen: String { return self._s[925]! }
- public var ChatSearch_ResultsTooltip: String { return self._s[926]! }
- public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[927]! }
- public var Calls_NoMissedCallsPlacehoder: String { return self._s[928]! }
- public var Group_PublicLink_Placeholder: String { return self._s[929]! }
- public var Notifications_ExceptionsDefaultSound: String { return self._s[930]! }
+ public var VoiceOver_Chat_OpenLinkHint: String { return self._s[928]! }
+ public var VoiceOver_Chat_Reply: String { return self._s[929]! }
+ public var ScheduledMessages_BotActionUnavailable: String { return self._s[930]! }
+ public var Channel_Info_Description: String { return self._s[931]! }
+ public var Stickers_FavoriteStickers: String { return self._s[932]! }
+ public var Channel_BanUser_PermissionAddMembers: String { return self._s[933]! }
+ public var Notifications_DisplayNamesOnLockScreen: String { return self._s[934]! }
+ public var ChatSearch_ResultsTooltip: String { return self._s[935]! }
+ public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[936]! }
+ public var Calls_NoMissedCallsPlacehoder: String { return self._s[937]! }
+ public var Group_PublicLink_Placeholder: String { return self._s[938]! }
+ public var Notifications_ExceptionsDefaultSound: String { return self._s[939]! }
public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[931]!, self._r[931]!, [_1])
+ return formatWithArgumentRanges(self._s[940]!, self._r[940]!, [_1])
}
- public var TextFormat_Underline: String { return self._s[932]! }
+ public var TextFormat_Underline: String { return self._s[941]! }
public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[933]!, self._r[933]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_1, _2])
}
public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[934]!, self._r[934]!, [_0])
+ return formatWithArgumentRanges(self._s[943]!, self._r[943]!, [_0])
}
- public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[935]! }
+ public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[944]! }
public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[936]!, self._r[936]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[945]!, self._r[945]!, [_1, _2])
}
- public var Wallet_Intro_ImportExisting: String { return self._s[937]! }
- public var GroupPermission_Delete: String { return self._s[938]! }
- public var Passport_Language_uk: String { return self._s[939]! }
- public var StickerPack_HideStickers: String { return self._s[941]! }
- public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[942]! }
+ public var Wallet_Intro_ImportExisting: String { return self._s[946]! }
+ public var GroupPermission_Delete: String { return self._s[947]! }
+ public var Passport_Language_uk: String { return self._s[948]! }
+ public var StickerPack_HideStickers: String { return self._s[950]! }
+ public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[951]! }
public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[943]!, self._r[943]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1, _2])
}
- public var Activity_UploadingVideoMessage: String { return self._s[944]! }
+ public var Activity_UploadingVideoMessage: String { return self._s[953]! }
public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[945]!, self._r[945]!, [_0])
+ return formatWithArgumentRanges(self._s[954]!, self._r[954]!, [_0])
}
- public var Channel_TitleInfo: String { return self._s[946]! }
- public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[947]! }
- public var Settings_CallSettings: String { return self._s[948]! }
- public var Camera_SquareMode: String { return self._s[949]! }
- public var Conversation_SendMessage_ScheduleMessage: String { return self._s[950]! }
- public var GroupInfo_SharedMediaNone: String { return self._s[951]! }
+ public var Channel_TitleInfo: String { return self._s[955]! }
+ public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[956]! }
+ public var Settings_CallSettings: String { return self._s[957]! }
+ public var Camera_SquareMode: String { return self._s[958]! }
+ public var Conversation_SendMessage_ScheduleMessage: String { return self._s[959]! }
+ public var GroupInfo_SharedMediaNone: String { return self._s[960]! }
public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1])
+ return formatWithArgumentRanges(self._s[961]!, self._r[961]!, [_1])
}
- public var Bot_GenericBotStatus: String { return self._s[953]! }
- public var Application_Update: String { return self._s[955]! }
- public var Month_ShortJanuary: String { return self._s[956]! }
- public var Contacts_PermissionsKeepDisabled: String { return self._s[957]! }
- public var Channel_AdminLog_BanReadMessages: String { return self._s[958]! }
- public var Settings_AppLanguage_Unofficial: String { return self._s[959]! }
- public var Passport_Address_Street2Placeholder: String { return self._s[960]! }
+ public var Bot_GenericBotStatus: String { return self._s[962]! }
+ public var Application_Update: String { return self._s[964]! }
+ public var Month_ShortJanuary: String { return self._s[965]! }
+ public var Contacts_PermissionsKeepDisabled: String { return self._s[966]! }
+ public var Channel_AdminLog_BanReadMessages: String { return self._s[967]! }
+ public var Settings_AppLanguage_Unofficial: String { return self._s[968]! }
+ public var Passport_Address_Street2Placeholder: String { return self._s[969]! }
public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[961]!, self._r[961]!, [_0])
+ return formatWithArgumentRanges(self._s[970]!, self._r[970]!, [_0])
}
- public var NetworkUsageSettings_Cellular: String { return self._s[962]! }
- public var Appearance_PreviewOutgoingText: String { return self._s[963]! }
- public var Notifications_PermissionsAllowInSettings: String { return self._s[964]! }
- public var AutoDownloadSettings_OnForAll: String { return self._s[966]! }
- public var Map_Directions: String { return self._s[967]! }
- public var Passport_FieldIdentityTranslationHelp: String { return self._s[969]! }
- public var Appearance_ThemeDay: String { return self._s[970]! }
- public var LogoutOptions_LogOut: String { return self._s[971]! }
- public var Group_PublicLink_Title: String { return self._s[973]! }
- public var Channel_AddBotErrorNoRights: String { return self._s[974]! }
- public var Passport_Identity_AddPassport: String { return self._s[975]! }
- public var LocalGroup_ButtonTitle: String { return self._s[976]! }
- public var Call_Message: String { return self._s[977]! }
- public var PhotoEditor_ExposureTool: String { return self._s[978]! }
- public var Wallet_Receive_CommentInfo: String { return self._s[980]! }
- public var Passport_FieldOneOf_Delimeter: String { return self._s[981]! }
- public var Channel_AdminLog_CanBanUsers: String { return self._s[983]! }
- public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[984]! }
- public var Appearance_Preview: String { return self._s[985]! }
- public var Compose_ChannelMembers: String { return self._s[986]! }
- public var Conversation_DeleteManyMessages: String { return self._s[987]! }
- public var ReportPeer_ReasonOther_Title: String { return self._s[988]! }
- public var Checkout_ErrorProviderAccountTimeout: String { return self._s[989]! }
- public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[990]! }
- public var Channel_Stickers_CreateYourOwn: String { return self._s[993]! }
- public var Conversation_UpdateTelegram: String { return self._s[994]! }
- public var EditTheme_Create_TopInfo: String { return self._s[995]! }
+ public var NetworkUsageSettings_Cellular: String { return self._s[971]! }
+ public var Appearance_PreviewOutgoingText: String { return self._s[972]! }
+ public var Notifications_PermissionsAllowInSettings: String { return self._s[973]! }
+ public var AutoDownloadSettings_OnForAll: String { return self._s[975]! }
+ public var Map_Directions: String { return self._s[976]! }
+ public var Passport_FieldIdentityTranslationHelp: String { return self._s[978]! }
+ public var Appearance_ThemeDay: String { return self._s[979]! }
+ public var LogoutOptions_LogOut: String { return self._s[980]! }
+ public var Group_PublicLink_Title: String { return self._s[982]! }
+ public var Channel_AddBotErrorNoRights: String { return self._s[983]! }
+ public var Passport_Identity_AddPassport: String { return self._s[984]! }
+ public var LocalGroup_ButtonTitle: String { return self._s[985]! }
+ public var Call_Message: String { return self._s[986]! }
+ public var PhotoEditor_ExposureTool: String { return self._s[987]! }
+ public var Wallet_Receive_CommentInfo: String { return self._s[989]! }
+ public var Passport_FieldOneOf_Delimeter: String { return self._s[990]! }
+ public var Channel_AdminLog_CanBanUsers: String { return self._s[992]! }
+ public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[993]! }
+ public var Appearance_Preview: String { return self._s[994]! }
+ public var Compose_ChannelMembers: String { return self._s[995]! }
+ public var Conversation_DeleteManyMessages: String { return self._s[996]! }
+ public var ReportPeer_ReasonOther_Title: String { return self._s[997]! }
+ public var Checkout_ErrorProviderAccountTimeout: String { return self._s[998]! }
+ public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[999]! }
+ public var Channel_Stickers_CreateYourOwn: String { return self._s[1002]! }
+ public var Conversation_UpdateTelegram: String { return self._s[1003]! }
+ public var EditTheme_Create_TopInfo: String { return self._s[1004]! }
public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[996]!, self._r[996]!, [_0])
+ return formatWithArgumentRanges(self._s[1005]!, self._r[1005]!, [_0])
}
- public var Wallet_WordCheck_Continue: String { return self._s[997]! }
- public var TwoFactorSetup_Hint_Action: String { return self._s[998]! }
+ public var Wallet_WordCheck_Continue: String { return self._s[1006]! }
+ public var TwoFactorSetup_Hint_Action: String { return self._s[1007]! }
public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[999]!, self._r[999]!, [_1])
+ return formatWithArgumentRanges(self._s[1008]!, self._r[1008]!, [_1])
}
- public var GroupInfo_Administrators_Title: String { return self._s[1000]! }
- public var Privacy_Forwards_PreviewMessageText: String { return self._s[1001]! }
+ public var GroupInfo_Administrators_Title: String { return self._s[1009]! }
+ public var Privacy_Forwards_PreviewMessageText: String { return self._s[1010]! }
public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1002]!, self._r[1002]!, [_0])
- }
- public var Tour_Title3: String { return self._s[1003]! }
- public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1004]! }
- public var Clipboard_SendPhoto: String { return self._s[1008]! }
- public var MediaPicker_Videos: String { return self._s[1009]! }
- public var Passport_Email_Title: String { return self._s[1010]! }
- public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[1011]!, self._r[1011]!, [_0])
}
- public var StickerPacksSettings_Title: String { return self._s[1012]! }
- public var Conversation_MessageDialogDelete: String { return self._s[1013]! }
- public var Privacy_Calls_CustomHelp: String { return self._s[1015]! }
- public var Message_Wallpaper: String { return self._s[1016]! }
- public var MemberSearch_BotSection: String { return self._s[1017]! }
- public var GroupInfo_SetSound: String { return self._s[1018]! }
- public var Core_ServiceUserStatus: String { return self._s[1019]! }
- public var LiveLocationUpdated_JustNow: String { return self._s[1020]! }
- public var Call_StatusFailed: String { return self._s[1021]! }
- public var TwoFactorSetup_Email_Placeholder: String { return self._s[1022]! }
- public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1023]! }
- public var TwoStepAuth_SetPassword: String { return self._s[1024]! }
- public var Permissions_PeopleNearbyText_v0: String { return self._s[1025]! }
- public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1027]!, self._r[1027]!, [_0])
+ public var Tour_Title3: String { return self._s[1012]! }
+ public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1013]! }
+ public var Clipboard_SendPhoto: String { return self._s[1017]! }
+ public var MediaPicker_Videos: String { return self._s[1018]! }
+ public var Passport_Email_Title: String { return self._s[1019]! }
+ public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1020]!, self._r[1020]!, [_0])
}
- public var Calls_SubmitRating: String { return self._s[1028]! }
- public var Profile_Username: String { return self._s[1029]! }
- public var Bot_DescriptionTitle: String { return self._s[1030]! }
- public var MaskStickerSettings_Title: String { return self._s[1031]! }
- public var SharedMedia_CategoryOther: String { return self._s[1032]! }
- public var GroupInfo_SetGroupPhoto: String { return self._s[1033]! }
- public var Common_NotNow: String { return self._s[1034]! }
- public var CallFeedback_IncludeLogsInfo: String { return self._s[1035]! }
- public var Conversation_ShareMyPhoneNumber: String { return self._s[1036]! }
- public var Map_Location: String { return self._s[1037]! }
- public var Invitation_JoinGroup: String { return self._s[1038]! }
- public var AutoDownloadSettings_Title: String { return self._s[1040]! }
- public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1041]! }
- public var Channel_ErrorAddBlocked: String { return self._s[1042]! }
- public var Conversation_UnblockUser: String { return self._s[1043]! }
- public var EditTheme_Edit_TopInfo: String { return self._s[1044]! }
- public var Watch_Bot_Restart: String { return self._s[1045]! }
- public var TwoStepAuth_Title: String { return self._s[1046]! }
- public var Channel_AdminLog_BanSendMessages: String { return self._s[1047]! }
- public var Checkout_ShippingMethod: String { return self._s[1048]! }
- public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1049]! }
+ public var StickerPacksSettings_Title: String { return self._s[1021]! }
+ public var Conversation_MessageDialogDelete: String { return self._s[1022]! }
+ public var Privacy_Calls_CustomHelp: String { return self._s[1024]! }
+ public var Message_Wallpaper: String { return self._s[1025]! }
+ public var MemberSearch_BotSection: String { return self._s[1026]! }
+ public var GroupInfo_SetSound: String { return self._s[1027]! }
+ public var Core_ServiceUserStatus: String { return self._s[1028]! }
+ public var LiveLocationUpdated_JustNow: String { return self._s[1029]! }
+ public var Call_StatusFailed: String { return self._s[1030]! }
+ public var TwoFactorSetup_Email_Placeholder: String { return self._s[1031]! }
+ public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1032]! }
+ public var TwoStepAuth_SetPassword: String { return self._s[1033]! }
+ public var Permissions_PeopleNearbyText_v0: String { return self._s[1034]! }
+ public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1036]!, self._r[1036]!, [_0])
+ }
+ public var Calls_SubmitRating: String { return self._s[1037]! }
+ public var Profile_Username: String { return self._s[1038]! }
+ public var Bot_DescriptionTitle: String { return self._s[1039]! }
+ public var MaskStickerSettings_Title: String { return self._s[1040]! }
+ public var SharedMedia_CategoryOther: String { return self._s[1041]! }
+ public var GroupInfo_SetGroupPhoto: String { return self._s[1042]! }
+ public var Common_NotNow: String { return self._s[1043]! }
+ public var CallFeedback_IncludeLogsInfo: String { return self._s[1044]! }
+ public var Conversation_ShareMyPhoneNumber: String { return self._s[1045]! }
+ public var Map_Location: String { return self._s[1046]! }
+ public var Invitation_JoinGroup: String { return self._s[1047]! }
+ public var AutoDownloadSettings_Title: String { return self._s[1049]! }
+ public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1050]! }
+ public var Channel_ErrorAddBlocked: String { return self._s[1051]! }
+ public var Conversation_UnblockUser: String { return self._s[1052]! }
+ public var EditTheme_Edit_TopInfo: String { return self._s[1053]! }
+ public var Watch_Bot_Restart: String { return self._s[1054]! }
+ public var TwoStepAuth_Title: String { return self._s[1055]! }
+ public var Channel_AdminLog_BanSendMessages: String { return self._s[1056]! }
+ public var Checkout_ShippingMethod: String { return self._s[1057]! }
+ public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1058]! }
public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1050]!, self._r[1050]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1059]!, self._r[1059]!, [_1, _2, _3])
}
public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1052]!, self._r[1052]!, [_0])
+ return formatWithArgumentRanges(self._s[1061]!, self._r[1061]!, [_0])
}
public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1053]!, self._r[1053]!, [_0])
+ return formatWithArgumentRanges(self._s[1062]!, self._r[1062]!, [_0])
}
- public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1054]! }
- public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1055]! }
- public var AuthSessions_TerminateOtherSessions: String { return self._s[1056]! }
- public var Contacts_FailedToSendInvitesMessage: String { return self._s[1057]! }
- public var PrivacySettings_TwoStepAuth: String { return self._s[1058]! }
- public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1059]! }
- public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1060]! }
- public var Conversation_EditingMessagePanelMedia: String { return self._s[1061]! }
- public var Checkout_PaymentMethod_Title: String { return self._s[1062]! }
- public var SocksProxySetup_Connection: String { return self._s[1063]! }
- public var Group_MessagePhotoRemoved: String { return self._s[1064]! }
- public var Channel_Stickers_NotFound: String { return self._s[1067]! }
- public var Group_About_Help: String { return self._s[1068]! }
- public var Notification_PassportValueProofOfIdentity: String { return self._s[1069]! }
- public var PeopleNearby_Title: String { return self._s[1071]! }
+ public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1063]! }
+ public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1064]! }
+ public var AuthSessions_TerminateOtherSessions: String { return self._s[1065]! }
+ public var Contacts_FailedToSendInvitesMessage: String { return self._s[1066]! }
+ public var PrivacySettings_TwoStepAuth: String { return self._s[1067]! }
+ public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1068]! }
+ public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1069]! }
+ public var Conversation_EditingMessagePanelMedia: String { return self._s[1070]! }
+ public var Checkout_PaymentMethod_Title: String { return self._s[1071]! }
+ public var SocksProxySetup_Connection: String { return self._s[1072]! }
+ public var Group_MessagePhotoRemoved: String { return self._s[1073]! }
+ public var Channel_Stickers_NotFound: String { return self._s[1076]! }
+ public var Group_About_Help: String { return self._s[1077]! }
+ public var Notification_PassportValueProofOfIdentity: String { return self._s[1078]! }
+ public var PeopleNearby_Title: String { return self._s[1080]! }
public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1072]!, self._r[1072]!, [_1])
+ return formatWithArgumentRanges(self._s[1081]!, self._r[1081]!, [_1])
}
- public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1074]! }
- public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1075]! }
- public var SocksProxySetup_Password: String { return self._s[1076]! }
- public var Notifications_PermissionsEnable: String { return self._s[1077]! }
- public var TwoStepAuth_ChangeEmail: String { return self._s[1079]! }
+ public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1083]! }
+ public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1084]! }
+ public var SocksProxySetup_Password: String { return self._s[1085]! }
+ public var Notifications_PermissionsEnable: String { return self._s[1086]! }
+ public var TwoStepAuth_ChangeEmail: String { return self._s[1088]! }
public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1080]!, self._r[1080]!, [_1])
+ return formatWithArgumentRanges(self._s[1089]!, self._r[1089]!, [_1])
}
public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1082]!, self._r[1082]!, [_0])
+ return formatWithArgumentRanges(self._s[1091]!, self._r[1091]!, [_0])
}
- public var Passport_Identity_TypeDriversLicense: String { return self._s[1083]! }
- public var ArchivedPacksAlert_Title: String { return self._s[1084]! }
- public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1085]! }
+ public var Passport_Identity_TypeDriversLicense: String { return self._s[1092]! }
+ public var ArchivedPacksAlert_Title: String { return self._s[1093]! }
+ public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1094]! }
public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1086]!, self._r[1086]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1095]!, self._r[1095]!, [_1, _2, _3])
}
- public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1087]! }
- public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1089]! }
- public var Conversation_StatusTyping: String { return self._s[1090]! }
- public var Broadcast_AdminLog_EmptyText: String { return self._s[1091]! }
- public var Notification_PassportValueProofOfAddress: String { return self._s[1092]! }
- public var UserInfo_CreateNewContact: String { return self._s[1093]! }
- public var Passport_Identity_FrontSide: String { return self._s[1094]! }
- public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1095]! }
- public var Calls_CallTabTitle: String { return self._s[1096]! }
- public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1097]! }
+ public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1096]! }
+ public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1098]! }
+ public var Conversation_StatusTyping: String { return self._s[1099]! }
+ public var Broadcast_AdminLog_EmptyText: String { return self._s[1100]! }
+ public var Notification_PassportValueProofOfAddress: String { return self._s[1101]! }
+ public var UserInfo_CreateNewContact: String { return self._s[1102]! }
+ public var Passport_Identity_FrontSide: String { return self._s[1103]! }
+ public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1104]! }
+ public var Calls_CallTabTitle: String { return self._s[1105]! }
+ public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1106]! }
public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1099]!, self._r[1099]!, [_0])
+ return formatWithArgumentRanges(self._s[1108]!, self._r[1108]!, [_0])
}
- public var Watch_UserInfo_MuteTitle: String { return self._s[1100]! }
- public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1101]! }
- public var SharedMedia_EmptyMusicText: String { return self._s[1102]! }
- public var Wallet_Completed_Text: String { return self._s[1103]! }
- public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1104]! }
- public var Paint_Stickers: String { return self._s[1105]! }
- public var Privacy_GroupsAndChannels: String { return self._s[1106]! }
- public var ChatList_Context_Delete: String { return self._s[1108]! }
- public var UserInfo_AddContact: String { return self._s[1109]! }
+ public var Watch_UserInfo_MuteTitle: String { return self._s[1109]! }
+ public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1110]! }
+ public var SharedMedia_EmptyMusicText: String { return self._s[1111]! }
+ public var Wallet_Completed_Text: String { return self._s[1112]! }
+ public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1113]! }
+ public var Paint_Stickers: String { return self._s[1114]! }
+ public var Privacy_GroupsAndChannels: String { return self._s[1115]! }
+ public var ChatList_Context_Delete: String { return self._s[1117]! }
+ public var UserInfo_AddContact: String { return self._s[1118]! }
public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1110]!, self._r[1110]!, [_0])
+ return formatWithArgumentRanges(self._s[1119]!, self._r[1119]!, [_0])
}
- public var PhoneNumberHelp_ChangeNumber: String { return self._s[1112]! }
+ public var PhoneNumberHelp_ChangeNumber: String { return self._s[1121]! }
public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1114]!, self._r[1114]!, [_0])
+ return formatWithArgumentRanges(self._s[1123]!, self._r[1123]!, [_0])
}
- public var DialogList_NoMessagesTitle: String { return self._s[1115]! }
- public var EditProfile_NameAndPhotoHelp: String { return self._s[1116]! }
- public var BlockedUsers_BlockUser: String { return self._s[1117]! }
- public var Notifications_PermissionsOpenSettings: String { return self._s[1118]! }
- public var MediaPicker_UngroupDescription: String { return self._s[1119]! }
- public var Watch_NoConnection: String { return self._s[1120]! }
- public var Month_GenSeptember: String { return self._s[1121]! }
- public var Conversation_ViewGroup: String { return self._s[1123]! }
- public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1126]! }
- public var Privacy_Forwards_AlwaysLink: String { return self._s[1127]! }
- public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1128]! }
- public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1129]! }
- public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1130]! }
- public var MediaPicker_CameraRoll: String { return self._s[1132]! }
- public var Month_GenAugust: String { return self._s[1133]! }
- public var Wallet_Configuration_SourceHeader: String { return self._s[1134]! }
- public var AccessDenied_VideoMessageMicrophone: String { return self._s[1135]! }
- public var SharedMedia_EmptyText: String { return self._s[1136]! }
- public var Map_ShareLiveLocation: String { return self._s[1137]! }
- public var Calls_All: String { return self._s[1138]! }
- public var Appearance_ThemeNight: String { return self._s[1141]! }
- public var Conversation_HoldForAudio: String { return self._s[1142]! }
- public var SettingsSearch_Synonyms_Support: String { return self._s[1145]! }
- public var GroupInfo_GroupHistoryHidden: String { return self._s[1146]! }
- public var SocksProxySetup_Secret: String { return self._s[1147]! }
+ public var DialogList_NoMessagesTitle: String { return self._s[1124]! }
+ public var EditProfile_NameAndPhotoHelp: String { return self._s[1125]! }
+ public var BlockedUsers_BlockUser: String { return self._s[1126]! }
+ public var Notifications_PermissionsOpenSettings: String { return self._s[1127]! }
+ public var MediaPicker_UngroupDescription: String { return self._s[1128]! }
+ public var Watch_NoConnection: String { return self._s[1129]! }
+ public var Month_GenSeptember: String { return self._s[1130]! }
+ public var Conversation_ViewGroup: String { return self._s[1132]! }
+ public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1135]! }
+ public var Privacy_Forwards_AlwaysLink: String { return self._s[1136]! }
+ public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1137]! }
+ public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1138]! }
+ public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1139]! }
+ public var MediaPicker_CameraRoll: String { return self._s[1141]! }
+ public var Month_GenAugust: String { return self._s[1142]! }
+ public var Wallet_Configuration_SourceHeader: String { return self._s[1143]! }
+ public var AccessDenied_VideoMessageMicrophone: String { return self._s[1144]! }
+ public var SharedMedia_EmptyText: String { return self._s[1145]! }
+ public var Map_ShareLiveLocation: String { return self._s[1146]! }
+ public var Calls_All: String { return self._s[1147]! }
+ public var Appearance_ThemeNight: String { return self._s[1150]! }
+ public var Conversation_HoldForAudio: String { return self._s[1151]! }
+ public var SettingsSearch_Synonyms_Support: String { return self._s[1154]! }
+ public var GroupInfo_GroupHistoryHidden: String { return self._s[1155]! }
+ public var SocksProxySetup_Secret: String { return self._s[1156]! }
public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1148]!, self._r[1148]!, [_0])
+ return formatWithArgumentRanges(self._s[1157]!, self._r[1157]!, [_0])
}
- public var Channel_BanList_RestrictedTitle: String { return self._s[1150]! }
- public var Conversation_Location: String { return self._s[1151]! }
+ public var Channel_BanList_RestrictedTitle: String { return self._s[1159]! }
+ public var Conversation_Location: String { return self._s[1160]! }
public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1152]!, self._r[1152]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1161]!, self._r[1161]!, [_1, _2])
}
- public var ChatSettings_AutoDownloadPhotos: String { return self._s[1154]! }
- public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1155]! }
- public var Notifications_PermissionsText: String { return self._s[1156]! }
- public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1157]! }
- public var Call_Flip: String { return self._s[1158]! }
- public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1160]! }
- public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1161]! }
- public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1162]! }
- public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1163]! }
- public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1165]! }
- public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1167]! }
- public var Channel_TooMuchBots: String { return self._s[1169]! }
- public var Passport_DeletePassportConfirmation: String { return self._s[1170]! }
- public var Login_InvalidCodeError: String { return self._s[1171]! }
- public var StickerPacksSettings_FeaturedPacks: String { return self._s[1172]! }
+ public var ChatSettings_AutoDownloadPhotos: String { return self._s[1163]! }
+ public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1164]! }
+ public var Notifications_PermissionsText: String { return self._s[1165]! }
+ public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1166]! }
+ public var Call_Flip: String { return self._s[1167]! }
+ public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1169]! }
+ public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1170]! }
+ public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1171]! }
+ public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1172]! }
+ public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1174]! }
+ public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1176]! }
+ public var Channel_TooMuchBots: String { return self._s[1178]! }
+ public var Passport_DeletePassportConfirmation: String { return self._s[1179]! }
+ public var Login_InvalidCodeError: String { return self._s[1180]! }
+ public var StickerPacksSettings_FeaturedPacks: String { return self._s[1181]! }
public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1173]!, self._r[1173]!, [_0])
+ return formatWithArgumentRanges(self._s[1182]!, self._r[1182]!, [_0])
}
public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1174]!, self._r[1174]!, [_0])
+ return formatWithArgumentRanges(self._s[1183]!, self._r[1183]!, [_0])
}
- public var VoiceOver_Navigation_ProxySettings: String { return self._s[1175]! }
- public var Call_CallInProgressTitle: String { return self._s[1176]! }
- public var Month_ShortSeptember: String { return self._s[1177]! }
- public var Watch_ChannelInfo_Title: String { return self._s[1178]! }
- public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1181]! }
- public var DialogList_PasscodeLockHelp: String { return self._s[1182]! }
- public var Chat_MultipleTextMessagesDisabled: String { return self._s[1183]! }
- public var Wallet_Receive_Title: String { return self._s[1184]! }
- public var Notifications_Badge_IncludePublicGroups: String { return self._s[1185]! }
- public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1186]! }
- public var PhotoEditor_CropReset: String { return self._s[1187]! }
- public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1189]! }
- public var Channel_Management_LabelEditor: String { return self._s[1190]! }
- public var Passport_Identity_LatinNameHelp: String { return self._s[1192]! }
- public var PhotoEditor_HighlightsTool: String { return self._s[1193]! }
- public var Wallet_Info_WalletCreated: String { return self._s[1194]! }
- public var UserInfo_Title: String { return self._s[1195]! }
- public var ChatList_HideAction: String { return self._s[1196]! }
- public var AccessDenied_Title: String { return self._s[1197]! }
- public var DialogList_SearchLabel: String { return self._s[1198]! }
- public var Group_Setup_HistoryHidden: String { return self._s[1199]! }
- public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1200]! }
- public var State_Updating: String { return self._s[1202]! }
- public var Contacts_TabTitle: String { return self._s[1203]! }
- public var Notifications_Badge_CountUnreadMessages: String { return self._s[1205]! }
- public var GroupInfo_GroupHistory: String { return self._s[1206]! }
- public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1207]! }
- public var Wallpaper_SetColor: String { return self._s[1208]! }
- public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1209]! }
- public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1210]! }
- public var Chat_AttachmentLimitReached: String { return self._s[1211]! }
- public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1212]! }
- public var Contacts_NotRegisteredSection: String { return self._s[1213]! }
+ public var VoiceOver_Navigation_ProxySettings: String { return self._s[1184]! }
+ public var Call_CallInProgressTitle: String { return self._s[1185]! }
+ public var Month_ShortSeptember: String { return self._s[1186]! }
+ public var Watch_ChannelInfo_Title: String { return self._s[1187]! }
+ public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1190]! }
+ public var DialogList_PasscodeLockHelp: String { return self._s[1191]! }
+ public var Chat_MultipleTextMessagesDisabled: String { return self._s[1192]! }
+ public var Wallet_Receive_Title: String { return self._s[1193]! }
+ public var Notifications_Badge_IncludePublicGroups: String { return self._s[1194]! }
+ public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1195]! }
+ public var PhotoEditor_CropReset: String { return self._s[1196]! }
+ public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1198]! }
+ public var Channel_Management_LabelEditor: String { return self._s[1199]! }
+ public var Passport_Identity_LatinNameHelp: String { return self._s[1201]! }
+ public var PhotoEditor_HighlightsTool: String { return self._s[1202]! }
+ public var Wallet_Info_WalletCreated: String { return self._s[1203]! }
+ public var UserInfo_Title: String { return self._s[1204]! }
+ public var ChatList_HideAction: String { return self._s[1205]! }
+ public var AccessDenied_Title: String { return self._s[1206]! }
+ public var DialogList_SearchLabel: String { return self._s[1207]! }
+ public var Group_Setup_HistoryHidden: String { return self._s[1208]! }
+ public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1209]! }
+ public var State_Updating: String { return self._s[1211]! }
+ public var Contacts_TabTitle: String { return self._s[1212]! }
+ public var Notifications_Badge_CountUnreadMessages: String { return self._s[1214]! }
+ public var GroupInfo_GroupHistory: String { return self._s[1215]! }
+ public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1216]! }
+ public var Wallpaper_SetColor: String { return self._s[1217]! }
+ public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1218]! }
+ public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1219]! }
+ public var Chat_AttachmentLimitReached: String { return self._s[1220]! }
+ public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1221]! }
+ public var Contacts_NotRegisteredSection: String { return self._s[1222]! }
public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1214]!, self._r[1214]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1223]!, self._r[1223]!, [_1, _2, _3])
}
- public var Paint_Clear: String { return self._s[1215]! }
- public var StickerPacksSettings_ArchivedMasks: String { return self._s[1216]! }
- public var SocksProxySetup_Connecting: String { return self._s[1217]! }
- public var ExplicitContent_AlertChannel: String { return self._s[1218]! }
- public var CreatePoll_AllOptionsAdded: String { return self._s[1219]! }
- public var Conversation_Contact: String { return self._s[1220]! }
- public var Login_CodeExpired: String { return self._s[1221]! }
- public var Passport_DiscardMessageAction: String { return self._s[1222]! }
- public var ChatList_Context_Unpin: String { return self._s[1223]! }
- public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1224]! }
+ public var Paint_Clear: String { return self._s[1224]! }
+ public var StickerPacksSettings_ArchivedMasks: String { return self._s[1225]! }
+ public var SocksProxySetup_Connecting: String { return self._s[1226]! }
+ public var ExplicitContent_AlertChannel: String { return self._s[1227]! }
+ public var CreatePoll_AllOptionsAdded: String { return self._s[1228]! }
+ public var Conversation_Contact: String { return self._s[1229]! }
+ public var Login_CodeExpired: String { return self._s[1230]! }
+ public var Passport_DiscardMessageAction: String { return self._s[1231]! }
+ public var ChatList_Context_Unpin: String { return self._s[1232]! }
+ public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1233]! }
public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1225]!, self._r[1225]!, [_0])
+ return formatWithArgumentRanges(self._s[1234]!, self._r[1234]!, [_0])
}
- public var Channel_AdminLog_EmptyMessageText: String { return self._s[1226]! }
- public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1227]! }
+ public var Channel_AdminLog_EmptyMessageText: String { return self._s[1235]! }
+ public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1236]! }
public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1228]!, self._r[1228]!, [_0])
+ return formatWithArgumentRanges(self._s[1237]!, self._r[1237]!, [_0])
}
- public var Month_ShortApril: String { return self._s[1229]! }
- public var AuthSessions_CurrentSession: String { return self._s[1230]! }
- public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1233]! }
- public var Wallet_Navigation_Cancel: String { return self._s[1235]! }
- public var WallpaperPreview_CropTopText: String { return self._s[1236]! }
- public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1237]! }
- public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1238]! }
+ public var Month_ShortApril: String { return self._s[1238]! }
+ public var AuthSessions_CurrentSession: String { return self._s[1239]! }
+ public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1242]! }
+ public var Wallet_Navigation_Cancel: String { return self._s[1244]! }
+ public var WallpaperPreview_CropTopText: String { return self._s[1245]! }
+ public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1246]! }
+ public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1247]! }
public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1239]!, self._r[1239]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[1248]!, self._r[1248]!, [_0, _1])
}
- public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1240]! }
- public var Channel_Setup_TypePrivate: String { return self._s[1242]! }
- public var Forward_ChannelReadOnly: String { return self._s[1245]! }
- public var PhotoEditor_CurvesBlue: String { return self._s[1246]! }
- public var AddContact_SharedContactException: String { return self._s[1247]! }
- public var UserInfo_BotPrivacy: String { return self._s[1249]! }
- public var Wallet_CreateInvoice_Title: String { return self._s[1250]! }
- public var Notification_PassportValueEmail: String { return self._s[1251]! }
- public var EmptyGroupInfo_Subtitle: String { return self._s[1252]! }
- public var GroupPermission_NewTitle: String { return self._s[1253]! }
- public var CallFeedback_ReasonDropped: String { return self._s[1254]! }
- public var GroupInfo_Permissions_AddException: String { return self._s[1255]! }
- public var Channel_SignMessages_Help: String { return self._s[1257]! }
- public var Undo_ChatDeleted: String { return self._s[1259]! }
- public var Conversation_ChatBackground: String { return self._s[1260]! }
+ public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1249]! }
+ public var Channel_Setup_TypePrivate: String { return self._s[1251]! }
+ public var Forward_ChannelReadOnly: String { return self._s[1254]! }
+ public var PhotoEditor_CurvesBlue: String { return self._s[1255]! }
+ public var AddContact_SharedContactException: String { return self._s[1256]! }
+ public var UserInfo_BotPrivacy: String { return self._s[1258]! }
+ public var Wallet_CreateInvoice_Title: String { return self._s[1259]! }
+ public var Notification_PassportValueEmail: String { return self._s[1260]! }
+ public var EmptyGroupInfo_Subtitle: String { return self._s[1261]! }
+ public var GroupPermission_NewTitle: String { return self._s[1262]! }
+ public var CallFeedback_ReasonDropped: String { return self._s[1263]! }
+ public var GroupInfo_Permissions_AddException: String { return self._s[1264]! }
+ public var Channel_SignMessages_Help: String { return self._s[1266]! }
+ public var Undo_ChatDeleted: String { return self._s[1268]! }
+ public var Conversation_ChatBackground: String { return self._s[1269]! }
public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1261]!, self._r[1261]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1270]!, self._r[1270]!, [_1, _2, _3])
}
- public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1262]! }
- public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1263]! }
- public var Passport_Language_pt: String { return self._s[1264]! }
- public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1265]! }
- public var NotificationsSound_Popcorn: String { return self._s[1268]! }
- public var AutoNightTheme_Disabled: String { return self._s[1269]! }
- public var BlockedUsers_LeavePrefix: String { return self._s[1270]! }
- public var WallpaperPreview_CustomColorTopText: String { return self._s[1271]! }
- public var Contacts_PermissionsSuppressWarningText: String { return self._s[1272]! }
- public var WallpaperSearch_ColorBlue: String { return self._s[1273]! }
+ public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1271]! }
+ public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1272]! }
+ public var Passport_Language_pt: String { return self._s[1273]! }
+ public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1274]! }
+ public var NotificationsSound_Popcorn: String { return self._s[1277]! }
+ public var AutoNightTheme_Disabled: String { return self._s[1278]! }
+ public var BlockedUsers_LeavePrefix: String { return self._s[1279]! }
+ public var WallpaperPreview_CustomColorTopText: String { return self._s[1280]! }
+ public var Contacts_PermissionsSuppressWarningText: String { return self._s[1281]! }
+ public var WallpaperSearch_ColorBlue: String { return self._s[1282]! }
public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1274]!, self._r[1274]!, [_0])
+ return formatWithArgumentRanges(self._s[1283]!, self._r[1283]!, [_0])
}
- public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1275]! }
- public var SocksProxySetup_UseForCalls: String { return self._s[1276]! }
- public var Passport_DeleteDocumentConfirmation: String { return self._s[1278]! }
+ public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1284]! }
+ public var SocksProxySetup_UseForCalls: String { return self._s[1285]! }
+ public var Passport_DeleteDocumentConfirmation: String { return self._s[1287]! }
public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1279]!, self._r[1279]!, ["\(_0)"])
+ return formatWithArgumentRanges(self._s[1288]!, self._r[1288]!, ["\(_0)"])
}
- public var SocksProxySetup_Hostname: String { return self._s[1282]! }
- public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1283]! }
- public var Compose_NewEncryptedChat: String { return self._s[1284]! }
- public var Login_CodeFloodError: String { return self._s[1285]! }
- public var Calls_TabTitle: String { return self._s[1286]! }
- public var Privacy_ProfilePhoto: String { return self._s[1287]! }
- public var Passport_Language_he: String { return self._s[1288]! }
+ public var SocksProxySetup_Hostname: String { return self._s[1291]! }
+ public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1292]! }
+ public var Compose_NewEncryptedChat: String { return self._s[1293]! }
+ public var Login_CodeFloodError: String { return self._s[1294]! }
+ public var Calls_TabTitle: String { return self._s[1295]! }
+ public var Privacy_ProfilePhoto: String { return self._s[1296]! }
+ public var Passport_Language_he: String { return self._s[1297]! }
public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1289]!, self._r[1289]!, [_0])
+ return formatWithArgumentRanges(self._s[1298]!, self._r[1298]!, [_0])
}
- public var GroupPermission_Title: String { return self._s[1290]! }
+ public var GroupPermission_Title: String { return self._s[1299]! }
public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1291]!, self._r[1291]!, [_0])
+ return formatWithArgumentRanges(self._s[1300]!, self._r[1300]!, [_0])
}
- public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1292]! }
- public var GroupPermission_NoChangeInfo: String { return self._s[1293]! }
- public var ChatList_DeleteForCurrentUser: String { return self._s[1294]! }
- public var Tour_Text1: String { return self._s[1295]! }
- public var Channel_EditAdmin_TransferOwnership: String { return self._s[1296]! }
- public var Month_ShortFebruary: String { return self._s[1297]! }
- public var TwoStepAuth_EmailSkip: String { return self._s[1298]! }
+ public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1301]! }
+ public var GroupPermission_NoChangeInfo: String { return self._s[1302]! }
+ public var ChatList_DeleteForCurrentUser: String { return self._s[1303]! }
+ public var Tour_Text1: String { return self._s[1304]! }
+ public var Channel_EditAdmin_TransferOwnership: String { return self._s[1305]! }
+ public var Month_ShortFebruary: String { return self._s[1306]! }
+ public var TwoStepAuth_EmailSkip: String { return self._s[1307]! }
public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1299]!, self._r[1299]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1308]!, self._r[1308]!, [_1, _2, _3])
}
- public var NotificationsSound_Glass: String { return self._s[1300]! }
- public var Appearance_ThemeNightBlue: String { return self._s[1301]! }
- public var CheckoutInfo_Pay: String { return self._s[1302]! }
- public var Invite_LargeRecipientsCountWarning: String { return self._s[1304]! }
- public var Call_CallAgain: String { return self._s[1306]! }
- public var AttachmentMenu_SendAsFile: String { return self._s[1307]! }
- public var AccessDenied_MicrophoneRestricted: String { return self._s[1308]! }
- public var Passport_InvalidPasswordError: String { return self._s[1309]! }
- public var Watch_Message_Game: String { return self._s[1310]! }
- public var Stickers_Install: String { return self._s[1311]! }
- public var VoiceOver_Chat_Message: String { return self._s[1312]! }
- public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1313]! }
- public var Passport_Identity_ResidenceCountry: String { return self._s[1315]! }
- public var Notifications_GroupNotificationsHelp: String { return self._s[1316]! }
- public var AuthSessions_OtherSessions: String { return self._s[1317]! }
- public var Channel_Username_Help: String { return self._s[1318]! }
- public var Camera_Title: String { return self._s[1319]! }
- public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1321]! }
- public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1322]! }
- public var Channel_AdminLog_SendPolls: String { return self._s[1323]! }
- public var Channel_AdminLog_TitleAllEvents: String { return self._s[1324]! }
- public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1325]! }
- public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1326]! }
- public var ScheduledMessages_DeleteMany: String { return self._s[1327]! }
- public var Conversation_RestrictedStickers: String { return self._s[1328]! }
- public var Notifications_ExceptionsResetToDefaults: String { return self._s[1330]! }
- public var UserInfo_TelegramCall: String { return self._s[1332]! }
- public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1333]! }
- public var CreatePoll_OptionsHeader: String { return self._s[1334]! }
- public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1335]! }
- public var ArchivedChats_IntroTitle1: String { return self._s[1336]! }
- public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1337]! }
- public var Passport_Identity_EditPersonalDetails: String { return self._s[1338]! }
+ public var NotificationsSound_Glass: String { return self._s[1309]! }
+ public var Appearance_ThemeNightBlue: String { return self._s[1310]! }
+ public var CheckoutInfo_Pay: String { return self._s[1311]! }
+ public var Invite_LargeRecipientsCountWarning: String { return self._s[1313]! }
+ public var Call_CallAgain: String { return self._s[1315]! }
+ public var AttachmentMenu_SendAsFile: String { return self._s[1316]! }
+ public var AccessDenied_MicrophoneRestricted: String { return self._s[1317]! }
+ public var Passport_InvalidPasswordError: String { return self._s[1318]! }
+ public var Watch_Message_Game: String { return self._s[1319]! }
+ public var Stickers_Install: String { return self._s[1320]! }
+ public var VoiceOver_Chat_Message: String { return self._s[1321]! }
+ public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1322]! }
+ public var Passport_Identity_ResidenceCountry: String { return self._s[1324]! }
+ public var Notifications_GroupNotificationsHelp: String { return self._s[1325]! }
+ public var AuthSessions_OtherSessions: String { return self._s[1326]! }
+ public var Channel_Username_Help: String { return self._s[1327]! }
+ public var Camera_Title: String { return self._s[1328]! }
+ public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1330]! }
+ public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1331]! }
+ public var Channel_AdminLog_SendPolls: String { return self._s[1332]! }
+ public var Channel_AdminLog_TitleAllEvents: String { return self._s[1333]! }
+ public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1334]! }
+ public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1335]! }
+ public var ScheduledMessages_DeleteMany: String { return self._s[1336]! }
+ public var Conversation_RestrictedStickers: String { return self._s[1337]! }
+ public var Notifications_ExceptionsResetToDefaults: String { return self._s[1339]! }
+ public var UserInfo_TelegramCall: String { return self._s[1341]! }
+ public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1342]! }
+ public var CreatePoll_OptionsHeader: String { return self._s[1343]! }
+ public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1344]! }
+ public var ArchivedChats_IntroTitle1: String { return self._s[1345]! }
+ public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1346]! }
+ public var Passport_Identity_EditPersonalDetails: String { return self._s[1347]! }
public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1339]!, self._r[1339]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1348]!, self._r[1348]!, [_1, _2, _3])
}
- public var Wallet_Month_GenAugust: String { return self._s[1340]! }
- public var Settings_SaveEditedPhotos: String { return self._s[1341]! }
- public var TwoStepAuth_ConfirmationTitle: String { return self._s[1342]! }
- public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1343]! }
- public var Conversation_MessageDialogRetry: String { return self._s[1344]! }
- public var ChatList_Context_MarkAsUnread: String { return self._s[1345]! }
- public var Conversation_DiscardVoiceMessageAction: String { return self._s[1346]! }
- public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1347]! }
- public var Group_Setup_TypeHeader: String { return self._s[1348]! }
- public var Paint_RecentStickers: String { return self._s[1349]! }
- public var PhotoEditor_GrainTool: String { return self._s[1350]! }
- public var CheckoutInfo_ShippingInfoState: String { return self._s[1351]! }
- public var EmptyGroupInfo_Line4: String { return self._s[1352]! }
- public var Watch_AuthRequired: String { return self._s[1354]! }
+ public var Wallet_Month_GenAugust: String { return self._s[1349]! }
+ public var Settings_SaveEditedPhotos: String { return self._s[1350]! }
+ public var TwoStepAuth_ConfirmationTitle: String { return self._s[1351]! }
+ public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1352]! }
+ public var Conversation_MessageDialogRetry: String { return self._s[1353]! }
+ public var ChatList_Context_MarkAsUnread: String { return self._s[1354]! }
+ public var Conversation_DiscardVoiceMessageAction: String { return self._s[1355]! }
+ public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1356]! }
+ public var Group_Setup_TypeHeader: String { return self._s[1357]! }
+ public var Paint_RecentStickers: String { return self._s[1358]! }
+ public var PhotoEditor_GrainTool: String { return self._s[1359]! }
+ public var CheckoutInfo_ShippingInfoState: String { return self._s[1360]! }
+ public var EmptyGroupInfo_Line4: String { return self._s[1361]! }
+ public var Watch_AuthRequired: String { return self._s[1363]! }
public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1355]!, self._r[1355]!, [_0])
+ return formatWithArgumentRanges(self._s[1364]!, self._r[1364]!, [_0])
}
- public var Conversation_EncryptedDescriptionTitle: String { return self._s[1356]! }
- public var ChannelIntro_Text: String { return self._s[1357]! }
- public var DialogList_DeleteBotConfirmation: String { return self._s[1358]! }
- public var GroupPermission_NoSendMedia: String { return self._s[1359]! }
- public var Calls_AddTab: String { return self._s[1360]! }
- public var Message_ReplyActionButtonShowReceipt: String { return self._s[1361]! }
- public var Channel_AdminLog_EmptyFilterText: String { return self._s[1362]! }
- public var Conversation_WalletRequiredSetup: String { return self._s[1363]! }
- public var Notification_MessageLifetime1d: String { return self._s[1364]! }
- public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1365]! }
- public var Channel_BanUser_PermissionsHeader: String { return self._s[1366]! }
- public var Passport_Identity_GenderFemale: String { return self._s[1367]! }
- public var BlockedUsers_BlockTitle: String { return self._s[1368]! }
+ public var Conversation_EncryptedDescriptionTitle: String { return self._s[1365]! }
+ public var ChannelIntro_Text: String { return self._s[1366]! }
+ public var DialogList_DeleteBotConfirmation: String { return self._s[1367]! }
+ public var GroupPermission_NoSendMedia: String { return self._s[1368]! }
+ public var Calls_AddTab: String { return self._s[1369]! }
+ public var Message_ReplyActionButtonShowReceipt: String { return self._s[1370]! }
+ public var Channel_AdminLog_EmptyFilterText: String { return self._s[1371]! }
+ public var Conversation_WalletRequiredSetup: String { return self._s[1372]! }
+ public var Notification_MessageLifetime1d: String { return self._s[1373]! }
+ public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1374]! }
+ public var Channel_BanUser_PermissionsHeader: String { return self._s[1375]! }
+ public var Passport_Identity_GenderFemale: String { return self._s[1376]! }
+ public var BlockedUsers_BlockTitle: String { return self._s[1377]! }
public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1369]!, self._r[1369]!, [_1])
+ return formatWithArgumentRanges(self._s[1378]!, self._r[1378]!, [_1])
}
- public var Weekday_Yesterday: String { return self._s[1370]! }
- public var WallpaperSearch_ColorBlack: String { return self._s[1371]! }
- public var Settings_Context_Logout: String { return self._s[1372]! }
- public var Wallet_Info_UnknownTransaction: String { return self._s[1373]! }
- public var ChatList_ArchiveAction: String { return self._s[1374]! }
- public var AutoNightTheme_Scheduled: String { return self._s[1375]! }
- public var TwoFactorSetup_Email_SkipAction: String { return self._s[1376]! }
+ public var Weekday_Yesterday: String { return self._s[1379]! }
+ public var WallpaperSearch_ColorBlack: String { return self._s[1380]! }
+ public var Settings_Context_Logout: String { return self._s[1381]! }
+ public var Wallet_Info_UnknownTransaction: String { return self._s[1382]! }
+ public var ChatList_ArchiveAction: String { return self._s[1383]! }
+ public var AutoNightTheme_Scheduled: String { return self._s[1384]! }
+ public var TwoFactorSetup_Email_SkipAction: String { return self._s[1385]! }
public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1377]!, self._r[1377]!, [_1, _2, _3, _4, _5, _6])
+ return formatWithArgumentRanges(self._s[1386]!, self._r[1386]!, [_1, _2, _3, _4, _5, _6])
}
- public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1378]! }
- public var Wallet_Receive_CreateInvoice: String { return self._s[1379]! }
- public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1380]! }
+ public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1387]! }
+ public var Wallet_Receive_CreateInvoice: String { return self._s[1388]! }
+ public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1389]! }
public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1381]!, self._r[1381]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1390]!, self._r[1390]!, [_1, _2])
}
- public var CreatePoll_Create: String { return self._s[1382]! }
- public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1383]! }
+ public var CreatePoll_Create: String { return self._s[1391]! }
+ public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1392]! }
public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1384]!, self._r[1384]!, [_1, _2])
- }
- public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1385]! }
- public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1386]! }
- public var Notifications_InAppNotificationsSounds: String { return self._s[1388]! }
- public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1389]!, self._r[1389]!, [_1])
- }
- public var Preview_OpenInInstagram: String { return self._s[1390]! }
- public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1391]! }
- public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1392]!, self._r[1392]!, [_1, _2, _3])
- }
- public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[1393]!, self._r[1393]!, [_1, _2])
}
- public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1394]! }
- public var ArchivedChats_IntroText3: String { return self._s[1395]! }
- public var ChatList_UndoArchiveHiddenText: String { return self._s[1396]! }
- public var NetworkUsageSettings_TotalSection: String { return self._s[1397]! }
- public var Wallet_Month_GenSeptember: String { return self._s[1398]! }
- public var Channel_Setup_TypePrivateHelp: String { return self._s[1399]! }
+ public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1394]! }
+ public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1395]! }
+ public var Notifications_InAppNotificationsSounds: String { return self._s[1397]! }
+ public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1398]!, self._r[1398]!, [_1])
+ }
+ public var Preview_OpenInInstagram: String { return self._s[1399]! }
+ public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1400]! }
+ public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1401]!, self._r[1401]!, [_1, _2, _3])
+ }
+ public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1402]!, self._r[1402]!, [_1, _2])
+ }
+ public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1403]! }
+ public var ArchivedChats_IntroText3: String { return self._s[1404]! }
+ public var ChatList_UndoArchiveHiddenText: String { return self._s[1405]! }
+ public var NetworkUsageSettings_TotalSection: String { return self._s[1406]! }
+ public var Wallet_Month_GenSeptember: String { return self._s[1407]! }
+ public var Channel_Setup_TypePrivateHelp: String { return self._s[1408]! }
public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1400]!, self._r[1400]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1409]!, self._r[1409]!, [_1, _2, _3])
}
- public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1402]! }
- public var FastTwoStepSetup_HintSection: String { return self._s[1403]! }
- public var Wallpaper_PhotoLibrary: String { return self._s[1404]! }
- public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1405]! }
- public var Gif_NoGifsFound: String { return self._s[1406]! }
- public var Watch_LastSeen_WithinAMonth: String { return self._s[1407]! }
- public var VoiceOver_MessageContextDelete: String { return self._s[1408]! }
- public var EditTheme_Preview: String { return self._s[1409]! }
- public var GroupInfo_ActionPromote: String { return self._s[1410]! }
- public var PasscodeSettings_SimplePasscode: String { return self._s[1411]! }
- public var GroupInfo_Permissions_Title: String { return self._s[1412]! }
- public var Permissions_ContactsText_v0: String { return self._s[1413]! }
- public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1414]! }
- public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1415]! }
- public var PrivacySettings_DataSettingsHelp: String { return self._s[1418]! }
- public var Passport_FieldEmailHelp: String { return self._s[1419]! }
+ public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1411]! }
+ public var FastTwoStepSetup_HintSection: String { return self._s[1412]! }
+ public var Wallpaper_PhotoLibrary: String { return self._s[1413]! }
+ public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1414]! }
+ public var Gif_NoGifsFound: String { return self._s[1415]! }
+ public var Watch_LastSeen_WithinAMonth: String { return self._s[1416]! }
+ public var VoiceOver_MessageContextDelete: String { return self._s[1417]! }
+ public var EditTheme_Preview: String { return self._s[1418]! }
+ public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1419]!, self._r[1419]!, [_0])
+ }
+ public var GroupInfo_ActionPromote: String { return self._s[1420]! }
+ public var PasscodeSettings_SimplePasscode: String { return self._s[1421]! }
+ public var GroupInfo_Permissions_Title: String { return self._s[1422]! }
+ public var Permissions_ContactsText_v0: String { return self._s[1423]! }
+ public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1424]! }
+ public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1425]! }
+ public var PrivacySettings_DataSettingsHelp: String { return self._s[1428]! }
+ public var Passport_FieldEmailHelp: String { return self._s[1429]! }
public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1420]!, self._r[1420]!, [_0])
+ return formatWithArgumentRanges(self._s[1430]!, self._r[1430]!, [_0])
}
- public var Passport_Identity_GenderPlaceholder: String { return self._s[1421]! }
- public var Weekday_ShortSaturday: String { return self._s[1422]! }
- public var ContactInfo_PhoneLabelMain: String { return self._s[1423]! }
- public var Watch_Conversation_UserInfo: String { return self._s[1424]! }
- public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1425]! }
- public var PrivacyLastSeenSettings_Title: String { return self._s[1426]! }
- public var Conversation_ShareBotLocationConfirmation: String { return self._s[1427]! }
- public var PhotoEditor_VignetteTool: String { return self._s[1428]! }
- public var Passport_Address_Street1Placeholder: String { return self._s[1429]! }
- public var Passport_Language_et: String { return self._s[1430]! }
- public var AppUpgrade_Running: String { return self._s[1431]! }
- public var Channel_DiscussionGroup_Info: String { return self._s[1433]! }
- public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1434]! }
- public var Passport_Language_bg: String { return self._s[1435]! }
- public var Stickers_NoStickersFound: String { return self._s[1437]! }
+ public var Passport_Identity_GenderPlaceholder: String { return self._s[1431]! }
+ public var Weekday_ShortSaturday: String { return self._s[1432]! }
+ public var ContactInfo_PhoneLabelMain: String { return self._s[1433]! }
+ public var Watch_Conversation_UserInfo: String { return self._s[1434]! }
+ public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1435]! }
+ public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1436]! }
+ public var PrivacyLastSeenSettings_Title: String { return self._s[1437]! }
+ public var Conversation_ShareBotLocationConfirmation: String { return self._s[1438]! }
+ public var PhotoEditor_VignetteTool: String { return self._s[1439]! }
+ public var Passport_Address_Street1Placeholder: String { return self._s[1440]! }
+ public var Passport_Language_et: String { return self._s[1441]! }
+ public var AppUpgrade_Running: String { return self._s[1442]! }
+ public var Channel_DiscussionGroup_Info: String { return self._s[1444]! }
+ public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1445]! }
+ public var Passport_Language_bg: String { return self._s[1446]! }
+ public var Stickers_NoStickersFound: String { return self._s[1448]! }
public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1439]!, self._r[1439]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1450]!, self._r[1450]!, [_1, _2])
}
public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1440]!, self._r[1440]!, [_0])
+ return formatWithArgumentRanges(self._s[1451]!, self._r[1451]!, [_0])
}
- public var Wallet_Month_GenJuly: String { return self._s[1441]! }
- public var Wallet_Receive_AddressHeader: String { return self._s[1442]! }
- public var Wallet_Send_AmountText: String { return self._s[1443]! }
- public var Settings_About: String { return self._s[1444]! }
+ public var Wallet_Month_GenJuly: String { return self._s[1452]! }
+ public var Wallet_Receive_AddressHeader: String { return self._s[1453]! }
+ public var Wallet_Send_AmountText: String { return self._s[1454]! }
+ public var Settings_About: String { return self._s[1455]! }
public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1445]!, self._r[1445]!, [_0, _1, _2])
+ return formatWithArgumentRanges(self._s[1456]!, self._r[1456]!, [_0, _1, _2])
}
- public var ChatList_Context_MarkAsRead: String { return self._s[1447]! }
- public var KeyCommand_NewMessage: String { return self._s[1448]! }
- public var Group_ErrorAddBlocked: String { return self._s[1449]! }
+ public var ChatList_Context_MarkAsRead: String { return self._s[1458]! }
+ public var KeyCommand_NewMessage: String { return self._s[1459]! }
+ public var Group_ErrorAddBlocked: String { return self._s[1460]! }
public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1450]!, self._r[1450]!, [_0])
+ return formatWithArgumentRanges(self._s[1461]!, self._r[1461]!, [_0])
}
- public var Map_LocationTitle: String { return self._s[1451]! }
- public var ReportGroupLocation_Title: String { return self._s[1452]! }
- public var CallSettings_UseLessDataLongDescription: String { return self._s[1453]! }
- public var Cache_ClearProgress: String { return self._s[1454]! }
+ public var Map_LocationTitle: String { return self._s[1462]! }
+ public var ReportGroupLocation_Title: String { return self._s[1463]! }
+ public var CallSettings_UseLessDataLongDescription: String { return self._s[1464]! }
+ public var Cache_ClearProgress: String { return self._s[1465]! }
public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1455]!, self._r[1455]!, [_0])
+ return formatWithArgumentRanges(self._s[1466]!, self._r[1466]!, [_0])
}
- public var GroupRemoved_AddToGroup: String { return self._s[1456]! }
- public var Passport_UpdateRequiredError: String { return self._s[1457]! }
- public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1458]! }
+ public var GroupRemoved_AddToGroup: String { return self._s[1467]! }
+ public var Passport_UpdateRequiredError: String { return self._s[1468]! }
+ public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1469]! }
public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1459]!, self._r[1459]!, [_1])
+ return formatWithArgumentRanges(self._s[1470]!, self._r[1470]!, [_1])
}
- public var Notifications_PermissionsSuppressWarningText: String { return self._s[1461]! }
- public var Passport_Identity_MainPageHelp: String { return self._s[1462]! }
- public var Conversation_StatusKickedFromGroup: String { return self._s[1463]! }
- public var Passport_Language_ka: String { return self._s[1464]! }
+ public var Notifications_PermissionsSuppressWarningText: String { return self._s[1472]! }
+ public var Passport_Identity_MainPageHelp: String { return self._s[1473]! }
+ public var Conversation_StatusKickedFromGroup: String { return self._s[1474]! }
+ public var Passport_Language_ka: String { return self._s[1475]! }
public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1465]!, self._r[1465]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1476]!, self._r[1476]!, [_1, _2, _3])
}
- public var Call_Decline: String { return self._s[1466]! }
- public var SocksProxySetup_ProxyEnabled: String { return self._s[1467]! }
- public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1470]! }
+ public var Call_Decline: String { return self._s[1477]! }
+ public var SocksProxySetup_ProxyEnabled: String { return self._s[1478]! }
+ public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1481]! }
public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1471]!, self._r[1471]!, [_0])
+ return formatWithArgumentRanges(self._s[1482]!, self._r[1482]!, [_0])
}
- public var CallFeedback_Send: String { return self._s[1472]! }
- public var EditTheme_EditTitle: String { return self._s[1473]! }
+ public var CallFeedback_Send: String { return self._s[1483]! }
+ public var EditTheme_EditTitle: String { return self._s[1484]! }
public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1474]!, self._r[1474]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1485]!, self._r[1485]!, [_1, _2])
}
- public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1475]! }
+ public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1486]! }
public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1477]!, self._r[1477]!, [_0])
+ return formatWithArgumentRanges(self._s[1488]!, self._r[1488]!, [_0])
}
- public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1478]! }
- public var Passport_DeletePassport: String { return self._s[1479]! }
- public var Appearance_AppIconFilled: String { return self._s[1480]! }
- public var Privacy_Calls_P2PAlways: String { return self._s[1481]! }
- public var Month_ShortDecember: String { return self._s[1482]! }
- public var Channel_AdminLog_CanEditMessages: String { return self._s[1484]! }
+ public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1489]! }
+ public var Passport_DeletePassport: String { return self._s[1490]! }
+ public var Appearance_AppIconFilled: String { return self._s[1491]! }
+ public var Privacy_Calls_P2PAlways: String { return self._s[1492]! }
+ public var Month_ShortDecember: String { return self._s[1493]! }
+ public var Channel_AdminLog_CanEditMessages: String { return self._s[1495]! }
public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1485]!, self._r[1485]!, [_0])
+ return formatWithArgumentRanges(self._s[1496]!, self._r[1496]!, [_0])
}
- public var Channel_Stickers_Searching: String { return self._s[1486]! }
- public var Conversation_EncryptedDescription1: String { return self._s[1487]! }
- public var Conversation_EncryptedDescription2: String { return self._s[1488]! }
- public var PasscodeSettings_PasscodeOptions: String { return self._s[1489]! }
- public var Conversation_EncryptedDescription3: String { return self._s[1491]! }
- public var PhotoEditor_SharpenTool: String { return self._s[1492]! }
- public var Wallet_Configuration_Title: String { return self._s[1493]! }
+ public var Channel_Stickers_Searching: String { return self._s[1497]! }
+ public var Conversation_EncryptedDescription1: String { return self._s[1498]! }
+ public var Conversation_EncryptedDescription2: String { return self._s[1499]! }
+ public var PasscodeSettings_PasscodeOptions: String { return self._s[1500]! }
+ public var Conversation_EncryptedDescription3: String { return self._s[1502]! }
+ public var PhotoEditor_SharpenTool: String { return self._s[1503]! }
+ public var Wallet_Configuration_Title: String { return self._s[1504]! }
public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1494]!, self._r[1494]!, [_0])
+ return formatWithArgumentRanges(self._s[1505]!, self._r[1505]!, [_0])
}
- public var Conversation_EncryptedDescription4: String { return self._s[1496]! }
- public var Channel_Members_AddMembers: String { return self._s[1497]! }
- public var Wallpaper_Search: String { return self._s[1498]! }
- public var Weekday_Friday: String { return self._s[1499]! }
- public var Privacy_ContactsSync: String { return self._s[1500]! }
- public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1501]! }
- public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1502]! }
+ public var Conversation_EncryptedDescription4: String { return self._s[1507]! }
+ public var Channel_Members_AddMembers: String { return self._s[1508]! }
+ public var Wallpaper_Search: String { return self._s[1509]! }
+ public var Weekday_Friday: String { return self._s[1510]! }
+ public var Privacy_ContactsSync: String { return self._s[1511]! }
+ public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1512]! }
+ public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1513]! }
public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1503]!, self._r[1503]!, [_0])
+ return formatWithArgumentRanges(self._s[1514]!, self._r[1514]!, [_0])
}
- public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1504]! }
- public var GroupInfo_Permissions_Removed: String { return self._s[1505]! }
- public var ScheduledMessages_ScheduledOnline: String { return self._s[1506]! }
- public var Passport_Identity_GenderMale: String { return self._s[1507]! }
+ public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1515]! }
+ public var GroupInfo_Permissions_Removed: String { return self._s[1516]! }
+ public var ScheduledMessages_ScheduledOnline: String { return self._s[1517]! }
+ public var Passport_Identity_GenderMale: String { return self._s[1518]! }
public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1508]!, self._r[1508]!, [_0])
+ return formatWithArgumentRanges(self._s[1519]!, self._r[1519]!, [_0])
}
- public var Notifications_PermissionsKeepDisabled: String { return self._s[1509]! }
- public var Conversation_JumpToDate: String { return self._s[1510]! }
- public var Contacts_GlobalSearch: String { return self._s[1511]! }
- public var AutoDownloadSettings_ResetHelp: String { return self._s[1512]! }
- public var SettingsSearch_Synonyms_FAQ: String { return self._s[1513]! }
- public var Profile_MessageLifetime1d: String { return self._s[1514]! }
+ public var Notifications_PermissionsKeepDisabled: String { return self._s[1520]! }
+ public var Conversation_JumpToDate: String { return self._s[1521]! }
+ public var Contacts_GlobalSearch: String { return self._s[1522]! }
+ public var AutoDownloadSettings_ResetHelp: String { return self._s[1523]! }
+ public var SettingsSearch_Synonyms_FAQ: String { return self._s[1524]! }
+ public var Profile_MessageLifetime1d: String { return self._s[1525]! }
public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1515]!, self._r[1515]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1526]!, self._r[1526]!, [_1, _2])
}
- public var StickerPack_BuiltinPackName: String { return self._s[1518]! }
+ public var StickerPack_BuiltinPackName: String { return self._s[1529]! }
public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1519]!, self._r[1519]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_1, _2])
}
- public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1520]! }
- public var Passport_InfoTitle: String { return self._s[1522]! }
- public var Notifications_PermissionsUnreachableText: String { return self._s[1523]! }
+ public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1531]! }
+ public var Passport_InfoTitle: String { return self._s[1533]! }
+ public var Notifications_PermissionsUnreachableText: String { return self._s[1534]! }
public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1527]!, self._r[1527]!, [_0])
+ return formatWithArgumentRanges(self._s[1538]!, self._r[1538]!, [_0])
}
public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1528]!, self._r[1528]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1539]!, self._r[1539]!, [_1, _2])
}
- public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1529]! }
- public var Profile_BotInfo: String { return self._s[1530]! }
- public var Watch_Compose_CreateMessage: String { return self._s[1531]! }
- public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1532]! }
- public var Month_ShortNovember: String { return self._s[1533]! }
- public var Conversation_ScamWarning: String { return self._s[1534]! }
- public var Wallpaper_SetCustomBackground: String { return self._s[1535]! }
- public var Passport_Identity_TranslationsHelp: String { return self._s[1536]! }
- public var NotificationsSound_Chime: String { return self._s[1537]! }
- public var Passport_Language_ko: String { return self._s[1539]! }
- public var InviteText_URL: String { return self._s[1540]! }
- public var TextFormat_Monospace: String { return self._s[1541]! }
+ public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1540]! }
+ public var Profile_BotInfo: String { return self._s[1541]! }
+ public var Watch_Compose_CreateMessage: String { return self._s[1542]! }
+ public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1543]! }
+ public var Month_ShortNovember: String { return self._s[1544]! }
+ public var Conversation_ScamWarning: String { return self._s[1545]! }
+ public var Wallpaper_SetCustomBackground: String { return self._s[1546]! }
+ public var Passport_Identity_TranslationsHelp: String { return self._s[1547]! }
+ public var NotificationsSound_Chime: String { return self._s[1548]! }
+ public var Passport_Language_ko: String { return self._s[1550]! }
+ public var InviteText_URL: String { return self._s[1551]! }
+ public var TextFormat_Monospace: String { return self._s[1552]! }
public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1553]!, self._r[1553]!, [_1, _2, _3])
}
- public var EditTheme_Edit_BottomInfo: String { return self._s[1543]! }
+ public var EditTheme_Edit_BottomInfo: String { return self._s[1554]! }
public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1544]!, self._r[1544]!, [_0])
+ return formatWithArgumentRanges(self._s[1555]!, self._r[1555]!, [_0])
}
public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1556]!, self._r[1556]!, [_1, _2])
}
- public var Wallet_Words_Title: String { return self._s[1546]! }
- public var Wallet_Month_ShortMay: String { return self._s[1547]! }
- public var EditTheme_CreateTitle: String { return self._s[1549]! }
- public var Passport_InfoLearnMore: String { return self._s[1550]! }
- public var TwoStepAuth_EmailPlaceholder: String { return self._s[1551]! }
- public var Passport_Identity_AddIdentityCard: String { return self._s[1552]! }
- public var Your_card_has_expired: String { return self._s[1553]! }
- public var StickerPacksSettings_StickerPacksSection: String { return self._s[1554]! }
- public var GroupInfo_InviteLink_Help: String { return self._s[1555]! }
- public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1559]! }
- public var Conversation_Report: String { return self._s[1560]! }
- public var Notifications_MessageNotificationsSound: String { return self._s[1561]! }
- public var Notification_MessageLifetime1m: String { return self._s[1562]! }
- public var Privacy_ContactsTitle: String { return self._s[1563]! }
- public var Conversation_ShareMyContactInfo: String { return self._s[1564]! }
- public var Wallet_WordCheck_Title: String { return self._s[1565]! }
- public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1566]! }
- public var Channel_Members_Title: String { return self._s[1567]! }
- public var Map_OpenInWaze: String { return self._s[1568]! }
- public var Login_PhoneBannedError: String { return self._s[1569]! }
+ public var Wallet_Words_Title: String { return self._s[1557]! }
+ public var Wallet_Month_ShortMay: String { return self._s[1558]! }
+ public var EditTheme_CreateTitle: String { return self._s[1560]! }
+ public var Passport_InfoLearnMore: String { return self._s[1561]! }
+ public var TwoStepAuth_EmailPlaceholder: String { return self._s[1562]! }
+ public var Passport_Identity_AddIdentityCard: String { return self._s[1563]! }
+ public var Your_card_has_expired: String { return self._s[1564]! }
+ public var StickerPacksSettings_StickerPacksSection: String { return self._s[1565]! }
+ public var GroupInfo_InviteLink_Help: String { return self._s[1566]! }
+ public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1570]! }
+ public var Conversation_Report: String { return self._s[1572]! }
+ public var Notifications_MessageNotificationsSound: String { return self._s[1573]! }
+ public var Notification_MessageLifetime1m: String { return self._s[1574]! }
+ public var Privacy_ContactsTitle: String { return self._s[1575]! }
+ public var Conversation_ShareMyContactInfo: String { return self._s[1576]! }
+ public var Wallet_WordCheck_Title: String { return self._s[1577]! }
+ public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1578]! }
+ public var Channel_Members_Title: String { return self._s[1579]! }
+ public var Map_OpenInWaze: String { return self._s[1580]! }
+ public var Login_PhoneBannedError: String { return self._s[1581]! }
public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1570]!, self._r[1570]!, [_0])
- }
- public var Group_Management_AddModeratorHelp: String { return self._s[1571]! }
- public var AutoDownloadSettings_WifiTitle: String { return self._s[1572]! }
- public var Common_OK: String { return self._s[1573]! }
- public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1574]! }
- public var Wallet_Words_NotDoneResponse: String { return self._s[1575]! }
- public var Cache_Music: String { return self._s[1576]! }
- public var Wallet_Configuration_SourceURL: String { return self._s[1577]! }
- public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1578]! }
- public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1579]! }
- public var TwoStepAuth_HintPlaceholder: String { return self._s[1580]! }
- public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1581]!, self._r[1581]!, [_1])
- }
- public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[1582]!, self._r[1582]!, [_0])
}
- public var TwoFactorSetup_Done_Action: String { return self._s[1583]! }
+ public var Group_Management_AddModeratorHelp: String { return self._s[1583]! }
+ public var AutoDownloadSettings_WifiTitle: String { return self._s[1584]! }
+ public var Common_OK: String { return self._s[1585]! }
+ public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1586]! }
+ public var Wallet_Words_NotDoneResponse: String { return self._s[1587]! }
+ public var Cache_Music: String { return self._s[1588]! }
+ public var Wallet_Configuration_SourceURL: String { return self._s[1589]! }
+ public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1590]! }
+ public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1591]! }
+ public var TwoStepAuth_HintPlaceholder: String { return self._s[1592]! }
+ public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1593]!, self._r[1593]!, [_1])
+ }
+ public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1594]!, self._r[1594]!, [_0])
+ }
+ public var TwoFactorSetup_Done_Action: String { return self._s[1595]! }
public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1584]!, self._r[1584]!, [_0])
+ return formatWithArgumentRanges(self._s[1596]!, self._r[1596]!, [_0])
}
- public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1585]! }
- public var Watch_MessageView_ViewOnPhone: String { return self._s[1587]! }
- public var Privacy_Calls_CustomShareHelp: String { return self._s[1588]! }
- public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1590]! }
- public var ChangePhoneNumberNumber_Title: String { return self._s[1591]! }
- public var State_ConnectingToProxyInfo: String { return self._s[1592]! }
- public var Conversation_SwipeToReplyHintTitle: String { return self._s[1593]! }
- public var Message_VideoMessage: String { return self._s[1595]! }
- public var ChannelInfo_DeleteChannel: String { return self._s[1596]! }
- public var ContactInfo_PhoneLabelOther: String { return self._s[1597]! }
- public var Channel_EditAdmin_CannotEdit: String { return self._s[1598]! }
- public var Passport_DeleteAddressConfirmation: String { return self._s[1599]! }
+ public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1597]! }
+ public var Watch_MessageView_ViewOnPhone: String { return self._s[1599]! }
+ public var Privacy_Calls_CustomShareHelp: String { return self._s[1600]! }
+ public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1602]! }
+ public var ChangePhoneNumberNumber_Title: String { return self._s[1603]! }
+ public var State_ConnectingToProxyInfo: String { return self._s[1604]! }
+ public var Conversation_SwipeToReplyHintTitle: String { return self._s[1605]! }
+ public var Message_VideoMessage: String { return self._s[1607]! }
+ public var ChannelInfo_DeleteChannel: String { return self._s[1608]! }
+ public var ContactInfo_PhoneLabelOther: String { return self._s[1609]! }
+ public var Channel_EditAdmin_CannotEdit: String { return self._s[1610]! }
+ public var Passport_DeleteAddressConfirmation: String { return self._s[1611]! }
public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1600]!, self._r[1600]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1612]!, self._r[1612]!, [_1, _2, _3])
}
- public var WallpaperPreview_SwipeBottomText: String { return self._s[1601]! }
- public var Activity_RecordingAudio: String { return self._s[1602]! }
- public var SettingsSearch_Synonyms_Watch: String { return self._s[1603]! }
- public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1604]! }
- public var Wallet_Info_Address: String { return self._s[1605]! }
+ public var WallpaperPreview_SwipeBottomText: String { return self._s[1613]! }
+ public var Activity_RecordingAudio: String { return self._s[1614]! }
+ public var SettingsSearch_Synonyms_Watch: String { return self._s[1615]! }
+ public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1616]! }
+ public var Wallet_Info_Address: String { return self._s[1617]! }
public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1607]!, self._r[1607]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[1619]!, self._r[1619]!, [_0, _1])
}
public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1611]!, self._r[1611]!, [_0])
+ return formatWithArgumentRanges(self._s[1623]!, self._r[1623]!, [_0])
}
- public var Conversation_ApplyLocalization: String { return self._s[1612]! }
- public var TwoFactorSetup_Intro_Action: String { return self._s[1613]! }
- public var UserInfo_AddPhone: String { return self._s[1614]! }
- public var Map_ShareLiveLocationHelp: String { return self._s[1615]! }
+ public var Conversation_ApplyLocalization: String { return self._s[1624]! }
+ public var TwoFactorSetup_Intro_Action: String { return self._s[1625]! }
+ public var UserInfo_AddPhone: String { return self._s[1626]! }
+ public var Map_ShareLiveLocationHelp: String { return self._s[1627]! }
public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1616]!, self._r[1616]!, [_0])
+ return formatWithArgumentRanges(self._s[1628]!, self._r[1628]!, [_0])
}
- public var Passport_Scans: String { return self._s[1618]! }
- public var BlockedUsers_Unblock: String { return self._s[1619]! }
+ public var Passport_Scans: String { return self._s[1630]! }
+ public var BlockedUsers_Unblock: String { return self._s[1631]! }
public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1620]!, self._r[1620]!, [_1])
+ return formatWithArgumentRanges(self._s[1632]!, self._r[1632]!, [_1])
}
- public var Channel_Management_LabelCreator: String { return self._s[1621]! }
- public var Conversation_ReportSpamAndLeave: String { return self._s[1622]! }
- public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1623]! }
- public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1624]! }
- public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1625]! }
+ public var Channel_Management_LabelCreator: String { return self._s[1633]! }
+ public var Conversation_ReportSpamAndLeave: String { return self._s[1634]! }
+ public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1635]! }
+ public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1636]! }
+ public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1637]! }
public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1626]!, self._r[1626]!, [_0, _1, _2])
+ return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_0, _1, _2])
}
- public var Login_PhoneNumberHelp: String { return self._s[1627]! }
- public var LastSeen_ALongTimeAgo: String { return self._s[1628]! }
- public var Channel_AdminLog_CanPinMessages: String { return self._s[1629]! }
- public var ChannelIntro_CreateChannel: String { return self._s[1630]! }
- public var Conversation_UnreadMessages: String { return self._s[1631]! }
- public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1632]! }
- public var Channel_AdminLog_EmptyText: String { return self._s[1633]! }
- public var Theme_Context_Apply: String { return self._s[1634]! }
- public var Notification_GroupActivated: String { return self._s[1635]! }
- public var NotificationSettings_ContactJoinedInfo: String { return self._s[1636]! }
- public var Wallet_Intro_CreateWallet: String { return self._s[1637]! }
+ public var Login_PhoneNumberHelp: String { return self._s[1639]! }
+ public var LastSeen_ALongTimeAgo: String { return self._s[1640]! }
+ public var Channel_AdminLog_CanPinMessages: String { return self._s[1641]! }
+ public var ChannelIntro_CreateChannel: String { return self._s[1642]! }
+ public var Conversation_UnreadMessages: String { return self._s[1643]! }
+ public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1644]! }
+ public var Channel_AdminLog_EmptyText: String { return self._s[1645]! }
+ public var Theme_Context_Apply: String { return self._s[1646]! }
+ public var Notification_GroupActivated: String { return self._s[1647]! }
+ public var NotificationSettings_ContactJoinedInfo: String { return self._s[1648]! }
+ public var Wallet_Intro_CreateWallet: String { return self._s[1649]! }
public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_0])
+ return formatWithArgumentRanges(self._s[1650]!, self._r[1650]!, [_0])
}
public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1639]!, self._r[1639]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[1651]!, self._r[1651]!, [_0, _1])
}
- public var GroupInfo_ConvertToSupergroup: String { return self._s[1641]! }
+ public var GroupInfo_ConvertToSupergroup: String { return self._s[1653]! }
public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1642]!, self._r[1642]!, [_0])
+ return formatWithArgumentRanges(self._s[1654]!, self._r[1654]!, [_0])
}
- public var Undo_DeletedChannel: String { return self._s[1643]! }
- public var CallFeedback_AddComment: String { return self._s[1644]! }
+ public var Undo_DeletedChannel: String { return self._s[1655]! }
+ public var CallFeedback_AddComment: String { return self._s[1656]! }
public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1645]!, self._r[1645]!, [_0])
+ return formatWithArgumentRanges(self._s[1657]!, self._r[1657]!, [_0])
}
- public var Document_TargetConfirmationFormat: String { return self._s[1646]! }
+ public var Document_TargetConfirmationFormat: String { return self._s[1658]! }
public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1647]!, self._r[1647]!, [_0])
+ return formatWithArgumentRanges(self._s[1659]!, self._r[1659]!, [_0])
}
- public var LogoutOptions_SetPasscodeTitle: String { return self._s[1648]! }
+ public var LogoutOptions_SetPasscodeTitle: String { return self._s[1660]! }
public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1649]!, self._r[1649]!, [_1, _2, _3, _4])
+ return formatWithArgumentRanges(self._s[1661]!, self._r[1661]!, [_1, _2, _3, _4])
}
- public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1650]! }
- public var Theme_ErrorNotFound: String { return self._s[1651]! }
- public var Contacts_SortByName: String { return self._s[1652]! }
- public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1653]! }
+ public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1662]! }
+ public var Theme_ErrorNotFound: String { return self._s[1663]! }
+ public var Contacts_SortByName: String { return self._s[1664]! }
+ public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1665]! }
public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1655]!, self._r[1655]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1667]!, self._r[1667]!, [_1, _2, _3])
}
- public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1656]! }
- public var ScheduledMessages_EditTime: String { return self._s[1657]! }
- public var Conversation_ClearSelfHistory: String { return self._s[1658]! }
- public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1659]! }
- public var PasscodeSettings_DoNotMatch: String { return self._s[1660]! }
- public var Stickers_SuggestNone: String { return self._s[1661]! }
- public var ChatSettings_Cache: String { return self._s[1662]! }
- public var Settings_SaveIncomingPhotos: String { return self._s[1663]! }
- public var Media_ShareThisPhoto: String { return self._s[1664]! }
- public var Chat_SlowmodeTooltipPending: String { return self._s[1665]! }
- public var InfoPlist_NSContactsUsageDescription: String { return self._s[1666]! }
- public var Conversation_ContextMenuCopyLink: String { return self._s[1667]! }
- public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1668]! }
- public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1669]! }
- public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1670]! }
+ public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1668]! }
+ public var ScheduledMessages_EditTime: String { return self._s[1669]! }
+ public var Conversation_ClearSelfHistory: String { return self._s[1670]! }
+ public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1671]! }
+ public var PasscodeSettings_DoNotMatch: String { return self._s[1672]! }
+ public var Stickers_SuggestNone: String { return self._s[1673]! }
+ public var ChatSettings_Cache: String { return self._s[1674]! }
+ public var Settings_SaveIncomingPhotos: String { return self._s[1675]! }
+ public var Media_ShareThisPhoto: String { return self._s[1676]! }
+ public var Chat_SlowmodeTooltipPending: String { return self._s[1677]! }
+ public var InfoPlist_NSContactsUsageDescription: String { return self._s[1678]! }
+ public var Conversation_ContextMenuCopyLink: String { return self._s[1679]! }
+ public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1680]! }
+ public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1681]! }
+ public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1682]! }
public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1671]!, self._r[1671]!, [_0])
+ return formatWithArgumentRanges(self._s[1683]!, self._r[1683]!, [_0])
}
- public var Permissions_CellularDataTitle_v0: String { return self._s[1672]! }
- public var WallpaperSearch_ColorWhite: String { return self._s[1674]! }
- public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1675]! }
- public var Conversation_ErrorInaccessibleMessage: String { return self._s[1676]! }
- public var Map_OpenIn: String { return self._s[1677]! }
+ public var Permissions_CellularDataTitle_v0: String { return self._s[1684]! }
+ public var WallpaperSearch_ColorWhite: String { return self._s[1686]! }
+ public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1687]! }
+ public var Conversation_ErrorInaccessibleMessage: String { return self._s[1688]! }
+ public var Map_OpenIn: String { return self._s[1689]! }
public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1680]!, self._r[1680]!, [_1])
+ return formatWithArgumentRanges(self._s[1692]!, self._r[1692]!, [_1])
}
public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1681]!, self._r[1681]!, [_0])
+ return formatWithArgumentRanges(self._s[1693]!, self._r[1693]!, [_0])
}
- public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1682]! }
- public var MessagePoll_LabelClosed: String { return self._s[1683]! }
- public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1685]! }
- public var Wallet_Send_SendAnyway: String { return self._s[1686]! }
- public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1687]! }
- public var UserInfo_FirstNamePlaceholder: String { return self._s[1688]! }
- public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1689]! }
- public var Login_SelectCountry_Title: String { return self._s[1690]! }
- public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1691]! }
+ public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1694]! }
+ public var MessagePoll_LabelClosed: String { return self._s[1695]! }
+ public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1697]! }
+ public var Wallet_Send_SendAnyway: String { return self._s[1698]! }
+ public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1699]! }
+ public var UserInfo_FirstNamePlaceholder: String { return self._s[1700]! }
+ public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1701]! }
+ public var Login_SelectCountry_Title: String { return self._s[1702]! }
+ public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1703]! }
public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1692]!, self._r[1692]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1704]!, self._r[1704]!, [_1, _2])
}
- public var Channel_AdminLog_ChangeInfo: String { return self._s[1693]! }
- public var Watch_Suggestion_BRB: String { return self._s[1694]! }
- public var Passport_Identity_EditIdentityCard: String { return self._s[1695]! }
- public var Contacts_PermissionsTitle: String { return self._s[1696]! }
- public var Conversation_RestrictedInline: String { return self._s[1697]! }
- public var StickerPack_ViewPack: String { return self._s[1699]! }
- public var Wallet_UnknownError: String { return self._s[1700]! }
+ public var Channel_AdminLog_ChangeInfo: String { return self._s[1705]! }
+ public var Watch_Suggestion_BRB: String { return self._s[1706]! }
+ public var Passport_Identity_EditIdentityCard: String { return self._s[1707]! }
+ public var Contacts_PermissionsTitle: String { return self._s[1708]! }
+ public var Conversation_RestrictedInline: String { return self._s[1709]! }
+ public var StickerPack_ViewPack: String { return self._s[1711]! }
+ public var Wallet_UnknownError: String { return self._s[1712]! }
public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1701]!, self._r[1701]!, [_0])
+ return formatWithArgumentRanges(self._s[1713]!, self._r[1713]!, [_0])
}
- public var Compose_NewChannel: String { return self._s[1703]! }
- public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1706]! }
- public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1708]! }
- public var Channel_Info_Stickers: String { return self._s[1709]! }
- public var AutoNightTheme_PreferredTheme: String { return self._s[1710]! }
- public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1711]! }
- public var Passport_DeletePersonalDetails: String { return self._s[1712]! }
- public var LogoutOptions_AddAccountTitle: String { return self._s[1713]! }
- public var Channel_DiscussionGroupInfo: String { return self._s[1714]! }
- public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1715]! }
- public var Conversation_SearchNoResults: String { return self._s[1717]! }
- public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1718]! }
- public var MessagePoll_LabelAnonymous: String { return self._s[1719]! }
- public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1720]! }
- public var Login_Code: String { return self._s[1721]! }
- public var EditTheme_Create_BottomInfo: String { return self._s[1722]! }
- public var Watch_Suggestion_WhatsUp: String { return self._s[1723]! }
- public var Weekday_ShortThursday: String { return self._s[1724]! }
- public var Resolve_ErrorNotFound: String { return self._s[1726]! }
- public var LastSeen_Offline: String { return self._s[1727]! }
- public var PeopleNearby_NoMembers: String { return self._s[1728]! }
- public var GroupPermission_AddMembersNotAvailable: String { return self._s[1729]! }
- public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1730]! }
- public var GroupInfo_Title: String { return self._s[1732]! }
- public var NotificationsSound_Note: String { return self._s[1733]! }
- public var Conversation_EditingMessagePanelTitle: String { return self._s[1734]! }
- public var Watch_Message_Poll: String { return self._s[1735]! }
- public var Privacy_Calls: String { return self._s[1736]! }
+ public var Compose_NewChannel: String { return self._s[1715]! }
+ public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1718]! }
+ public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1720]! }
+ public var Channel_Info_Stickers: String { return self._s[1721]! }
+ public var AutoNightTheme_PreferredTheme: String { return self._s[1722]! }
+ public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1723]! }
+ public var Passport_DeletePersonalDetails: String { return self._s[1724]! }
+ public var LogoutOptions_AddAccountTitle: String { return self._s[1725]! }
+ public var Channel_DiscussionGroupInfo: String { return self._s[1726]! }
+ public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1727]! }
+ public var Conversation_SearchNoResults: String { return self._s[1729]! }
+ public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1730]! }
+ public var MessagePoll_LabelAnonymous: String { return self._s[1731]! }
+ public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1732]! }
+ public var Login_Code: String { return self._s[1733]! }
+ public var EditTheme_Create_BottomInfo: String { return self._s[1734]! }
+ public var Watch_Suggestion_WhatsUp: String { return self._s[1735]! }
+ public var Weekday_ShortThursday: String { return self._s[1736]! }
+ public var Resolve_ErrorNotFound: String { return self._s[1738]! }
+ public var LastSeen_Offline: String { return self._s[1739]! }
+ public var PeopleNearby_NoMembers: String { return self._s[1740]! }
+ public var GroupPermission_AddMembersNotAvailable: String { return self._s[1741]! }
+ public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1742]! }
+ public var GroupInfo_Title: String { return self._s[1744]! }
+ public var NotificationsSound_Note: String { return self._s[1745]! }
+ public var Conversation_EditingMessagePanelTitle: String { return self._s[1746]! }
+ public var Watch_Message_Poll: String { return self._s[1747]! }
+ public var Privacy_Calls: String { return self._s[1748]! }
public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1737]!, self._r[1737]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1749]!, self._r[1749]!, [_1, _2, _3])
}
- public var Month_ShortAugust: String { return self._s[1738]! }
- public var TwoStepAuth_SetPasswordHelp: String { return self._s[1739]! }
- public var Notifications_Reset: String { return self._s[1740]! }
- public var Conversation_Pin: String { return self._s[1741]! }
- public var Passport_Language_lv: String { return self._s[1742]! }
- public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1743]! }
- public var BlockedUsers_Info: String { return self._s[1744]! }
- public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1746]! }
- public var Watch_Conversation_Unblock: String { return self._s[1748]! }
+ public var Month_ShortAugust: String { return self._s[1750]! }
+ public var TwoStepAuth_SetPasswordHelp: String { return self._s[1751]! }
+ public var Notifications_Reset: String { return self._s[1752]! }
+ public var Conversation_Pin: String { return self._s[1753]! }
+ public var Passport_Language_lv: String { return self._s[1754]! }
+ public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1755]! }
+ public var BlockedUsers_Info: String { return self._s[1756]! }
+ public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1758]! }
+ public var Watch_Conversation_Unblock: String { return self._s[1760]! }
public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1749]!, self._r[1749]!, [_0])
+ return formatWithArgumentRanges(self._s[1761]!, self._r[1761]!, [_0])
}
- public var CloudStorage_Title: String { return self._s[1750]! }
- public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1751]! }
+ public var CloudStorage_Title: String { return self._s[1762]! }
+ public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1763]! }
public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1752]!, self._r[1752]!, [_0])
+ return formatWithArgumentRanges(self._s[1764]!, self._r[1764]!, [_0])
}
- public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1753]! }
- public var Watch_Suggestion_OnMyWay: String { return self._s[1754]! }
- public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1755]! }
- public var Passport_Address_EditBankStatement: String { return self._s[1756]! }
+ public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1765]! }
+ public var Watch_Suggestion_OnMyWay: String { return self._s[1766]! }
+ public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1767]! }
+ public var Passport_Address_EditBankStatement: String { return self._s[1768]! }
public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1757]!, self._r[1757]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1769]!, self._r[1769]!, [_1, _2])
}
- public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1758]! }
- public var ShareMenu_Comment: String { return self._s[1759]! }
- public var Permissions_ContactsTitle_v0: String { return self._s[1760]! }
- public var Notifications_PermissionsTitle: String { return self._s[1761]! }
- public var GroupPermission_NoSendLinks: String { return self._s[1762]! }
- public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1763]! }
- public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1764]! }
- public var Settings_Support: String { return self._s[1765]! }
- public var Notifications_ChannelNotificationsSound: String { return self._s[1766]! }
- public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1767]! }
- public var Privacy_Forwards_Preview: String { return self._s[1768]! }
- public var GroupPermission_ApplyAlertAction: String { return self._s[1769]! }
- public var Watch_Stickers_StickerPacks: String { return self._s[1770]! }
- public var Common_Select: String { return self._s[1772]! }
- public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1773]! }
- public var WallpaperSearch_ColorGray: String { return self._s[1776]! }
- public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1777]! }
- public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1778]! }
- public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1779]! }
- public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1780]! }
- public var Appearance_PreviewReplyAuthor: String { return self._s[1781]! }
- public var TwoStepAuth_RecoveryTitle: String { return self._s[1782]! }
- public var Widget_AuthRequired: String { return self._s[1783]! }
- public var Camera_FlashOn: String { return self._s[1784]! }
- public var Conversation_ContextMenuLookUp: String { return self._s[1785]! }
- public var Channel_Stickers_NotFoundHelp: String { return self._s[1786]! }
- public var Watch_Suggestion_OK: String { return self._s[1787]! }
+ public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1770]! }
+ public var ShareMenu_Comment: String { return self._s[1771]! }
+ public var Permissions_ContactsTitle_v0: String { return self._s[1772]! }
+ public var Notifications_PermissionsTitle: String { return self._s[1773]! }
+ public var GroupPermission_NoSendLinks: String { return self._s[1774]! }
+ public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1775]! }
+ public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1776]! }
+ public var Settings_Support: String { return self._s[1777]! }
+ public var Notifications_ChannelNotificationsSound: String { return self._s[1778]! }
+ public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1779]! }
+ public var Privacy_Forwards_Preview: String { return self._s[1780]! }
+ public var GroupPermission_ApplyAlertAction: String { return self._s[1781]! }
+ public var Watch_Stickers_StickerPacks: String { return self._s[1782]! }
+ public var Common_Select: String { return self._s[1784]! }
+ public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1785]! }
+ public var WallpaperSearch_ColorGray: String { return self._s[1788]! }
+ public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1789]! }
+ public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1790]! }
+ public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1791]! }
+ public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1792]! }
+ public var Appearance_PreviewReplyAuthor: String { return self._s[1793]! }
+ public var TwoStepAuth_RecoveryTitle: String { return self._s[1794]! }
+ public var Widget_AuthRequired: String { return self._s[1795]! }
+ public var Camera_FlashOn: String { return self._s[1796]! }
+ public var Conversation_ContextMenuLookUp: String { return self._s[1797]! }
+ public var Channel_Stickers_NotFoundHelp: String { return self._s[1798]! }
+ public var Watch_Suggestion_OK: String { return self._s[1799]! }
public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1789]!, self._r[1789]!, [_0])
+ return formatWithArgumentRanges(self._s[1801]!, self._r[1801]!, [_0])
}
public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1791]!, self._r[1791]!, [_0])
+ return formatWithArgumentRanges(self._s[1803]!, self._r[1803]!, [_0])
}
- public var TextFormat_Strikethrough: String { return self._s[1792]! }
- public var DialogList_AdLabel: String { return self._s[1793]! }
- public var WatchRemote_NotificationText: String { return self._s[1794]! }
- public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1795]! }
- public var Conversation_ReportSpam: String { return self._s[1796]! }
- public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1797]! }
- public var Settings_LogoutConfirmationTitle: String { return self._s[1799]! }
- public var PhoneLabel_Title: String { return self._s[1800]! }
- public var Passport_Address_EditRentalAgreement: String { return self._s[1801]! }
- public var Settings_ChangePhoneNumber: String { return self._s[1802]! }
- public var Notifications_ExceptionsTitle: String { return self._s[1803]! }
- public var Notifications_AlertTones: String { return self._s[1804]! }
- public var Call_ReportIncludeLogDescription: String { return self._s[1805]! }
- public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1806]! }
- public var AutoDownloadSettings_PrivateChats: String { return self._s[1807]! }
- public var VoiceOver_Chat_Photo: String { return self._s[1809]! }
- public var TwoStepAuth_AddHintTitle: String { return self._s[1810]! }
- public var ReportPeer_ReasonOther: String { return self._s[1811]! }
- public var ChatList_Context_JoinChannel: String { return self._s[1812]! }
- public var KeyCommand_ScrollDown: String { return self._s[1814]! }
- public var Conversation_ScheduleMessage_Title: String { return self._s[1815]! }
+ public var TextFormat_Strikethrough: String { return self._s[1804]! }
+ public var DialogList_AdLabel: String { return self._s[1805]! }
+ public var WatchRemote_NotificationText: String { return self._s[1806]! }
+ public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1807]! }
+ public var Conversation_ReportSpam: String { return self._s[1808]! }
+ public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1809]! }
+ public var Settings_LogoutConfirmationTitle: String { return self._s[1811]! }
+ public var PhoneLabel_Title: String { return self._s[1812]! }
+ public var Passport_Address_EditRentalAgreement: String { return self._s[1813]! }
+ public var Settings_ChangePhoneNumber: String { return self._s[1814]! }
+ public var Notifications_ExceptionsTitle: String { return self._s[1815]! }
+ public var Notifications_AlertTones: String { return self._s[1816]! }
+ public var Call_ReportIncludeLogDescription: String { return self._s[1817]! }
+ public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1818]! }
+ public var AutoDownloadSettings_PrivateChats: String { return self._s[1819]! }
+ public var VoiceOver_Chat_Photo: String { return self._s[1821]! }
+ public var TwoStepAuth_AddHintTitle: String { return self._s[1822]! }
+ public var ReportPeer_ReasonOther: String { return self._s[1823]! }
+ public var ChatList_Context_JoinChannel: String { return self._s[1824]! }
+ public var KeyCommand_ScrollDown: String { return self._s[1826]! }
+ public var Conversation_ScheduleMessage_Title: String { return self._s[1827]! }
public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1816]!, self._r[1816]!, [_0])
+ return formatWithArgumentRanges(self._s[1828]!, self._r[1828]!, [_0])
}
- public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1817]! }
- public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1818]! }
- public var AuthSessions_LogOut: String { return self._s[1819]! }
- public var Passport_Identity_TypeInternalPassport: String { return self._s[1820]! }
- public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1821]! }
- public var Passport_Phone_Title: String { return self._s[1822]! }
- public var ContactList_Context_StartSecretChat: String { return self._s[1823]! }
- public var Settings_PhoneNumber: String { return self._s[1824]! }
+ public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1829]! }
+ public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1830]! }
+ public var AuthSessions_LogOut: String { return self._s[1831]! }
+ public var Passport_Identity_TypeInternalPassport: String { return self._s[1832]! }
+ public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1833]! }
+ public var Passport_Phone_Title: String { return self._s[1834]! }
+ public var ContactList_Context_StartSecretChat: String { return self._s[1835]! }
+ public var Settings_PhoneNumber: String { return self._s[1836]! }
public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1825]!, self._r[1825]!, [_0])
+ return formatWithArgumentRanges(self._s[1837]!, self._r[1837]!, [_0])
}
- public var NotificationsSound_Alert: String { return self._s[1826]! }
- public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1827]! }
- public var WebSearch_SearchNoResults: String { return self._s[1828]! }
- public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1830]! }
- public var Wallet_Configuration_SourceInfo: String { return self._s[1831]! }
- public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1832]! }
- public var SettingsSearch_Synonyms_Passport: String { return self._s[1833]! }
- public var PhotoEditor_CurvesTool: String { return self._s[1834]! }
- public var Checkout_PaymentMethod: String { return self._s[1836]! }
+ public var NotificationsSound_Alert: String { return self._s[1838]! }
+ public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1839]! }
+ public var WebSearch_SearchNoResults: String { return self._s[1840]! }
+ public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1842]! }
+ public var Wallet_Configuration_SourceInfo: String { return self._s[1843]! }
+ public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1844]! }
+ public var SettingsSearch_Synonyms_Passport: String { return self._s[1845]! }
+ public var PhotoEditor_CurvesTool: String { return self._s[1846]! }
+ public var Checkout_PaymentMethod: String { return self._s[1848]! }
public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1837]!, self._r[1837]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1849]!, self._r[1849]!, [_1, _2])
}
- public var Contacts_AccessDeniedError: String { return self._s[1838]! }
- public var Camera_PhotoMode: String { return self._s[1841]! }
- public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1842]! }
- public var Passport_Address_AddUtilityBill: String { return self._s[1844]! }
- public var CallSettings_OnMobile: String { return self._s[1845]! }
- public var Tour_Text2: String { return self._s[1846]! }
+ public var Contacts_AccessDeniedError: String { return self._s[1850]! }
+ public var Camera_PhotoMode: String { return self._s[1853]! }
+ public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1854]! }
+ public var Passport_Address_AddUtilityBill: String { return self._s[1856]! }
+ public var CallSettings_OnMobile: String { return self._s[1857]! }
+ public var Tour_Text2: String { return self._s[1858]! }
public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1847]!, self._r[1847]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1859]!, self._r[1859]!, [_1, _2])
}
- public var DialogList_EncryptionProcessing: String { return self._s[1849]! }
- public var Permissions_Skip: String { return self._s[1850]! }
- public var Wallet_Words_NotDoneOk: String { return self._s[1851]! }
- public var SecretImage_Title: String { return self._s[1852]! }
- public var Watch_MessageView_Title: String { return self._s[1853]! }
- public var Channel_DiscussionGroupAdd: String { return self._s[1854]! }
- public var AttachmentMenu_Poll: String { return self._s[1855]! }
+ public var DialogList_EncryptionProcessing: String { return self._s[1861]! }
+ public var Permissions_Skip: String { return self._s[1862]! }
+ public var Wallet_Words_NotDoneOk: String { return self._s[1863]! }
+ public var SecretImage_Title: String { return self._s[1864]! }
+ public var Watch_MessageView_Title: String { return self._s[1865]! }
+ public var Channel_DiscussionGroupAdd: String { return self._s[1866]! }
+ public var AttachmentMenu_Poll: String { return self._s[1867]! }
public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1856]!, self._r[1856]!, [_0])
+ return formatWithArgumentRanges(self._s[1868]!, self._r[1868]!, [_0])
}
public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1857]!, self._r[1857]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1869]!, self._r[1869]!, [_1, _2])
}
- public var Notification_CallCanceled: String { return self._s[1858]! }
- public var WallpaperPreview_Title: String { return self._s[1859]! }
- public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1860]! }
- public var Settings_ProxyConnecting: String { return self._s[1861]! }
- public var Settings_CheckPhoneNumberText: String { return self._s[1863]! }
- public var VoiceOver_Chat_YourVideo: String { return self._s[1864]! }
- public var Wallet_Intro_Title: String { return self._s[1865]! }
- public var TwoFactorSetup_Password_Action: String { return self._s[1866]! }
- public var Profile_MessageLifetime5s: String { return self._s[1867]! }
- public var Username_InvalidCharacters: String { return self._s[1868]! }
- public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1869]! }
- public var ScheduledMessages_ClearAll: String { return self._s[1870]! }
- public var WallpaperPreview_CropBottomText: String { return self._s[1871]! }
- public var AutoDownloadSettings_LimitBySize: String { return self._s[1872]! }
- public var Settings_AddAccount: String { return self._s[1873]! }
- public var Notification_CreatedChannel: String { return self._s[1876]! }
+ public var Notification_CallCanceled: String { return self._s[1870]! }
+ public var WallpaperPreview_Title: String { return self._s[1871]! }
+ public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1872]! }
+ public var Settings_ProxyConnecting: String { return self._s[1873]! }
+ public var Settings_CheckPhoneNumberText: String { return self._s[1875]! }
+ public var VoiceOver_Chat_YourVideo: String { return self._s[1876]! }
+ public var Wallet_Intro_Title: String { return self._s[1877]! }
+ public var TwoFactorSetup_Password_Action: String { return self._s[1878]! }
+ public var Profile_MessageLifetime5s: String { return self._s[1879]! }
+ public var Username_InvalidCharacters: String { return self._s[1880]! }
+ public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1881]! }
+ public var ScheduledMessages_ClearAll: String { return self._s[1882]! }
+ public var WallpaperPreview_CropBottomText: String { return self._s[1883]! }
+ public var AutoDownloadSettings_LimitBySize: String { return self._s[1884]! }
+ public var Settings_AddAccount: String { return self._s[1885]! }
+ public var Notification_CreatedChannel: String { return self._s[1888]! }
public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1877]!, self._r[1877]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[1889]!, self._r[1889]!, [_1, _2, _3])
}
- public var Passcode_AppLockedAlert: String { return self._s[1879]! }
- public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1880]! }
- public var VoiceOver_Media_PlaybackStop: String { return self._s[1881]! }
- public var Contacts_TopSection: String { return self._s[1882]! }
- public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1883]! }
+ public var Passcode_AppLockedAlert: String { return self._s[1891]! }
+ public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1892]! }
+ public var VoiceOver_Media_PlaybackStop: String { return self._s[1893]! }
+ public var Contacts_TopSection: String { return self._s[1894]! }
+ public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1895]! }
public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1884]!, self._r[1884]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[1896]!, self._r[1896]!, [_0, _1])
}
- public var Wallet_Info_Receive: String { return self._s[1885]! }
- public var Wallet_Completed_ViewWallet: String { return self._s[1886]! }
+ public var Wallet_Info_Receive: String { return self._s[1897]! }
+ public var Wallet_Completed_ViewWallet: String { return self._s[1898]! }
public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1887]!, self._r[1887]!, [_0])
+ return formatWithArgumentRanges(self._s[1899]!, self._r[1899]!, [_0])
}
- public var ReportPeer_ReasonSpam: String { return self._s[1888]! }
- public var UserInfo_TapToCall: String { return self._s[1889]! }
- public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1891]! }
- public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1892]! }
- public var Common_Search: String { return self._s[1893]! }
- public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1894]! }
+ public var ReportPeer_ReasonSpam: String { return self._s[1900]! }
+ public var UserInfo_TapToCall: String { return self._s[1901]! }
+ public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1903]! }
+ public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1904]! }
+ public var Common_Search: String { return self._s[1905]! }
+ public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1906]! }
public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1895]!, self._r[1895]!, [_0])
+ return formatWithArgumentRanges(self._s[1907]!, self._r[1907]!, [_0])
}
- public var Wallet_Month_ShortJuly: String { return self._s[1896]! }
- public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1897]! }
- public var Message_InvoiceLabel: String { return self._s[1898]! }
- public var Conversation_InputTextPlaceholder: String { return self._s[1899]! }
- public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1900]! }
+ public var Wallet_Month_ShortJuly: String { return self._s[1908]! }
+ public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1910]! }
+ public var Message_InvoiceLabel: String { return self._s[1911]! }
+ public var Conversation_InputTextPlaceholder: String { return self._s[1912]! }
+ public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1913]! }
public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_0])
+ return formatWithArgumentRanges(self._s[1914]!, self._r[1914]!, [_0])
}
- public var Conversation_Info: String { return self._s[1902]! }
- public var Login_InfoDeletePhoto: String { return self._s[1903]! }
- public var Passport_Language_vi: String { return self._s[1905]! }
- public var UserInfo_ScamUserWarning: String { return self._s[1906]! }
- public var Conversation_Search: String { return self._s[1907]! }
- public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1909]! }
- public var ReportPeer_ReasonPornography: String { return self._s[1910]! }
- public var AutoDownloadSettings_PhotosTitle: String { return self._s[1911]! }
- public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1912]! }
- public var Map_LiveLocationGroupDescription: String { return self._s[1913]! }
- public var Channel_Setup_TypeHeader: String { return self._s[1914]! }
- public var AuthSessions_LoggedIn: String { return self._s[1915]! }
- public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1916]! }
- public var Login_SmsRequestState3: String { return self._s[1917]! }
- public var Passport_Address_EditUtilityBill: String { return self._s[1918]! }
- public var Appearance_ReduceMotionInfo: String { return self._s[1919]! }
- public var Join_ChannelsTooMuch: String { return self._s[1920]! }
- public var Channel_Edit_LinkItem: String { return self._s[1921]! }
- public var Privacy_Calls_P2PNever: String { return self._s[1922]! }
- public var Conversation_AddToReadingList: String { return self._s[1924]! }
- public var Share_MultipleMessagesDisabled: String { return self._s[1925]! }
- public var Message_Animation: String { return self._s[1926]! }
- public var Conversation_DefaultRestrictedMedia: String { return self._s[1927]! }
- public var Map_Unknown: String { return self._s[1928]! }
- public var AutoDownloadSettings_LastDelimeter: String { return self._s[1929]! }
+ public var Conversation_Info: String { return self._s[1915]! }
+ public var Login_InfoDeletePhoto: String { return self._s[1916]! }
+ public var Passport_Language_vi: String { return self._s[1918]! }
+ public var UserInfo_ScamUserWarning: String { return self._s[1919]! }
+ public var Conversation_Search: String { return self._s[1920]! }
+ public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1922]! }
+ public var ReportPeer_ReasonPornography: String { return self._s[1923]! }
+ public var AutoDownloadSettings_PhotosTitle: String { return self._s[1924]! }
+ public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1925]! }
+ public var Map_LiveLocationGroupDescription: String { return self._s[1926]! }
+ public var Channel_Setup_TypeHeader: String { return self._s[1927]! }
+ public var AuthSessions_LoggedIn: String { return self._s[1928]! }
+ public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1929]! }
+ public var Login_SmsRequestState3: String { return self._s[1930]! }
+ public var Passport_Address_EditUtilityBill: String { return self._s[1931]! }
+ public var Appearance_ReduceMotionInfo: String { return self._s[1932]! }
+ public var Join_ChannelsTooMuch: String { return self._s[1933]! }
+ public var Channel_Edit_LinkItem: String { return self._s[1934]! }
+ public var Privacy_Calls_P2PNever: String { return self._s[1935]! }
+ public var Conversation_AddToReadingList: String { return self._s[1937]! }
+ public var Share_MultipleMessagesDisabled: String { return self._s[1938]! }
+ public var Message_Animation: String { return self._s[1939]! }
+ public var Conversation_DefaultRestrictedMedia: String { return self._s[1940]! }
+ public var Map_Unknown: String { return self._s[1941]! }
+ public var AutoDownloadSettings_LastDelimeter: String { return self._s[1942]! }
public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1930]!, self._r[1930]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1943]!, self._r[1943]!, [_1, _2])
}
public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1931]!, self._r[1931]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1944]!, self._r[1944]!, [_1, _2])
}
- public var Call_StatusRequesting: String { return self._s[1932]! }
- public var Conversation_SecretChatContextBotAlert: String { return self._s[1933]! }
- public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1934]! }
+ public var Call_StatusRequesting: String { return self._s[1945]! }
+ public var Conversation_SecretChatContextBotAlert: String { return self._s[1946]! }
+ public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1947]! }
public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1935]!, self._r[1935]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[1948]!, self._r[1948]!, [_1, _2])
}
public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1936]!, self._r[1936]!, [_0])
- }
- public var Update_Skip: String { return self._s[1937]! }
- public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1938]! }
- public var Message_PinnedPollMessage: String { return self._s[1939]! }
- public var BlockedUsers_Title: String { return self._s[1940]! }
- public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1941]!, self._r[1941]!, [_1])
- }
- public var Username_CheckingUsername: String { return self._s[1942]! }
- public var NotificationsSound_Bell: String { return self._s[1943]! }
- public var Conversation_SendMessageErrorFlood: String { return self._s[1944]! }
- public var Weekday_Monday: String { return self._s[1945]! }
- public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1946]! }
- public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1947]! }
- public var ChatSettings_Groups: String { return self._s[1948]! }
- public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[1949]!, self._r[1949]!, [_0])
}
- public var Your_card_was_declined: String { return self._s[1950]! }
- public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1952]! }
- public var Wallet_Month_ShortApril: String { return self._s[1953]! }
- public var ChatList_Unmute: String { return self._s[1954]! }
- public var PhotoEditor_CurvesAll: String { return self._s[1955]! }
- public var Weekday_ShortTuesday: String { return self._s[1956]! }
- public var DialogList_Read: String { return self._s[1957]! }
- public var Appearance_AppIconClassic: String { return self._s[1958]! }
- public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1959]! }
- public var Passport_Identity_Gender: String { return self._s[1960]! }
+ public var Update_Skip: String { return self._s[1950]! }
+ public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1951]! }
+ public var Message_PinnedPollMessage: String { return self._s[1952]! }
+ public var BlockedUsers_Title: String { return self._s[1953]! }
+ public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1954]!, self._r[1954]!, [_1])
+ }
+ public var Username_CheckingUsername: String { return self._s[1955]! }
+ public var NotificationsSound_Bell: String { return self._s[1956]! }
+ public var Conversation_SendMessageErrorFlood: String { return self._s[1957]! }
+ public var Weekday_Monday: String { return self._s[1958]! }
+ public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1959]! }
+ public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1960]! }
+ public var ChatSettings_Groups: String { return self._s[1961]! }
+ public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[1962]!, self._r[1962]!, [_0])
+ }
+ public var Your_card_was_declined: String { return self._s[1963]! }
+ public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1965]! }
+ public var Wallet_Month_ShortApril: String { return self._s[1966]! }
+ public var ChatList_Unmute: String { return self._s[1967]! }
+ public var PhotoEditor_CurvesAll: String { return self._s[1968]! }
+ public var Weekday_ShortTuesday: String { return self._s[1969]! }
+ public var DialogList_Read: String { return self._s[1970]! }
+ public var Appearance_AppIconClassic: String { return self._s[1971]! }
+ public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1972]! }
+ public var Passport_Identity_Gender: String { return self._s[1973]! }
public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1961]!, self._r[1961]!, [_0])
+ return formatWithArgumentRanges(self._s[1974]!, self._r[1974]!, [_0])
}
- public var Target_SelectGroup: String { return self._s[1962]! }
+ public var Target_SelectGroup: String { return self._s[1975]! }
public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1964]!, self._r[1964]!, [_0])
+ return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_0])
}
- public var Passport_Language_en: String { return self._s[1965]! }
- public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1966]! }
- public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1967]! }
- public var Login_CancelPhoneVerificationContinue: String { return self._s[1968]! }
- public var ScheduledMessages_SendNow: String { return self._s[1969]! }
- public var Checkout_NewCard_PaymentCard: String { return self._s[1971]! }
- public var Login_InfoHelp: String { return self._s[1972]! }
- public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1973]! }
- public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1974]! }
+ public var Passport_Language_en: String { return self._s[1978]! }
+ public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1979]! }
+ public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1980]! }
+ public var Login_CancelPhoneVerificationContinue: String { return self._s[1981]! }
+ public var ScheduledMessages_SendNow: String { return self._s[1982]! }
+ public var Checkout_NewCard_PaymentCard: String { return self._s[1984]! }
+ public var Login_InfoHelp: String { return self._s[1985]! }
+ public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1986]! }
+ public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1987]! }
public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1975]!, self._r[1975]!, [_1, _2])
- }
- public var SocksProxySetup_AddProxy: String { return self._s[1978]! }
- public var CreatePoll_Title: String { return self._s[1979]! }
- public var Conversation_ViewTheme: String { return self._s[1980]! }
- public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1981]! }
- public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1982]! }
- public var TwoFactorSetup_Intro_Text: String { return self._s[1983]! }
- public var UserInfo_GroupsInCommon: String { return self._s[1984]! }
- public var TelegramWallet_Intro_TermsUrl: String { return self._s[1985]! }
- public var Call_AudioRouteHide: String { return self._s[1986]! }
- public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[1988]!, self._r[1988]!, [_1, _2])
}
- public var ContactInfo_PhoneLabelMobile: String { return self._s[1989]! }
+ public var SocksProxySetup_AddProxy: String { return self._s[1991]! }
+ public var CreatePoll_Title: String { return self._s[1992]! }
+ public var Conversation_ViewTheme: String { return self._s[1993]! }
+ public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1994]! }
+ public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1995]! }
+ public var TwoFactorSetup_Intro_Text: String { return self._s[1996]! }
+ public var UserInfo_GroupsInCommon: String { return self._s[1997]! }
+ public var TelegramWallet_Intro_TermsUrl: String { return self._s[1998]! }
+ public var Call_AudioRouteHide: String { return self._s[1999]! }
+ public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2001]!, self._r[2001]!, [_1, _2])
+ }
+ public var ContactInfo_PhoneLabelMobile: String { return self._s[2002]! }
public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1990]!, self._r[1990]!, [_0])
+ return formatWithArgumentRanges(self._s[2003]!, self._r[2003]!, [_0])
}
- public var TextFormat_Bold: String { return self._s[1991]! }
- public var FastTwoStepSetup_EmailSection: String { return self._s[1992]! }
- public var Notifications_Title: String { return self._s[1993]! }
- public var Group_Username_InvalidTooShort: String { return self._s[1994]! }
- public var Channel_ErrorAddTooMuch: String { return self._s[1995]! }
+ public var TextFormat_Bold: String { return self._s[2004]! }
+ public var FastTwoStepSetup_EmailSection: String { return self._s[2005]! }
+ public var Notifications_Title: String { return self._s[2006]! }
+ public var Group_Username_InvalidTooShort: String { return self._s[2007]! }
+ public var Channel_ErrorAddTooMuch: String { return self._s[2008]! }
public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[1996]!, self._r[1996]!, ["\(_0)"])
+ return formatWithArgumentRanges(self._s[2009]!, self._r[2009]!, ["\(_0)"])
}
- public var VoiceOver_DiscardPreparedContent: String { return self._s[1998]! }
- public var Stickers_SuggestAdded: String { return self._s[1999]! }
- public var Login_CountryCode: String { return self._s[2000]! }
- public var ChatSettings_AutoPlayVideos: String { return self._s[2001]! }
- public var Map_GetDirections: String { return self._s[2002]! }
- public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2003]! }
- public var Login_PhoneFloodError: String { return self._s[2004]! }
+ public var VoiceOver_DiscardPreparedContent: String { return self._s[2011]! }
+ public var Stickers_SuggestAdded: String { return self._s[2012]! }
+ public var Login_CountryCode: String { return self._s[2013]! }
+ public var ChatSettings_AutoPlayVideos: String { return self._s[2014]! }
+ public var Map_GetDirections: String { return self._s[2015]! }
+ public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2016]! }
+ public var Login_PhoneFloodError: String { return self._s[2017]! }
public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2005]!, self._r[2005]!, [_0])
+ return formatWithArgumentRanges(self._s[2018]!, self._r[2018]!, [_0])
}
public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2006]!, self._r[2006]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2019]!, self._r[2019]!, [_1, _2, _3])
}
- public var Settings_SetUsername: String { return self._s[2008]! }
- public var Group_Location_ChangeLocation: String { return self._s[2009]! }
- public var Notification_GroupInviterSelf: String { return self._s[2010]! }
- public var InstantPage_TapToOpenLink: String { return self._s[2011]! }
+ public var Settings_SetUsername: String { return self._s[2021]! }
+ public var Group_Location_ChangeLocation: String { return self._s[2022]! }
+ public var Notification_GroupInviterSelf: String { return self._s[2023]! }
+ public var InstantPage_TapToOpenLink: String { return self._s[2024]! }
public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2012]!, self._r[2012]!, [_0])
+ return formatWithArgumentRanges(self._s[2025]!, self._r[2025]!, [_0])
}
- public var Watch_Suggestion_TalkLater: String { return self._s[2013]! }
- public var SecretChat_Title: String { return self._s[2014]! }
- public var Group_UpgradeNoticeText1: String { return self._s[2015]! }
- public var AuthSessions_Title: String { return self._s[2016]! }
+ public var Watch_Suggestion_TalkLater: String { return self._s[2026]! }
+ public var SecretChat_Title: String { return self._s[2027]! }
+ public var Group_UpgradeNoticeText1: String { return self._s[2028]! }
+ public var AuthSessions_Title: String { return self._s[2029]! }
public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2017]!, self._r[2017]!, [_0])
- }
- public var PhotoEditor_CropAuto: String { return self._s[2018]! }
- public var Channel_About_Title: String { return self._s[2019]! }
- public var FastTwoStepSetup_EmailHelp: String { return self._s[2020]! }
- public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2022]!, self._r[2022]!, ["\(_0)"])
- }
- public var VoiceOver_MessageContextReport: String { return self._s[2023]! }
- public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2025]! }
- public var Group_Setup_HistoryVisibleHelp: String { return self._s[2026]! }
- public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2027]!, self._r[2027]!, [_1])
- }
- public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2029]!, self._r[2029]!, [_0])
- }
- public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[2030]!, self._r[2030]!, [_0])
}
- public var Privacy_PaymentsClearInfoHelp: String { return self._s[2031]! }
- public var Presence_online: String { return self._s[2034]! }
- public var PasscodeSettings_Title: String { return self._s[2035]! }
- public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2036]! }
- public var Web_OpenExternal: String { return self._s[2037]! }
- public var AutoDownloadSettings_AutoDownload: String { return self._s[2039]! }
- public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2040]! }
- public var LocalGroup_Title: String { return self._s[2041]! }
- public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
+ public var PhotoEditor_CropAuto: String { return self._s[2031]! }
+ public var Channel_About_Title: String { return self._s[2032]! }
+ public var FastTwoStepSetup_EmailHelp: String { return self._s[2033]! }
+ public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2035]!, self._r[2035]!, ["\(_0)"])
+ }
+ public var VoiceOver_MessageContextReport: String { return self._s[2036]! }
+ public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2038]! }
+ public var Group_Setup_HistoryVisibleHelp: String { return self._s[2039]! }
+ public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2040]!, self._r[2040]!, [_1])
+ }
+ public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[2042]!, self._r[2042]!, [_0])
}
- public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2043]! }
- public var Map_YouAreHere: String { return self._s[2044]! }
+ public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2043]!, self._r[2043]!, [_0])
+ }
+ public var Privacy_PaymentsClearInfoHelp: String { return self._s[2044]! }
+ public var Presence_online: String { return self._s[2047]! }
+ public var PasscodeSettings_Title: String { return self._s[2048]! }
+ public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2049]! }
+ public var Web_OpenExternal: String { return self._s[2050]! }
+ public var AutoDownloadSettings_AutoDownload: String { return self._s[2052]! }
+ public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2053]! }
+ public var LocalGroup_Title: String { return self._s[2054]! }
+ public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2055]!, self._r[2055]!, [_0])
+ }
+ public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2056]! }
+ public var Map_YouAreHere: String { return self._s[2057]! }
public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2045]!, self._r[2045]!, [_0])
+ return formatWithArgumentRanges(self._s[2058]!, self._r[2058]!, [_0])
}
public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2046]!, self._r[2046]!, [_0])
+ return formatWithArgumentRanges(self._s[2059]!, self._r[2059]!, [_0])
}
- public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2047]! }
- public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2048]! }
+ public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2060]! }
+ public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2061]! }
public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2049]!, self._r[2049]!, [_0])
+ return formatWithArgumentRanges(self._s[2062]!, self._r[2062]!, [_0])
}
public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2050]!, self._r[2050]!, [_0])
+ return formatWithArgumentRanges(self._s[2063]!, self._r[2063]!, [_0])
}
- public var SocksProxySetup_Username: String { return self._s[2051]! }
- public var Bot_Start: String { return self._s[2052]! }
+ public var SocksProxySetup_Username: String { return self._s[2064]! }
+ public var Bot_Start: String { return self._s[2065]! }
public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2053]!, self._r[2053]!, [_0])
+ return formatWithArgumentRanges(self._s[2066]!, self._r[2066]!, [_0])
}
public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2054]!, self._r[2054]!, [_0])
+ return formatWithArgumentRanges(self._s[2067]!, self._r[2067]!, [_0])
}
- public var Contacts_SortByPresence: String { return self._s[2055]! }
- public var AccentColor_Title: String { return self._s[2057]! }
- public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2058]! }
+ public var Contacts_SortByPresence: String { return self._s[2068]! }
+ public var AccentColor_Title: String { return self._s[2070]! }
+ public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2071]! }
public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2059]!, self._r[2059]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2072]!, self._r[2072]!, [_1, _2])
}
public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2060]!, self._r[2060]!, [_0])
+ return formatWithArgumentRanges(self._s[2073]!, self._r[2073]!, [_0])
}
public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2061]!, self._r[2061]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2074]!, self._r[2074]!, [_1, _2])
}
- public var Passport_Email_EnterOtherEmail: String { return self._s[2062]! }
- public var Login_InfoAvatarPhoto: String { return self._s[2063]! }
- public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2064]! }
- public var Tour_Title4: String { return self._s[2065]! }
- public var Passport_Identity_Translation: String { return self._s[2066]! }
- public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2067]! }
- public var Login_TermsOfServiceLabel: String { return self._s[2069]! }
- public var Passport_Language_it: String { return self._s[2070]! }
- public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2071]! }
- public var Passport_Identity_SelfieHelp: String { return self._s[2072]! }
- public var Conversation_ClearAll: String { return self._s[2074]! }
- public var Wallet_Send_UninitializedText: String { return self._s[2076]! }
- public var Channel_OwnershipTransfer_Title: String { return self._s[2077]! }
- public var TwoStepAuth_FloodError: String { return self._s[2078]! }
+ public var Passport_Email_EnterOtherEmail: String { return self._s[2075]! }
+ public var Login_InfoAvatarPhoto: String { return self._s[2076]! }
+ public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2077]! }
+ public var Tour_Title4: String { return self._s[2078]! }
+ public var Passport_Identity_Translation: String { return self._s[2079]! }
+ public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2080]! }
+ public var Login_TermsOfServiceLabel: String { return self._s[2082]! }
+ public var Passport_Language_it: String { return self._s[2083]! }
+ public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2084]! }
+ public var Passport_Identity_SelfieHelp: String { return self._s[2085]! }
+ public var Conversation_ClearAll: String { return self._s[2087]! }
+ public var Wallet_Send_UninitializedText: String { return self._s[2089]! }
+ public var Channel_OwnershipTransfer_Title: String { return self._s[2090]! }
+ public var TwoStepAuth_FloodError: String { return self._s[2091]! }
public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_1])
+ return formatWithArgumentRanges(self._s[2092]!, self._r[2092]!, [_1])
}
- public var Paint_Delete: String { return self._s[2080]! }
+ public var Paint_Delete: String { return self._s[2093]! }
public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2081]!, self._r[2081]!, [_0])
+ return formatWithArgumentRanges(self._s[2094]!, self._r[2094]!, [_0])
}
- public var Privacy_AddNewPeer: String { return self._s[2082]! }
+ public var Privacy_AddNewPeer: String { return self._s[2095]! }
public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2083]!, self._r[2083]!, [_1])
+ return formatWithArgumentRanges(self._s[2096]!, self._r[2096]!, [_1])
}
- public var LogoutOptions_SetPasscodeText: String { return self._s[2084]! }
+ public var LogoutOptions_SetPasscodeText: String { return self._s[2097]! }
public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2085]!, self._r[2085]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2098]!, self._r[2098]!, [_1, _2])
}
- public var Message_PinnedAudioMessage: String { return self._s[2086]! }
+ public var Message_PinnedAudioMessage: String { return self._s[2099]! }
public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2087]!, self._r[2087]!, [_0])
+ return formatWithArgumentRanges(self._s[2100]!, self._r[2100]!, [_0])
}
- public var Notification_Mute1hMin: String { return self._s[2088]! }
- public var Notifications_GroupNotificationsSound: String { return self._s[2089]! }
- public var Wallet_Month_GenNovember: String { return self._s[2090]! }
- public var SocksProxySetup_ShareProxyList: String { return self._s[2091]! }
- public var Conversation_MessageEditedLabel: String { return self._s[2092]! }
+ public var Notification_Mute1hMin: String { return self._s[2101]! }
+ public var Notifications_GroupNotificationsSound: String { return self._s[2102]! }
+ public var Wallet_Month_GenNovember: String { return self._s[2103]! }
+ public var SocksProxySetup_ShareProxyList: String { return self._s[2104]! }
+ public var Conversation_MessageEditedLabel: String { return self._s[2105]! }
public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2093]!, self._r[2093]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[2106]!, self._r[2106]!, [_0, _1])
}
- public var Notification_Exceptions_AlwaysOff: String { return self._s[2094]! }
- public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2095]! }
+ public var Notification_Exceptions_AlwaysOff: String { return self._s[2107]! }
+ public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2108]! }
public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2096]!, self._r[2096]!, [_0, _1, _2])
+ return formatWithArgumentRanges(self._s[2109]!, self._r[2109]!, [_0, _1, _2])
}
- public var NetworkUsageSettings_ResetStats: String { return self._s[2097]! }
+ public var NetworkUsageSettings_ResetStats: String { return self._s[2110]! }
public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2098]!, self._r[2098]!, [_1])
+ return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, [_1])
}
- public var AccessDenied_LocationTracking: String { return self._s[2099]! }
- public var Month_GenOctober: String { return self._s[2100]! }
- public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2101]! }
- public var EnterPasscode_EnterPasscode: String { return self._s[2102]! }
- public var MediaPicker_TimerTooltip: String { return self._s[2104]! }
- public var SharedMedia_TitleAll: String { return self._s[2105]! }
- public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2108]! }
- public var Conversation_RestrictedMedia: String { return self._s[2109]! }
- public var AccessDenied_PhotosRestricted: String { return self._s[2110]! }
- public var Privacy_Forwards_WhoCanForward: String { return self._s[2112]! }
- public var ChangePhoneNumberCode_Called: String { return self._s[2113]! }
+ public var AccessDenied_LocationTracking: String { return self._s[2112]! }
+ public var Month_GenOctober: String { return self._s[2113]! }
+ public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2114]! }
+ public var EnterPasscode_EnterPasscode: String { return self._s[2115]! }
+ public var MediaPicker_TimerTooltip: String { return self._s[2117]! }
+ public var SharedMedia_TitleAll: String { return self._s[2118]! }
+ public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2121]! }
+ public var Conversation_RestrictedMedia: String { return self._s[2122]! }
+ public var AccessDenied_PhotosRestricted: String { return self._s[2123]! }
+ public var Privacy_Forwards_WhoCanForward: String { return self._s[2125]! }
+ public var ChangePhoneNumberCode_Called: String { return self._s[2126]! }
public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2114]!, self._r[2114]!, [_0])
+ return formatWithArgumentRanges(self._s[2127]!, self._r[2127]!, [_0])
}
- public var Conversation_SavedMessages: String { return self._s[2117]! }
- public var Your_cards_expiration_month_is_invalid: String { return self._s[2119]! }
- public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2120]! }
+ public var Conversation_SavedMessages: String { return self._s[2130]! }
+ public var Your_cards_expiration_month_is_invalid: String { return self._s[2132]! }
+ public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2133]! }
public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2122]!, self._r[2122]!, [_0])
+ return formatWithArgumentRanges(self._s[2135]!, self._r[2135]!, [_0])
}
- public var VoiceOver_Chat_YourMessage: String { return self._s[2123]! }
+ public var VoiceOver_Chat_YourMessage: String { return self._s[2136]! }
public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2124]!, self._r[2124]!, [_0])
+ return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_0])
}
- public var ReportPeer_AlertSuccess: String { return self._s[2125]! }
- public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2126]! }
+ public var ReportPeer_AlertSuccess: String { return self._s[2138]! }
+ public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2139]! }
public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2127]!, self._r[2127]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2140]!, self._r[2140]!, [_1, _2])
}
- public var Checkout_PasswordEntry_Title: String { return self._s[2128]! }
- public var PhotoEditor_FadeTool: String { return self._s[2129]! }
- public var Privacy_ContactsReset: String { return self._s[2130]! }
+ public var Checkout_PasswordEntry_Title: String { return self._s[2141]! }
+ public var PhotoEditor_FadeTool: String { return self._s[2142]! }
+ public var Privacy_ContactsReset: String { return self._s[2143]! }
public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2132]!, self._r[2132]!, [_0])
+ return formatWithArgumentRanges(self._s[2145]!, self._r[2145]!, [_0])
}
- public var Message_PinnedVideoMessage: String { return self._s[2133]! }
- public var ChatList_Mute: String { return self._s[2134]! }
+ public var Message_PinnedVideoMessage: String { return self._s[2146]! }
+ public var ChatList_Mute: String { return self._s[2147]! }
public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2135]!, self._r[2135]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2148]!, self._r[2148]!, [_1, _2, _3])
}
- public var Permissions_CellularDataText_v0: String { return self._s[2136]! }
- public var ShareMenu_SelectChats: String { return self._s[2139]! }
- public var ChatList_Context_Unarchive: String { return self._s[2140]! }
- public var MusicPlayer_VoiceNote: String { return self._s[2141]! }
- public var Conversation_RestrictedText: String { return self._s[2142]! }
- public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2143]! }
- public var Wallet_Month_GenApril: String { return self._s[2144]! }
- public var Wallet_Month_ShortMarch: String { return self._s[2145]! }
- public var TwoStepAuth_DisableSuccess: String { return self._s[2146]! }
- public var Cache_Videos: String { return self._s[2147]! }
- public var PrivacySettings_PhoneNumber: String { return self._s[2148]! }
- public var Wallet_Month_GenFebruary: String { return self._s[2149]! }
- public var FeatureDisabled_Oops: String { return self._s[2151]! }
- public var Passport_Address_PostcodePlaceholder: String { return self._s[2152]! }
+ public var Permissions_CellularDataText_v0: String { return self._s[2149]! }
+ public var ShareMenu_SelectChats: String { return self._s[2152]! }
+ public var ChatList_Context_Unarchive: String { return self._s[2153]! }
+ public var MusicPlayer_VoiceNote: String { return self._s[2154]! }
+ public var Conversation_RestrictedText: String { return self._s[2155]! }
+ public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2156]! }
+ public var Wallet_Month_GenApril: String { return self._s[2157]! }
+ public var Wallet_Month_ShortMarch: String { return self._s[2158]! }
+ public var TwoStepAuth_DisableSuccess: String { return self._s[2159]! }
+ public var Cache_Videos: String { return self._s[2160]! }
+ public var PrivacySettings_PhoneNumber: String { return self._s[2161]! }
+ public var Wallet_Month_GenFebruary: String { return self._s[2162]! }
+ public var FeatureDisabled_Oops: String { return self._s[2164]! }
+ public var Passport_Address_PostcodePlaceholder: String { return self._s[2165]! }
public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2153]!, self._r[2153]!, [_0])
+ return formatWithArgumentRanges(self._s[2166]!, self._r[2166]!, [_0])
}
- public var Stickers_GroupStickersHelp: String { return self._s[2154]! }
- public var GroupPermission_NoSendPolls: String { return self._s[2155]! }
- public var Wallet_Qr_ScanCode: String { return self._s[2156]! }
- public var Message_VideoExpired: String { return self._s[2158]! }
- public var Notifications_Badge: String { return self._s[2159]! }
- public var GroupInfo_GroupHistoryVisible: String { return self._s[2160]! }
- public var Wallet_Receive_AddressCopied: String { return self._s[2161]! }
- public var CreatePoll_OptionPlaceholder: String { return self._s[2162]! }
- public var Username_InvalidTooShort: String { return self._s[2163]! }
- public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2164]! }
- public var Channel_AdminLog_PinMessages: String { return self._s[2165]! }
- public var ArchivedChats_IntroTitle3: String { return self._s[2166]! }
+ public var Stickers_GroupStickersHelp: String { return self._s[2167]! }
+ public var GroupPermission_NoSendPolls: String { return self._s[2168]! }
+ public var Wallet_Qr_ScanCode: String { return self._s[2169]! }
+ public var Message_VideoExpired: String { return self._s[2171]! }
+ public var Notifications_Badge: String { return self._s[2172]! }
+ public var GroupInfo_GroupHistoryVisible: String { return self._s[2173]! }
+ public var Wallet_Receive_AddressCopied: String { return self._s[2174]! }
+ public var CreatePoll_OptionPlaceholder: String { return self._s[2175]! }
+ public var Username_InvalidTooShort: String { return self._s[2176]! }
+ public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2177]! }
+ public var Channel_AdminLog_PinMessages: String { return self._s[2178]! }
+ public var ArchivedChats_IntroTitle3: String { return self._s[2179]! }
public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2167]!, self._r[2167]!, [_1])
+ return formatWithArgumentRanges(self._s[2180]!, self._r[2180]!, [_1])
}
- public var Permissions_SiriAllowInSettings_v0: String { return self._s[2168]! }
- public var Conversation_DefaultRestrictedText: String { return self._s[2169]! }
- public var SharedMedia_CategoryDocs: String { return self._s[2172]! }
+ public var Permissions_SiriAllowInSettings_v0: String { return self._s[2181]! }
+ public var Conversation_DefaultRestrictedText: String { return self._s[2182]! }
+ public var SharedMedia_CategoryDocs: String { return self._s[2185]! }
public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2173]!, self._r[2173]!, [_1])
+ return formatWithArgumentRanges(self._s[2186]!, self._r[2186]!, [_1])
}
- public var Wallet_Send_UninitializedTitle: String { return self._s[2174]! }
- public var Privacy_Forwards_NeverLink: String { return self._s[2176]! }
+ public var Wallet_Send_UninitializedTitle: String { return self._s[2187]! }
+ public var Privacy_Forwards_NeverLink: String { return self._s[2189]! }
public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_1])
+ return formatWithArgumentRanges(self._s[2190]!, self._r[2190]!, [_1])
}
- public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2178]! }
+ public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2191]! }
public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2179]!, self._r[2179]!, [_0])
+ return formatWithArgumentRanges(self._s[2192]!, self._r[2192]!, [_0])
}
- public var ChatSettings_PrivateChats: String { return self._s[2180]! }
- public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2181]! }
- public var Conversation_PrivateMessageLinkCopied: String { return self._s[2182]! }
- public var Channel_UpdatePhotoItem: String { return self._s[2183]! }
- public var GroupInfo_LeftStatus: String { return self._s[2184]! }
- public var Watch_MessageView_Forward: String { return self._s[2186]! }
- public var ReportPeer_ReasonChildAbuse: String { return self._s[2187]! }
- public var Cache_ClearEmpty: String { return self._s[2189]! }
- public var Localization_LanguageName: String { return self._s[2190]! }
- public var WebSearch_GIFs: String { return self._s[2191]! }
- public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2192]! }
- public var Username_InvalidStartsWithNumber: String { return self._s[2193]! }
- public var Common_Back: String { return self._s[2194]! }
- public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2195]! }
- public var Wallet_Send_Send: String { return self._s[2196]! }
+ public var ChatSettings_PrivateChats: String { return self._s[2193]! }
+ public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2194]! }
+ public var Conversation_PrivateMessageLinkCopied: String { return self._s[2195]! }
+ public var Channel_UpdatePhotoItem: String { return self._s[2196]! }
+ public var GroupInfo_LeftStatus: String { return self._s[2197]! }
+ public var Watch_MessageView_Forward: String { return self._s[2199]! }
+ public var ReportPeer_ReasonChildAbuse: String { return self._s[2200]! }
+ public var Cache_ClearEmpty: String { return self._s[2202]! }
+ public var Localization_LanguageName: String { return self._s[2203]! }
+ public var Wallet_AccessDenied_Title: String { return self._s[2204]! }
+ public var WebSearch_GIFs: String { return self._s[2205]! }
+ public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2206]! }
+ public var Wallet_AccessDenied_Settings: String { return self._s[2207]! }
+ public var Username_InvalidStartsWithNumber: String { return self._s[2208]! }
+ public var Common_Back: String { return self._s[2209]! }
+ public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2210]! }
+ public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2211]! }
+ public var Wallet_Send_Send: String { return self._s[2212]! }
public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2213]!, self._r[2213]!, [_1, _2])
}
- public var Wallet_Info_RefreshErrorTitle: String { return self._s[2198]! }
- public var Wallet_Month_GenJune: String { return self._s[2199]! }
- public var Passport_Email_Help: String { return self._s[2200]! }
- public var Watch_Conversation_Reply: String { return self._s[2202]! }
- public var Conversation_EditingMessageMediaChange: String { return self._s[2204]! }
- public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2205]! }
- public var Channel_BanUser_Unban: String { return self._s[2207]! }
- public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2208]! }
- public var Group_Username_CreatePublicLinkHelp: String { return self._s[2209]! }
- public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2211]! }
- public var Wallet_Send_AddressHeader: String { return self._s[2212]! }
- public var Passport_Identity_Name: String { return self._s[2213]! }
+ public var Wallet_Info_RefreshErrorTitle: String { return self._s[2214]! }
+ public var Wallet_Month_GenJune: String { return self._s[2215]! }
+ public var Passport_Email_Help: String { return self._s[2216]! }
+ public var Watch_Conversation_Reply: String { return self._s[2218]! }
+ public var Conversation_EditingMessageMediaChange: String { return self._s[2221]! }
+ public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2222]! }
+ public var Channel_BanUser_Unban: String { return self._s[2224]! }
+ public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2225]! }
+ public var Group_Username_CreatePublicLinkHelp: String { return self._s[2226]! }
+ public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2228]! }
+ public var Wallet_Send_AddressHeader: String { return self._s[2229]! }
+ public var Passport_Identity_Name: String { return self._s[2230]! }
public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2214]!, self._r[2214]!, [_0])
+ return formatWithArgumentRanges(self._s[2231]!, self._r[2231]!, [_0])
}
- public var GroupRemoved_ViewUserInfo: String { return self._s[2215]! }
- public var Conversation_BlockUser: String { return self._s[2216]! }
- public var Month_GenJanuary: String { return self._s[2217]! }
- public var ChatSettings_TextSize: String { return self._s[2218]! }
- public var Notification_PassportValuePhone: String { return self._s[2219]! }
- public var Passport_Language_ne: String { return self._s[2220]! }
- public var Notification_CallBack: String { return self._s[2221]! }
- public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2222]! }
- public var TwoStepAuth_EmailHelp: String { return self._s[2223]! }
+ public var GroupRemoved_ViewUserInfo: String { return self._s[2232]! }
+ public var Conversation_BlockUser: String { return self._s[2233]! }
+ public var Month_GenJanuary: String { return self._s[2234]! }
+ public var ChatSettings_TextSize: String { return self._s[2235]! }
+ public var Notification_PassportValuePhone: String { return self._s[2236]! }
+ public var Passport_Language_ne: String { return self._s[2237]! }
+ public var Notification_CallBack: String { return self._s[2238]! }
+ public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2239]! }
+ public var TwoStepAuth_EmailHelp: String { return self._s[2240]! }
public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2224]!, self._r[2224]!, [_0])
+ return formatWithArgumentRanges(self._s[2241]!, self._r[2241]!, [_0])
}
- public var Channel_Info_Management: String { return self._s[2225]! }
- public var Passport_FieldIdentityUploadHelp: String { return self._s[2226]! }
- public var Stickers_FrequentlyUsed: String { return self._s[2227]! }
- public var Channel_BanUser_PermissionSendMessages: String { return self._s[2228]! }
- public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2230]! }
+ public var Channel_Info_Management: String { return self._s[2242]! }
+ public var Passport_FieldIdentityUploadHelp: String { return self._s[2243]! }
+ public var Stickers_FrequentlyUsed: String { return self._s[2244]! }
+ public var Channel_BanUser_PermissionSendMessages: String { return self._s[2245]! }
+ public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2247]! }
public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2231]!, self._r[2231]!, [_1, "\(_2)"])
+ return formatWithArgumentRanges(self._s[2248]!, self._r[2248]!, [_1, "\(_2)"])
}
- public var TwoFactorSetup_Password_Title: String { return self._s[2232]! }
- public var Passport_Address_EditResidentialAddress: String { return self._s[2233]! }
- public var PrivacyPolicy_DeclineTitle: String { return self._s[2234]! }
- public var CreatePoll_TextHeader: String { return self._s[2235]! }
+ public var TwoFactorSetup_Password_Title: String { return self._s[2249]! }
+ public var Passport_Address_EditResidentialAddress: String { return self._s[2250]! }
+ public var PrivacyPolicy_DeclineTitle: String { return self._s[2251]! }
+ public var CreatePoll_TextHeader: String { return self._s[2252]! }
public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2236]!, self._r[2236]!, [_0])
+ return formatWithArgumentRanges(self._s[2253]!, self._r[2253]!, [_0])
}
- public var PhotoEditor_QualityMedium: String { return self._s[2237]! }
- public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2238]! }
- public var Conversation_StatusKickedFromChannel: String { return self._s[2240]! }
- public var CheckoutInfo_ReceiverInfoName: String { return self._s[2241]! }
- public var Group_ErrorSendRestrictedStickers: String { return self._s[2242]! }
+ public var PhotoEditor_QualityMedium: String { return self._s[2254]! }
+ public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2255]! }
+ public var Conversation_StatusKickedFromChannel: String { return self._s[2257]! }
+ public var CheckoutInfo_ReceiverInfoName: String { return self._s[2258]! }
+ public var Group_ErrorSendRestrictedStickers: String { return self._s[2259]! }
public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2243]!, self._r[2243]!, [_0])
+ return formatWithArgumentRanges(self._s[2260]!, self._r[2260]!, [_0])
}
public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2244]!, self._r[2244]!, [_1])
+ return formatWithArgumentRanges(self._s[2261]!, self._r[2261]!, [_1])
}
- public var LogoutOptions_LogOutWalletInfo: String { return self._s[2245]! }
- public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2246]! }
- public var Conversation_LinkDialogOpen: String { return self._s[2248]! }
- public var TwoFactorSetup_Hint_Title: String { return self._s[2249]! }
- public var VoiceOver_Chat_PollNoVotes: String { return self._s[2250]! }
- public var Settings_Username: String { return self._s[2252]! }
- public var Conversation_Block: String { return self._s[2254]! }
- public var Wallpaper_Wallpaper: String { return self._s[2255]! }
- public var SocksProxySetup_UseProxy: String { return self._s[2257]! }
- public var Wallet_Send_Confirmation: String { return self._s[2258]! }
- public var EditTheme_UploadEditedTheme: String { return self._s[2259]! }
- public var UserInfo_ShareMyContactInfo: String { return self._s[2260]! }
- public var MessageTimer_Forever: String { return self._s[2261]! }
- public var Privacy_Calls_WhoCanCallMe: String { return self._s[2262]! }
- public var PhotoEditor_DiscardChanges: String { return self._s[2263]! }
- public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2264]! }
- public var Passport_Language_da: String { return self._s[2265]! }
- public var SocksProxySetup_PortPlaceholder: String { return self._s[2266]! }
+ public var LogoutOptions_LogOutWalletInfo: String { return self._s[2262]! }
+ public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2263]! }
+ public var Conversation_LinkDialogOpen: String { return self._s[2265]! }
+ public var TwoFactorSetup_Hint_Title: String { return self._s[2266]! }
+ public var VoiceOver_Chat_PollNoVotes: String { return self._s[2267]! }
+ public var Settings_Username: String { return self._s[2269]! }
+ public var Conversation_Block: String { return self._s[2271]! }
+ public var Wallpaper_Wallpaper: String { return self._s[2272]! }
+ public var SocksProxySetup_UseProxy: String { return self._s[2274]! }
+ public var Wallet_Send_Confirmation: String { return self._s[2275]! }
+ public var EditTheme_UploadEditedTheme: String { return self._s[2276]! }
+ public var UserInfo_ShareMyContactInfo: String { return self._s[2277]! }
+ public var MessageTimer_Forever: String { return self._s[2278]! }
+ public var Privacy_Calls_WhoCanCallMe: String { return self._s[2279]! }
+ public var PhotoEditor_DiscardChanges: String { return self._s[2280]! }
+ public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2281]! }
+ public var Passport_Language_da: String { return self._s[2282]! }
+ public var SocksProxySetup_PortPlaceholder: String { return self._s[2283]! }
public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2267]!, self._r[2267]!, [_0])
+ return formatWithArgumentRanges(self._s[2284]!, self._r[2284]!, [_0])
}
- public var Passport_Address_EditPassportRegistration: String { return self._s[2268]! }
+ public var Passport_Address_EditPassportRegistration: String { return self._s[2285]! }
public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2270]!, self._r[2270]!, [_0])
+ return formatWithArgumentRanges(self._s[2287]!, self._r[2287]!, [_0])
}
- public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2272]! }
- public var Conversation_SearchByName_Prefix: String { return self._s[2273]! }
- public var Conversation_PinnedPoll: String { return self._s[2274]! }
- public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2275]! }
+ public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2289]! }
+ public var Conversation_SearchByName_Prefix: String { return self._s[2290]! }
+ public var Conversation_PinnedPoll: String { return self._s[2291]! }
+ public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2292]! }
public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2276]!, self._r[2276]!, [_1])
+ return formatWithArgumentRanges(self._s[2293]!, self._r[2293]!, [_1])
}
- public var WallpaperSearch_ColorPurple: String { return self._s[2277]! }
- public var Cache_ByPeerHeader: String { return self._s[2278]! }
+ public var WallpaperSearch_ColorPurple: String { return self._s[2294]! }
+ public var Cache_ByPeerHeader: String { return self._s[2295]! }
public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2279]!, self._r[2279]!, [_0])
+ return formatWithArgumentRanges(self._s[2296]!, self._r[2296]!, [_0])
}
- public var ChatSettings_AutoDownloadDocuments: String { return self._s[2280]! }
- public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2283]! }
- public var Wallet_Completed_Title: String { return self._s[2284]! }
- public var Notification_PinnedMessage: String { return self._s[2285]! }
- public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2286]! }
- public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2288]! }
- public var Contacts_SortBy: String { return self._s[2289]! }
+ public var ChatSettings_AutoDownloadDocuments: String { return self._s[2297]! }
+ public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2300]! }
+ public var Wallet_Completed_Title: String { return self._s[2301]! }
+ public var Notification_PinnedMessage: String { return self._s[2302]! }
+ public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2303]! }
+ public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2305]! }
+ public var Contacts_SortBy: String { return self._s[2306]! }
public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2290]!, self._r[2290]!, [_1])
+ return formatWithArgumentRanges(self._s[2307]!, self._r[2307]!, [_1])
}
+ public var Appearance_ColorThemeNight: String { return self._s[2309]! }
public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2292]!, self._r[2292]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2310]!, self._r[2310]!, [_1, _2])
}
- public var Call_EncryptionKey_Title: String { return self._s[2293]! }
- public var Watch_UserInfo_Service: String { return self._s[2294]! }
- public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2296]! }
- public var Conversation_Unpin: String { return self._s[2298]! }
- public var CancelResetAccount_Title: String { return self._s[2299]! }
- public var Map_LiveLocationFor15Minutes: String { return self._s[2300]! }
+ public var Call_EncryptionKey_Title: String { return self._s[2311]! }
+ public var Watch_UserInfo_Service: String { return self._s[2312]! }
+ public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2314]! }
+ public var Conversation_Unpin: String { return self._s[2316]! }
+ public var CancelResetAccount_Title: String { return self._s[2317]! }
+ public var Map_LiveLocationFor15Minutes: String { return self._s[2318]! }
public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2302]!, self._r[2302]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2320]!, self._r[2320]!, [_1, _2, _3])
}
- public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2303]! }
- public var CallSettings_Title: String { return self._s[2304]! }
- public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2305]! }
- public var PasscodeSettings_EncryptDataHelp: String { return self._s[2307]! }
- public var AutoDownloadSettings_Contacts: String { return self._s[2308]! }
+ public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2321]! }
+ public var CallSettings_Title: String { return self._s[2322]! }
+ public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2323]! }
+ public var PasscodeSettings_EncryptDataHelp: String { return self._s[2325]! }
+ public var AutoDownloadSettings_Contacts: String { return self._s[2326]! }
public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2309]!, self._r[2309]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2327]!, self._r[2327]!, [_1, _2])
}
- public var Passport_Identity_DocumentDetails: String { return self._s[2310]! }
- public var LoginPassword_PasswordHelp: String { return self._s[2311]! }
- public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2312]! }
- public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2313]! }
- public var Checkout_TotalPaidAmount: String { return self._s[2314]! }
+ public var Passport_Identity_DocumentDetails: String { return self._s[2328]! }
+ public var LoginPassword_PasswordHelp: String { return self._s[2329]! }
+ public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2330]! }
+ public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2331]! }
+ public var Checkout_TotalPaidAmount: String { return self._s[2332]! }
public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2315]!, self._r[2315]!, [_0])
+ return formatWithArgumentRanges(self._s[2333]!, self._r[2333]!, [_0])
}
- public var PasscodeSettings_ChangePasscode: String { return self._s[2316]! }
- public var Conversation_SecretLinkPreviewAlert: String { return self._s[2318]! }
- public var Privacy_SecretChatsLinkPreviews: String { return self._s[2319]! }
+ public var PasscodeSettings_ChangePasscode: String { return self._s[2334]! }
+ public var Conversation_SecretLinkPreviewAlert: String { return self._s[2336]! }
+ public var Privacy_SecretChatsLinkPreviews: String { return self._s[2337]! }
public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2320]!, self._r[2320]!, [_1])
+ return formatWithArgumentRanges(self._s[2338]!, self._r[2338]!, [_1])
}
- public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2321]! }
- public var Contacts_InviteFriends: String { return self._s[2323]! }
- public var Map_ChooseLocationTitle: String { return self._s[2324]! }
- public var Conversation_StopPoll: String { return self._s[2326]! }
+ public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2339]! }
+ public var Contacts_InviteFriends: String { return self._s[2341]! }
+ public var Map_ChooseLocationTitle: String { return self._s[2342]! }
+ public var Conversation_StopPoll: String { return self._s[2344]! }
public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2327]!, self._r[2327]!, [_0])
+ return formatWithArgumentRanges(self._s[2345]!, self._r[2345]!, [_0])
}
- public var Call_Camera: String { return self._s[2328]! }
- public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2329]! }
- public var AppWallet_Intro_Text: String { return self._s[2330]! }
- public var Calls_RatingFeedback: String { return self._s[2331]! }
- public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2332]! }
- public var Wallet_Alert_OK: String { return self._s[2333]! }
- public var NotificationsSound_Pulse: String { return self._s[2334]! }
- public var Watch_LastSeen_Lately: String { return self._s[2335]! }
- public var ReportGroupLocation_Report: String { return self._s[2338]! }
- public var Widget_NoUsers: String { return self._s[2339]! }
- public var Conversation_UnvotePoll: String { return self._s[2340]! }
- public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2342]! }
- public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2343]! }
- public var NotificationsSound_Circles: String { return self._s[2344]! }
- public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2347]! }
- public var Wallet_Settings_DeleteWallet: String { return self._s[2348]! }
- public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2349]! }
- public var Proxy_TooltipUnavailable: String { return self._s[2350]! }
- public var Passport_Identity_CountryPlaceholder: String { return self._s[2352]! }
- public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2354]! }
- public var Conversation_FileDropbox: String { return self._s[2355]! }
- public var Notifications_ExceptionsUnmuted: String { return self._s[2356]! }
- public var Tour_Text3: String { return self._s[2358]! }
- public var Login_ResetAccountProtected_Title: String { return self._s[2360]! }
- public var GroupPermission_NoSendMessages: String { return self._s[2361]! }
- public var WallpaperSearch_ColorTitle: String { return self._s[2362]! }
- public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2363]! }
+ public var Call_Camera: String { return self._s[2346]! }
+ public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2347]! }
+ public var AppWallet_Intro_Text: String { return self._s[2348]! }
+ public var Calls_RatingFeedback: String { return self._s[2349]! }
+ public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2350]! }
+ public var Wallet_Alert_OK: String { return self._s[2351]! }
+ public var NotificationsSound_Pulse: String { return self._s[2352]! }
+ public var Watch_LastSeen_Lately: String { return self._s[2353]! }
+ public var ReportGroupLocation_Report: String { return self._s[2356]! }
+ public var Widget_NoUsers: String { return self._s[2357]! }
+ public var Conversation_UnvotePoll: String { return self._s[2358]! }
+ public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2360]! }
+ public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2361]! }
+ public var NotificationsSound_Circles: String { return self._s[2362]! }
+ public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2365]! }
+ public var Wallet_Settings_DeleteWallet: String { return self._s[2366]! }
+ public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2367]! }
+ public var Proxy_TooltipUnavailable: String { return self._s[2368]! }
+ public var Passport_Identity_CountryPlaceholder: String { return self._s[2370]! }
+ public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2372]! }
+ public var Conversation_FileDropbox: String { return self._s[2373]! }
+ public var Notifications_ExceptionsUnmuted: String { return self._s[2374]! }
+ public var Tour_Text3: String { return self._s[2376]! }
+ public var Login_ResetAccountProtected_Title: String { return self._s[2378]! }
+ public var GroupPermission_NoSendMessages: String { return self._s[2379]! }
+ public var WallpaperSearch_ColorTitle: String { return self._s[2380]! }
+ public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2381]! }
public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2365]!, self._r[2365]!, [_0])
+ return formatWithArgumentRanges(self._s[2383]!, self._r[2383]!, [_0])
}
- public var GroupInfo_AddParticipantTitle: String { return self._s[2366]! }
- public var Checkout_ShippingOption_Title: String { return self._s[2367]! }
- public var ChatSettings_AutoDownloadTitle: String { return self._s[2368]! }
+ public var GroupInfo_AddParticipantTitle: String { return self._s[2384]! }
+ public var Checkout_ShippingOption_Title: String { return self._s[2385]! }
+ public var ChatSettings_AutoDownloadTitle: String { return self._s[2386]! }
public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2369]!, self._r[2369]!, [_0])
+ return formatWithArgumentRanges(self._s[2387]!, self._r[2387]!, [_0])
}
public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2370]!, self._r[2370]!, [_0])
+ return formatWithArgumentRanges(self._s[2388]!, self._r[2388]!, [_0])
}
- public var Channel_Management_LabelAdministrator: String { return self._s[2371]! }
- public var EditTheme_FileReadError: String { return self._s[2372]! }
- public var OwnershipTransfer_ComeBackLater: String { return self._s[2373]! }
- public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2374]! }
- public var AutoDownloadSettings_Photos: String { return self._s[2376]! }
- public var Appearance_PreviewIncomingText: String { return self._s[2377]! }
- public var ChatList_Context_MarkAllAsRead: String { return self._s[2378]! }
- public var ChannelInfo_ConfirmLeave: String { return self._s[2379]! }
- public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2380]! }
- public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2381]! }
- public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2382]! }
- public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2383]! }
- public var GroupInfo_SetGroupPhotoStop: String { return self._s[2384]! }
- public var Notification_SecretChatScreenshot: String { return self._s[2385]! }
- public var AccessDenied_Wallpapers: String { return self._s[2386]! }
- public var ChatList_Context_Mute: String { return self._s[2388]! }
- public var Passport_Address_City: String { return self._s[2389]! }
- public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2390]! }
- public var Appearance_ThemeCarouselClassic: String { return self._s[2391]! }
- public var SocksProxySetup_SecretPlaceholder: String { return self._s[2392]! }
- public var AccessDenied_LocationDisabled: String { return self._s[2393]! }
- public var Group_Location_Title: String { return self._s[2394]! }
- public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2396]! }
- public var GroupInfo_Sound: String { return self._s[2397]! }
- public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2398]! }
- public var ChannelInfo_ScamChannelWarning: String { return self._s[2399]! }
- public var Stickers_RemoveFromFavorites: String { return self._s[2400]! }
- public var Contacts_Title: String { return self._s[2401]! }
- public var EditTheme_ThemeTemplateAlertText: String { return self._s[2402]! }
- public var Passport_Language_fr: String { return self._s[2403]! }
- public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2404]! }
- public var Notifications_ResetAllNotifications: String { return self._s[2405]! }
- public var PrivacySettings_SecurityTitle: String { return self._s[2408]! }
- public var Checkout_NewCard_Title: String { return self._s[2409]! }
- public var Login_HaveNotReceivedCodeInternal: String { return self._s[2410]! }
- public var Conversation_ForwardChats: String { return self._s[2411]! }
- public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2413]! }
- public var PasscodeSettings_4DigitCode: String { return self._s[2414]! }
- public var Settings_FAQ: String { return self._s[2416]! }
- public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2417]! }
- public var Conversation_ContextMenuForward: String { return self._s[2418]! }
- public var VoiceOver_Chat_YourPhoto: String { return self._s[2421]! }
- public var PrivacyPolicy_Title: String { return self._s[2424]! }
- public var Notifications_TextTone: String { return self._s[2425]! }
- public var Profile_CreateNewContact: String { return self._s[2426]! }
- public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2427]! }
- public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2429]! }
- public var Call_Speaker: String { return self._s[2430]! }
- public var AutoNightTheme_AutomaticSection: String { return self._s[2431]! }
- public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2433]! }
- public var Channel_Username_InvalidCharacters: String { return self._s[2434]! }
+ public var Channel_Management_LabelAdministrator: String { return self._s[2389]! }
+ public var EditTheme_FileReadError: String { return self._s[2390]! }
+ public var OwnershipTransfer_ComeBackLater: String { return self._s[2391]! }
+ public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2392]! }
+ public var AutoDownloadSettings_Photos: String { return self._s[2394]! }
+ public var Appearance_PreviewIncomingText: String { return self._s[2395]! }
+ public var ChatList_Context_MarkAllAsRead: String { return self._s[2396]! }
+ public var ChannelInfo_ConfirmLeave: String { return self._s[2397]! }
+ public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2398]! }
+ public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2399]! }
+ public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2400]! }
+ public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2401]! }
+ public var GroupInfo_SetGroupPhotoStop: String { return self._s[2402]! }
+ public var Notification_SecretChatScreenshot: String { return self._s[2403]! }
+ public var AccessDenied_Wallpapers: String { return self._s[2404]! }
+ public var ChatList_Context_Mute: String { return self._s[2406]! }
+ public var Passport_Address_City: String { return self._s[2407]! }
+ public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2408]! }
+ public var Appearance_ThemeCarouselClassic: String { return self._s[2409]! }
+ public var SocksProxySetup_SecretPlaceholder: String { return self._s[2410]! }
+ public var AccessDenied_LocationDisabled: String { return self._s[2411]! }
+ public var Group_Location_Title: String { return self._s[2412]! }
+ public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2414]! }
+ public var GroupInfo_Sound: String { return self._s[2415]! }
+ public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2416]! }
+ public var ChannelInfo_ScamChannelWarning: String { return self._s[2417]! }
+ public var Stickers_RemoveFromFavorites: String { return self._s[2418]! }
+ public var Contacts_Title: String { return self._s[2419]! }
+ public var EditTheme_ThemeTemplateAlertText: String { return self._s[2420]! }
+ public var Passport_Language_fr: String { return self._s[2421]! }
+ public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2422]! }
+ public var Notifications_ResetAllNotifications: String { return self._s[2423]! }
+ public var PrivacySettings_SecurityTitle: String { return self._s[2426]! }
+ public var Checkout_NewCard_Title: String { return self._s[2427]! }
+ public var Login_HaveNotReceivedCodeInternal: String { return self._s[2428]! }
+ public var Conversation_ForwardChats: String { return self._s[2429]! }
+ public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2431]! }
+ public var PasscodeSettings_4DigitCode: String { return self._s[2432]! }
+ public var Settings_FAQ: String { return self._s[2434]! }
+ public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2435]! }
+ public var Conversation_ContextMenuForward: String { return self._s[2436]! }
+ public var VoiceOver_Chat_YourPhoto: String { return self._s[2439]! }
+ public var PrivacyPolicy_Title: String { return self._s[2442]! }
+ public var Notifications_TextTone: String { return self._s[2443]! }
+ public var Profile_CreateNewContact: String { return self._s[2444]! }
+ public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2445]! }
+ public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2447]! }
+ public var Call_Speaker: String { return self._s[2448]! }
+ public var AutoNightTheme_AutomaticSection: String { return self._s[2449]! }
+ public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2451]! }
+ public var Channel_Username_InvalidCharacters: String { return self._s[2452]! }
public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2435]!, self._r[2435]!, [_0])
+ return formatWithArgumentRanges(self._s[2453]!, self._r[2453]!, [_0])
}
- public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2436]! }
- public var PrivacySettings_LastSeenTitle: String { return self._s[2437]! }
- public var Channel_AdminLog_CanInviteUsers: String { return self._s[2438]! }
- public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2439]! }
- public var OwnershipTransfer_SecurityCheck: String { return self._s[2440]! }
- public var Conversation_MessageDeliveryFailed: String { return self._s[2441]! }
- public var Watch_ChatList_NoConversationsText: String { return self._s[2442]! }
- public var Bot_Unblock: String { return self._s[2443]! }
- public var TextFormat_Italic: String { return self._s[2444]! }
- public var WallpaperSearch_ColorPink: String { return self._s[2445]! }
- public var Settings_About_Help: String { return self._s[2446]! }
- public var SearchImages_Title: String { return self._s[2447]! }
- public var Weekday_Wednesday: String { return self._s[2448]! }
- public var Conversation_ClousStorageInfo_Description1: String { return self._s[2449]! }
- public var ExplicitContent_AlertTitle: String { return self._s[2450]! }
+ public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2454]! }
+ public var PrivacySettings_LastSeenTitle: String { return self._s[2455]! }
+ public var Channel_AdminLog_CanInviteUsers: String { return self._s[2456]! }
+ public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2457]! }
+ public var OwnershipTransfer_SecurityCheck: String { return self._s[2458]! }
+ public var Conversation_MessageDeliveryFailed: String { return self._s[2459]! }
+ public var Watch_ChatList_NoConversationsText: String { return self._s[2460]! }
+ public var Bot_Unblock: String { return self._s[2461]! }
+ public var TextFormat_Italic: String { return self._s[2462]! }
+ public var WallpaperSearch_ColorPink: String { return self._s[2463]! }
+ public var Settings_About_Help: String { return self._s[2464]! }
+ public var SearchImages_Title: String { return self._s[2465]! }
+ public var Weekday_Wednesday: String { return self._s[2466]! }
+ public var Conversation_ClousStorageInfo_Description1: String { return self._s[2467]! }
+ public var ExplicitContent_AlertTitle: String { return self._s[2468]! }
public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2451]!, self._r[2451]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2469]!, self._r[2469]!, [_1, _2, _3])
}
- public var Channel_DiscussionGroup_Create: String { return self._s[2452]! }
- public var Weekday_Thursday: String { return self._s[2453]! }
- public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2454]! }
- public var Channel_Members_AddMembersHelp: String { return self._s[2455]! }
+ public var Channel_DiscussionGroup_Create: String { return self._s[2470]! }
+ public var Weekday_Thursday: String { return self._s[2471]! }
+ public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2472]! }
+ public var Channel_Members_AddMembersHelp: String { return self._s[2473]! }
public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2456]!, self._r[2456]!, [_0])
+ return formatWithArgumentRanges(self._s[2474]!, self._r[2474]!, [_0])
}
- public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2457]! }
- public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2458]! }
- public var Passport_RequestedInformation: String { return self._s[2459]! }
- public var Login_PhoneAndCountryHelp: String { return self._s[2460]! }
- public var Conversation_EncryptionProcessing: String { return self._s[2462]! }
- public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2463]! }
- public var PhotoEditor_EnhanceTool: String { return self._s[2465]! }
- public var Channel_Setup_Title: String { return self._s[2466]! }
- public var Conversation_SearchPlaceholder: String { return self._s[2467]! }
- public var AccessDenied_LocationAlwaysDenied: String { return self._s[2468]! }
- public var Checkout_ErrorGeneric: String { return self._s[2469]! }
- public var Passport_Language_hu: String { return self._s[2470]! }
- public var Wallet_Month_ShortSeptember: String { return self._s[2471]! }
+ public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2475]! }
+ public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2476]! }
+ public var Passport_RequestedInformation: String { return self._s[2477]! }
+ public var Login_PhoneAndCountryHelp: String { return self._s[2478]! }
+ public var Conversation_EncryptionProcessing: String { return self._s[2480]! }
+ public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2481]! }
+ public var PhotoEditor_EnhanceTool: String { return self._s[2483]! }
+ public var Channel_Setup_Title: String { return self._s[2484]! }
+ public var Conversation_SearchPlaceholder: String { return self._s[2485]! }
+ public var AccessDenied_LocationAlwaysDenied: String { return self._s[2486]! }
+ public var Checkout_ErrorGeneric: String { return self._s[2487]! }
+ public var Passport_Language_hu: String { return self._s[2488]! }
+ public var GroupPermission_EditingDisabled: String { return self._s[2489]! }
+ public var Wallet_Month_ShortSeptember: String { return self._s[2491]! }
public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2473]!, self._r[2473]!, [_0])
+ return formatWithArgumentRanges(self._s[2492]!, self._r[2492]!, [_0])
}
public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2476]!, self._r[2476]!, [_1])
+ return formatWithArgumentRanges(self._s[2495]!, self._r[2495]!, [_1])
}
- public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2477]! }
+ public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2496]! }
public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2478]!, self._r[2478]!, [_0])
+ return formatWithArgumentRanges(self._s[2497]!, self._r[2497]!, [_0])
}
- public var Conversation_CloudStorageInfo_Title: String { return self._s[2479]! }
- public var Group_Location_Info: String { return self._s[2480]! }
- public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2481]! }
- public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2482]! }
+ public var Conversation_CloudStorageInfo_Title: String { return self._s[2498]! }
+ public var Group_Location_Info: String { return self._s[2499]! }
+ public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2500]! }
+ public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2501]! }
public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2483]!, self._r[2483]!, [_0])
+ return formatWithArgumentRanges(self._s[2502]!, self._r[2502]!, [_0])
}
- public var Conversation_ClearPrivateHistory: String { return self._s[2484]! }
- public var ContactInfo_PhoneLabelHome: String { return self._s[2485]! }
- public var Appearance_RemoveThemeConfirmation: String { return self._s[2486]! }
- public var PrivacySettings_LastSeenContacts: String { return self._s[2487]! }
+ public var Conversation_ClearPrivateHistory: String { return self._s[2503]! }
+ public var ContactInfo_PhoneLabelHome: String { return self._s[2504]! }
+ public var Appearance_RemoveThemeConfirmation: String { return self._s[2505]! }
+ public var PrivacySettings_LastSeenContacts: String { return self._s[2506]! }
public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2488]!, self._r[2488]!, [_0])
+ return formatWithArgumentRanges(self._s[2507]!, self._r[2507]!, [_0])
}
- public var Passport_Language_cs: String { return self._s[2489]! }
- public var Message_PinnedAnimationMessage: String { return self._s[2491]! }
- public var Passport_Identity_ReverseSideHelp: String { return self._s[2493]! }
- public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2494]! }
- public var Wallet_Info_TransactionTo: String { return self._s[2496]! }
- public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2497]! }
- public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2498]! }
- public var Embed_PlayingInPIP: String { return self._s[2499]! }
- public var AutoNightTheme_ScheduleSection: String { return self._s[2500]! }
+ public var Passport_Language_cs: String { return self._s[2508]! }
+ public var Message_PinnedAnimationMessage: String { return self._s[2510]! }
+ public var Passport_Identity_ReverseSideHelp: String { return self._s[2512]! }
+ public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2513]! }
+ public var Wallet_Info_TransactionTo: String { return self._s[2515]! }
+ public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2516]! }
+ public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2517]! }
+ public var Embed_PlayingInPIP: String { return self._s[2518]! }
+ public var AutoNightTheme_ScheduleSection: String { return self._s[2519]! }
public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2501]!, self._r[2501]!, [_0])
+ return formatWithArgumentRanges(self._s[2520]!, self._r[2520]!, [_0])
}
- public var MediaPicker_LivePhotoDescription: String { return self._s[2502]! }
+ public var MediaPicker_LivePhotoDescription: String { return self._s[2521]! }
public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2503]!, self._r[2503]!, [_1])
+ return formatWithArgumentRanges(self._s[2522]!, self._r[2522]!, [_1])
}
- public var Notification_PaymentSent: String { return self._s[2504]! }
- public var PhotoEditor_CurvesGreen: String { return self._s[2505]! }
- public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2506]! }
- public var AutoNightTheme_System: String { return self._s[2507]! }
- public var SaveIncomingPhotosSettings_Title: String { return self._s[2508]! }
- public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2509]! }
- public var VoiceOver_Chat_PagePreview: String { return self._s[2510]! }
+ public var Notification_PaymentSent: String { return self._s[2523]! }
+ public var PhotoEditor_CurvesGreen: String { return self._s[2524]! }
+ public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2525]! }
+ public var AutoNightTheme_System: String { return self._s[2526]! }
+ public var SaveIncomingPhotosSettings_Title: String { return self._s[2527]! }
+ public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2528]! }
+ public var VoiceOver_Chat_PagePreview: String { return self._s[2529]! }
public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2513]!, self._r[2513]!, [_1])
+ return formatWithArgumentRanges(self._s[2532]!, self._r[2532]!, [_1])
}
public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2514]!, self._r[2514]!, [_1])
+ return formatWithArgumentRanges(self._s[2533]!, self._r[2533]!, [_1])
}
public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2515]!, self._r[2515]!, [_1])
+ return formatWithArgumentRanges(self._s[2534]!, self._r[2534]!, [_1])
}
- public var NetworkUsageSettings_CallDataSection: String { return self._s[2517]! }
- public var PasscodeSettings_HelpTop: String { return self._s[2518]! }
- public var Conversation_WalletRequiredTitle: String { return self._s[2519]! }
- public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2520]! }
- public var Passport_Address_TypeRentalAgreement: String { return self._s[2521]! }
- public var EditTheme_ShortLink: String { return self._s[2522]! }
- public var ProxyServer_VoiceOver_Active: String { return self._s[2523]! }
- public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2524]! }
- public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2525]! }
- public var Call_Accept: String { return self._s[2527]! }
- public var GroupRemoved_RemoveInfo: String { return self._s[2528]! }
- public var Month_GenMarch: String { return self._s[2530]! }
- public var PhotoEditor_ShadowsTool: String { return self._s[2531]! }
- public var LoginPassword_Title: String { return self._s[2532]! }
- public var Call_End: String { return self._s[2533]! }
- public var Watch_Conversation_GroupInfo: String { return self._s[2534]! }
- public var VoiceOver_Chat_Contact: String { return self._s[2535]! }
- public var EditTheme_Create_Preview_IncomingText: String { return self._s[2536]! }
- public var CallSettings_Always: String { return self._s[2537]! }
- public var CallFeedback_Success: String { return self._s[2538]! }
- public var TwoStepAuth_SetupHint: String { return self._s[2539]! }
+ public var NetworkUsageSettings_CallDataSection: String { return self._s[2536]! }
+ public var PasscodeSettings_HelpTop: String { return self._s[2537]! }
+ public var Conversation_WalletRequiredTitle: String { return self._s[2538]! }
+ public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2539]! }
+ public var Passport_Address_TypeRentalAgreement: String { return self._s[2540]! }
+ public var EditTheme_ShortLink: String { return self._s[2541]! }
+ public var ProxyServer_VoiceOver_Active: String { return self._s[2542]! }
+ public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2543]! }
+ public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2544]! }
+ public var Call_Accept: String { return self._s[2546]! }
+ public var GroupRemoved_RemoveInfo: String { return self._s[2547]! }
+ public var Month_GenMarch: String { return self._s[2549]! }
+ public var PhotoEditor_ShadowsTool: String { return self._s[2550]! }
+ public var LoginPassword_Title: String { return self._s[2551]! }
+ public var Call_End: String { return self._s[2552]! }
+ public var Watch_Conversation_GroupInfo: String { return self._s[2553]! }
+ public var VoiceOver_Chat_Contact: String { return self._s[2554]! }
+ public var EditTheme_Create_Preview_IncomingText: String { return self._s[2555]! }
+ public var CallSettings_Always: String { return self._s[2556]! }
+ public var CallFeedback_Success: String { return self._s[2557]! }
+ public var TwoStepAuth_SetupHint: String { return self._s[2558]! }
public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2540]!, self._r[2540]!, [_1])
+ return formatWithArgumentRanges(self._s[2559]!, self._r[2559]!, [_1])
}
- public var ConversationProfile_UsersTooMuchError: String { return self._s[2541]! }
- public var Login_PhoneTitle: String { return self._s[2542]! }
- public var Passport_FieldPhoneHelp: String { return self._s[2543]! }
- public var Weekday_ShortSunday: String { return self._s[2544]! }
- public var Passport_InfoFAQ_URL: String { return self._s[2545]! }
- public var ContactInfo_Job: String { return self._s[2547]! }
- public var UserInfo_InviteBotToGroup: String { return self._s[2548]! }
- public var Appearance_ThemeCarouselNightBlue: String { return self._s[2549]! }
- public var TwoFactorSetup_Email_Text: String { return self._s[2550]! }
- public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2551]! }
- public var Invite_ChannelsTooMuch: String { return self._s[2552]! }
- public var Wallet_Send_ConfirmationConfirm: String { return self._s[2553]! }
- public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2554]! }
- public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2555]! }
- public var Wallet_Receive_AmountText: String { return self._s[2556]! }
- public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2557]! }
- public var CallFeedback_ReasonNoise: String { return self._s[2558]! }
- public var Appearance_AppIconDefault: String { return self._s[2560]! }
- public var Passport_Identity_AddInternalPassport: String { return self._s[2561]! }
- public var MediaPicker_AddCaption: String { return self._s[2562]! }
- public var CallSettings_TabIconDescription: String { return self._s[2563]! }
+ public var ConversationProfile_UsersTooMuchError: String { return self._s[2560]! }
+ public var Login_PhoneTitle: String { return self._s[2561]! }
+ public var Passport_FieldPhoneHelp: String { return self._s[2562]! }
+ public var Weekday_ShortSunday: String { return self._s[2563]! }
+ public var Passport_InfoFAQ_URL: String { return self._s[2564]! }
+ public var ContactInfo_Job: String { return self._s[2566]! }
+ public var UserInfo_InviteBotToGroup: String { return self._s[2567]! }
+ public var Appearance_ThemeCarouselNightBlue: String { return self._s[2568]! }
+ public var TwoFactorSetup_Email_Text: String { return self._s[2569]! }
+ public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2570]! }
+ public var Invite_ChannelsTooMuch: String { return self._s[2571]! }
+ public var Wallet_Send_ConfirmationConfirm: String { return self._s[2572]! }
+ public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2573]! }
+ public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2574]! }
+ public var Wallet_Receive_AmountText: String { return self._s[2575]! }
+ public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2576]! }
+ public var CallFeedback_ReasonNoise: String { return self._s[2577]! }
+ public var Appearance_AppIconDefault: String { return self._s[2579]! }
+ public var Passport_Identity_AddInternalPassport: String { return self._s[2580]! }
+ public var MediaPicker_AddCaption: String { return self._s[2581]! }
+ public var CallSettings_TabIconDescription: String { return self._s[2582]! }
public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2564]!, self._r[2564]!, [_0])
+ return formatWithArgumentRanges(self._s[2583]!, self._r[2583]!, [_0])
}
- public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2565]! }
- public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2566]! }
- public var Passport_Identity_TypePersonalDetails: String { return self._s[2567]! }
- public var DialogList_SearchSectionRecent: String { return self._s[2568]! }
- public var PrivacyPolicy_DeclineMessage: String { return self._s[2569]! }
- public var LogoutOptions_ClearCacheText: String { return self._s[2572]! }
- public var LastSeen_WithinAWeek: String { return self._s[2573]! }
- public var ChannelMembers_GroupAdminsTitle: String { return self._s[2574]! }
- public var Conversation_CloudStorage_ChatStatus: String { return self._s[2576]! }
- public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2577]! }
+ public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2584]! }
+ public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2585]! }
+ public var Passport_Identity_TypePersonalDetails: String { return self._s[2586]! }
+ public var DialogList_SearchSectionRecent: String { return self._s[2587]! }
+ public var PrivacyPolicy_DeclineMessage: String { return self._s[2588]! }
+ public var LogoutOptions_ClearCacheText: String { return self._s[2591]! }
+ public var LastSeen_WithinAWeek: String { return self._s[2592]! }
+ public var ChannelMembers_GroupAdminsTitle: String { return self._s[2593]! }
+ public var Conversation_CloudStorage_ChatStatus: String { return self._s[2595]! }
+ public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2596]! }
public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2578]!, self._r[2578]!, [_0])
+ return formatWithArgumentRanges(self._s[2597]!, self._r[2597]!, [_0])
}
- public var Passport_Address_TypeResidentialAddress: String { return self._s[2579]! }
- public var Conversation_StatusLeftGroup: String { return self._s[2580]! }
- public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2581]! }
- public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2583]! }
- public var GroupPermission_AddSuccess: String { return self._s[2584]! }
- public var PhotoEditor_BlurToolRadial: String { return self._s[2586]! }
- public var Conversation_ContextMenuCopy: String { return self._s[2587]! }
- public var AccessDenied_CallMicrophone: String { return self._s[2588]! }
+ public var Passport_Address_TypeResidentialAddress: String { return self._s[2598]! }
+ public var Conversation_StatusLeftGroup: String { return self._s[2599]! }
+ public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2600]! }
+ public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2602]! }
+ public var GroupPermission_AddSuccess: String { return self._s[2603]! }
+ public var PhotoEditor_BlurToolRadial: String { return self._s[2605]! }
+ public var Conversation_ContextMenuCopy: String { return self._s[2606]! }
+ public var AccessDenied_CallMicrophone: String { return self._s[2607]! }
public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2589]!, self._r[2589]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2608]!, self._r[2608]!, [_1, _2, _3])
}
- public var Login_InvalidFirstNameError: String { return self._s[2590]! }
- public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2591]! }
- public var Checkout_PaymentMethod_New: String { return self._s[2592]! }
- public var ShareMenu_CopyShareLinkGame: String { return self._s[2593]! }
- public var PhotoEditor_QualityTool: String { return self._s[2594]! }
- public var Login_SendCodeViaSms: String { return self._s[2595]! }
- public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2596]! }
- public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2597]! }
- public var Wallet_Receive_CopyAddress: String { return self._s[2598]! }
- public var Login_EmailNotConfiguredError: String { return self._s[2599]! }
- public var SocksProxySetup_Status: String { return self._s[2600]! }
- public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2601]! }
- public var PrivacyPolicy_Accept: String { return self._s[2602]! }
- public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2603]! }
- public var Appearance_AppIconClassicX: String { return self._s[2604]! }
+ public var Login_InvalidFirstNameError: String { return self._s[2609]! }
+ public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2610]! }
+ public var Checkout_PaymentMethod_New: String { return self._s[2611]! }
+ public var ShareMenu_CopyShareLinkGame: String { return self._s[2612]! }
+ public var PhotoEditor_QualityTool: String { return self._s[2613]! }
+ public var Login_SendCodeViaSms: String { return self._s[2614]! }
+ public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2615]! }
+ public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2616]! }
+ public var Wallet_Receive_CopyAddress: String { return self._s[2617]! }
+ public var Login_EmailNotConfiguredError: String { return self._s[2618]! }
+ public var SocksProxySetup_Status: String { return self._s[2619]! }
+ public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2620]! }
+ public var PrivacyPolicy_Accept: String { return self._s[2621]! }
+ public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2622]! }
+ public var Appearance_AppIconClassicX: String { return self._s[2623]! }
public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2624]!, self._r[2624]!, [_1, _2, _3])
}
- public var OwnershipTransfer_SecurityRequirements: String { return self._s[2606]! }
- public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2608]! }
- public var AutoNightTheme_Automatic: String { return self._s[2609]! }
- public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2610]! }
- public var Privacy_ContactsSyncHelp: String { return self._s[2611]! }
- public var Cache_Help: String { return self._s[2612]! }
- public var Group_ErrorAccessDenied: String { return self._s[2613]! }
- public var Passport_Language_fa: String { return self._s[2614]! }
- public var Wallet_Intro_Text: String { return self._s[2615]! }
- public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2616]! }
- public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2617]! }
- public var PrivacySettings_LastSeen: String { return self._s[2618]! }
+ public var OwnershipTransfer_SecurityRequirements: String { return self._s[2625]! }
+ public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2627]! }
+ public var AutoNightTheme_Automatic: String { return self._s[2628]! }
+ public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2629]! }
+ public var Privacy_ContactsSyncHelp: String { return self._s[2630]! }
+ public var Cache_Help: String { return self._s[2631]! }
+ public var Group_ErrorAccessDenied: String { return self._s[2632]! }
+ public var Passport_Language_fa: String { return self._s[2633]! }
+ public var Wallet_Intro_Text: String { return self._s[2634]! }
+ public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2635]! }
+ public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2636]! }
+ public var PrivacySettings_LastSeen: String { return self._s[2637]! }
public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2619]!, self._r[2619]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[2638]!, self._r[2638]!, [_0, _1])
}
- public var Wallet_Configuration_Apply: String { return self._s[2623]! }
- public var Preview_SaveGif: String { return self._s[2624]! }
- public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2625]! }
- public var Profile_About: String { return self._s[2626]! }
- public var Channel_About_Placeholder: String { return self._s[2627]! }
- public var Login_InfoTitle: String { return self._s[2628]! }
+ public var Wallet_Configuration_Apply: String { return self._s[2642]! }
+ public var Preview_SaveGif: String { return self._s[2643]! }
+ public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2644]! }
+ public var Profile_About: String { return self._s[2645]! }
+ public var Channel_About_Placeholder: String { return self._s[2646]! }
+ public var Login_InfoTitle: String { return self._s[2647]! }
public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_0])
+ return formatWithArgumentRanges(self._s[2648]!, self._r[2648]!, [_0])
}
- public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2630]! }
- public var Watch_Suggestion_CantTalk: String { return self._s[2632]! }
- public var ContactInfo_Title: String { return self._s[2633]! }
- public var Media_ShareThisVideo: String { return self._s[2634]! }
- public var Weekday_ShortFriday: String { return self._s[2635]! }
- public var AccessDenied_Contacts: String { return self._s[2637]! }
- public var Notification_CallIncomingShort: String { return self._s[2638]! }
- public var Group_Setup_TypePublic: String { return self._s[2639]! }
- public var Notifications_MessageNotificationsExceptions: String { return self._s[2640]! }
- public var Notifications_Badge_IncludeChannels: String { return self._s[2641]! }
- public var Notifications_MessageNotificationsPreview: String { return self._s[2644]! }
- public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2645]! }
- public var Group_ErrorAddTooMuchBots: String { return self._s[2646]! }
- public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2647]! }
- public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2648]! }
+ public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2649]! }
+ public var Watch_Suggestion_CantTalk: String { return self._s[2651]! }
+ public var ContactInfo_Title: String { return self._s[2652]! }
+ public var Media_ShareThisVideo: String { return self._s[2653]! }
+ public var Weekday_ShortFriday: String { return self._s[2654]! }
+ public var AccessDenied_Contacts: String { return self._s[2656]! }
+ public var Notification_CallIncomingShort: String { return self._s[2657]! }
+ public var Group_Setup_TypePublic: String { return self._s[2658]! }
+ public var Notifications_MessageNotificationsExceptions: String { return self._s[2659]! }
+ public var Notifications_Badge_IncludeChannels: String { return self._s[2660]! }
+ public var Notifications_MessageNotificationsPreview: String { return self._s[2663]! }
+ public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2664]! }
+ public var Group_ErrorAddTooMuchBots: String { return self._s[2665]! }
+ public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2666]! }
+ public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2667]! }
public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2649]!, self._r[2649]!, [_0])
- }
- public var DialogList_Typing: String { return self._s[2650]! }
- public var CallFeedback_IncludeLogs: String { return self._s[2652]! }
- public var Checkout_Phone: String { return self._s[2654]! }
- public var Login_InfoFirstNamePlaceholder: String { return self._s[2657]! }
- public var Privacy_Calls_Integration: String { return self._s[2658]! }
- public var Notifications_PermissionsAllow: String { return self._s[2659]! }
- public var TwoStepAuth_AddHintDescription: String { return self._s[2663]! }
- public var Settings_ChatSettings: String { return self._s[2664]! }
- public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2665]!, self._r[2665]!, [_1, _2])
- }
- public var GroupRemoved_DeleteUser: String { return self._s[2667]! }
- public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[2668]!, self._r[2668]!, [_0])
}
+ public var DialogList_Typing: String { return self._s[2669]! }
+ public var CallFeedback_IncludeLogs: String { return self._s[2671]! }
+ public var Checkout_Phone: String { return self._s[2673]! }
+ public var Login_InfoFirstNamePlaceholder: String { return self._s[2676]! }
+ public var Privacy_Calls_Integration: String { return self._s[2677]! }
+ public var Notifications_PermissionsAllow: String { return self._s[2678]! }
+ public var TwoStepAuth_AddHintDescription: String { return self._s[2682]! }
+ public var Settings_ChatSettings: String { return self._s[2683]! }
+ public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2684]!, self._r[2684]!, [_0])
+ }
+ public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2685]!, self._r[2685]!, [_1, _2])
+ }
+ public var GroupRemoved_DeleteUser: String { return self._s[2687]! }
+ public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[2688]!, self._r[2688]!, [_0])
+ }
public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2669]!, self._r[2669]!, [_1])
+ return formatWithArgumentRanges(self._s[2689]!, self._r[2689]!, [_1])
}
- public var Login_ContinueWithLocalization: String { return self._s[2670]! }
- public var Watch_Message_ForwardedFrom: String { return self._s[2671]! }
- public var TwoStepAuth_EnterEmailCode: String { return self._s[2673]! }
- public var Conversation_Unblock: String { return self._s[2674]! }
- public var PrivacySettings_DataSettings: String { return self._s[2675]! }
- public var Group_PublicLink_Info: String { return self._s[2676]! }
+ public var Login_ContinueWithLocalization: String { return self._s[2690]! }
+ public var Watch_Message_ForwardedFrom: String { return self._s[2691]! }
+ public var TwoStepAuth_EnterEmailCode: String { return self._s[2693]! }
+ public var Conversation_Unblock: String { return self._s[2694]! }
+ public var PrivacySettings_DataSettings: String { return self._s[2695]! }
+ public var Group_PublicLink_Info: String { return self._s[2696]! }
public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2677]!, self._r[2677]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2697]!, self._r[2697]!, [_1, _2, _3])
}
- public var Notifications_InAppNotificationsVibrate: String { return self._s[2678]! }
+ public var Notifications_InAppNotificationsVibrate: String { return self._s[2698]! }
public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2679]!, self._r[2679]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[2699]!, self._r[2699]!, [_0, _1])
}
- public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2681]! }
- public var PrivacySettings_Passcode: String { return self._s[2683]! }
- public var Call_Mute: String { return self._s[2684]! }
- public var Wallet_Weekday_Yesterday: String { return self._s[2685]! }
- public var Passport_Language_dz: String { return self._s[2686]! }
- public var Wallet_Receive_AmountHeader: String { return self._s[2687]! }
- public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2688]! }
- public var Passport_Language_tk: String { return self._s[2689]! }
+ public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2701]! }
+ public var PrivacySettings_Passcode: String { return self._s[2703]! }
+ public var Call_Mute: String { return self._s[2704]! }
+ public var Wallet_Weekday_Yesterday: String { return self._s[2705]! }
+ public var Passport_Language_dz: String { return self._s[2706]! }
+ public var Wallet_Receive_AmountHeader: String { return self._s[2707]! }
+ public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2708]! }
+ public var Passport_Language_tk: String { return self._s[2709]! }
public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2690]!, self._r[2690]!, [_0])
+ return formatWithArgumentRanges(self._s[2710]!, self._r[2710]!, [_0])
}
- public var Settings_Search: String { return self._s[2691]! }
- public var Wallet_Month_ShortFebruary: String { return self._s[2692]! }
- public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2693]! }
- public var Wallet_Configuration_SourceJSON: String { return self._s[2694]! }
- public var Conversation_ContextMenuReply: String { return self._s[2695]! }
- public var WallpaperSearch_ColorBrown: String { return self._s[2696]! }
- public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2697]! }
- public var Tour_Title1: String { return self._s[2698]! }
- public var Wallet_Alert_Cancel: String { return self._s[2699]! }
- public var Conversation_ClearGroupHistory: String { return self._s[2701]! }
- public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2702]! }
- public var WallpaperPreview_Motion: String { return self._s[2703]! }
+ public var Settings_Search: String { return self._s[2711]! }
+ public var Wallet_Month_ShortFebruary: String { return self._s[2712]! }
+ public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2713]! }
+ public var Wallet_Configuration_SourceJSON: String { return self._s[2714]! }
+ public var Conversation_ContextMenuReply: String { return self._s[2715]! }
+ public var WallpaperSearch_ColorBrown: String { return self._s[2716]! }
+ public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2717]! }
+ public var Tour_Title1: String { return self._s[2718]! }
+ public var Wallet_Alert_Cancel: String { return self._s[2719]! }
+ public var Conversation_ClearGroupHistory: String { return self._s[2721]! }
+ public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2722]! }
+ public var WallpaperPreview_Motion: String { return self._s[2723]! }
public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2704]!, self._r[2704]!, [_0])
+ return formatWithArgumentRanges(self._s[2724]!, self._r[2724]!, [_0])
}
- public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2705]! }
- public var Call_RateCall: String { return self._s[2706]! }
- public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2707]! }
- public var Passport_PasswordCompleteSetup: String { return self._s[2708]! }
- public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2709]! }
- public var UserInfo_LastNamePlaceholder: String { return self._s[2711]! }
+ public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2725]! }
+ public var Call_RateCall: String { return self._s[2726]! }
+ public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2727]! }
+ public var Passport_PasswordCompleteSetup: String { return self._s[2728]! }
+ public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2729]! }
+ public var UserInfo_LastNamePlaceholder: String { return self._s[2731]! }
public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2713]!, self._r[2713]!, [_0])
+ return formatWithArgumentRanges(self._s[2733]!, self._r[2733]!, [_0])
}
- public var Compose_Create: String { return self._s[2714]! }
- public var Contacts_InviteToTelegram: String { return self._s[2715]! }
- public var GroupInfo_Notifications: String { return self._s[2716]! }
- public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2718]! }
- public var Message_PinnedLiveLocationMessage: String { return self._s[2719]! }
- public var Month_GenApril: String { return self._s[2720]! }
- public var Appearance_AutoNightTheme: String { return self._s[2721]! }
- public var ChatSettings_AutomaticAudioDownload: String { return self._s[2723]! }
- public var Login_CodeSentSms: String { return self._s[2725]! }
+ public var Compose_Create: String { return self._s[2734]! }
+ public var Contacts_InviteToTelegram: String { return self._s[2735]! }
+ public var GroupInfo_Notifications: String { return self._s[2736]! }
+ public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2738]! }
+ public var Message_PinnedLiveLocationMessage: String { return self._s[2739]! }
+ public var Month_GenApril: String { return self._s[2740]! }
+ public var Appearance_AutoNightTheme: String { return self._s[2741]! }
+ public var ChatSettings_AutomaticAudioDownload: String { return self._s[2743]! }
+ public var Login_CodeSentSms: String { return self._s[2745]! }
public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2726]!, self._r[2726]!, [_0])
+ return formatWithArgumentRanges(self._s[2746]!, self._r[2746]!, [_0])
}
- public var EmptyGroupInfo_Line3: String { return self._s[2727]! }
- public var LogoutOptions_ContactSupportText: String { return self._s[2728]! }
- public var Passport_Language_hr: String { return self._s[2729]! }
- public var Common_ActionNotAllowedError: String { return self._s[2730]! }
+ public var EmptyGroupInfo_Line3: String { return self._s[2747]! }
+ public var LogoutOptions_ContactSupportText: String { return self._s[2748]! }
+ public var Passport_Language_hr: String { return self._s[2749]! }
+ public var Common_ActionNotAllowedError: String { return self._s[2750]! }
public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2731]!, self._r[2731]!, [_0])
+ return formatWithArgumentRanges(self._s[2751]!, self._r[2751]!, [_0])
}
- public var GroupInfo_InviteLink_CopyLink: String { return self._s[2732]! }
- public var Wallet_Info_TransactionFrom: String { return self._s[2733]! }
- public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2734]! }
- public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2735]! }
- public var Privacy_SecretChatsTitle: String { return self._s[2736]! }
- public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2738]! }
- public var GroupInfo_AddUserLeftError: String { return self._s[2739]! }
- public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2740]! }
- public var LogoutOptions_ContactSupportTitle: String { return self._s[2741]! }
- public var Channel_AddBotErrorHaveRights: String { return self._s[2742]! }
- public var Preview_DeleteGif: String { return self._s[2743]! }
- public var GroupInfo_Permissions_Exceptions: String { return self._s[2744]! }
- public var Group_ErrorNotMutualContact: String { return self._s[2745]! }
- public var Notification_MessageLifetime5s: String { return self._s[2746]! }
- public var Wallet_Send_OwnAddressAlertText: String { return self._s[2747]! }
+ public var GroupInfo_InviteLink_CopyLink: String { return self._s[2752]! }
+ public var Wallet_Info_TransactionFrom: String { return self._s[2753]! }
+ public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2754]! }
+ public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2755]! }
+ public var Privacy_SecretChatsTitle: String { return self._s[2756]! }
+ public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2758]! }
+ public var GroupInfo_AddUserLeftError: String { return self._s[2759]! }
+ public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2760]! }
+ public var LogoutOptions_ContactSupportTitle: String { return self._s[2761]! }
+ public var Channel_AddBotErrorHaveRights: String { return self._s[2762]! }
+ public var Preview_DeleteGif: String { return self._s[2763]! }
+ public var GroupInfo_Permissions_Exceptions: String { return self._s[2764]! }
+ public var Group_ErrorNotMutualContact: String { return self._s[2765]! }
+ public var Notification_MessageLifetime5s: String { return self._s[2766]! }
+ public var Wallet_Send_OwnAddressAlertText: String { return self._s[2767]! }
public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2748]!, self._r[2748]!, [_0])
+ return formatWithArgumentRanges(self._s[2768]!, self._r[2768]!, [_0])
}
- public var VoiceOver_Chat_Video: String { return self._s[2749]! }
- public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2751]! }
- public var ReportSpam_DeleteThisChat: String { return self._s[2752]! }
- public var Passport_Address_AddBankStatement: String { return self._s[2753]! }
- public var Notification_CallIncoming: String { return self._s[2754]! }
- public var Wallet_Words_NotDoneTitle: String { return self._s[2755]! }
- public var Compose_NewGroupTitle: String { return self._s[2756]! }
- public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2758]! }
- public var Passport_Address_Postcode: String { return self._s[2760]! }
+ public var VoiceOver_Chat_Video: String { return self._s[2769]! }
+ public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2771]! }
+ public var ReportSpam_DeleteThisChat: String { return self._s[2772]! }
+ public var Passport_Address_AddBankStatement: String { return self._s[2773]! }
+ public var Notification_CallIncoming: String { return self._s[2774]! }
+ public var Wallet_Words_NotDoneTitle: String { return self._s[2775]! }
+ public var Compose_NewGroupTitle: String { return self._s[2776]! }
+ public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2778]! }
+ public var Passport_Address_Postcode: String { return self._s[2780]! }
public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2761]!, self._r[2761]!, [_0])
+ return formatWithArgumentRanges(self._s[2781]!, self._r[2781]!, [_0])
}
- public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2762]! }
- public var Wallet_Month_ShortOctober: String { return self._s[2763]! }
- public var VoiceOver_Chat_YourMusic: String { return self._s[2764]! }
- public var WallpaperColors_Title: String { return self._s[2765]! }
- public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2766]! }
- public var VoiceOver_MessageContextForward: String { return self._s[2767]! }
- public var GroupPermission_Duration: String { return self._s[2768]! }
+ public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2782]! }
+ public var Wallet_Month_ShortOctober: String { return self._s[2783]! }
+ public var VoiceOver_Chat_YourMusic: String { return self._s[2784]! }
+ public var WallpaperColors_Title: String { return self._s[2785]! }
+ public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2786]! }
+ public var VoiceOver_MessageContextForward: String { return self._s[2787]! }
+ public var GroupPermission_Duration: String { return self._s[2788]! }
public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2769]!, self._r[2769]!, [_0])
+ return formatWithArgumentRanges(self._s[2789]!, self._r[2789]!, [_0])
}
- public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2770]! }
- public var Username_Placeholder: String { return self._s[2771]! }
- public var CallFeedback_WhatWentWrong: String { return self._s[2772]! }
- public var Passport_FieldAddressUploadHelp: String { return self._s[2773]! }
- public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2774]! }
+ public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2790]! }
+ public var Username_Placeholder: String { return self._s[2791]! }
+ public var CallFeedback_WhatWentWrong: String { return self._s[2792]! }
+ public var Passport_FieldAddressUploadHelp: String { return self._s[2793]! }
+ public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2794]! }
public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2776]!, self._r[2776]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2796]!, self._r[2796]!, [_1, _2])
}
- public var Passport_PasswordDescription: String { return self._s[2777]! }
- public var Channel_MessagePhotoUpdated: String { return self._s[2778]! }
- public var MediaPicker_TapToUngroupDescription: String { return self._s[2779]! }
- public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2780]! }
- public var AttachmentMenu_PhotoOrVideo: String { return self._s[2781]! }
- public var Conversation_ContextMenuMore: String { return self._s[2782]! }
- public var Privacy_PaymentsClearInfo: String { return self._s[2783]! }
- public var CallSettings_TabIcon: String { return self._s[2784]! }
- public var KeyCommand_Find: String { return self._s[2785]! }
- public var ClearCache_FreeSpaceDescription: String { return self._s[2786]! }
- public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2787]! }
- public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2788]! }
- public var Message_PinnedGame: String { return self._s[2789]! }
- public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2790]! }
- public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2792]! }
- public var Login_CallRequestState2: String { return self._s[2794]! }
- public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2796]! }
+ public var Passport_PasswordDescription: String { return self._s[2797]! }
+ public var Channel_MessagePhotoUpdated: String { return self._s[2798]! }
+ public var MediaPicker_TapToUngroupDescription: String { return self._s[2799]! }
+ public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2800]! }
+ public var AttachmentMenu_PhotoOrVideo: String { return self._s[2801]! }
+ public var Conversation_ContextMenuMore: String { return self._s[2802]! }
+ public var Privacy_PaymentsClearInfo: String { return self._s[2803]! }
+ public var CallSettings_TabIcon: String { return self._s[2804]! }
+ public var KeyCommand_Find: String { return self._s[2805]! }
+ public var ClearCache_FreeSpaceDescription: String { return self._s[2806]! }
+ public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2807]! }
+ public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2808]! }
+ public var Message_PinnedGame: String { return self._s[2809]! }
+ public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2810]! }
+ public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2812]! }
+ public var Login_CallRequestState2: String { return self._s[2814]! }
+ public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2816]! }
public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2797]!, self._r[2797]!, [_0])
+ return formatWithArgumentRanges(self._s[2817]!, self._r[2817]!, [_0])
}
public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2799]!, self._r[2799]!, [_0])
+ return formatWithArgumentRanges(self._s[2819]!, self._r[2819]!, [_0])
}
- public var WallpaperPreview_Blurred: String { return self._s[2800]! }
- public var Conversation_InstantPagePreview: String { return self._s[2801]! }
+ public var WallpaperPreview_Blurred: String { return self._s[2820]! }
+ public var Conversation_InstantPagePreview: String { return self._s[2821]! }
public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2802]!, self._r[2802]!, [_0])
+ return formatWithArgumentRanges(self._s[2822]!, self._r[2822]!, [_0])
}
- public var SecretTimer_VideoDescription: String { return self._s[2805]! }
- public var WallpaperSearch_ColorRed: String { return self._s[2806]! }
- public var GroupPermission_NoPinMessages: String { return self._s[2807]! }
- public var Passport_Language_es: String { return self._s[2808]! }
- public var Permissions_ContactsAllow_v0: String { return self._s[2810]! }
- public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2811]! }
+ public var SecretTimer_VideoDescription: String { return self._s[2825]! }
+ public var WallpaperSearch_ColorRed: String { return self._s[2826]! }
+ public var GroupPermission_NoPinMessages: String { return self._s[2827]! }
+ public var Passport_Language_es: String { return self._s[2828]! }
+ public var Permissions_ContactsAllow_v0: String { return self._s[2830]! }
+ public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2831]! }
public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2812]!, self._r[2812]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2832]!, self._r[2832]!, [_1, _2])
}
- public var Privacy_Forwards_CustomHelp: String { return self._s[2813]! }
- public var WebPreview_GettingLinkInfo: String { return self._s[2814]! }
- public var Watch_UserInfo_Unmute: String { return self._s[2815]! }
- public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2816]! }
- public var AccessDenied_CameraRestricted: String { return self._s[2818]! }
+ public var Privacy_Forwards_CustomHelp: String { return self._s[2833]! }
+ public var WebPreview_GettingLinkInfo: String { return self._s[2834]! }
+ public var Watch_UserInfo_Unmute: String { return self._s[2835]! }
+ public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2836]! }
+ public var AccessDenied_CameraRestricted: String { return self._s[2838]! }
public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2819]!, self._r[2819]!, ["\(_0)"])
+ return formatWithArgumentRanges(self._s[2839]!, self._r[2839]!, ["\(_0)"])
}
- public var ChatList_ReadAll: String { return self._s[2821]! }
- public var Settings_CopyUsername: String { return self._s[2822]! }
- public var Contacts_SearchLabel: String { return self._s[2823]! }
- public var Map_OpenInYandexNavigator: String { return self._s[2825]! }
- public var PasscodeSettings_EncryptData: String { return self._s[2826]! }
- public var Settings_Wallet: String { return self._s[2827]! }
- public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2828]! }
- public var WallpaperSearch_ColorPrefix: String { return self._s[2829]! }
- public var Notifications_GroupNotificationsPreview: String { return self._s[2830]! }
- public var DialogList_AdNoticeAlert: String { return self._s[2831]! }
- public var Wallet_Month_GenMay: String { return self._s[2833]! }
- public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2834]! }
- public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2835]! }
- public var Localization_LanguageCustom: String { return self._s[2836]! }
- public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2837]! }
- public var CallFeedback_Title: String { return self._s[2838]! }
- public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2841]! }
- public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2842]! }
- public var Wallet_Intro_CreateErrorTitle: String { return self._s[2843]! }
- public var Conversation_InfoGroup: String { return self._s[2844]! }
- public var Compose_NewMessage: String { return self._s[2845]! }
- public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2846]! }
- public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2847]! }
- public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2848]! }
- public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2849]! }
+ public var ChatList_ReadAll: String { return self._s[2841]! }
+ public var Settings_CopyUsername: String { return self._s[2842]! }
+ public var Contacts_SearchLabel: String { return self._s[2843]! }
+ public var Map_OpenInYandexNavigator: String { return self._s[2845]! }
+ public var PasscodeSettings_EncryptData: String { return self._s[2846]! }
+ public var Settings_Wallet: String { return self._s[2847]! }
+ public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2848]! }
+ public var WallpaperSearch_ColorPrefix: String { return self._s[2849]! }
+ public var Notifications_GroupNotificationsPreview: String { return self._s[2850]! }
+ public var DialogList_AdNoticeAlert: String { return self._s[2851]! }
+ public var Wallet_Month_GenMay: String { return self._s[2853]! }
+ public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2854]! }
+ public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2855]! }
+ public var Localization_LanguageCustom: String { return self._s[2856]! }
+ public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2857]! }
+ public var CallFeedback_Title: String { return self._s[2858]! }
+ public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2861]! }
+ public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2862]! }
+ public var Wallet_Intro_CreateErrorTitle: String { return self._s[2863]! }
+ public var Conversation_InfoGroup: String { return self._s[2864]! }
+ public var Compose_NewMessage: String { return self._s[2865]! }
+ public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2866]! }
+ public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2867]! }
+ public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2868]! }
+ public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2869]! }
public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2850]!, self._r[2850]!, [_0])
+ return formatWithArgumentRanges(self._s[2870]!, self._r[2870]!, [_0])
}
- public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2851]! }
- public var Login_CancelSignUpConfirmation: String { return self._s[2852]! }
- public var ChangePhoneNumberCode_Help: String { return self._s[2853]! }
- public var PrivacySettings_DeleteAccountHelp: String { return self._s[2854]! }
- public var Channel_BlackList_Title: String { return self._s[2855]! }
- public var UserInfo_PhoneCall: String { return self._s[2856]! }
- public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2858]! }
- public var Wallet_Month_ShortJanuary: String { return self._s[2859]! }
- public var State_connecting: String { return self._s[2860]! }
- public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2861]! }
- public var Wallet_Month_GenMarch: String { return self._s[2862]! }
- public var EditTheme_Expand_BottomInfo: String { return self._s[2863]! }
+ public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2871]! }
+ public var Login_CancelSignUpConfirmation: String { return self._s[2872]! }
+ public var ChangePhoneNumberCode_Help: String { return self._s[2873]! }
+ public var PrivacySettings_DeleteAccountHelp: String { return self._s[2874]! }
+ public var Channel_BlackList_Title: String { return self._s[2875]! }
+ public var UserInfo_PhoneCall: String { return self._s[2876]! }
+ public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2878]! }
+ public var Wallet_Month_ShortJanuary: String { return self._s[2879]! }
+ public var State_connecting: String { return self._s[2880]! }
+ public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2881]! }
+ public var Wallet_Month_GenMarch: String { return self._s[2882]! }
+ public var EditTheme_Expand_BottomInfo: String { return self._s[2883]! }
public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2864]!, self._r[2864]!, [_0])
+ return formatWithArgumentRanges(self._s[2884]!, self._r[2884]!, [_0])
}
public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2865]!, self._r[2865]!, [_0])
+ return formatWithArgumentRanges(self._s[2885]!, self._r[2885]!, [_0])
}
- public var Notifications_GroupNotifications: String { return self._s[2866]! }
- public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2867]! }
- public var Passport_Identity_EditPassport: String { return self._s[2868]! }
- public var EnterPasscode_RepeatNewPasscode: String { return self._s[2870]! }
- public var Localization_EnglishLanguageName: String { return self._s[2871]! }
- public var Share_AuthDescription: String { return self._s[2872]! }
- public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2873]! }
- public var Passport_Identity_Surname: String { return self._s[2874]! }
- public var Compose_TokenListPlaceholder: String { return self._s[2875]! }
- public var Passport_Identity_OneOfTypePassport: String { return self._s[2876]! }
- public var Settings_AboutEmpty: String { return self._s[2877]! }
- public var Conversation_Unmute: String { return self._s[2878]! }
- public var CreateGroup_ChannelsTooMuch: String { return self._s[2880]! }
- public var Wallet_Sending_Text: String { return self._s[2881]! }
+ public var Notifications_GroupNotifications: String { return self._s[2886]! }
+ public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2887]! }
+ public var Passport_Identity_EditPassport: String { return self._s[2888]! }
+ public var EnterPasscode_RepeatNewPasscode: String { return self._s[2890]! }
+ public var Localization_EnglishLanguageName: String { return self._s[2891]! }
+ public var Share_AuthDescription: String { return self._s[2892]! }
+ public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2893]! }
+ public var Passport_Identity_Surname: String { return self._s[2894]! }
+ public var Compose_TokenListPlaceholder: String { return self._s[2895]! }
+ public var Wallet_AccessDenied_Camera: String { return self._s[2896]! }
+ public var Passport_Identity_OneOfTypePassport: String { return self._s[2897]! }
+ public var Settings_AboutEmpty: String { return self._s[2898]! }
+ public var Conversation_Unmute: String { return self._s[2899]! }
+ public var CreateGroup_ChannelsTooMuch: String { return self._s[2901]! }
+ public var Wallet_Sending_Text: String { return self._s[2902]! }
public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2882]!, self._r[2882]!, [_1])
+ return formatWithArgumentRanges(self._s[2903]!, self._r[2903]!, [_1])
}
- public var Login_CodeSentCall: String { return self._s[2883]! }
- public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2885]! }
- public var ChatSettings_Appearance: String { return self._s[2886]! }
- public var ClearCache_StorageUsage: String { return self._s[2887]! }
- public var Appearance_PickAccentColor: String { return self._s[2888]! }
+ public var Login_CodeSentCall: String { return self._s[2904]! }
+ public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2906]! }
+ public var ChatSettings_Appearance: String { return self._s[2907]! }
+ public var ClearCache_StorageUsage: String { return self._s[2908]! }
+ public var Appearance_PickAccentColor: String { return self._s[2909]! }
public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2889]!, self._r[2889]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2910]!, self._r[2910]!, [_1, _2])
}
public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2890]!, self._r[2890]!, [_1])
+ return formatWithArgumentRanges(self._s[2911]!, self._r[2911]!, [_1])
}
- public var Notification_CallMissed: String { return self._s[2891]! }
- public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2892]! }
- public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2893]! }
- public var Wallet_Month_GenOctober: String { return self._s[2895]! }
- public var ChatAdmins_AdminLabel: String { return self._s[2896]! }
- public var KeyCommand_JumpToNextChat: String { return self._s[2897]! }
- public var Conversation_StopPollConfirmationTitle: String { return self._s[2899]! }
- public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2900]! }
- public var Month_GenJune: String { return self._s[2901]! }
- public var Watch_Location_Current: String { return self._s[2902]! }
- public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2903]! }
- public var Conversation_TitleMute: String { return self._s[2904]! }
+ public var Notification_CallMissed: String { return self._s[2912]! }
+ public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2913]! }
+ public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2914]! }
+ public var Wallet_Month_GenOctober: String { return self._s[2916]! }
+ public var ChatAdmins_AdminLabel: String { return self._s[2917]! }
+ public var KeyCommand_JumpToNextChat: String { return self._s[2918]! }
+ public var Conversation_StopPollConfirmationTitle: String { return self._s[2920]! }
+ public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2921]! }
+ public var Month_GenJune: String { return self._s[2922]! }
+ public var Watch_Location_Current: String { return self._s[2923]! }
+ public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2924]! }
+ public var Conversation_TitleMute: String { return self._s[2925]! }
public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2905]!, self._r[2905]!, [_1])
+ return formatWithArgumentRanges(self._s[2926]!, self._r[2926]!, [_1])
}
- public var GroupInfo_DeleteAndExit: String { return self._s[2906]! }
+ public var GroupInfo_DeleteAndExit: String { return self._s[2927]! }
public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2907]!, self._r[2907]!, [_0])
+ return formatWithArgumentRanges(self._s[2928]!, self._r[2928]!, [_0])
}
- public var Call_ReportPlaceholder: String { return self._s[2908]! }
- public var Chat_SlowmodeSendError: String { return self._s[2909]! }
- public var MaskStickerSettings_Info: String { return self._s[2910]! }
- public var EditTheme_Expand_TopInfo: String { return self._s[2911]! }
+ public var Call_ReportPlaceholder: String { return self._s[2929]! }
+ public var Chat_SlowmodeSendError: String { return self._s[2930]! }
+ public var MaskStickerSettings_Info: String { return self._s[2931]! }
+ public var EditTheme_Expand_TopInfo: String { return self._s[2932]! }
public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2912]!, self._r[2912]!, [_0])
+ return formatWithArgumentRanges(self._s[2933]!, self._r[2933]!, [_0])
}
- public var Checkout_NewCard_PostcodeTitle: String { return self._s[2913]! }
- public var Passport_Address_RegionPlaceholder: String { return self._s[2915]! }
- public var Contacts_ShareTelegram: String { return self._s[2916]! }
- public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2917]! }
- public var Channel_ErrorAccessDenied: String { return self._s[2918]! }
- public var UserInfo_ScamBotWarning: String { return self._s[2920]! }
- public var Stickers_GroupChooseStickerPack: String { return self._s[2921]! }
- public var Call_ConnectionErrorTitle: String { return self._s[2922]! }
- public var UserInfo_NotificationsEnable: String { return self._s[2923]! }
- public var ArchivedChats_IntroText1: String { return self._s[2924]! }
- public var Tour_Text4: String { return self._s[2927]! }
- public var WallpaperSearch_Recent: String { return self._s[2928]! }
- public var GroupInfo_ScamGroupWarning: String { return self._s[2929]! }
- public var Profile_MessageLifetime2s: String { return self._s[2931]! }
- public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2932]! }
- public var Notification_MessageLifetime2s: String { return self._s[2933]! }
+ public var Checkout_NewCard_PostcodeTitle: String { return self._s[2934]! }
+ public var Passport_Address_RegionPlaceholder: String { return self._s[2936]! }
+ public var Contacts_ShareTelegram: String { return self._s[2937]! }
+ public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2938]! }
+ public var Channel_ErrorAccessDenied: String { return self._s[2939]! }
+ public var UserInfo_ScamBotWarning: String { return self._s[2941]! }
+ public var Stickers_GroupChooseStickerPack: String { return self._s[2942]! }
+ public var Call_ConnectionErrorTitle: String { return self._s[2943]! }
+ public var UserInfo_NotificationsEnable: String { return self._s[2944]! }
+ public var ArchivedChats_IntroText1: String { return self._s[2945]! }
+ public var Tour_Text4: String { return self._s[2948]! }
+ public var WallpaperSearch_Recent: String { return self._s[2949]! }
+ public var GroupInfo_ScamGroupWarning: String { return self._s[2950]! }
+ public var Profile_MessageLifetime2s: String { return self._s[2952]! }
+ public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2953]! }
+ public var Notification_MessageLifetime2s: String { return self._s[2954]! }
public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2934]!, self._r[2934]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[2955]!, self._r[2955]!, [_1, _2, _3])
}
- public var Cache_ClearCache: String { return self._s[2935]! }
- public var AutoNightTheme_UpdateLocation: String { return self._s[2936]! }
- public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2937]! }
+ public var Cache_ClearCache: String { return self._s[2956]! }
+ public var AutoNightTheme_UpdateLocation: String { return self._s[2957]! }
+ public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2958]! }
public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2941]!, self._r[2941]!, [_0])
+ return formatWithArgumentRanges(self._s[2962]!, self._r[2962]!, [_0])
}
public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2943]!, self._r[2943]!, [_0])
+ return formatWithArgumentRanges(self._s[2964]!, self._r[2964]!, [_0])
}
- public var LocalGroup_Text: String { return self._s[2944]! }
- public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2945]! }
- public var SocksProxySetup_TypeSocks: String { return self._s[2946]! }
- public var ChatList_UnarchiveAction: String { return self._s[2947]! }
- public var AutoNightTheme_Title: String { return self._s[2948]! }
- public var InstantPage_FeedbackButton: String { return self._s[2949]! }
- public var Passport_FieldAddress: String { return self._s[2950]! }
+ public var LocalGroup_Text: String { return self._s[2965]! }
+ public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2966]! }
+ public var SocksProxySetup_TypeSocks: String { return self._s[2967]! }
+ public var ChatList_UnarchiveAction: String { return self._s[2968]! }
+ public var AutoNightTheme_Title: String { return self._s[2969]! }
+ public var InstantPage_FeedbackButton: String { return self._s[2970]! }
+ public var Passport_FieldAddress: String { return self._s[2971]! }
public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2951]!, self._r[2951]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2972]!, self._r[2972]!, [_1, _2])
}
- public var Month_ShortMarch: String { return self._s[2952]! }
+ public var Month_ShortMarch: String { return self._s[2973]! }
public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2953]!, self._r[2953]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2974]!, self._r[2974]!, [_1, _2])
}
- public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2954]! }
- public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2955]! }
- public var Passport_FloodError: String { return self._s[2956]! }
- public var SecretGif_Title: String { return self._s[2957]! }
- public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2958]! }
- public var ChatList_Context_UnhideArchive: String { return self._s[2959]! }
- public var Passport_Language_th: String { return self._s[2961]! }
- public var Passport_Address_Address: String { return self._s[2962]! }
- public var Login_InvalidLastNameError: String { return self._s[2963]! }
- public var Notifications_InAppNotificationsPreview: String { return self._s[2964]! }
- public var Notifications_PermissionsUnreachableTitle: String { return self._s[2965]! }
- public var ChatList_Context_Archive: String { return self._s[2966]! }
- public var SettingsSearch_FAQ: String { return self._s[2967]! }
- public var ShareMenu_Send: String { return self._s[2968]! }
- public var WallpaperSearch_ColorYellow: String { return self._s[2970]! }
- public var Month_GenNovember: String { return self._s[2972]! }
- public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2974]! }
+ public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2975]! }
+ public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2976]! }
+ public var Passport_FloodError: String { return self._s[2977]! }
+ public var SecretGif_Title: String { return self._s[2978]! }
+ public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2979]! }
+ public var ChatList_Context_UnhideArchive: String { return self._s[2980]! }
+ public var Passport_Language_th: String { return self._s[2982]! }
+ public var Passport_Address_Address: String { return self._s[2983]! }
+ public var Login_InvalidLastNameError: String { return self._s[2984]! }
+ public var Notifications_InAppNotificationsPreview: String { return self._s[2985]! }
+ public var Notifications_PermissionsUnreachableTitle: String { return self._s[2986]! }
+ public var ChatList_Context_Archive: String { return self._s[2987]! }
+ public var SettingsSearch_FAQ: String { return self._s[2988]! }
+ public var ShareMenu_Send: String { return self._s[2989]! }
+ public var WallpaperSearch_ColorYellow: String { return self._s[2991]! }
+ public var Month_GenNovember: String { return self._s[2993]! }
+ public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2995]! }
public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2975]!, self._r[2975]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[2996]!, self._r[2996]!, [_1, _2])
}
- public var Conversation_SwipeToReplyHintText: String { return self._s[2976]! }
- public var Checkout_Email: String { return self._s[2977]! }
- public var NotificationsSound_Tritone: String { return self._s[2978]! }
- public var StickerPacksSettings_ManagingHelp: String { return self._s[2980]! }
- public var Wallet_ContextMenuCopy: String { return self._s[2982]! }
+ public var Conversation_SwipeToReplyHintText: String { return self._s[2997]! }
+ public var Checkout_Email: String { return self._s[2998]! }
+ public var NotificationsSound_Tritone: String { return self._s[2999]! }
+ public var StickerPacksSettings_ManagingHelp: String { return self._s[3001]! }
+ public var Wallet_ContextMenuCopy: String { return self._s[3003]! }
public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2984]!, self._r[2984]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3005]!, self._r[3005]!, [_1, _2, _3])
}
public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2985]!, self._r[2985]!, [_1])
+ return formatWithArgumentRanges(self._s[3006]!, self._r[3006]!, [_1])
}
- public var ChangePhoneNumberNumber_Help: String { return self._s[2986]! }
+ public var ChangePhoneNumberNumber_Help: String { return self._s[3007]! }
public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[2987]!, self._r[2987]!, [_1, _1, _1, _2])
+ return formatWithArgumentRanges(self._s[3008]!, self._r[3008]!, [_1, _1, _1, _2])
}
- public var ChatList_UndoArchiveTitle: String { return self._s[2988]! }
- public var Notification_Exceptions_Add: String { return self._s[2989]! }
- public var DialogList_You: String { return self._s[2990]! }
- public var MediaPicker_Send: String { return self._s[2993]! }
- public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2994]! }
- public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[2995]! }
- public var Call_AudioRouteSpeaker: String { return self._s[2996]! }
- public var Watch_UserInfo_Title: String { return self._s[2997]! }
- public var VoiceOver_Chat_PollFinalResults: String { return self._s[2998]! }
- public var Appearance_AccentColor: String { return self._s[3000]! }
+ public var ChatList_UndoArchiveTitle: String { return self._s[3009]! }
+ public var Notification_Exceptions_Add: String { return self._s[3010]! }
+ public var DialogList_You: String { return self._s[3011]! }
+ public var MediaPicker_Send: String { return self._s[3014]! }
+ public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3015]! }
+ public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3016]! }
+ public var Call_AudioRouteSpeaker: String { return self._s[3017]! }
+ public var Watch_UserInfo_Title: String { return self._s[3018]! }
+ public var VoiceOver_Chat_PollFinalResults: String { return self._s[3019]! }
+ public var Appearance_AccentColor: String { return self._s[3021]! }
public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3001]!, self._r[3001]!, [_0])
+ return formatWithArgumentRanges(self._s[3022]!, self._r[3022]!, [_0])
}
- public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3002]! }
+ public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3023]! }
public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3003]!, self._r[3003]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3024]!, self._r[3024]!, [_1, _2])
}
- public var Conversation_ClousStorageInfo_Description2: String { return self._s[3004]! }
- public var WebSearch_RecentClearConfirmation: String { return self._s[3005]! }
- public var Notification_CallOutgoing: String { return self._s[3006]! }
- public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3007]! }
- public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3008]! }
- public var Call_RecordingDisabledMessage: String { return self._s[3009]! }
- public var Message_Game: String { return self._s[3010]! }
- public var Conversation_PressVolumeButtonForSound: String { return self._s[3011]! }
- public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3012]! }
- public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3013]! }
- public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3014]! }
- public var Date_DialogDateFormat: String { return self._s[3015]! }
- public var WallpaperColors_SetCustomColor: String { return self._s[3016]! }
- public var Notifications_InAppNotifications: String { return self._s[3017]! }
+ public var Conversation_ClousStorageInfo_Description2: String { return self._s[3025]! }
+ public var WebSearch_RecentClearConfirmation: String { return self._s[3026]! }
+ public var Notification_CallOutgoing: String { return self._s[3027]! }
+ public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3028]! }
+ public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3029]! }
+ public var Call_RecordingDisabledMessage: String { return self._s[3030]! }
+ public var Message_Game: String { return self._s[3031]! }
+ public var Conversation_PressVolumeButtonForSound: String { return self._s[3032]! }
+ public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3033]! }
+ public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3034]! }
+ public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3035]! }
+ public var Date_DialogDateFormat: String { return self._s[3036]! }
+ public var WallpaperColors_SetCustomColor: String { return self._s[3037]! }
+ public var Notifications_InAppNotifications: String { return self._s[3038]! }
public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3018]!, self._r[3018]!, [_0])
+ return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_0])
}
public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3019]!, self._r[3019]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3040]!, self._r[3040]!, [_1, _2])
}
- public var NewContact_Title: String { return self._s[3020]! }
+ public var NewContact_Title: String { return self._s[3041]! }
public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3021]!, self._r[3021]!, [_0])
+ return formatWithArgumentRanges(self._s[3042]!, self._r[3042]!, [_0])
}
- public var Conversation_ViewContactDetails: String { return self._s[3022]! }
+ public var Conversation_ViewContactDetails: String { return self._s[3043]! }
public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3024]!, self._r[3024]!, [_1])
+ return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_1])
}
- public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3025]! }
- public var Passport_Identity_ExpiryDateNone: String { return self._s[3026]! }
- public var PrivacySettings_Title: String { return self._s[3027]! }
- public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3030]! }
- public var GroupRemoved_UsersSectionTitle: String { return self._s[3031]! }
- public var VoiceOver_Chat_ContactEmail: String { return self._s[3032]! }
- public var Contacts_PhoneNumber: String { return self._s[3033]! }
- public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3035]! }
- public var Map_ShowPlaces: String { return self._s[3036]! }
- public var ChatAdmins_Title: String { return self._s[3037]! }
- public var InstantPage_Reference: String { return self._s[3039]! }
- public var Wallet_Info_Updating: String { return self._s[3040]! }
- public var ReportGroupLocation_Text: String { return self._s[3041]! }
+ public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3046]! }
+ public var Passport_Identity_ExpiryDateNone: String { return self._s[3047]! }
+ public var PrivacySettings_Title: String { return self._s[3048]! }
+ public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3051]! }
+ public var GroupRemoved_UsersSectionTitle: String { return self._s[3052]! }
+ public var VoiceOver_Chat_ContactEmail: String { return self._s[3053]! }
+ public var Contacts_PhoneNumber: String { return self._s[3054]! }
+ public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3056]! }
+ public var Map_ShowPlaces: String { return self._s[3057]! }
+ public var ChatAdmins_Title: String { return self._s[3058]! }
+ public var InstantPage_Reference: String { return self._s[3060]! }
+ public var Wallet_Info_Updating: String { return self._s[3061]! }
+ public var ReportGroupLocation_Text: String { return self._s[3062]! }
public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3042]!, self._r[3042]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3063]!, self._r[3063]!, [_1, _2])
}
- public var Camera_FlashOff: String { return self._s[3043]! }
- public var Watch_UserInfo_Block: String { return self._s[3044]! }
- public var ChatSettings_Stickers: String { return self._s[3045]! }
- public var ChatSettings_DownloadInBackground: String { return self._s[3046]! }
- public var Appearance_ThemeCarouselTintedNight: String { return self._s[3047]! }
+ public var Camera_FlashOff: String { return self._s[3064]! }
+ public var Watch_UserInfo_Block: String { return self._s[3065]! }
+ public var ChatSettings_Stickers: String { return self._s[3066]! }
+ public var ChatSettings_DownloadInBackground: String { return self._s[3067]! }
+ public var Appearance_ThemeCarouselTintedNight: String { return self._s[3068]! }
public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3048]!, self._r[3048]!, [_0])
+ return formatWithArgumentRanges(self._s[3069]!, self._r[3069]!, [_0])
}
- public var Settings_ViewPhoto: String { return self._s[3049]! }
- public var Login_CheckOtherSessionMessages: String { return self._s[3050]! }
- public var AutoDownloadSettings_Cellular: String { return self._s[3051]! }
- public var Wallet_Created_ExportErrorTitle: String { return self._s[3052]! }
- public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3053]! }
- public var VoiceOver_MessageContextShare: String { return self._s[3054]! }
+ public var Settings_ViewPhoto: String { return self._s[3070]! }
+ public var Login_CheckOtherSessionMessages: String { return self._s[3071]! }
+ public var AutoDownloadSettings_Cellular: String { return self._s[3072]! }
+ public var Wallet_Created_ExportErrorTitle: String { return self._s[3073]! }
+ public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3074]! }
+ public var VoiceOver_MessageContextShare: String { return self._s[3075]! }
public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3056]!, self._r[3056]!, [_0])
+ return formatWithArgumentRanges(self._s[3077]!, self._r[3077]!, [_0])
}
- public var Privacy_DeleteDrafts: String { return self._s[3057]! }
- public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3058]! }
+ public var Privacy_DeleteDrafts: String { return self._s[3078]! }
+ public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3079]! }
public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3059]!, self._r[3059]!, [_0])
+ return formatWithArgumentRanges(self._s[3080]!, self._r[3080]!, [_0])
}
- public var DialogList_SavedMessagesHelp: String { return self._s[3060]! }
- public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3061]! }
- public var DialogList_SavedMessages: String { return self._s[3062]! }
- public var GroupInfo_UpgradeButton: String { return self._s[3063]! }
- public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3065]! }
- public var DialogList_Pin: String { return self._s[3066]! }
+ public var DialogList_SavedMessagesHelp: String { return self._s[3081]! }
+ public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3082]! }
+ public var DialogList_SavedMessages: String { return self._s[3083]! }
+ public var GroupInfo_UpgradeButton: String { return self._s[3084]! }
+ public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3086]! }
+ public var DialogList_Pin: String { return self._s[3087]! }
public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3067]!, self._r[3067]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[3088]!, self._r[3088]!, [_0, _1])
}
public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3068]!, self._r[3068]!, [_0])
+ return formatWithArgumentRanges(self._s[3089]!, self._r[3089]!, [_0])
}
- public var Notification_Exceptions_AlwaysOn: String { return self._s[3069]! }
- public var UserInfo_NotificationsDisable: String { return self._s[3070]! }
- public var Paint_Outlined: String { return self._s[3071]! }
- public var Activity_PlayingGame: String { return self._s[3072]! }
- public var SearchImages_NoImagesFound: String { return self._s[3073]! }
- public var SocksProxySetup_ProxyType: String { return self._s[3074]! }
- public var AppleWatch_ReplyPresetsHelp: String { return self._s[3076]! }
- public var Conversation_ContextMenuCancelSending: String { return self._s[3077]! }
- public var Settings_AppLanguage: String { return self._s[3078]! }
- public var TwoStepAuth_ResetAccountHelp: String { return self._s[3079]! }
- public var Common_ChoosePhoto: String { return self._s[3080]! }
- public var CallFeedback_ReasonEcho: String { return self._s[3081]! }
+ public var Notification_Exceptions_AlwaysOn: String { return self._s[3090]! }
+ public var UserInfo_NotificationsDisable: String { return self._s[3091]! }
+ public var Paint_Outlined: String { return self._s[3092]! }
+ public var Activity_PlayingGame: String { return self._s[3093]! }
+ public var SearchImages_NoImagesFound: String { return self._s[3094]! }
+ public var SocksProxySetup_ProxyType: String { return self._s[3095]! }
+ public var AppleWatch_ReplyPresetsHelp: String { return self._s[3097]! }
+ public var Conversation_ContextMenuCancelSending: String { return self._s[3098]! }
+ public var Settings_AppLanguage: String { return self._s[3099]! }
+ public var TwoStepAuth_ResetAccountHelp: String { return self._s[3100]! }
+ public var Common_ChoosePhoto: String { return self._s[3101]! }
+ public var CallFeedback_ReasonEcho: String { return self._s[3102]! }
public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3082]!, self._r[3082]!, [_1])
+ return formatWithArgumentRanges(self._s[3103]!, self._r[3103]!, [_1])
}
- public var Privacy_Calls_AlwaysAllow: String { return self._s[3083]! }
- public var Activity_UploadingVideo: String { return self._s[3084]! }
- public var Conversation_WalletRequiredNotNow: String { return self._s[3085]! }
- public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3086]! }
- public var NetworkUsageSettings_Wifi: String { return self._s[3087]! }
- public var VoiceOver_Editing_ClearText: String { return self._s[3088]! }
- public var PUSH_SENDER_YOU: String { return self._s[3089]! }
- public var Channel_BanUser_PermissionReadMessages: String { return self._s[3090]! }
- public var Checkout_PayWithTouchId: String { return self._s[3091]! }
- public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3092]! }
+ public var Privacy_Calls_AlwaysAllow: String { return self._s[3104]! }
+ public var Activity_UploadingVideo: String { return self._s[3105]! }
+ public var Conversation_WalletRequiredNotNow: String { return self._s[3106]! }
+ public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3107]! }
+ public var NetworkUsageSettings_Wifi: String { return self._s[3108]! }
+ public var VoiceOver_Editing_ClearText: String { return self._s[3109]! }
+ public var PUSH_SENDER_YOU: String { return self._s[3110]! }
+ public var Channel_BanUser_PermissionReadMessages: String { return self._s[3111]! }
+ public var Checkout_PayWithTouchId: String { return self._s[3112]! }
+ public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3113]! }
public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3094]!, self._r[3094]!, [_1])
+ return formatWithArgumentRanges(self._s[3115]!, self._r[3115]!, [_1])
}
- public var Notifications_ExceptionsNone: String { return self._s[3095]! }
+ public var Notifications_ExceptionsNone: String { return self._s[3116]! }
public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3096]!, self._r[3096]!, [_0])
+ return formatWithArgumentRanges(self._s[3117]!, self._r[3117]!, [_0])
}
public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3097]!, self._r[3097]!, [_1])
+ return formatWithArgumentRanges(self._s[3118]!, self._r[3118]!, [_1])
}
- public var AuthSessions_IncompleteAttempts: String { return self._s[3099]! }
- public var Passport_Address_Region: String { return self._s[3102]! }
- public var ChatList_DeleteChat: String { return self._s[3103]! }
- public var LogoutOptions_ClearCacheTitle: String { return self._s[3104]! }
- public var PhotoEditor_TiltShift: String { return self._s[3105]! }
- public var Settings_FAQ_URL: String { return self._s[3106]! }
- public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3107]! }
- public var Passport_Language_sl: String { return self._s[3108]! }
- public var Settings_PrivacySettings: String { return self._s[3110]! }
- public var SharedMedia_TitleLink: String { return self._s[3111]! }
- public var Passport_Identity_TypePassportUploadScan: String { return self._s[3112]! }
- public var Settings_SetProfilePhoto: String { return self._s[3113]! }
- public var Channel_About_Help: String { return self._s[3114]! }
- public var Contacts_PermissionsEnable: String { return self._s[3115]! }
- public var Wallet_Sending_Title: String { return self._s[3116]! }
- public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3117]! }
- public var AttachmentMenu_SendAsFiles: String { return self._s[3118]! }
- public var CallFeedback_ReasonInterruption: String { return self._s[3120]! }
- public var Passport_Address_AddTemporaryRegistration: String { return self._s[3121]! }
- public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3122]! }
- public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3123]! }
- public var PrivacySettings_DeleteAccountTitle: String { return self._s[3124]! }
- public var AccessDenied_VideoMessageCamera: String { return self._s[3126]! }
- public var Map_OpenInYandexMaps: String { return self._s[3128]! }
- public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3129]! }
- public var VoiceOver_MessageContextReply: String { return self._s[3130]! }
- public var PhotoEditor_SaturationTool: String { return self._s[3131]! }
+ public var AuthSessions_IncompleteAttempts: String { return self._s[3120]! }
+ public var Passport_Address_Region: String { return self._s[3123]! }
+ public var ChatList_DeleteChat: String { return self._s[3124]! }
+ public var LogoutOptions_ClearCacheTitle: String { return self._s[3125]! }
+ public var PhotoEditor_TiltShift: String { return self._s[3126]! }
+ public var Settings_FAQ_URL: String { return self._s[3127]! }
+ public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3128]! }
+ public var Passport_Language_sl: String { return self._s[3129]! }
+ public var Settings_PrivacySettings: String { return self._s[3131]! }
+ public var SharedMedia_TitleLink: String { return self._s[3132]! }
+ public var Passport_Identity_TypePassportUploadScan: String { return self._s[3133]! }
+ public var Settings_SetProfilePhoto: String { return self._s[3134]! }
+ public var Channel_About_Help: String { return self._s[3135]! }
+ public var Contacts_PermissionsEnable: String { return self._s[3136]! }
+ public var Wallet_Sending_Title: String { return self._s[3137]! }
+ public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3138]! }
+ public var AttachmentMenu_SendAsFiles: String { return self._s[3139]! }
+ public var CallFeedback_ReasonInterruption: String { return self._s[3141]! }
+ public var Passport_Address_AddTemporaryRegistration: String { return self._s[3142]! }
+ public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3143]! }
+ public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3144]! }
+ public var PrivacySettings_DeleteAccountTitle: String { return self._s[3145]! }
+ public var AccessDenied_VideoMessageCamera: String { return self._s[3147]! }
+ public var Map_OpenInYandexMaps: String { return self._s[3149]! }
+ public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3150]! }
+ public var VoiceOver_MessageContextReply: String { return self._s[3151]! }
+ public var PhotoEditor_SaturationTool: String { return self._s[3152]! }
public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3132]!, self._r[3132]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3153]!, self._r[3153]!, [_1, _2])
}
- public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3133]! }
- public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3134]! }
- public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3135]! }
- public var Appearance_TextSize: String { return self._s[3136]! }
+ public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3154]! }
+ public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3155]! }
+ public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3156]! }
+ public var Appearance_TextSize: String { return self._s[3157]! }
public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_1, "\(_2)"])
+ return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_1, "\(_2)"])
}
- public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3138]! }
- public var Channel_Username_InvalidTooShort: String { return self._s[3140]! }
- public var SettingsSearch_Synonyms_Wallet: String { return self._s[3141]! }
+ public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3159]! }
+ public var Channel_Username_InvalidTooShort: String { return self._s[3161]! }
+ public var SettingsSearch_Synonyms_Wallet: String { return self._s[3162]! }
public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3142]!, self._r[3142]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3163]!, self._r[3163]!, [_1, _2])
}
public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3143]!, self._r[3143]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3164]!, self._r[3164]!, [_1, _2, _3])
}
- public var GroupInfo_PublicLinkAdd: String { return self._s[3144]! }
- public var Passport_PassportInformation: String { return self._s[3147]! }
- public var Theme_Unsupported: String { return self._s[3148]! }
- public var WatchRemote_AlertTitle: String { return self._s[3149]! }
- public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3150]! }
- public var ConvertToSupergroup_HelpText: String { return self._s[3152]! }
+ public var GroupInfo_PublicLinkAdd: String { return self._s[3165]! }
+ public var Passport_PassportInformation: String { return self._s[3168]! }
+ public var Theme_Unsupported: String { return self._s[3169]! }
+ public var WatchRemote_AlertTitle: String { return self._s[3170]! }
+ public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3171]! }
+ public var ConvertToSupergroup_HelpText: String { return self._s[3173]! }
public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3153]!, self._r[3153]!, [_0])
+ return formatWithArgumentRanges(self._s[3174]!, self._r[3174]!, [_0])
}
public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3154]!, self._r[3154]!, [_1])
+ return formatWithArgumentRanges(self._s[3175]!, self._r[3175]!, [_1])
}
- public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3155]! }
- public var Wallet_Navigation_Done: String { return self._s[3157]! }
- public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3158]! }
- public var AccessDenied_CameraDisabled: String { return self._s[3159]! }
+ public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3176]! }
+ public var Wallet_Navigation_Done: String { return self._s[3178]! }
+ public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3179]! }
+ public var AccessDenied_CameraDisabled: String { return self._s[3180]! }
public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3160]!, self._r[3160]!, [_0])
+ return formatWithArgumentRanges(self._s[3181]!, self._r[3181]!, [_0])
}
- public var PhotoEditor_ContrastTool: String { return self._s[3163]! }
+ public var ClearCache_Forever: String { return self._s[3182]! }
+ public var PhotoEditor_ContrastTool: String { return self._s[3185]! }
public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3164]!, self._r[3164]!, [_1])
+ return formatWithArgumentRanges(self._s[3186]!, self._r[3186]!, [_1])
}
- public var DialogList_Draft: String { return self._s[3165]! }
- public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3166]! }
- public var Privacy_TopPeersDelete: String { return self._s[3168]! }
- public var LoginPassword_PasswordPlaceholder: String { return self._s[3169]! }
- public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3170]! }
- public var WebSearch_RecentSectionClear: String { return self._s[3171]! }
- public var EditTheme_ErrorInvalidCharacters: String { return self._s[3172]! }
- public var Watch_ChatList_NoConversationsTitle: String { return self._s[3174]! }
- public var Common_Done: String { return self._s[3176]! }
- public var AuthSessions_EmptyText: String { return self._s[3177]! }
- public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3178]! }
- public var Conversation_ShareBotContactConfirmation: String { return self._s[3179]! }
- public var Tour_Title5: String { return self._s[3180]! }
- public var Wallet_Settings_Title: String { return self._s[3181]! }
+ public var DialogList_Draft: String { return self._s[3187]! }
+ public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3188]! }
+ public var Privacy_TopPeersDelete: String { return self._s[3190]! }
+ public var LoginPassword_PasswordPlaceholder: String { return self._s[3191]! }
+ public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3192]! }
+ public var WebSearch_RecentSectionClear: String { return self._s[3193]! }
+ public var EditTheme_ErrorInvalidCharacters: String { return self._s[3194]! }
+ public var Watch_ChatList_NoConversationsTitle: String { return self._s[3196]! }
+ public var Common_Done: String { return self._s[3198]! }
+ public var AuthSessions_EmptyText: String { return self._s[3199]! }
+ public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3200]! }
+ public var Conversation_ShareBotContactConfirmation: String { return self._s[3201]! }
+ public var Tour_Title5: String { return self._s[3202]! }
+ public var Wallet_Settings_Title: String { return self._s[3203]! }
public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3182]!, self._r[3182]!, [_0])
+ return formatWithArgumentRanges(self._s[3204]!, self._r[3204]!, [_0])
}
- public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3183]! }
- public var Conversation_LinkDialogSave: String { return self._s[3184]! }
- public var GroupInfo_ActionRestrict: String { return self._s[3185]! }
- public var Checkout_Title: String { return self._s[3186]! }
- public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3188]! }
- public var Channel_AdminLog_CanChangeInfo: String { return self._s[3190]! }
- public var Notification_RenamedGroup: String { return self._s[3191]! }
- public var PeopleNearby_Groups: String { return self._s[3192]! }
- public var Checkout_PayWithFaceId: String { return self._s[3193]! }
- public var Channel_BanList_BlockedTitle: String { return self._s[3194]! }
- public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3196]! }
- public var Checkout_WebConfirmation_Title: String { return self._s[3197]! }
- public var Notifications_MessageNotificationsAlert: String { return self._s[3198]! }
+ public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3205]! }
+ public var Conversation_LinkDialogSave: String { return self._s[3206]! }
+ public var GroupInfo_ActionRestrict: String { return self._s[3207]! }
+ public var Checkout_Title: String { return self._s[3208]! }
+ public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3210]! }
+ public var Channel_AdminLog_CanChangeInfo: String { return self._s[3212]! }
+ public var Notification_RenamedGroup: String { return self._s[3213]! }
+ public var PeopleNearby_Groups: String { return self._s[3214]! }
+ public var Checkout_PayWithFaceId: String { return self._s[3215]! }
+ public var Channel_BanList_BlockedTitle: String { return self._s[3216]! }
+ public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3218]! }
+ public var Checkout_WebConfirmation_Title: String { return self._s[3219]! }
+ public var Notifications_MessageNotificationsAlert: String { return self._s[3220]! }
public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3199]!, self._r[3199]!, [_0])
+ return formatWithArgumentRanges(self._s[3221]!, self._r[3221]!, [_0])
}
- public var Profile_AddToExisting: String { return self._s[3201]! }
+ public var Profile_AddToExisting: String { return self._s[3223]! }
public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3202]!, self._r[3202]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[3224]!, self._r[3224]!, [_0, _1])
}
- public var Cache_Files: String { return self._s[3204]! }
- public var Permissions_PrivacyPolicy: String { return self._s[3205]! }
- public var SocksProxySetup_ConnectAndSave: String { return self._s[3206]! }
- public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3207]! }
- public var AutoDownloadSettings_TypeContacts: String { return self._s[3209]! }
- public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3211]! }
- public var Calls_NoCallsPlaceholder: String { return self._s[3212]! }
+ public var Cache_Files: String { return self._s[3226]! }
+ public var Permissions_PrivacyPolicy: String { return self._s[3227]! }
+ public var SocksProxySetup_ConnectAndSave: String { return self._s[3228]! }
+ public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3229]! }
+ public var AutoDownloadSettings_TypeContacts: String { return self._s[3231]! }
+ public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3233]! }
+ public var Calls_NoCallsPlaceholder: String { return self._s[3234]! }
public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3213]!, self._r[3213]!, [_0])
+ return formatWithArgumentRanges(self._s[3235]!, self._r[3235]!, [_0])
}
- public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3214]! }
- public var VoiceOver_AttachMedia: String { return self._s[3216]! }
- public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3217]! }
+ public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3236]! }
+ public var VoiceOver_AttachMedia: String { return self._s[3238]! }
+ public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3239]! }
public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3240]!, self._r[3240]!, [_1, _2, _3])
}
- public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3219]! }
- public var Conversation_SetReminder_Title: String { return self._s[3220]! }
- public var Passport_FieldAddressHelp: String { return self._s[3221]! }
- public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3222]! }
- public var PUSH_REMINDER_TITLE: String { return self._s[3223]! }
+ public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3241]! }
+ public var Conversation_SetReminder_Title: String { return self._s[3242]! }
+ public var Passport_FieldAddressHelp: String { return self._s[3243]! }
+ public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3244]! }
+ public var PUSH_REMINDER_TITLE: String { return self._s[3245]! }
public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3224]!, self._r[3224]!, [_0])
+ return formatWithArgumentRanges(self._s[3246]!, self._r[3246]!, [_0])
}
- public var Channel_AdminLog_EmptyTitle: String { return self._s[3225]! }
- public var Privacy_Calls_NeverAllow_Title: String { return self._s[3226]! }
- public var Login_UnknownError: String { return self._s[3227]! }
- public var Group_UpgradeNoticeText2: String { return self._s[3230]! }
- public var Watch_Compose_AddContact: String { return self._s[3231]! }
- public var Web_Error: String { return self._s[3232]! }
- public var Gif_Search: String { return self._s[3233]! }
- public var Profile_MessageLifetime1h: String { return self._s[3234]! }
- public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3235]! }
- public var Channel_Username_CheckingUsername: String { return self._s[3236]! }
- public var CallFeedback_ReasonSilentRemote: String { return self._s[3237]! }
- public var AutoDownloadSettings_TypeChannels: String { return self._s[3238]! }
- public var Channel_AboutItem: String { return self._s[3239]! }
- public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3241]! }
- public var VoiceOver_Chat_VoiceMessage: String { return self._s[3242]! }
- public var GroupInfo_SharedMedia: String { return self._s[3243]! }
+ public var Channel_AdminLog_EmptyTitle: String { return self._s[3247]! }
+ public var Privacy_Calls_NeverAllow_Title: String { return self._s[3248]! }
+ public var Login_UnknownError: String { return self._s[3249]! }
+ public var Group_UpgradeNoticeText2: String { return self._s[3252]! }
+ public var Watch_Compose_AddContact: String { return self._s[3253]! }
+ public var ClearCache_StorageServiceFiles: String { return self._s[3254]! }
+ public var Web_Error: String { return self._s[3255]! }
+ public var Gif_Search: String { return self._s[3256]! }
+ public var Profile_MessageLifetime1h: String { return self._s[3257]! }
+ public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3258]! }
+ public var Channel_Username_CheckingUsername: String { return self._s[3259]! }
+ public var CallFeedback_ReasonSilentRemote: String { return self._s[3260]! }
+ public var AutoDownloadSettings_TypeChannels: String { return self._s[3261]! }
+ public var Channel_AboutItem: String { return self._s[3262]! }
+ public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3264]! }
+ public var VoiceOver_Chat_VoiceMessage: String { return self._s[3265]! }
+ public var GroupInfo_SharedMedia: String { return self._s[3266]! }
public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3244]!, self._r[3244]!, [_1])
+ return formatWithArgumentRanges(self._s[3267]!, self._r[3267]!, [_1])
}
- public var Call_PhoneCallInProgressMessage: String { return self._s[3245]! }
+ public var Call_PhoneCallInProgressMessage: String { return self._s[3268]! }
public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3246]!, self._r[3246]!, [_1])
+ return formatWithArgumentRanges(self._s[3269]!, self._r[3269]!, [_1])
}
- public var ChatList_UndoArchiveRevealedText: String { return self._s[3247]! }
- public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3248]! }
- public var Conversation_SearchByName_Placeholder: String { return self._s[3249]! }
- public var CreatePoll_AddOption: String { return self._s[3250]! }
- public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3251]! }
- public var Group_UpgradeNoticeHeader: String { return self._s[3252]! }
- public var Channel_Management_AddModerator: String { return self._s[3253]! }
- public var AutoDownloadSettings_MaxFileSize: String { return self._s[3254]! }
- public var StickerPacksSettings_ShowStickersButton: String { return self._s[3255]! }
- public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3256]! }
- public var NotificationsSound_Hello: String { return self._s[3258]! }
- public var SocksProxySetup_SavedProxies: String { return self._s[3259]! }
- public var Channel_Stickers_Placeholder: String { return self._s[3261]! }
+ public var ChatList_UndoArchiveRevealedText: String { return self._s[3270]! }
+ public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3271]! }
+ public var Conversation_SearchByName_Placeholder: String { return self._s[3272]! }
+ public var CreatePoll_AddOption: String { return self._s[3273]! }
+ public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3274]! }
+ public var Group_UpgradeNoticeHeader: String { return self._s[3275]! }
+ public var Channel_Management_AddModerator: String { return self._s[3276]! }
+ public var AutoDownloadSettings_MaxFileSize: String { return self._s[3277]! }
+ public var StickerPacksSettings_ShowStickersButton: String { return self._s[3278]! }
+ public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3279]! }
+ public var NotificationsSound_Hello: String { return self._s[3281]! }
+ public var SocksProxySetup_SavedProxies: String { return self._s[3282]! }
+ public var Channel_Stickers_Placeholder: String { return self._s[3284]! }
public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3262]!, self._r[3262]!, [_0])
+ return formatWithArgumentRanges(self._s[3285]!, self._r[3285]!, [_0])
}
- public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3263]! }
- public var Channel_Management_AddModeratorHelp: String { return self._s[3264]! }
- public var ContactInfo_BirthdayLabel: String { return self._s[3265]! }
- public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3266]! }
- public var AutoDownloadSettings_Channels: String { return self._s[3267]! }
- public var Passport_Language_mn: String { return self._s[3268]! }
- public var Notifications_ResetAllNotificationsHelp: String { return self._s[3271]! }
- public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3272]! }
- public var Passport_Language_ja: String { return self._s[3274]! }
- public var Settings_About_Title: String { return self._s[3275]! }
- public var Settings_NotificationsAndSounds: String { return self._s[3276]! }
- public var ChannelInfo_DeleteGroup: String { return self._s[3277]! }
- public var Settings_BlockedUsers: String { return self._s[3278]! }
+ public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3286]! }
+ public var Channel_Management_AddModeratorHelp: String { return self._s[3287]! }
+ public var ContactInfo_BirthdayLabel: String { return self._s[3288]! }
+ public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3289]! }
+ public var AutoDownloadSettings_Channels: String { return self._s[3290]! }
+ public var Passport_Language_mn: String { return self._s[3291]! }
+ public var Notifications_ResetAllNotificationsHelp: String { return self._s[3294]! }
+ public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3295]! }
+ public var Passport_Language_ja: String { return self._s[3297]! }
+ public var Settings_About_Title: String { return self._s[3298]! }
+ public var Settings_NotificationsAndSounds: String { return self._s[3299]! }
+ public var ChannelInfo_DeleteGroup: String { return self._s[3300]! }
+ public var Settings_BlockedUsers: String { return self._s[3301]! }
public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3279]!, self._r[3279]!, [_0])
+ return formatWithArgumentRanges(self._s[3302]!, self._r[3302]!, [_0])
}
- public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3280]! }
- public var Wallet_Weekday_Today: String { return self._s[3281]! }
- public var AutoDownloadSettings_PreloadVideo: String { return self._s[3282]! }
- public var Widget_ApplicationLocked: String { return self._s[3283]! }
- public var Passport_Address_AddResidentialAddress: String { return self._s[3284]! }
- public var Channel_Username_Title: String { return self._s[3285]! }
+ public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3303]! }
+ public var Wallet_Weekday_Today: String { return self._s[3304]! }
+ public var AutoDownloadSettings_PreloadVideo: String { return self._s[3305]! }
+ public var Widget_ApplicationLocked: String { return self._s[3306]! }
+ public var Passport_Address_AddResidentialAddress: String { return self._s[3307]! }
+ public var Channel_Username_Title: String { return self._s[3308]! }
public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3286]!, self._r[3286]!, [_0])
+ return formatWithArgumentRanges(self._s[3309]!, self._r[3309]!, [_0])
}
- public var AttachmentMenu_File: String { return self._s[3288]! }
- public var AppleWatch_Title: String { return self._s[3289]! }
- public var Activity_RecordingVideoMessage: String { return self._s[3290]! }
+ public var AttachmentMenu_File: String { return self._s[3311]! }
+ public var AppleWatch_Title: String { return self._s[3312]! }
+ public var Activity_RecordingVideoMessage: String { return self._s[3313]! }
public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3291]!, self._r[3291]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3314]!, self._r[3314]!, [_1, _2])
}
- public var Weekday_Saturday: String { return self._s[3292]! }
- public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3293]! }
- public var Profile_CreateEncryptedChatError: String { return self._s[3294]! }
- public var Common_Next: String { return self._s[3296]! }
- public var Channel_Stickers_YourStickers: String { return self._s[3298]! }
- public var Message_Theme: String { return self._s[3299]! }
- public var Call_AudioRouteHeadphones: String { return self._s[3300]! }
- public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3302]! }
- public var Watch_Contacts_NoResults: String { return self._s[3304]! }
- public var PhotoEditor_TintTool: String { return self._s[3307]! }
- public var LoginPassword_ResetAccount: String { return self._s[3309]! }
- public var Settings_SavedMessages: String { return self._s[3310]! }
- public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3311]! }
- public var Bot_GenericSupportStatus: String { return self._s[3312]! }
- public var StickerPack_Add: String { return self._s[3313]! }
- public var Checkout_TotalAmount: String { return self._s[3314]! }
- public var Your_cards_number_is_invalid: String { return self._s[3315]! }
- public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3316]! }
- public var VoiceOver_Chat_VideoMessage: String { return self._s[3317]! }
+ public var Weekday_Saturday: String { return self._s[3315]! }
+ public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3316]! }
+ public var Profile_CreateEncryptedChatError: String { return self._s[3317]! }
+ public var Common_Next: String { return self._s[3319]! }
+ public var Channel_Stickers_YourStickers: String { return self._s[3321]! }
+ public var Message_Theme: String { return self._s[3322]! }
+ public var Call_AudioRouteHeadphones: String { return self._s[3323]! }
+ public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3325]! }
+ public var Watch_Contacts_NoResults: String { return self._s[3327]! }
+ public var PhotoEditor_TintTool: String { return self._s[3330]! }
+ public var LoginPassword_ResetAccount: String { return self._s[3332]! }
+ public var Settings_SavedMessages: String { return self._s[3333]! }
+ public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3334]! }
+ public var Bot_GenericSupportStatus: String { return self._s[3335]! }
+ public var StickerPack_Add: String { return self._s[3336]! }
+ public var Checkout_TotalAmount: String { return self._s[3337]! }
+ public var Your_cards_number_is_invalid: String { return self._s[3338]! }
+ public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3339]! }
+ public var VoiceOver_Chat_VideoMessage: String { return self._s[3340]! }
public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3318]!, self._r[3318]!, [_0])
+ return formatWithArgumentRanges(self._s[3341]!, self._r[3341]!, [_0])
}
public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3319]!, self._r[3319]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_1, _2])
}
- public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3320]! }
+ public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3343]! }
public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3322]!, self._r[3322]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3345]!, self._r[3345]!, [_1, _2])
}
public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3323]!, self._r[3323]!, [_0])
+ return formatWithArgumentRanges(self._s[3346]!, self._r[3346]!, [_0])
}
- public var GroupInfo_InviteLink_ShareLink: String { return self._s[3324]! }
- public var StickerPack_Share: String { return self._s[3325]! }
- public var Passport_DeleteAddress: String { return self._s[3326]! }
- public var Settings_Passport: String { return self._s[3327]! }
- public var SharedMedia_EmptyFilesText: String { return self._s[3328]! }
- public var Conversation_DeleteMessagesForMe: String { return self._s[3329]! }
- public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3330]! }
- public var Contacts_PermissionsText: String { return self._s[3331]! }
- public var Group_Setup_HistoryVisible: String { return self._s[3332]! }
- public var Wallet_Month_ShortDecember: String { return self._s[3334]! }
- public var Passport_Address_AddRentalAgreement: String { return self._s[3335]! }
- public var SocksProxySetup_Title: String { return self._s[3336]! }
- public var Notification_Mute1h: String { return self._s[3337]! }
+ public var GroupInfo_InviteLink_ShareLink: String { return self._s[3347]! }
+ public var StickerPack_Share: String { return self._s[3348]! }
+ public var Passport_DeleteAddress: String { return self._s[3349]! }
+ public var Settings_Passport: String { return self._s[3350]! }
+ public var SharedMedia_EmptyFilesText: String { return self._s[3351]! }
+ public var Conversation_DeleteMessagesForMe: String { return self._s[3352]! }
+ public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3353]! }
+ public var Contacts_PermissionsText: String { return self._s[3354]! }
+ public var Group_Setup_HistoryVisible: String { return self._s[3355]! }
+ public var Wallet_Month_ShortDecember: String { return self._s[3357]! }
+ public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3358]! }
+ public var Passport_Address_AddRentalAgreement: String { return self._s[3359]! }
+ public var SocksProxySetup_Title: String { return self._s[3360]! }
+ public var Notification_Mute1h: String { return self._s[3361]! }
public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3338]!, self._r[3338]!, [_0])
+ return formatWithArgumentRanges(self._s[3362]!, self._r[3362]!, [_0])
}
- public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3339]! }
+ public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3363]! }
public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3340]!, self._r[3340]!, [_1])
+ return formatWithArgumentRanges(self._s[3364]!, self._r[3364]!, [_1])
}
- public var FastTwoStepSetup_PasswordSection: String { return self._s[3341]! }
- public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3344]! }
- public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3346]! }
- public var DialogList_NoMessagesText: String { return self._s[3347]! }
- public var Privacy_ContactsResetConfirmation: String { return self._s[3348]! }
- public var Privacy_Calls_P2PHelp: String { return self._s[3349]! }
- public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3351]! }
- public var Your_cards_expiration_year_is_invalid: String { return self._s[3352]! }
- public var Common_TakePhotoOrVideo: String { return self._s[3353]! }
- public var Wallet_Words_Text: String { return self._s[3354]! }
- public var Call_StatusBusy: String { return self._s[3355]! }
- public var Conversation_PinnedMessage: String { return self._s[3356]! }
- public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3357]! }
- public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3358]! }
- public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3359]! }
- public var Undo_ChatCleared: String { return self._s[3360]! }
- public var AppleWatch_ReplyPresets: String { return self._s[3361]! }
- public var Passport_DiscardMessageDescription: String { return self._s[3363]! }
- public var Login_NetworkError: String { return self._s[3364]! }
+ public var FastTwoStepSetup_PasswordSection: String { return self._s[3365]! }
+ public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3368]! }
+ public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3370]! }
+ public var DialogList_NoMessagesText: String { return self._s[3371]! }
+ public var Privacy_ContactsResetConfirmation: String { return self._s[3372]! }
+ public var Privacy_Calls_P2PHelp: String { return self._s[3373]! }
+ public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3375]! }
+ public var Your_cards_expiration_year_is_invalid: String { return self._s[3376]! }
+ public var Common_TakePhotoOrVideo: String { return self._s[3377]! }
+ public var Wallet_Words_Text: String { return self._s[3378]! }
+ public var Call_StatusBusy: String { return self._s[3379]! }
+ public var Conversation_PinnedMessage: String { return self._s[3380]! }
+ public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3381]! }
+ public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3382]! }
+ public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3383]! }
+ public var Undo_ChatCleared: String { return self._s[3384]! }
+ public var AppleWatch_ReplyPresets: String { return self._s[3385]! }
+ public var Passport_DiscardMessageDescription: String { return self._s[3387]! }
+ public var Login_NetworkError: String { return self._s[3388]! }
public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3365]!, self._r[3365]!, [_0])
+ return formatWithArgumentRanges(self._s[3389]!, self._r[3389]!, [_0])
}
public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3366]!, self._r[3366]!, [_0])
+ return formatWithArgumentRanges(self._s[3390]!, self._r[3390]!, [_0])
}
- public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3367]! }
- public var Wallet_WordCheck_ViewWords: String { return self._s[3369]! }
- public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3370]! }
+ public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3391]! }
+ public var Wallet_WordCheck_ViewWords: String { return self._s[3393]! }
+ public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3394]! }
public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3372]!, self._r[3372]!, [_0])
+ return formatWithArgumentRanges(self._s[3396]!, self._r[3396]!, [_0])
}
- public var Call_ConnectionErrorMessage: String { return self._s[3373]! }
- public var VoiceOver_Chat_Music: String { return self._s[3374]! }
- public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3375]! }
- public var Compose_GroupTokenListPlaceholder: String { return self._s[3377]! }
- public var ConversationMedia_Title: String { return self._s[3378]! }
- public var EncryptionKey_Title: String { return self._s[3380]! }
- public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3381]! }
- public var Notification_Exceptions_AddException: String { return self._s[3382]! }
- public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3383]! }
- public var Profile_MessageLifetime1m: String { return self._s[3384]! }
+ public var Call_ConnectionErrorMessage: String { return self._s[3397]! }
+ public var VoiceOver_Chat_Music: String { return self._s[3398]! }
+ public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3399]! }
+ public var Compose_GroupTokenListPlaceholder: String { return self._s[3401]! }
+ public var ConversationMedia_Title: String { return self._s[3402]! }
+ public var EncryptionKey_Title: String { return self._s[3404]! }
+ public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3405]! }
+ public var Notification_Exceptions_AddException: String { return self._s[3406]! }
+ public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3407]! }
+ public var Profile_MessageLifetime1m: String { return self._s[3408]! }
public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3385]!, self._r[3385]!, [_1])
+ return formatWithArgumentRanges(self._s[3409]!, self._r[3409]!, [_1])
}
- public var Month_GenMay: String { return self._s[3386]! }
+ public var Month_GenMay: String { return self._s[3410]! }
public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3387]!, self._r[3387]!, [_0])
+ return formatWithArgumentRanges(self._s[3411]!, self._r[3411]!, [_0])
}
- public var PeopleNearby_Users: String { return self._s[3388]! }
- public var Wallet_Send_AddressInfo: String { return self._s[3389]! }
- public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3390]! }
- public var AutoDownloadSettings_ResetSettings: String { return self._s[3391]! }
+ public var PeopleNearby_Users: String { return self._s[3412]! }
+ public var Wallet_Send_AddressInfo: String { return self._s[3413]! }
+ public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3414]! }
+ public var AutoDownloadSettings_ResetSettings: String { return self._s[3415]! }
public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3393]!, self._r[3393]!, [_0])
+ return formatWithArgumentRanges(self._s[3417]!, self._r[3417]!, [_0])
}
- public var Conversation_EmptyPlaceholder: String { return self._s[3394]! }
- public var Passport_Address_AddPassportRegistration: String { return self._s[3395]! }
- public var Notifications_ChannelNotificationsAlert: String { return self._s[3396]! }
- public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3397]! }
- public var Camera_TapAndHoldForVideo: String { return self._s[3398]! }
- public var Channel_JoinChannel: String { return self._s[3400]! }
- public var Appearance_Animations: String { return self._s[3403]! }
+ public var Conversation_EmptyPlaceholder: String { return self._s[3418]! }
+ public var Passport_Address_AddPassportRegistration: String { return self._s[3419]! }
+ public var Notifications_ChannelNotificationsAlert: String { return self._s[3420]! }
+ public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3421]! }
+ public var Camera_TapAndHoldForVideo: String { return self._s[3422]! }
+ public var Channel_JoinChannel: String { return self._s[3424]! }
+ public var Appearance_Animations: String { return self._s[3427]! }
public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3428]!, self._r[3428]!, [_1, _2])
}
- public var Stickers_GroupStickers: String { return self._s[3406]! }
- public var Appearance_ShareTheme: String { return self._s[3407]! }
- public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3408]! }
- public var ConvertToSupergroup_HelpTitle: String { return self._s[3410]! }
- public var Passport_Address_Street: String { return self._s[3411]! }
- public var Conversation_AddContact: String { return self._s[3412]! }
- public var Login_PhonePlaceholder: String { return self._s[3413]! }
- public var Channel_Members_InviteLink: String { return self._s[3415]! }
- public var Bot_Stop: String { return self._s[3416]! }
- public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3418]! }
- public var Notification_PassportValueAddress: String { return self._s[3419]! }
- public var Month_ShortJuly: String { return self._s[3420]! }
- public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3421]! }
- public var Channel_AdminLog_BanSendMedia: String { return self._s[3422]! }
- public var Passport_Identity_ReverseSide: String { return self._s[3423]! }
- public var Watch_Stickers_Recents: String { return self._s[3426]! }
- public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3428]! }
- public var Map_SendThisLocation: String { return self._s[3429]! }
+ public var Stickers_GroupStickers: String { return self._s[3430]! }
+ public var Appearance_ShareTheme: String { return self._s[3431]! }
+ public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3432]! }
+ public var ConvertToSupergroup_HelpTitle: String { return self._s[3434]! }
+ public var Passport_Address_Street: String { return self._s[3435]! }
+ public var Conversation_AddContact: String { return self._s[3436]! }
+ public var Login_PhonePlaceholder: String { return self._s[3437]! }
+ public var Channel_Members_InviteLink: String { return self._s[3439]! }
+ public var Bot_Stop: String { return self._s[3440]! }
+ public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3442]! }
+ public var Notification_PassportValueAddress: String { return self._s[3443]! }
+ public var Month_ShortJuly: String { return self._s[3444]! }
+ public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3445]! }
+ public var Channel_AdminLog_BanSendMedia: String { return self._s[3446]! }
+ public var Passport_Identity_ReverseSide: String { return self._s[3447]! }
+ public var Watch_Stickers_Recents: String { return self._s[3450]! }
+ public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3452]! }
+ public var Map_SendThisLocation: String { return self._s[3453]! }
public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3430]!, self._r[3430]!, [_0])
+ return formatWithArgumentRanges(self._s[3454]!, self._r[3454]!, [_0])
}
public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3431]!, self._r[3431]!, [_0])
+ return formatWithArgumentRanges(self._s[3455]!, self._r[3455]!, [_0])
}
- public var ConvertToSupergroup_Note: String { return self._s[3432]! }
- public var Wallet_Intro_NotNow: String { return self._s[3433]! }
+ public var ConvertToSupergroup_Note: String { return self._s[3456]! }
+ public var Wallet_Intro_NotNow: String { return self._s[3457]! }
public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3434]!, self._r[3434]!, [_0])
+ return formatWithArgumentRanges(self._s[3458]!, self._r[3458]!, [_0])
}
- public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3435]! }
+ public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3459]! }
public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3436]!, self._r[3436]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[3460]!, self._r[3460]!, [_0, _1])
}
- public var Login_CallRequestState3: String { return self._s[3438]! }
- public var Wallpaper_SearchShort: String { return self._s[3439]! }
- public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3441]! }
- public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3442]! }
- public var Channel_BotDoesntSupportGroups: String { return self._s[3443]! }
+ public var Login_CallRequestState3: String { return self._s[3462]! }
+ public var Wallpaper_SearchShort: String { return self._s[3463]! }
+ public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3465]! }
+ public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3466]! }
+ public var Channel_BotDoesntSupportGroups: String { return self._s[3467]! }
public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3444]!, self._r[3444]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3468]!, self._r[3468]!, [_1, _2])
}
- public var Channel_AdminLogFilter_Title: String { return self._s[3445]! }
- public var Notifications_GroupNotificationsExceptions: String { return self._s[3449]! }
+ public var Channel_AdminLogFilter_Title: String { return self._s[3469]! }
+ public var Notifications_GroupNotificationsExceptions: String { return self._s[3473]! }
public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3450]!, self._r[3450]!, [_0])
+ return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_0])
}
- public var Passport_CorrectErrors: String { return self._s[3451]! }
- public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3452]! }
+ public var Passport_CorrectErrors: String { return self._s[3475]! }
+ public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3476]! }
public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3453]!, self._r[3453]!, [_0])
+ return formatWithArgumentRanges(self._s[3477]!, self._r[3477]!, [_0])
}
- public var Map_SendMyCurrentLocation: String { return self._s[3454]! }
- public var Channel_DiscussionGroup: String { return self._s[3455]! }
- public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3456]! }
+ public var Map_SendMyCurrentLocation: String { return self._s[3478]! }
+ public var Channel_DiscussionGroup: String { return self._s[3479]! }
+ public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3480]! }
public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3457]!, self._r[3457]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3481]!, self._r[3481]!, [_1, _2])
}
- public var SharedMedia_SearchNoResults: String { return self._s[3458]! }
- public var Permissions_NotificationsText_v0: String { return self._s[3459]! }
- public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3460]! }
- public var Appearance_AppIcon: String { return self._s[3461]! }
- public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3462]! }
- public var LoginPassword_FloodError: String { return self._s[3463]! }
- public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3465]! }
- public var Group_Setup_HistoryHiddenHelp: String { return self._s[3466]! }
+ public var SharedMedia_SearchNoResults: String { return self._s[3482]! }
+ public var Permissions_NotificationsText_v0: String { return self._s[3483]! }
+ public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3484]! }
+ public var Appearance_AppIcon: String { return self._s[3485]! }
+ public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3486]! }
+ public var LoginPassword_FloodError: String { return self._s[3487]! }
+ public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3489]! }
+ public var Group_Setup_HistoryHiddenHelp: String { return self._s[3490]! }
public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3467]!, self._r[3467]!, [_0])
+ return formatWithArgumentRanges(self._s[3491]!, self._r[3491]!, [_0])
}
- public var Passport_Language_bn: String { return self._s[3468]! }
+ public var Passport_Language_bn: String { return self._s[3492]! }
public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3469]!, self._r[3469]!, [_0])
+ return formatWithArgumentRanges(self._s[3493]!, self._r[3493]!, [_0])
}
- public var ChatList_Context_Pin: String { return self._s[3470]! }
+ public var ChatList_Context_Pin: String { return self._s[3494]! }
public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3471]!, self._r[3471]!, [_0])
+ return formatWithArgumentRanges(self._s[3495]!, self._r[3495]!, [_0])
}
public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3472]!, self._r[3472]!, [_0])
+ return formatWithArgumentRanges(self._s[3496]!, self._r[3496]!, [_0])
}
- public var Wallet_Navigation_Close: String { return self._s[3473]! }
- public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3477]! }
- public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3479]! }
- public var Wallet_Month_GenDecember: String { return self._s[3480]! }
- public var Contacts_PermissionsAllow: String { return self._s[3481]! }
- public var ReportPeer_ReasonCopyright: String { return self._s[3482]! }
- public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3483]! }
- public var WallpaperPreview_Pattern: String { return self._s[3484]! }
- public var Paint_Duplicate: String { return self._s[3485]! }
- public var Passport_Address_Country: String { return self._s[3486]! }
- public var Notification_RenamedChannel: String { return self._s[3488]! }
- public var ChatList_Context_Unmute: String { return self._s[3489]! }
- public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3490]! }
- public var Group_MessagePhotoUpdated: String { return self._s[3491]! }
- public var Channel_BanUser_PermissionSendMedia: String { return self._s[3492]! }
- public var Conversation_ContextMenuBan: String { return self._s[3493]! }
- public var TwoStepAuth_EmailSent: String { return self._s[3494]! }
- public var MessagePoll_NoVotes: String { return self._s[3495]! }
- public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3496]! }
- public var Passport_Language_is: String { return self._s[3497]! }
- public var PeopleNearby_UsersEmpty: String { return self._s[3499]! }
- public var Tour_Text5: String { return self._s[3500]! }
+ public var Wallet_Navigation_Close: String { return self._s[3497]! }
+ public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3501]! }
+ public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3503]! }
+ public var Wallet_Month_GenDecember: String { return self._s[3504]! }
+ public var Contacts_PermissionsAllow: String { return self._s[3505]! }
+ public var ReportPeer_ReasonCopyright: String { return self._s[3506]! }
+ public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3507]! }
+ public var WallpaperPreview_Pattern: String { return self._s[3508]! }
+ public var Paint_Duplicate: String { return self._s[3509]! }
+ public var Passport_Address_Country: String { return self._s[3510]! }
+ public var Notification_RenamedChannel: String { return self._s[3512]! }
+ public var ChatList_Context_Unmute: String { return self._s[3513]! }
+ public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3514]! }
+ public var Group_MessagePhotoUpdated: String { return self._s[3515]! }
+ public var Channel_BanUser_PermissionSendMedia: String { return self._s[3516]! }
+ public var Conversation_ContextMenuBan: String { return self._s[3517]! }
+ public var TwoStepAuth_EmailSent: String { return self._s[3518]! }
+ public var MessagePoll_NoVotes: String { return self._s[3519]! }
+ public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3520]! }
+ public var Passport_Language_is: String { return self._s[3521]! }
+ public var PeopleNearby_UsersEmpty: String { return self._s[3523]! }
+ public var Tour_Text5: String { return self._s[3524]! }
public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3502]!, self._r[3502]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3526]!, self._r[3526]!, [_1, _2])
}
- public var Undo_SecretChatDeleted: String { return self._s[3503]! }
- public var SocksProxySetup_ShareQRCode: String { return self._s[3504]! }
+ public var Undo_SecretChatDeleted: String { return self._s[3527]! }
+ public var SocksProxySetup_ShareQRCode: String { return self._s[3528]! }
public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3505]!, self._r[3505]!, [_0])
+ return formatWithArgumentRanges(self._s[3529]!, self._r[3529]!, [_0])
}
- public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3506]! }
- public var Paint_Edit: String { return self._s[3508]! }
- public var ScheduledMessages_ReminderNotification: String { return self._s[3510]! }
- public var Undo_DeletedGroup: String { return self._s[3512]! }
- public var LoginPassword_ForgotPassword: String { return self._s[3513]! }
- public var Wallet_WordImport_IncorrectTitle: String { return self._s[3514]! }
- public var GroupInfo_GroupNamePlaceholder: String { return self._s[3515]! }
+ public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3530]! }
+ public var Paint_Edit: String { return self._s[3532]! }
+ public var ScheduledMessages_ReminderNotification: String { return self._s[3534]! }
+ public var Undo_DeletedGroup: String { return self._s[3536]! }
+ public var LoginPassword_ForgotPassword: String { return self._s[3537]! }
+ public var Wallet_WordImport_IncorrectTitle: String { return self._s[3538]! }
+ public var GroupInfo_GroupNamePlaceholder: String { return self._s[3539]! }
public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3516]!, self._r[3516]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[3540]!, self._r[3540]!, [_0, _1])
}
- public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3517]! }
- public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3518]! }
- public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3519]! }
- public var Passport_Language_uz: String { return self._s[3520]! }
- public var Conversation_PinMessageAlertGroup: String { return self._s[3521]! }
- public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3522]! }
- public var Map_StopLiveLocation: String { return self._s[3524]! }
- public var VoiceOver_MessageContextSend: String { return self._s[3526]! }
- public var PasscodeSettings_Help: String { return self._s[3527]! }
- public var NotificationsSound_Input: String { return self._s[3528]! }
- public var Share_Title: String { return self._s[3531]! }
- public var LogoutOptions_Title: String { return self._s[3532]! }
- public var Wallet_Send_AddressText: String { return self._s[3533]! }
- public var Login_TermsOfServiceAgree: String { return self._s[3534]! }
- public var Compose_NewEncryptedChatTitle: String { return self._s[3535]! }
- public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3536]! }
- public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3537]! }
- public var EnterPasscode_EnterTitle: String { return self._s[3538]! }
+ public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3541]! }
+ public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3542]! }
+ public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3543]! }
+ public var Passport_Language_uz: String { return self._s[3544]! }
+ public var Conversation_PinMessageAlertGroup: String { return self._s[3545]! }
+ public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3546]! }
+ public var Map_StopLiveLocation: String { return self._s[3548]! }
+ public var VoiceOver_MessageContextSend: String { return self._s[3550]! }
+ public var PasscodeSettings_Help: String { return self._s[3551]! }
+ public var NotificationsSound_Input: String { return self._s[3552]! }
+ public var Share_Title: String { return self._s[3555]! }
+ public var LogoutOptions_Title: String { return self._s[3556]! }
+ public var Wallet_Send_AddressText: String { return self._s[3557]! }
+ public var Login_TermsOfServiceAgree: String { return self._s[3558]! }
+ public var Compose_NewEncryptedChatTitle: String { return self._s[3559]! }
+ public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3560]! }
+ public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3561]! }
+ public var EnterPasscode_EnterTitle: String { return self._s[3562]! }
public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_0])
+ return formatWithArgumentRanges(self._s[3563]!, self._r[3563]!, [_0])
}
- public var Settings_CopyPhoneNumber: String { return self._s[3540]! }
- public var Conversation_AddToContacts: String { return self._s[3541]! }
+ public var Settings_CopyPhoneNumber: String { return self._s[3564]! }
+ public var Conversation_AddToContacts: String { return self._s[3565]! }
public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3542]!, self._r[3542]!, [_0])
+ return formatWithArgumentRanges(self._s[3566]!, self._r[3566]!, [_0])
}
- public var NotificationsSound_Keys: String { return self._s[3543]! }
+ public var NotificationsSound_Keys: String { return self._s[3567]! }
public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3544]!, self._r[3544]!, [_0])
+ return formatWithArgumentRanges(self._s[3568]!, self._r[3568]!, [_0])
}
- public var Notification_MessageLifetime1w: String { return self._s[3545]! }
- public var Message_Video: String { return self._s[3546]! }
- public var AutoDownloadSettings_CellularTitle: String { return self._s[3547]! }
+ public var Notification_MessageLifetime1w: String { return self._s[3569]! }
+ public var Message_Video: String { return self._s[3570]! }
+ public var AutoDownloadSettings_CellularTitle: String { return self._s[3571]! }
public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3548]!, self._r[3548]!, [_1])
+ return formatWithArgumentRanges(self._s[3572]!, self._r[3572]!, [_1])
}
- public var Wallet_Receive_AmountInfo: String { return self._s[3551]! }
+ public var Wallet_Receive_AmountInfo: String { return self._s[3575]! }
public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3552]!, self._r[3552]!, [_0])
+ return formatWithArgumentRanges(self._s[3576]!, self._r[3576]!, [_0])
}
public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3553]!, self._r[3553]!, [_0])
+ return formatWithArgumentRanges(self._s[3577]!, self._r[3577]!, [_0])
}
- public var Passport_Language_mk: String { return self._s[3554]! }
+ public var Passport_Language_mk: String { return self._s[3578]! }
public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3555]!, self._r[3555]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3579]!, self._r[3579]!, [_1, _2, _3])
}
- public var CreatePoll_CancelConfirmation: String { return self._s[3556]! }
- public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3558]! }
- public var PrivacyPolicy_Decline: String { return self._s[3559]! }
- public var Passport_Identity_DoesNotExpire: String { return self._s[3560]! }
- public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3561]! }
- public var Permissions_SiriAllow_v0: String { return self._s[3563]! }
- public var Wallet_Month_ShortAugust: String { return self._s[3564]! }
- public var Appearance_ThemeCarouselNight: String { return self._s[3565]! }
+ public var CreatePoll_CancelConfirmation: String { return self._s[3580]! }
+ public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3582]! }
+ public var PrivacyPolicy_Decline: String { return self._s[3583]! }
+ public var Passport_Identity_DoesNotExpire: String { return self._s[3584]! }
+ public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3585]! }
+ public var Permissions_SiriAllow_v0: String { return self._s[3587]! }
+ public var Wallet_Month_ShortAugust: String { return self._s[3588]! }
+ public var Appearance_ThemeCarouselNight: String { return self._s[3589]! }
public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3566]!, self._r[3566]!, [_1, "\(_2)"])
+ return formatWithArgumentRanges(self._s[3590]!, self._r[3590]!, [_1, "\(_2)"])
}
public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3567]!, self._r[3567]!, [_0])
+ return formatWithArgumentRanges(self._s[3591]!, self._r[3591]!, [_0])
}
- public var Paint_Regular: String { return self._s[3568]! }
- public var ChatSettings_AutoDownloadReset: String { return self._s[3569]! }
- public var SocksProxySetup_ShareLink: String { return self._s[3570]! }
- public var Wallet_Qr_Title: String { return self._s[3571]! }
- public var BlockedUsers_SelectUserTitle: String { return self._s[3572]! }
- public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3574]! }
- public var Wallet_Settings_Configuration: String { return self._s[3575]! }
- public var GroupInfo_InviteByLink: String { return self._s[3576]! }
- public var MessageTimer_Custom: String { return self._s[3577]! }
- public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3578]! }
- public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3580]! }
- public var Conversation_SendMessage_SetReminder: String { return self._s[3581]! }
- public var VoiceOver_Chat_Selected: String { return self._s[3582]! }
- public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3583]! }
- public var Channel_Username_InvalidTaken: String { return self._s[3584]! }
- public var Conversation_ClousStorageInfo_Description3: String { return self._s[3585]! }
- public var Wallet_WordCheck_TryAgain: String { return self._s[3586]! }
- public var Wallet_Info_TransactionPendingHeader: String { return self._s[3587]! }
- public var Settings_ChatBackground: String { return self._s[3588]! }
- public var Channel_Subscribers_Title: String { return self._s[3589]! }
- public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3590]! }
- public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3591]! }
- public var Watch_ConnectionDescription: String { return self._s[3592]! }
- public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3595]! }
- public var ChatList_ArchivedChatsTitle: String { return self._s[3597]! }
- public var Wallpaper_ResetWallpapers: String { return self._s[3598]! }
- public var Wallet_Send_TransactionInProgress: String { return self._s[3599]! }
- public var EditProfile_Title: String { return self._s[3600]! }
- public var NotificationsSound_Bamboo: String { return self._s[3602]! }
- public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3604]! }
- public var Login_SmsRequestState2: String { return self._s[3605]! }
- public var Passport_Language_ar: String { return self._s[3606]! }
+ public var Paint_Regular: String { return self._s[3592]! }
+ public var ChatSettings_AutoDownloadReset: String { return self._s[3593]! }
+ public var SocksProxySetup_ShareLink: String { return self._s[3594]! }
+ public var Wallet_Qr_Title: String { return self._s[3595]! }
+ public var BlockedUsers_SelectUserTitle: String { return self._s[3596]! }
+ public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3598]! }
+ public var Wallet_Settings_Configuration: String { return self._s[3599]! }
+ public var GroupInfo_InviteByLink: String { return self._s[3600]! }
+ public var MessageTimer_Custom: String { return self._s[3601]! }
+ public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3602]! }
+ public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3604]! }
+ public var Conversation_SendMessage_SetReminder: String { return self._s[3605]! }
+ public var VoiceOver_Chat_Selected: String { return self._s[3606]! }
+ public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3607]! }
+ public var Channel_Username_InvalidTaken: String { return self._s[3608]! }
+ public var Conversation_ClousStorageInfo_Description3: String { return self._s[3609]! }
+ public var Wallet_WordCheck_TryAgain: String { return self._s[3610]! }
+ public var Wallet_Info_TransactionPendingHeader: String { return self._s[3611]! }
+ public var Settings_ChatBackground: String { return self._s[3612]! }
+ public var Channel_Subscribers_Title: String { return self._s[3613]! }
+ public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3614]! }
+ public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3615]! }
+ public var Watch_ConnectionDescription: String { return self._s[3616]! }
+ public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3619]! }
+ public var ChatList_ArchivedChatsTitle: String { return self._s[3621]! }
+ public var Wallpaper_ResetWallpapers: String { return self._s[3622]! }
+ public var Wallet_Send_TransactionInProgress: String { return self._s[3623]! }
+ public var EditProfile_Title: String { return self._s[3624]! }
+ public var NotificationsSound_Bamboo: String { return self._s[3626]! }
+ public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3628]! }
+ public var Login_SmsRequestState2: String { return self._s[3629]! }
+ public var Passport_Language_ar: String { return self._s[3630]! }
public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3607]!, self._r[3607]!, [_0])
+ return formatWithArgumentRanges(self._s[3631]!, self._r[3631]!, [_0])
}
- public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3608]! }
- public var Wallet_Created_Text: String { return self._s[3609]! }
- public var Conversation_MessageDialogEdit: String { return self._s[3610]! }
- public var Wallet_Created_Proceed: String { return self._s[3611]! }
- public var Wallet_Words_Done: String { return self._s[3612]! }
- public var VoiceOver_Media_PlaybackPause: String { return self._s[3613]! }
+ public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3632]! }
+ public var Wallet_Created_Text: String { return self._s[3633]! }
+ public var Conversation_MessageDialogEdit: String { return self._s[3635]! }
+ public var Wallet_Created_Proceed: String { return self._s[3636]! }
+ public var Wallet_Words_Done: String { return self._s[3637]! }
+ public var VoiceOver_Media_PlaybackPause: String { return self._s[3638]! }
public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3614]!, self._r[3614]!, [_1])
+ return formatWithArgumentRanges(self._s[3639]!, self._r[3639]!, [_1])
}
- public var Common_Close: String { return self._s[3615]! }
- public var GroupInfo_PublicLink: String { return self._s[3616]! }
- public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3617]! }
- public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3618]! }
+ public var Common_Close: String { return self._s[3640]! }
+ public var GroupInfo_PublicLink: String { return self._s[3641]! }
+ public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3642]! }
+ public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3643]! }
public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3622]!, self._r[3622]!, [_0])
+ return formatWithArgumentRanges(self._s[3647]!, self._r[3647]!, [_0])
}
- public var UserInfo_About_Placeholder: String { return self._s[3623]! }
+ public var UserInfo_About_Placeholder: String { return self._s[3648]! }
public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3624]!, self._r[3624]!, [_0])
+ return formatWithArgumentRanges(self._s[3649]!, self._r[3649]!, [_0])
}
- public var GroupInfo_Permissions_SectionTitle: String { return self._s[3625]! }
- public var Channel_Info_Banned: String { return self._s[3627]! }
+ public var GroupInfo_Permissions_SectionTitle: String { return self._s[3650]! }
+ public var Channel_Info_Banned: String { return self._s[3652]! }
public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3628]!, self._r[3628]!, [_0])
+ return formatWithArgumentRanges(self._s[3653]!, self._r[3653]!, [_0])
}
- public var Appearance_Other: String { return self._s[3629]! }
- public var Passport_Language_my: String { return self._s[3630]! }
- public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3631]! }
+ public var Appearance_Other: String { return self._s[3654]! }
+ public var Passport_Language_my: String { return self._s[3655]! }
+ public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3656]! }
public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3632]!, self._r[3632]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3657]!, self._r[3657]!, [_1, _2, _3])
}
- public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3633]! }
- public var Preview_CopyAddress: String { return self._s[3634]! }
+ public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3658]! }
+ public var Preview_CopyAddress: String { return self._s[3659]! }
public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3635]!, self._r[3635]!, [_0])
+ return formatWithArgumentRanges(self._s[3660]!, self._r[3660]!, [_0])
}
- public var KeyCommand_JumpToPreviousChat: String { return self._s[3636]! }
- public var UserInfo_BotSettings: String { return self._s[3637]! }
- public var LiveLocation_MenuStopAll: String { return self._s[3639]! }
- public var Passport_PasswordCreate: String { return self._s[3640]! }
- public var StickerSettings_MaskContextInfo: String { return self._s[3641]! }
- public var Message_PinnedLocationMessage: String { return self._s[3642]! }
- public var Map_Satellite: String { return self._s[3643]! }
- public var Watch_Message_Unsupported: String { return self._s[3644]! }
- public var Username_TooManyPublicUsernamesError: String { return self._s[3645]! }
- public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3646]! }
+ public var KeyCommand_JumpToPreviousChat: String { return self._s[3661]! }
+ public var UserInfo_BotSettings: String { return self._s[3662]! }
+ public var LiveLocation_MenuStopAll: String { return self._s[3664]! }
+ public var Passport_PasswordCreate: String { return self._s[3665]! }
+ public var StickerSettings_MaskContextInfo: String { return self._s[3666]! }
+ public var Message_PinnedLocationMessage: String { return self._s[3667]! }
+ public var Map_Satellite: String { return self._s[3668]! }
+ public var Watch_Message_Unsupported: String { return self._s[3669]! }
+ public var Username_TooManyPublicUsernamesError: String { return self._s[3670]! }
+ public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3671]! }
public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3647]!, self._r[3647]!, [_0, _1])
+ return formatWithArgumentRanges(self._s[3672]!, self._r[3672]!, [_0, _1])
}
public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3648]!, self._r[3648]!, [_0])
+ return formatWithArgumentRanges(self._s[3673]!, self._r[3673]!, [_0])
}
- public var Wallet_WordImport_Continue: String { return self._s[3649]! }
+ public var Wallet_WordImport_Continue: String { return self._s[3674]! }
public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3650]!, self._r[3650]!, [_0])
+ return formatWithArgumentRanges(self._s[3675]!, self._r[3675]!, [_0])
}
- public var Notifications_ChannelNotificationsHelp: String { return self._s[3651]! }
- public var Privacy_Calls_P2PContacts: String { return self._s[3652]! }
- public var NotificationsSound_None: String { return self._s[3653]! }
- public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3654]! }
- public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3656]! }
- public var AccessDenied_VoiceMicrophone: String { return self._s[3657]! }
+ public var Notifications_ChannelNotificationsHelp: String { return self._s[3676]! }
+ public var Privacy_Calls_P2PContacts: String { return self._s[3677]! }
+ public var NotificationsSound_None: String { return self._s[3678]! }
+ public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3679]! }
+ public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3681]! }
+ public var AccessDenied_VoiceMicrophone: String { return self._s[3682]! }
public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3658]!, self._r[3658]!, [_1])
+ return formatWithArgumentRanges(self._s[3683]!, self._r[3683]!, [_1])
}
- public var Cache_Indexing: String { return self._s[3659]! }
- public var DialogList_RecentTitlePeople: String { return self._s[3661]! }
- public var DialogList_EncryptionRejected: String { return self._s[3662]! }
- public var GroupInfo_Administrators: String { return self._s[3663]! }
- public var Passport_ScanPassportHelp: String { return self._s[3664]! }
- public var Application_Name: String { return self._s[3665]! }
- public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3666]! }
- public var Appearance_ThemeCarouselDay: String { return self._s[3668]! }
- public var Passport_Identity_TranslationHelp: String { return self._s[3669]! }
+ public var Cache_Indexing: String { return self._s[3684]! }
+ public var DialogList_RecentTitlePeople: String { return self._s[3686]! }
+ public var DialogList_EncryptionRejected: String { return self._s[3687]! }
+ public var GroupInfo_Administrators: String { return self._s[3688]! }
+ public var Passport_ScanPassportHelp: String { return self._s[3689]! }
+ public var Application_Name: String { return self._s[3690]! }
+ public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3691]! }
+ public var Appearance_ThemeCarouselDay: String { return self._s[3693]! }
+ public var Passport_Identity_TranslationHelp: String { return self._s[3694]! }
public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3670]!, self._r[3670]!, [_0])
+ return formatWithArgumentRanges(self._s[3695]!, self._r[3695]!, [_0])
}
public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3671]!, self._r[3671]!, [_0])
+ return formatWithArgumentRanges(self._s[3696]!, self._r[3696]!, [_0])
}
public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3672]!, self._r[3672]!, [_0])
+ return formatWithArgumentRanges(self._s[3697]!, self._r[3697]!, [_0])
}
- public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3673]! }
- public var Privacy_ChatsTitle: String { return self._s[3674]! }
- public var DialogList_ClearHistoryConfirmation: String { return self._s[3675]! }
- public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3676]! }
- public var Watch_Suggestion_HoldOn: String { return self._s[3677]! }
- public var Group_EditAdmin_TransferOwnership: String { return self._s[3678]! }
- public var WebBrowser_Title: String { return self._s[3679]! }
- public var Group_LinkedChannel: String { return self._s[3680]! }
- public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3681]! }
- public var SocksProxySetup_RequiredCredentials: String { return self._s[3682]! }
- public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3683]! }
- public var TwoStepAuth_EmailSkipAlert: String { return self._s[3684]! }
- public var ScheduledMessages_RemindersTitle: String { return self._s[3686]! }
- public var Channel_Setup_TypePublic: String { return self._s[3688]! }
+ public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3698]! }
+ public var Privacy_ChatsTitle: String { return self._s[3699]! }
+ public var DialogList_ClearHistoryConfirmation: String { return self._s[3700]! }
+ public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3701]! }
+ public var Watch_Suggestion_HoldOn: String { return self._s[3702]! }
+ public var Group_EditAdmin_TransferOwnership: String { return self._s[3703]! }
+ public var WebBrowser_Title: String { return self._s[3704]! }
+ public var Group_LinkedChannel: String { return self._s[3705]! }
+ public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3706]! }
+ public var SocksProxySetup_RequiredCredentials: String { return self._s[3707]! }
+ public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3708]! }
+ public var TwoStepAuth_EmailSkipAlert: String { return self._s[3709]! }
+ public var ScheduledMessages_RemindersTitle: String { return self._s[3711]! }
+ public var Channel_Setup_TypePublic: String { return self._s[3713]! }
public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3689]!, self._r[3689]!, [_0])
+ return formatWithArgumentRanges(self._s[3714]!, self._r[3714]!, [_0])
}
- public var Channel_TypeSetup_Title: String { return self._s[3691]! }
- public var Map_OpenInMaps: String { return self._s[3693]! }
+ public var Channel_TypeSetup_Title: String { return self._s[3716]! }
+ public var Map_OpenInMaps: String { return self._s[3718]! }
public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3694]!, self._r[3694]!, [_1])
+ return formatWithArgumentRanges(self._s[3719]!, self._r[3719]!, [_1])
}
- public var NotificationsSound_Tremolo: String { return self._s[3696]! }
+ public var NotificationsSound_Tremolo: String { return self._s[3721]! }
public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3697]!, self._r[3697]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3722]!, self._r[3722]!, [_1, _2, _3])
}
- public var ConversationProfile_UnknownAddMemberError: String { return self._s[3698]! }
- public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3699]! }
- public var Passport_PasswordHelp: String { return self._s[3700]! }
- public var Login_CodeExpiredError: String { return self._s[3701]! }
- public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3702]! }
- public var Conversation_TitleUnmute: String { return self._s[3703]! }
- public var Passport_Identity_ScansHelp: String { return self._s[3704]! }
- public var Passport_Language_lo: String { return self._s[3705]! }
- public var Camera_FlashAuto: String { return self._s[3706]! }
- public var Conversation_OpenBotLinkOpen: String { return self._s[3707]! }
- public var Common_Cancel: String { return self._s[3708]! }
- public var DialogList_SavedMessagesTooltip: String { return self._s[3709]! }
- public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3710]! }
- public var Appearance_TintAllColors: String { return self._s[3711]! }
+ public var ConversationProfile_UnknownAddMemberError: String { return self._s[3723]! }
+ public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3724]! }
+ public var Passport_PasswordHelp: String { return self._s[3725]! }
+ public var Login_CodeExpiredError: String { return self._s[3726]! }
+ public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3727]! }
+ public var Conversation_TitleUnmute: String { return self._s[3728]! }
+ public var Passport_Identity_ScansHelp: String { return self._s[3729]! }
+ public var Passport_Language_lo: String { return self._s[3730]! }
+ public var Camera_FlashAuto: String { return self._s[3731]! }
+ public var Conversation_OpenBotLinkOpen: String { return self._s[3732]! }
+ public var Common_Cancel: String { return self._s[3733]! }
+ public var DialogList_SavedMessagesTooltip: String { return self._s[3734]! }
+ public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3735]! }
+ public var Appearance_TintAllColors: String { return self._s[3736]! }
public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3712]!, self._r[3712]!, [_1])
+ return formatWithArgumentRanges(self._s[3737]!, self._r[3737]!, [_1])
}
- public var Conversation_ReportSpamConfirmation: String { return self._s[3713]! }
- public var ChatSettings_Title: String { return self._s[3715]! }
- public var Passport_PasswordReset: String { return self._s[3716]! }
- public var SocksProxySetup_TypeNone: String { return self._s[3717]! }
- public var EditTheme_Title: String { return self._s[3719]! }
- public var PhoneNumberHelp_Help: String { return self._s[3720]! }
- public var Checkout_EnterPassword: String { return self._s[3721]! }
- public var Share_AuthTitle: String { return self._s[3723]! }
- public var Activity_UploadingDocument: String { return self._s[3724]! }
- public var State_Connecting: String { return self._s[3725]! }
- public var Profile_MessageLifetime1w: String { return self._s[3726]! }
- public var Conversation_ContextMenuReport: String { return self._s[3727]! }
- public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3728]! }
- public var AutoNightTheme_ScheduledTo: String { return self._s[3729]! }
+ public var Conversation_ReportSpamConfirmation: String { return self._s[3738]! }
+ public var ChatSettings_Title: String { return self._s[3740]! }
+ public var Passport_PasswordReset: String { return self._s[3741]! }
+ public var SocksProxySetup_TypeNone: String { return self._s[3742]! }
+ public var EditTheme_Title: String { return self._s[3744]! }
+ public var PhoneNumberHelp_Help: String { return self._s[3745]! }
+ public var Checkout_EnterPassword: String { return self._s[3746]! }
+ public var Share_AuthTitle: String { return self._s[3748]! }
+ public var Activity_UploadingDocument: String { return self._s[3749]! }
+ public var State_Connecting: String { return self._s[3750]! }
+ public var Profile_MessageLifetime1w: String { return self._s[3751]! }
+ public var Conversation_ContextMenuReport: String { return self._s[3752]! }
+ public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3753]! }
+ public var AutoNightTheme_ScheduledTo: String { return self._s[3754]! }
public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3730]!, self._r[3730]!, [_0])
+ return formatWithArgumentRanges(self._s[3755]!, self._r[3755]!, [_0])
}
- public var AuthSessions_Terminate: String { return self._s[3731]! }
- public var Wallet_WordImport_CanNotRemember: String { return self._s[3732]! }
- public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3733]! }
- public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3734]! }
- public var PhotoEditor_Set: String { return self._s[3735]! }
- public var EmptyGroupInfo_Title: String { return self._s[3736]! }
- public var Login_PadPhoneHelp: String { return self._s[3737]! }
- public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3739]! }
- public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3741]! }
- public var NotificationsSound_Complete: String { return self._s[3742]! }
- public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3743]! }
- public var Group_Info_AdminLog: String { return self._s[3744]! }
- public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3745]! }
+ public var AuthSessions_Terminate: String { return self._s[3756]! }
+ public var Wallet_WordImport_CanNotRemember: String { return self._s[3757]! }
+ public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3759]! }
+ public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3760]! }
+ public var PhotoEditor_Set: String { return self._s[3761]! }
+ public var EmptyGroupInfo_Title: String { return self._s[3762]! }
+ public var Login_PadPhoneHelp: String { return self._s[3763]! }
+ public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3765]! }
+ public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3767]! }
+ public var NotificationsSound_Complete: String { return self._s[3768]! }
+ public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3769]! }
+ public var Group_Info_AdminLog: String { return self._s[3770]! }
+ public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3771]! }
public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3746]!, self._r[3746]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3772]!, self._r[3772]!, [_1, _2, _3])
}
- public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3747]! }
- public var Conversation_Admin: String { return self._s[3749]! }
- public var Conversation_GifTooltip: String { return self._s[3750]! }
- public var Passport_NotLoggedInMessage: String { return self._s[3751]! }
+ public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3773]! }
+ public var Conversation_Admin: String { return self._s[3775]! }
+ public var Conversation_GifTooltip: String { return self._s[3776]! }
+ public var Passport_NotLoggedInMessage: String { return self._s[3777]! }
public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3753]!, self._r[3753]!, [_0])
+ return formatWithArgumentRanges(self._s[3779]!, self._r[3779]!, [_0])
}
- public var Profile_MessageLifetimeForever: String { return self._s[3754]! }
- public var SharedMedia_EmptyTitle: String { return self._s[3756]! }
- public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3758]! }
- public var Username_Help: String { return self._s[3759]! }
- public var DialogList_LanguageTooltip: String { return self._s[3761]! }
- public var Map_LoadError: String { return self._s[3762]! }
- public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3763]! }
- public var Channel_AdminLog_AddMembers: String { return self._s[3764]! }
- public var ArchivedChats_IntroTitle2: String { return self._s[3765]! }
- public var Notification_Exceptions_NewException: String { return self._s[3766]! }
- public var TwoStepAuth_EmailTitle: String { return self._s[3767]! }
- public var WatchRemote_AlertText: String { return self._s[3768]! }
+ public var Profile_MessageLifetimeForever: String { return self._s[3780]! }
+ public var SharedMedia_EmptyTitle: String { return self._s[3782]! }
+ public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3784]! }
+ public var Username_Help: String { return self._s[3785]! }
+ public var DialogList_LanguageTooltip: String { return self._s[3787]! }
+ public var Map_LoadError: String { return self._s[3788]! }
+ public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3789]! }
+ public var Channel_AdminLog_AddMembers: String { return self._s[3790]! }
+ public var ArchivedChats_IntroTitle2: String { return self._s[3791]! }
+ public var Notification_Exceptions_NewException: String { return self._s[3792]! }
+ public var TwoStepAuth_EmailTitle: String { return self._s[3793]! }
+ public var WatchRemote_AlertText: String { return self._s[3794]! }
public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3769]!, self._r[3769]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3795]!, self._r[3795]!, [_1, _2, _3])
}
- public var ChatSettings_ConnectionType_Title: String { return self._s[3773]! }
- public var WebBrowser_DefaultBrowser: String { return self._s[3774]! }
+ public var ChatSettings_ConnectionType_Title: String { return self._s[3799]! }
+ public var WebBrowser_DefaultBrowser: String { return self._s[3800]! }
public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3775]!, self._r[3775]!, [_0])
+ return formatWithArgumentRanges(self._s[3801]!, self._r[3801]!, [_0])
}
- public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3776]! }
- public var Passport_Address_CountryPlaceholder: String { return self._s[3777]! }
+ public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3802]! }
+ public var Passport_Address_CountryPlaceholder: String { return self._s[3803]! }
public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3778]!, self._r[3778]!, [_0])
+ return formatWithArgumentRanges(self._s[3804]!, self._r[3804]!, [_0])
}
public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3779]!, self._r[3779]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3805]!, self._r[3805]!, [_1, _2, _3])
}
- public var Group_AdminLog_EmptyText: String { return self._s[3780]! }
- public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3781]! }
- public var Conversation_PrivateChannelTooltip: String { return self._s[3783]! }
- public var Wallet_Created_ExportErrorText: String { return self._s[3784]! }
- public var ChatList_UndoArchiveText1: String { return self._s[3785]! }
- public var AccessDenied_VideoMicrophone: String { return self._s[3786]! }
- public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3787]! }
- public var Cache_ClearNone: String { return self._s[3788]! }
- public var SocksProxySetup_FailedToConnect: String { return self._s[3789]! }
- public var Permissions_NotificationsTitle_v0: String { return self._s[3790]! }
+ public var Group_AdminLog_EmptyText: String { return self._s[3806]! }
+ public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3807]! }
+ public var Conversation_PrivateChannelTooltip: String { return self._s[3809]! }
+ public var Wallet_Created_ExportErrorText: String { return self._s[3810]! }
+ public var ChatList_UndoArchiveText1: String { return self._s[3811]! }
+ public var AccessDenied_VideoMicrophone: String { return self._s[3812]! }
+ public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3813]! }
+ public var Cache_ClearNone: String { return self._s[3814]! }
+ public var SocksProxySetup_FailedToConnect: String { return self._s[3815]! }
+ public var Permissions_NotificationsTitle_v0: String { return self._s[3816]! }
public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3791]!, self._r[3791]!, [_0])
+ return formatWithArgumentRanges(self._s[3817]!, self._r[3817]!, [_0])
}
- public var Passport_Identity_Country: String { return self._s[3792]! }
+ public var Passport_Identity_Country: String { return self._s[3818]! }
public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3793]!, self._r[3793]!, [_0])
+ return formatWithArgumentRanges(self._s[3819]!, self._r[3819]!, [_0])
}
public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3794]!, self._r[3794]!, [_0])
+ return formatWithArgumentRanges(self._s[3820]!, self._r[3820]!, [_0])
}
- public var Exceptions_AddToExceptions: String { return self._s[3795]! }
- public var AccessDenied_Settings: String { return self._s[3796]! }
- public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3797]! }
- public var Month_ShortMay: String { return self._s[3798]! }
- public var Compose_NewGroup: String { return self._s[3800]! }
- public var Group_Setup_TypePrivate: String { return self._s[3802]! }
- public var Login_PadPhoneHelpTitle: String { return self._s[3804]! }
- public var Appearance_ThemeDayClassic: String { return self._s[3805]! }
- public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3806]! }
- public var AutoDownloadSettings_OffForAll: String { return self._s[3807]! }
- public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3808]! }
- public var Conversation_typing: String { return self._s[3810]! }
- public var Undo_ScheduledMessagesCleared: String { return self._s[3811]! }
- public var Paint_Masks: String { return self._s[3812]! }
- public var Contacts_DeselectAll: String { return self._s[3813]! }
+ public var Exceptions_AddToExceptions: String { return self._s[3821]! }
+ public var AccessDenied_Settings: String { return self._s[3822]! }
+ public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3823]! }
+ public var Month_ShortMay: String { return self._s[3824]! }
+ public var Compose_NewGroup: String { return self._s[3826]! }
+ public var Group_Setup_TypePrivate: String { return self._s[3828]! }
+ public var Login_PadPhoneHelpTitle: String { return self._s[3830]! }
+ public var Appearance_ThemeDayClassic: String { return self._s[3831]! }
+ public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3832]! }
+ public var AutoDownloadSettings_OffForAll: String { return self._s[3833]! }
+ public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3834]! }
+ public var Conversation_typing: String { return self._s[3836]! }
+ public var Undo_ScheduledMessagesCleared: String { return self._s[3837]! }
+ public var Paint_Masks: String { return self._s[3838]! }
+ public var Contacts_DeselectAll: String { return self._s[3839]! }
public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3814]!, self._r[3814]!, [_0])
+ return formatWithArgumentRanges(self._s[3840]!, self._r[3840]!, [_0])
}
- public var Username_InvalidTaken: String { return self._s[3815]! }
- public var Call_StatusNoAnswer: String { return self._s[3816]! }
- public var TwoStepAuth_EmailAddSuccess: String { return self._s[3817]! }
- public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3818]! }
- public var Passport_Identity_Selfie: String { return self._s[3819]! }
- public var Login_InfoLastNamePlaceholder: String { return self._s[3820]! }
- public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3821]! }
- public var Conversation_ClearSecretHistory: String { return self._s[3822]! }
- public var PeopleNearby_Description: String { return self._s[3824]! }
- public var NetworkUsageSettings_Title: String { return self._s[3825]! }
- public var Your_cards_security_code_is_invalid: String { return self._s[3827]! }
+ public var Username_InvalidTaken: String { return self._s[3841]! }
+ public var Call_StatusNoAnswer: String { return self._s[3842]! }
+ public var TwoStepAuth_EmailAddSuccess: String { return self._s[3843]! }
+ public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3844]! }
+ public var Passport_Identity_Selfie: String { return self._s[3845]! }
+ public var Login_InfoLastNamePlaceholder: String { return self._s[3846]! }
+ public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3847]! }
+ public var Conversation_ClearSecretHistory: String { return self._s[3848]! }
+ public var PeopleNearby_Description: String { return self._s[3850]! }
+ public var NetworkUsageSettings_Title: String { return self._s[3851]! }
+ public var Your_cards_security_code_is_invalid: String { return self._s[3853]! }
public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3829]!, self._r[3829]!, [_0])
+ return formatWithArgumentRanges(self._s[3855]!, self._r[3855]!, [_0])
}
public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3830]!, self._r[3830]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3856]!, self._r[3856]!, [_1, _2])
}
- public var SaveIncomingPhotosSettings_From: String { return self._s[3832]! }
- public var VoiceOver_Navigation_Search: String { return self._s[3833]! }
- public var Map_LiveLocationTitle: String { return self._s[3834]! }
- public var Login_InfoAvatarAdd: String { return self._s[3835]! }
- public var Passport_Identity_FilesView: String { return self._s[3836]! }
- public var UserInfo_GenericPhoneLabel: String { return self._s[3837]! }
- public var Privacy_Calls_NeverAllow: String { return self._s[3838]! }
- public var VoiceOver_Chat_File: String { return self._s[3839]! }
- public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3840]! }
+ public var SaveIncomingPhotosSettings_From: String { return self._s[3858]! }
+ public var VoiceOver_Navigation_Search: String { return self._s[3859]! }
+ public var Map_LiveLocationTitle: String { return self._s[3860]! }
+ public var Login_InfoAvatarAdd: String { return self._s[3861]! }
+ public var Passport_Identity_FilesView: String { return self._s[3862]! }
+ public var UserInfo_GenericPhoneLabel: String { return self._s[3863]! }
+ public var Privacy_Calls_NeverAllow: String { return self._s[3864]! }
+ public var VoiceOver_Chat_File: String { return self._s[3865]! }
+ public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3866]! }
public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3841]!, self._r[3841]!, [_0])
+ return formatWithArgumentRanges(self._s[3867]!, self._r[3867]!, [_0])
}
- public var ContactInfo_PhoneNumberHidden: String { return self._s[3842]! }
- public var TwoStepAuth_ConfirmationText: String { return self._s[3843]! }
- public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3844]! }
+ public var ContactInfo_PhoneNumberHidden: String { return self._s[3868]! }
+ public var TwoStepAuth_ConfirmationText: String { return self._s[3869]! }
+ public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3870]! }
public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3845]!, self._r[3845]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3871]!, self._r[3871]!, [_1, _2, _3])
}
- public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3846]! }
- public var Wallet_Intro_CreateErrorText: String { return self._s[3847]! }
- public var Tour_Title2: String { return self._s[3848]! }
- public var Wallet_Sent_ViewWallet: String { return self._s[3849]! }
- public var Conversation_FileOpenIn: String { return self._s[3850]! }
- public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3851]! }
- public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3852]! }
- public var Wallpaper_Set: String { return self._s[3853]! }
- public var Passport_Identity_Translations: String { return self._s[3855]! }
+ public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3872]! }
+ public var Wallet_Intro_CreateErrorText: String { return self._s[3873]! }
+ public var Tour_Title2: String { return self._s[3874]! }
+ public var Wallet_Sent_ViewWallet: String { return self._s[3875]! }
+ public var Conversation_FileOpenIn: String { return self._s[3876]! }
+ public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3877]! }
+ public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3878]! }
+ public var Wallpaper_Set: String { return self._s[3879]! }
+ public var Passport_Identity_Translations: String { return self._s[3881]! }
public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3856]!, self._r[3856]!, [_0])
+ return formatWithArgumentRanges(self._s[3882]!, self._r[3882]!, [_0])
}
- public var Channel_LeaveChannel: String { return self._s[3857]! }
+ public var Channel_LeaveChannel: String { return self._s[3883]! }
public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3858]!, self._r[3858]!, [_1])
+ return formatWithArgumentRanges(self._s[3884]!, self._r[3884]!, [_1])
}
- public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3860]! }
- public var PhotoEditor_HighlightsTint: String { return self._s[3861]! }
- public var Passport_Email_Delete: String { return self._s[3862]! }
- public var Conversation_Mute: String { return self._s[3864]! }
- public var Channel_AddBotAsAdmin: String { return self._s[3865]! }
- public var Channel_AdminLog_CanSendMessages: String { return self._s[3867]! }
- public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3868]! }
- public var Channel_Management_LabelOwner: String { return self._s[3870]! }
+ public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3886]! }
+ public var PhotoEditor_HighlightsTint: String { return self._s[3887]! }
+ public var Passport_Email_Delete: String { return self._s[3888]! }
+ public var Conversation_Mute: String { return self._s[3890]! }
+ public var Channel_AddBotAsAdmin: String { return self._s[3891]! }
+ public var Channel_AdminLog_CanSendMessages: String { return self._s[3893]! }
+ public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3894]! }
+ public var Channel_Management_LabelOwner: String { return self._s[3896]! }
public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3871]!, self._r[3871]!, [_1, _2])
- }
- public var Calls_CallTabDescription: String { return self._s[3872]! }
- public var Passport_Identity_NativeNameHelp: String { return self._s[3873]! }
- public var Common_No: String { return self._s[3874]! }
- public var Weekday_Sunday: String { return self._s[3875]! }
- public var Notification_Reply: String { return self._s[3876]! }
- public var Conversation_ViewMessage: String { return self._s[3877]! }
- public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3878]!, self._r[3878]!, [_0])
- }
- public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_0])
- }
- public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3880]!, self._r[3880]!, [_1, _2, _3])
- }
- public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3881]! }
- public var Wallet_Send_Title: String { return self._s[3882]! }
- public var Message_PinnedDocumentMessage: String { return self._s[3883]! }
- public var Wallet_Info_RefreshErrorText: String { return self._s[3884]! }
- public var DialogList_TabTitle: String { return self._s[3886]! }
- public var ChatSettings_AutoPlayTitle: String { return self._s[3887]! }
- public var Passport_FieldEmail: String { return self._s[3888]! }
- public var Conversation_UnpinMessageAlert: String { return self._s[3889]! }
- public var Passport_Address_TypeBankStatement: String { return self._s[3890]! }
- public var Wallet_SecureStorageReset_Title: String { return self._s[3891]! }
- public var Passport_Identity_ExpiryDate: String { return self._s[3892]! }
- public var Privacy_Calls_P2P: String { return self._s[3893]! }
- public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3895]!, self._r[3895]!, [_0])
- }
- public var SocksProxySetup_UseForCallsHelp: String { return self._s[3896]! }
- public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[3897]!, self._r[3897]!, [_1, _2])
}
- public var Stickers_ClearRecent: String { return self._s[3898]! }
- public var EnterPasscode_ChangeTitle: String { return self._s[3899]! }
- public var TwoFactorSetup_Email_Title: String { return self._s[3900]! }
- public var Passport_InfoText: String { return self._s[3901]! }
- public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3902]! }
+ public var Calls_CallTabDescription: String { return self._s[3898]! }
+ public var Passport_Identity_NativeNameHelp: String { return self._s[3899]! }
+ public var Common_No: String { return self._s[3900]! }
+ public var Weekday_Sunday: String { return self._s[3901]! }
+ public var Notification_Reply: String { return self._s[3902]! }
+ public var Conversation_ViewMessage: String { return self._s[3903]! }
+ public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[3904]!, self._r[3904]!, [_0])
+ }
+ public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[3905]!, self._r[3905]!, [_0])
+ }
+ public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[3906]!, self._r[3906]!, [_1, _2, _3])
+ }
+ public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3907]! }
+ public var Wallet_Send_Title: String { return self._s[3908]! }
+ public var Message_PinnedDocumentMessage: String { return self._s[3909]! }
+ public var Wallet_Info_RefreshErrorText: String { return self._s[3910]! }
+ public var DialogList_TabTitle: String { return self._s[3912]! }
+ public var ChatSettings_AutoPlayTitle: String { return self._s[3913]! }
+ public var Passport_FieldEmail: String { return self._s[3914]! }
+ public var Conversation_UnpinMessageAlert: String { return self._s[3915]! }
+ public var Passport_Address_TypeBankStatement: String { return self._s[3916]! }
+ public var Wallet_SecureStorageReset_Title: String { return self._s[3917]! }
+ public var Passport_Identity_ExpiryDate: String { return self._s[3918]! }
+ public var Privacy_Calls_P2P: String { return self._s[3919]! }
+ public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[3921]!, self._r[3921]!, [_0])
+ }
+ public var SocksProxySetup_UseForCallsHelp: String { return self._s[3922]! }
+ public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[3923]!, self._r[3923]!, [_1, _2])
+ }
+ public var Stickers_ClearRecent: String { return self._s[3924]! }
+ public var EnterPasscode_ChangeTitle: String { return self._s[3925]! }
+ public var TwoFactorSetup_Email_Title: String { return self._s[3926]! }
+ public var Passport_InfoText: String { return self._s[3927]! }
+ public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3928]! }
public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3903]!, self._r[3903]!, [_0])
+ return formatWithArgumentRanges(self._s[3929]!, self._r[3929]!, [_0])
}
public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3904]!, self._r[3904]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[3930]!, self._r[3930]!, [_1, _2, _3])
}
- public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3905]! }
- public var ScheduledMessages_PollUnavailable: String { return self._s[3906]! }
- public var VoiceOver_Navigation_Compose: String { return self._s[3907]! }
- public var Passport_Identity_EditDriversLicense: String { return self._s[3908]! }
- public var Conversation_TapAndHoldToRecord: String { return self._s[3910]! }
- public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3911]! }
+ public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3931]! }
+ public var ScheduledMessages_PollUnavailable: String { return self._s[3932]! }
+ public var VoiceOver_Navigation_Compose: String { return self._s[3933]! }
+ public var Passport_Identity_EditDriversLicense: String { return self._s[3934]! }
+ public var Conversation_TapAndHoldToRecord: String { return self._s[3936]! }
+ public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3937]! }
public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3912]!, self._r[3912]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3938]!, self._r[3938]!, [_1, _2])
}
- public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3914]! }
- public var ChatSettings_OpenLinksIn: String { return self._s[3915]! }
+ public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3940]! }
+ public var ChatSettings_OpenLinksIn: String { return self._s[3941]! }
public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3917]!, self._r[3917]!, [_0])
+ return formatWithArgumentRanges(self._s[3943]!, self._r[3943]!, [_0])
}
- public var DialogList_Unread: String { return self._s[3918]! }
+ public var DialogList_Unread: String { return self._s[3944]! }
public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3919]!, self._r[3919]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3945]!, self._r[3945]!, [_1, _2])
}
- public var User_DeletedAccount: String { return self._s[3920]! }
- public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3921]! }
+ public var User_DeletedAccount: String { return self._s[3946]! }
+ public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3947]! }
public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3922]!, self._r[3922]!, [_0])
+ return formatWithArgumentRanges(self._s[3948]!, self._r[3948]!, [_0])
}
- public var UserInfo_NotificationsDefault: String { return self._s[3923]! }
- public var SharedMedia_CategoryMedia: String { return self._s[3924]! }
- public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3925]! }
- public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3926]! }
- public var Watch_ChatList_Compose: String { return self._s[3927]! }
- public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3928]! }
- public var AutoDownloadSettings_Delimeter: String { return self._s[3929]! }
- public var Watch_Microphone_Access: String { return self._s[3930]! }
- public var Group_Setup_HistoryHeader: String { return self._s[3931]! }
- public var Map_SetThisLocation: String { return self._s[3932]! }
- public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3933]! }
- public var Activity_UploadingPhoto: String { return self._s[3934]! }
- public var Conversation_Edit: String { return self._s[3936]! }
- public var Group_ErrorSendRestrictedMedia: String { return self._s[3937]! }
- public var Login_TermsOfServiceDecline: String { return self._s[3938]! }
- public var Message_PinnedContactMessage: String { return self._s[3939]! }
+ public var UserInfo_NotificationsDefault: String { return self._s[3949]! }
+ public var SharedMedia_CategoryMedia: String { return self._s[3950]! }
+ public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3951]! }
+ public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3952]! }
+ public var Watch_ChatList_Compose: String { return self._s[3953]! }
+ public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3954]! }
+ public var AutoDownloadSettings_Delimeter: String { return self._s[3955]! }
+ public var Watch_Microphone_Access: String { return self._s[3956]! }
+ public var Group_Setup_HistoryHeader: String { return self._s[3957]! }
+ public var Map_SetThisLocation: String { return self._s[3958]! }
+ public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3959]! }
+ public var Activity_UploadingPhoto: String { return self._s[3960]! }
+ public var Conversation_Edit: String { return self._s[3962]! }
+ public var Group_ErrorSendRestrictedMedia: String { return self._s[3963]! }
+ public var Login_TermsOfServiceDecline: String { return self._s[3964]! }
+ public var Message_PinnedContactMessage: String { return self._s[3965]! }
public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3940]!, self._r[3940]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3966]!, self._r[3966]!, [_1, _2])
}
public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3941]!, self._r[3941]!, [_1, _2, _3, _4, _5])
+ return formatWithArgumentRanges(self._s[3967]!, self._r[3967]!, [_1, _2, _3, _4, _5])
}
- public var Appearance_LargeEmoji: String { return self._s[3942]! }
- public var TwoStepAuth_AdditionalPassword: String { return self._s[3944]! }
- public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[3945]! }
+ public var Appearance_LargeEmoji: String { return self._s[3968]! }
+ public var TwoStepAuth_AdditionalPassword: String { return self._s[3970]! }
+ public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[3971]! }
public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3946]!, self._r[3946]!, [_1, _2])
+ return formatWithArgumentRanges(self._s[3972]!, self._r[3972]!, [_1, _2])
}
- public var Passport_Phone_EnterOtherNumber: String { return self._s[3947]! }
- public var Message_PinnedPhotoMessage: String { return self._s[3948]! }
- public var Passport_FieldPhone: String { return self._s[3949]! }
- public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3950]! }
- public var ChatSettings_AutoPlayGifs: String { return self._s[3951]! }
- public var InfoPlist_NSCameraUsageDescription: String { return self._s[3953]! }
- public var Conversation_Call: String { return self._s[3954]! }
- public var Common_TakePhoto: String { return self._s[3956]! }
- public var Group_EditAdmin_RankTitle: String { return self._s[3957]! }
- public var Wallet_Receive_CommentHeader: String { return self._s[3958]! }
- public var Channel_NotificationLoading: String { return self._s[3959]! }
+ public var Passport_Phone_EnterOtherNumber: String { return self._s[3973]! }
+ public var Message_PinnedPhotoMessage: String { return self._s[3974]! }
+ public var Passport_FieldPhone: String { return self._s[3975]! }
+ public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3976]! }
+ public var ChatSettings_AutoPlayGifs: String { return self._s[3977]! }
+ public var InfoPlist_NSCameraUsageDescription: String { return self._s[3979]! }
+ public var Conversation_Call: String { return self._s[3980]! }
+ public var Common_TakePhoto: String { return self._s[3982]! }
+ public var Group_EditAdmin_RankTitle: String { return self._s[3983]! }
+ public var Wallet_Receive_CommentHeader: String { return self._s[3984]! }
+ public var Channel_NotificationLoading: String { return self._s[3985]! }
public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3960]!, self._r[3960]!, [_0])
+ return formatWithArgumentRanges(self._s[3986]!, self._r[3986]!, [_0])
}
public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3961]!, self._r[3961]!, [_0])
+ return formatWithArgumentRanges(self._s[3987]!, self._r[3987]!, [_0])
}
public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3962]!, self._r[3962]!, [_1])
+ return formatWithArgumentRanges(self._s[3988]!, self._r[3988]!, [_1])
}
- public var Permissions_SiriTitle_v0: String { return self._s[3963]! }
+ public var Permissions_SiriTitle_v0: String { return self._s[3989]! }
public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3964]!, self._r[3964]!, [_0])
- }
- public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3965]!, self._r[3965]!, [_0])
- }
- public var Channel_MessagePhotoRemoved: String { return self._s[3966]! }
- public var Wallet_Info_ReceiveGrams: String { return self._s[3967]! }
- public var ClearCache_FreeSpace: String { return self._s[3968]! }
- public var Common_edit: String { return self._s[3969]! }
- public var PrivacySettings_AuthSessions: String { return self._s[3970]! }
- public var Month_ShortJune: String { return self._s[3971]! }
- public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3972]! }
- public var Call_ReportSend: String { return self._s[3973]! }
- public var Watch_LastSeen_JustNow: String { return self._s[3974]! }
- public var Notifications_MessageNotifications: String { return self._s[3975]! }
- public var WallpaperSearch_ColorGreen: String { return self._s[3976]! }
- public var BroadcastListInfo_AddRecipient: String { return self._s[3978]! }
- public var Group_Status: String { return self._s[3979]! }
- public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3980]!, self._r[3980]!, [_0, _1])
- }
- public var TextFormat_AddLinkTitle: String { return self._s[3981]! }
- public var ShareMenu_ShareTo: String { return self._s[3982]! }
- public var Conversation_Moderate_Ban: String { return self._s[3983]! }
- public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3984]!, self._r[3984]!, [_0])
- }
- public var SharedMedia_ViewInChat: String { return self._s[3985]! }
- public var Map_LiveLocationFor8Hours: String { return self._s[3986]! }
- public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3987]!, self._r[3987]!, [_1])
- }
- public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3988]!, self._r[3988]!, [_1, _2])
- }
- public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) {
return formatWithArgumentRanges(self._s[3990]!, self._r[3990]!, [_0])
}
- public var Map_OpenInHereMaps: String { return self._s[3991]! }
- public var Appearance_ReduceMotion: String { return self._s[3992]! }
- public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[3993]!, self._r[3993]!, [_1, _2])
+ public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[3991]!, self._r[3991]!, [_0])
}
- public var Channel_Setup_TypePublicHelp: String { return self._s[3994]! }
- public var Passport_Identity_EditInternalPassport: String { return self._s[3995]! }
- public var PhotoEditor_Skip: String { return self._s[3996]! }
- public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String {
+ public var Channel_MessagePhotoRemoved: String { return self._s[3992]! }
+ public var Wallet_Info_ReceiveGrams: String { return self._s[3993]! }
+ public var ClearCache_FreeSpace: String { return self._s[3994]! }
+ public var Common_edit: String { return self._s[3995]! }
+ public var PrivacySettings_AuthSessions: String { return self._s[3996]! }
+ public var Month_ShortJune: String { return self._s[3997]! }
+ public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3998]! }
+ public var Call_ReportSend: String { return self._s[3999]! }
+ public var Watch_LastSeen_JustNow: String { return self._s[4000]! }
+ public var Notifications_MessageNotifications: String { return self._s[4001]! }
+ public var WallpaperSearch_ColorGreen: String { return self._s[4002]! }
+ public var BroadcastListInfo_AddRecipient: String { return self._s[4004]! }
+ public var Group_Status: String { return self._s[4005]! }
+ public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[4006]!, self._r[4006]!, [_0, _1])
+ }
+ public var TextFormat_AddLinkTitle: String { return self._s[4007]! }
+ public var ShareMenu_ShareTo: String { return self._s[4008]! }
+ public var Conversation_Moderate_Ban: String { return self._s[4009]! }
+ public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[4010]!, self._r[4010]!, [_0])
+ }
+ public var SharedMedia_ViewInChat: String { return self._s[4011]! }
+ public var Map_LiveLocationFor8Hours: String { return self._s[4012]! }
+ public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_1])
+ }
+ public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[4014]!, self._r[4014]!, [_1, _2])
+ }
+ public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[4016]!, self._r[4016]!, [_0])
+ }
+ public var Map_OpenInHereMaps: String { return self._s[4017]! }
+ public var Appearance_ReduceMotion: String { return self._s[4018]! }
+ public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+ return formatWithArgumentRanges(self._s[4019]!, self._r[4019]!, [_1, _2])
+ }
+ public var Channel_Setup_TypePublicHelp: String { return self._s[4020]! }
+ public var Passport_Identity_EditInternalPassport: String { return self._s[4021]! }
+ public var PhotoEditor_Skip: String { return self._s[4022]! }
+ public func Conversation_LiveLocationMembersCount(_ 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 SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String {
+ public func Contacts_ImportersCount(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func LastSeen_HoursAgo(_ value: Int32) -> String {
+ public func StickerPack_RemoveStickerCount(_ 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 Invitation_Members(_ value: Int32) -> String {
+ public func ForwardedContacts(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MessageTimer_ShortHours(_ value: Int32) -> String {
+ public func GroupInfo_ShowMoreMembers(_ 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 MessageTimer_Minutes(_ value: Int32) -> String {
+ public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func SharedMedia_Link(_ value: Int32) -> String {
+ public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Call_ShortMinutes(_ value: Int32) -> String {
+ public func MessageTimer_Months(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func ChatList_SelectedChats(_ value: Int32) -> String {
+ public func SharedMedia_Link(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String {
+ public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Media_SharePhoto(_ value: Int32) -> String {
+ public func InviteText_ContactsCountText(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MessageTimer_ShortSeconds(_ value: Int32) -> String {
+ public func SharedMedia_Generic(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MessageTimer_Years(_ 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[12 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func SharedMedia_Photo(_ value: Int32) -> String {
+ public func Call_ShortSeconds(_ 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 {
+ public func Call_ShortMinutes(_ 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 ChatList_DeleteConfirmation(_ value: Int32) -> String {
+ 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[15 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Theme_UsersCount(_ value: Int32) -> String {
+ public func ServiceMessage_GameScoreSimple(_ 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 Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String {
+ public func AttachmentMenu_SendPhoto(_ 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 StickerPack_RemoveStickerCount(_ 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 ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String {
+ public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
let form = getPluralizationForm(self.lc, selector)
- return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, _0, _1)
+ return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func Notification_GameScoreSelfExtended(_ value: Int32) -> String {
+ 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[19 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+ }
+ 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[20 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String {
+ public func PrivacyLastSeenSettings_AddUsers(_ 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 StickerPack_AddStickerCount(_ value: Int32) -> String {
+ public func MessageTimer_ShortWeeks(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[22 * 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[23 * 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[23 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func Notification_GameScoreExtended(_ value: Int32) -> String {
+ public func Notification_GameScoreSimple(_ 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 Wallet_Updated_HoursAgo(_ value: Int32) -> String {
+ 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[25 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MessageTimer_Months(_ value: Int32) -> String {
+ public func Conversation_StatusSubscribers(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func SharedMedia_File(_ value: Int32) -> String {
+ public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+ }
+ public func ForwardedAudios(_ 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)
+ return String(format: self._ps[28 * 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[28 * 6 + Int(form.rawValue)]!, _1, _2)
- }
- public func Media_ShareItem(_ value: Int32) -> String {
+ public func SharedMedia_DeleteItemsConfirmation(_ 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 PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
- let form = getPluralizationForm(self.lc, selector)
- return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, _1, _2)
+ public func QuickSend_Photos(_ value: Int32) -> String {
+ let form = getPluralizationForm(self.lc, value)
+ let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+ return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String {
+ public func MessageTimer_Weeks(_ 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 PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
- let form = getPluralizationForm(self.lc, selector)
- return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, _1, _2)
+ public func Notification_GameScoreSelfSimple(_ value: Int32) -> String {
+ let form = getPluralizationForm(self.lc, value)
+ let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+ return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func SharedMedia_Generic(_ value: Int32) -> String {
+ public func MuteExpires_Hours(_ 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 Conversation_StatusMembers(_ value: Int32) -> String {
+ public func ForwardedFiles(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
- let form = getPluralizationForm(self.lc, selector)
- return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, _1, _2)
+ public func MuteExpires_Days(_ 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 ForwardedFiles(_ value: Int32) -> String {
+ public func Invitation_Members(_ 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 Watch_LastSeen_MinutesAgo(_ value: Int32) -> String {
+ public func MessageTimer_Hours(_ 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 Wallpaper_DeleteConfirmation(_ 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 PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String {
+ public func MessageTimer_Seconds(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func CreatePoll_AddMoreOptions(_ value: Int32) -> String {
+ public func SharedMedia_Video(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func ForwardedVideos(_ value: Int32) -> String {
+ public func MessageTimer_Years(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String {
+ public func Media_SharePhoto(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func AttachmentMenu_SendItem(_ value: Int32) -> String {
+ 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[43 * 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[44 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+ public func ForwardedPhotos(_ 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 LastSeen_MinutesAgo(_ value: Int32) -> String {
+ public func Media_ShareVideo(_ 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 Contacts_ImportersCount(_ value: Int32) -> String {
+ public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Map_ETAHours(_ value: Int32) -> String {
+ public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String {
+ public func Notification_GameScoreExtended(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String {
+ public func SharedMedia_Photo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MessageTimer_ShortWeeks(_ value: Int32) -> String {
+ public func AttachmentMenu_SendItem(_ 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 MessageTimer_Hours(_ value: Int32) -> String {
+ public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func GroupInfo_ParticipantCount(_ value: Int32) -> String {
+ public func MessagePoll_VotedCount(_ 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 Notification_GameScoreSelfSimple(_ value: Int32) -> String {
+ public func MessageTimer_ShortSeconds(_ 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 Watch_LastSeen_HoursAgo(_ value: Int32) -> String {
+ public func MuteFor_Hours(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String {
+ public func StickerPack_AddStickerCount(_ 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 LiveLocationUpdated_MinutesAgo(_ 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_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func InviteText_ContactsCountText(_ value: Int32) -> String {
+ public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func ForwardedLocations(_ value: Int32) -> String {
+ public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Passport_Scans(_ value: Int32) -> String {
+ public func LiveLocation_MenuChatsCount(_ 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 Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
+ public func ForwardedVideoMessages(_ 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 QuickSend_Photos(_ value: Int32) -> String {
+ public func CreatePoll_AddMoreOptions(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String {
+ public func ChatList_DeleteConfirmation(_ 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 AttachmentMenu_SendVideo(_ value: Int32) -> String {
+ public func Conversation_SelectedMessages(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String {
+ public func StickerPack_RemoveMaskCount(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[64 * 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[65 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+ public func StickerPack_AddMaskCount(_ 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 MuteFor_Hours(_ value: Int32) -> String {
+ public func ForwardedMessages(_ 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 Conversation_SelectedMessages(_ value: Int32) -> String {
+ public func MuteFor_Days(_ 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 MessagePoll_VotedCount(_ value: Int32) -> String {
+ public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MessageTimer_ShortMinutes(_ value: Int32) -> String {
+ public func Map_ETAHours(_ 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 Notifications_Exceptions(_ 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 PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func MessageTimer_Days(_ value: Int32) -> String {
+ public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[71 * 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[72 * 6 + Int(form.rawValue)]!, _1, _2)
+ public func AttachmentMenu_SendVideo(_ 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 ServiceMessage_GameScoreSelfSimple(_ 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 MessageTimer_ShortDays(_ value: Int32) -> String {
+ public func Conversation_StatusMembers(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[74 * 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[75 * 6 + Int(form.rawValue)]!, _1, _2)
- }
- public func ForwardedAudios(_ value: Int32) -> String {
+ public func Forward_ConfirmMultipleFiles(_ 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)
+ return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Notification_GameScoreSimple(_ value: Int32) -> String {
+ public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, _1, _2)
+ }
+ public func LastSeen_HoursAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[77 * 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[78 * 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_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
let form = getPluralizationForm(self.lc, selector)
- return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+ return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, _2, _1, _3)
}
- public func LiveLocation_MenuChatsCount(_ value: Int32) -> String {
+ public func SharedMedia_File(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
- return String(format: self._ps[80 * 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[81 * 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[82 * 6 + Int(form.rawValue)]!, stringValue)
- }
- public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String {
- let form = getPluralizationForm(self.lc, value)
- let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
- return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue)
- }
- public func ForwardedGifs(_ 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 Call_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 Chat_DeleteMessagesConfirmation(_ 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 ForwardedMessages(_ 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 ForwardedContacts(_ 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 AttachmentMenu_SendGif(_ value: Int32) -> String {
- let form = getPluralizationForm(self.lc, value)
- let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
- return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue)
- }
- public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
- let form = getPluralizationForm(self.lc, selector)
- return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, _1, _2)
- }
- public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
- let form = getPluralizationForm(self.lc, selector)
- return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, _1, _2)
- }
- public func Call_ShortSeconds(_ value: Int32) -> String {
- let form = getPluralizationForm(self.lc, value)
- let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
- return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue)
+ return String(format: self._ps[79 * 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[93 * 6 + Int(form.rawValue)]!, stringValue)
+ return String(format: self._ps[80 * 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[94 * 6 + Int(form.rawValue)]!, _2, _1, _3)
- }
- public func ForwardedPhotos(_ value: Int32) -> String {
+ public func ChatList_DeletedChats(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
- return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue)
+ return String(format: self._ps[81 * 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[82 * 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[83 * 6 + Int(form.rawValue)]!, stringValue)
+ }
+ public func GroupInfo_ParticipantCount(_ value: Int32) -> String {
+ let form = getPluralizationForm(self.lc, value)
+ let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+ return String(format: self._ps[84 * 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[85 * 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[86 * 6 + Int(form.rawValue)]!, _0, _1)
+ }
+ public func PasscodeSettings_FailedAttempts(_ 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 Conversation_StatusOnline(_ value: Int32) -> String {
+ let form = getPluralizationForm(self.lc, value)
+ let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+ return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue)
+ }
+ public func Call_Minutes(_ value: Int32) -> String {
+ let form = getPluralizationForm(self.lc, value)
+ let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+ return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue)
+ }
+ public func LiveLocationUpdated_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 Chat_DeleteMessagesConfirmation(_ 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 Notification_GameScoreSelfExtended(_ 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 ChatList_SelectedChats(_ 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 Media_ShareItem(_ 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_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+ }
+ public func MessageTimer_ShortHours(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[96 * 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[97 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+ public func AttachmentMenu_SendGif(_ value: Int32) -> String {
+ let form = getPluralizationForm(self.lc, value)
+ let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+ return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MessageTimer_Seconds(_ value: Int32) -> String {
+ public func ForwardedVideos(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+ public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
let form = getPluralizationForm(self.lc, selector)
return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func Conversation_StatusSubscribers(_ value: Int32) -> String {
+ public func LastSeen_MinutesAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func UserCount(_ value: Int32) -> String {
+ public func MessageTimer_Days(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[101 * 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[102 * 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[102 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func Media_ShareVideo(_ value: Int32) -> String {
+ public func MessageTimer_ShortDays(_ 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 ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String {
+ public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[104 * 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[105 * 6 + Int(form.rawValue)]!, stringValue)
+ public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, _2, _1, _3)
}
- public func SharedMedia_Video(_ 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[106 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func MuteFor_Days(_ value: Int32) -> String {
+ public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+ let form = getPluralizationForm(self.lc, selector)
+ return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, _1, _2)
+ }
+ public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
- return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue)
+ return String(format: self._ps[108 * 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[108 * 6 + Int(form.rawValue)]!, _1, _2)
- }
- public func Watch_UserInfo_Mute(_ value: Int32) -> String {
+ public func StickerPack_StickerCount(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func StickerPack_AddMaskCount(_ value: Int32) -> String {
+ public func MessageTimer_ShortMinutes(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func ForwardedStickers(_ value: Int32) -> String {
+ public func UserCount(_ 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 MessageTimer_Weeks(_ value: Int32) -> String {
+ public func Map_ETAMinutes(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[112 * 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[113 * 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[113 * 6 + Int(form.rawValue)]!, _1, _2)
}
- public func MuteExpires_Days(_ value: Int32) -> String {
+ public func ForwardedGifs(_ 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 AttachmentMenu_SendPhoto(_ value: Int32) -> String {
+ public func ForwardedStickers(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[115 * 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[116 * 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[117 * 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 b2a87e52a4..2b04cbf843 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
@@ -289,6 +289,18 @@ public final class PresentationThemeItemDisclosureActions {
}
}
+public final class PresentationThemeItemBarChart {
+ public let color1: UIColor
+ public let color2: UIColor
+ public let color3: UIColor
+
+ public init(color1: UIColor, color2: UIColor, color3: UIColor) {
+ self.color1 = color1
+ self.color2 = color2
+ self.color3 = color3
+ }
+}
+
public final class PresentationThemeFillStrokeForeground {
public let fillColor: UIColor
public let strokeColor: UIColor
@@ -346,8 +358,9 @@ public final class PresentationThemeList {
public let scrollIndicatorColor: UIColor
public let pageIndicatorInactiveColor: UIColor
public let inputClearButtonColor: UIColor
+ public let itemBarChart: PresentationThemeItemBarChart
- 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, mediaPlaceholderColor: UIColor, scrollIndicatorColor: UIColor, pageIndicatorInactiveColor: UIColor, inputClearButtonColor: UIColor) {
+ 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, mediaPlaceholderColor: UIColor, scrollIndicatorColor: UIColor, pageIndicatorInactiveColor: UIColor, inputClearButtonColor: UIColor, itemBarChart: PresentationThemeItemBarChart) {
self.blocksBackgroundColor = blocksBackgroundColor
self.plainBackgroundColor = plainBackgroundColor
self.itemPrimaryTextColor = itemPrimaryTextColor
@@ -376,6 +389,7 @@ public final class PresentationThemeList {
self.scrollIndicatorColor = scrollIndicatorColor
self.pageIndicatorInactiveColor = pageIndicatorInactiveColor
self.inputClearButtonColor = inputClearButtonColor
+ self.itemBarChart = itemBarChart
}
}
@@ -551,6 +565,7 @@ public final class PresentationThemePartedColors {
public let accentControlColor: UIColor
public let mediaActiveControlColor: UIColor
public let mediaInactiveControlColor: UIColor
+ public let mediaControlInnerBackgroundColor: UIColor
public let pendingActivityColor: UIColor
public let fileTitleColor: UIColor
public let fileDescriptionColor: UIColor
@@ -563,7 +578,7 @@ public final class PresentationThemePartedColors {
public let textSelectionColor: UIColor
public let textSelectionKnobColor: UIColor
- public init(bubble: PresentationThemeBubbleColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, linkTextColor: UIColor, linkHighlightColor: UIColor, scamColor: UIColor, textHighlightColor: UIColor, accentTextColor: UIColor, accentControlColor: UIColor, mediaActiveControlColor: UIColor, mediaInactiveControlColor: UIColor, pendingActivityColor: UIColor, fileTitleColor: UIColor, fileDescriptionColor: UIColor, fileDurationColor: UIColor, mediaPlaceholderColor: UIColor, polls: PresentationThemeChatBubblePolls, actionButtonsFillColor: PresentationThemeVariableColor, actionButtonsStrokeColor: PresentationThemeVariableColor, actionButtonsTextColor: PresentationThemeVariableColor, textSelectionColor: UIColor, textSelectionKnobColor: UIColor) {
+ public init(bubble: PresentationThemeBubbleColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, linkTextColor: UIColor, linkHighlightColor: UIColor, scamColor: UIColor, textHighlightColor: UIColor, accentTextColor: UIColor, accentControlColor: UIColor, mediaActiveControlColor: UIColor, mediaInactiveControlColor: UIColor, mediaControlInnerBackgroundColor: UIColor, pendingActivityColor: UIColor, fileTitleColor: UIColor, fileDescriptionColor: UIColor, fileDurationColor: UIColor, mediaPlaceholderColor: UIColor, polls: PresentationThemeChatBubblePolls, actionButtonsFillColor: PresentationThemeVariableColor, actionButtonsStrokeColor: PresentationThemeVariableColor, actionButtonsTextColor: PresentationThemeVariableColor, textSelectionColor: UIColor, textSelectionKnobColor: UIColor) {
self.bubble = bubble
self.primaryTextColor = primaryTextColor
self.secondaryTextColor = secondaryTextColor
@@ -575,6 +590,7 @@ public final class PresentationThemePartedColors {
self.accentControlColor = accentControlColor
self.mediaActiveControlColor = mediaActiveControlColor
self.mediaInactiveControlColor = mediaInactiveControlColor
+ self.mediaControlInnerBackgroundColor = mediaControlInnerBackgroundColor
self.pendingActivityColor = pendingActivityColor
self.fileTitleColor = fileTitleColor
self.fileDescriptionColor = fileDescriptionColor
diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
index b76fe2e399..2c14713e3b 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
@@ -5,7 +5,12 @@ import TelegramCore
import SyncCore
import TelegramUIPreferences
-private func decodeColor(_ values: KeyedDecodingContainer, _ key: Key) throws -> UIColor {
+private func decodeColor(_ values: KeyedDecodingContainer, _ key: Key, decoder: Decoder? = nil, fallbackKey: String? = nil) throws -> UIColor {
+ if let decoder = decoder as? PresentationThemeDecoding, let fallbackKey = fallbackKey {
+ let key = (decoder.codingPath.map { $0.stringValue } + [key.stringValue]).joined(separator: ".")
+ decoder.fallbackKeys[key] = fallbackKey
+ }
+
let value = try values.decode(String.self, forKey: key)
if value.lowercased() == "clear" {
return UIColor.clear
@@ -347,6 +352,7 @@ extension PresentationThemeRootNavigationBar: Codable {
public convenience init(from decoder: Decoder) throws {
let values = try decoder.container(keyedBy: CodingKeys.self)
+
self.init(buttonColor: try decodeColor(values, .button),
disabledButtonColor: try decodeColor(values, .disabledButton),
primaryTextColor: try decodeColor(values, .primaryText),
@@ -358,10 +364,10 @@ extension PresentationThemeRootNavigationBar: Codable {
badgeBackgroundColor: try decodeColor(values, .badgeFill),
badgeStrokeColor: try decodeColor(values, .badgeStroke),
badgeTextColor: try decodeColor(values, .badgeText),
- segmentedBackgroundColor: try decodeColor(values, .segmentedBg),
- segmentedForegroundColor: try decodeColor(values, .segmentedFg),
- segmentedTextColor: try decodeColor(values, .segmentedText),
- segmentedDividerColor: try decodeColor(values, .segmentedDivider))
+ segmentedBackgroundColor: try decodeColor(values, .segmentedBg, decoder: decoder, fallbackKey: "root.searchBar.inputFill"),
+ segmentedForegroundColor: try decodeColor(values, .segmentedFg, decoder: decoder, fallbackKey: "root.navBar.background"),
+ segmentedTextColor: try decodeColor(values, .segmentedText, decoder: decoder, fallbackKey: "root.navBar.primaryText"),
+ segmentedDividerColor: try decodeColor(values, .segmentedDivider, decoder: decoder, fallbackKey: "root.list.freeInputField.stroke"))
}
public func encode(to encoder: Encoder) throws {
@@ -603,6 +609,29 @@ extension PresentationThemeItemDisclosureActions: Codable {
}
}
+
+extension PresentationThemeItemBarChart: Codable {
+ enum CodingKeys: String, CodingKey {
+ case color1
+ case color2
+ case color3
+ }
+
+ public convenience init(from decoder: Decoder) throws {
+ let values = try decoder.container(keyedBy: CodingKeys.self)
+ self.init(color1: try decodeColor(values, .color1),
+ color2: try decodeColor(values, .color2),
+ color3: try decodeColor(values, .color3))
+ }
+
+ public func encode(to encoder: Encoder) throws {
+ var values = encoder.container(keyedBy: CodingKeys.self)
+ try encodeColor(&values, self.color1, .color1)
+ try encodeColor(&values, self.color2, .color2)
+ try encodeColor(&values, self.color3, .color3)
+ }
+}
+
extension PresentationThemeFillStrokeForeground: Codable {
enum CodingKeys: String, CodingKey {
case bg
@@ -683,6 +712,7 @@ extension PresentationThemeList: Codable {
case scrollIndicator
case pageIndicatorInactive
case inputClearButton
+ case itemBarChart
}
public convenience init(from decoder: Decoder) throws {
@@ -714,7 +744,8 @@ extension PresentationThemeList: Codable {
mediaPlaceholderColor: try decodeColor(values, .mediaPlaceholder),
scrollIndicatorColor: try decodeColor(values, .scrollIndicator),
pageIndicatorInactiveColor: try decodeColor(values, .pageIndicatorInactive),
- inputClearButtonColor: try decodeColor(values, .inputClearButton))
+ inputClearButtonColor: try decodeColor(values, .inputClearButton),
+ itemBarChart: try values.decode(PresentationThemeItemBarChart.self, forKey: .itemBarChart))
}
public func encode(to encoder: Encoder) throws {
@@ -747,6 +778,7 @@ extension PresentationThemeList: Codable {
try encodeColor(&values, self.scrollIndicatorColor, .scrollIndicator)
try encodeColor(&values, self.pageIndicatorInactiveColor, .pageIndicatorInactive)
try encodeColor(&values, self.inputClearButtonColor, .inputClearButton)
+ try values.encode(self.itemBarChart, forKey: .itemBarChart)
}
}
@@ -982,6 +1014,7 @@ extension PresentationThemePartedColors: Codable {
case accentControl
case mediaActiveControl
case mediaInactiveControl
+ case mediaControlInnerBg
case pendingActivity
case fileTitle
case fileDescription
@@ -997,6 +1030,7 @@ extension PresentationThemePartedColors: Codable {
public convenience init(from decoder: Decoder) throws {
let values = try decoder.container(keyedBy: CodingKeys.self)
+ let codingPath = decoder.codingPath.map { $0.stringValue }.joined(separator: ".")
self.init(
bubble: try values.decode(PresentationThemeBubbleColor.self, forKey: .bubble),
primaryTextColor: try decodeColor(values, .primaryText),
@@ -1009,6 +1043,7 @@ extension PresentationThemePartedColors: Codable {
accentControlColor: try decodeColor(values, .accentControl),
mediaActiveControlColor: try decodeColor(values, .mediaActiveControl),
mediaInactiveControlColor: try decodeColor(values, .mediaInactiveControl),
+ mediaControlInnerBackgroundColor: try decodeColor(values, .mediaControlInnerBg, decoder: decoder, fallbackKey: codingPath + ".bubble.withWp.bg"),
pendingActivityColor: try decodeColor(values, .pendingActivity),
fileTitleColor: try decodeColor(values, .fileTitle),
fileDescriptionColor: try decodeColor(values, .fileDescription),
@@ -1036,6 +1071,7 @@ extension PresentationThemePartedColors: Codable {
try encodeColor(&values, self.accentControlColor, .accentControl)
try encodeColor(&values, self.mediaActiveControlColor, .mediaActiveControl)
try encodeColor(&values, self.mediaInactiveControlColor, .mediaInactiveControl)
+ try encodeColor(&values, self.mediaControlInnerBackgroundColor, .mediaControlInnerBg)
try encodeColor(&values, self.pendingActivityColor, .pendingActivity)
try encodeColor(&values, self.fileTitleColor, .fileTitle)
try encodeColor(&values, self.fileDescriptionColor, .fileDescription)
diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift
index 057a3e1d4c..cce47b6c95 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCoder.swift
@@ -113,6 +113,23 @@ fileprivate class PresentationThemeEncoding: Encoder {
return container
}
+ private func dictionaryForNodes(_ nodes: [Node]) -> [String: Any] {
+ var dictionary: [String: Any] = [:]
+ for node in nodes {
+ var value: Any?
+ switch node.value {
+ case let .string(string):
+ value = string
+ case let .subnode(subnodes):
+ value = dictionaryForNodes(subnodes)
+ }
+ if let key = node.key {
+ dictionary[key] = value
+ }
+ }
+ return dictionary
+ }
+
func entry(for codingKey: [String]) -> Any? {
var currentNode: Node = self.data.rootNode
for component in codingKey {
@@ -123,8 +140,8 @@ fileprivate class PresentationThemeEncoding: Encoder {
if component == codingKey.last {
if case let .string(string) = node.value {
return string
- } else {
- return nil
+ } else if case let .subnode(nodes) = node.value {
+ return dictionaryForNodes(nodes)
}
} else {
currentNode = node
@@ -404,6 +421,7 @@ class PresentationThemeDecoding: Decoder {
var referenceTheme: PresentationTheme?
var serviceBackgroundColor: UIColor?
var resolvedWallpaper: TelegramWallpaper?
+ var fallbackKeys: [String: String] = [:]
private var _referenceCoding: PresentationThemeEncoding?
fileprivate var referenceCoding: PresentationThemeEncoding? {
@@ -510,14 +528,43 @@ fileprivate struct PresentationThemeKeyedDecodingContainer: Keyed
return entry is NSNull
}
-
- public func decode(_ type: Bool.Type, forKey key: Key) throws -> Bool {
+
+ private func storageEntry(forKey key: [String]) -> Any? {
+ if let container = self.decoder.storage.containers.first as? [String: Any] {
+ func entry(container: [String: Any], forKey key: [String]) -> Any? {
+ if let keyComponent = key.first, let value = container[keyComponent] {
+ if key.count == 1 {
+ return value
+ } else if let subContainer = value as? [String: Any] {
+ return entry(container: subContainer, forKey: Array(key.suffix(from: 1)))
+ }
+ }
+ return nil
+ }
+ return entry(container: container, forKey: key)
+ } else {
+ return nil
+ }
+ }
+
+ private func containerEntry(forKey key: Key) -> Any? {
var containerEntry: Any? = self.container[key.stringValue]
if containerEntry == nil {
- containerEntry = self.decoder.referenceCoding?.entry(for: self.codingPath.map { $0.stringValue } + [key.stringValue])
+ let initialKey = self.codingPath.map { $0.stringValue } + [key.stringValue]
+ let initialKeyString = initialKey.joined(separator: ".")
+ if let fallbackKeyString = self.decoder.fallbackKeys[initialKeyString] {
+ let fallbackKey = fallbackKeyString.components(separatedBy: ".")
+ containerEntry = self.storageEntry(forKey: fallbackKey)
+ }
+ if containerEntry == nil {
+ containerEntry = self.decoder.referenceCoding?.entry(for: initialKey)
+ }
}
-
- guard let entry = containerEntry else {
+ return containerEntry
+ }
+
+ public func decode(_ type: Bool.Type, forKey key: Key) throws -> Bool {
+ guard let entry = self.containerEntry(forKey: key) else {
throw PresentationThemeDecodingError.keyNotFound
}
@@ -532,12 +579,7 @@ fileprivate struct PresentationThemeKeyedDecodingContainer: Keyed
}
public func decode(_ type: Int32.Type, forKey key: Key) throws -> Int32 {
- var containerEntry: Any? = self.container[key.stringValue]
- if containerEntry == nil {
- containerEntry = self.decoder.referenceCoding?.entry(for: self.codingPath.map { $0.stringValue } + [key.stringValue])
- }
-
- guard let entry = containerEntry else {
+ guard let entry = self.containerEntry(forKey: key) else {
throw PresentationThemeDecodingError.keyNotFound
}
@@ -552,12 +594,7 @@ fileprivate struct PresentationThemeKeyedDecodingContainer: Keyed
}
public func decode(_ type: String.Type, forKey key: Key) throws -> String {
- var containerEntry: Any? = self.container[key.stringValue]
- if containerEntry == nil {
- containerEntry = self.decoder.referenceCoding?.entry(for: self.codingPath.map { $0.stringValue } + [key.stringValue])
- }
-
- guard let entry = containerEntry else {
+ guard let entry = self.containerEntry(forKey: key) else {
throw PresentationThemeDecodingError.keyNotFound
}
@@ -572,12 +609,7 @@ fileprivate struct PresentationThemeKeyedDecodingContainer: Keyed
}
public func decode(_ type: T.Type, forKey key: Key) throws -> T {
- var containerEntry: Any? = self.container[key.stringValue]
- if containerEntry == nil {
- containerEntry = self.decoder.referenceCoding?.entry(for: self.codingPath.map { $0.stringValue } + [key.stringValue])
- }
-
- guard let entry = containerEntry else {
+ guard let entry = self.containerEntry(forKey: key) else {
throw PresentationThemeDecodingError.keyNotFound
}
diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
index a598a1dfa3..b41ba4527b 100644
--- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
+++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
@@ -31,6 +31,7 @@ public enum PresentationResourceKey: Int32 {
case navigationPlayerMaximizedRateActiveIcon
case navigationPlayerMaximizedRateInactiveIcon
+ case itemListDownArrow
case itemListDisclosureArrow
case itemListCheckIcon
case itemListSecondaryCheckIcon
diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift
index 0bf4c16233..53b0efb48f 100644
--- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift
+++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift
@@ -21,6 +21,12 @@ public func generateItemListPlusIcon(_ color: UIColor) -> UIImage? {
}
public struct PresentationResourcesItemList {
+ public static func downArrowImage(_ theme: PresentationTheme) -> UIImage? {
+ return theme.image(PresentationResourceKey.itemListDownArrow.rawValue, { theme in
+ return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Search/DownButton"), color: theme.list.itemAccentColor)
+ })
+ }
+
public static func disclosureArrowImage(_ theme: PresentationTheme) -> UIImage? {
return theme.image(PresentationResourceKey.itemListDisclosureArrow.rawValue, { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Item List/DisclosureArrow"), color: theme.list.disclosureArrowColor)
diff --git a/submodules/TelegramStringFormatting/Sources/DeviceType.swift b/submodules/TelegramStringFormatting/Sources/DeviceType.swift
new file mode 100644
index 0000000000..5a9aab573c
--- /dev/null
+++ b/submodules/TelegramStringFormatting/Sources/DeviceType.swift
@@ -0,0 +1,12 @@
+import UIKit
+
+public func stringForDeviceType() -> String {
+ let model = UIDevice.current.model.lowercased()
+ if model.contains("ipad") {
+ return "iPad"
+ } else if model.contains("ipod") {
+ return "iPod touch"
+ } else {
+ return "iPhone"
+ }
+}
diff --git a/submodules/TelegramUI/BUCK b/submodules/TelegramUI/BUCK
index 783342d0cd..35d07b5256 100644
--- a/submodules/TelegramUI/BUCK
+++ b/submodules/TelegramUI/BUCK
@@ -197,13 +197,13 @@ framework(
"//submodules/AppLock:AppLock",
"//submodules/NotificationsPresentationData:NotificationsPresentationData",
"//submodules/UrlWhitelist:UrlWhitelist",
+ "//submodules/AppIntents:AppIntents",
],
frameworks = [
"$SDKROOT/System/Library/Frameworks/Foundation.framework",
"$SDKROOT/System/Library/Frameworks/UIKit.framework",
"$SDKROOT/System/Library/Frameworks/CoreAudio.framework",
"$SDKROOT/System/Library/Frameworks/WebKit.framework",
- "$SDKROOT/System/Library/Frameworks/Intents.framework",
],
weak_frameworks = [
"Vision",
@@ -211,5 +211,6 @@ framework(
"CallKit",
"PassKit",
"Contacts",
+ "Intents",
],
)
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/Contents.json b/submodules/TelegramUI/Images.xcassets/Components/Volume/Contents.json
deleted file mode 100644
index 38f0c81fc2..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Components/Volume/Contents.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "info" : {
- "version" : 1,
- "author" : "xcode"
- },
- "properties" : {
- "provides-namespace" : true
- }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/Contents.json
deleted file mode 100644
index 4cb7985a7b..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "vol_full@2x.png",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "vol_full@3x.png",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@2x.png b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@2x.png
deleted file mode 100644
index 241c7d68de..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@2x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@3x.png b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@3x.png
deleted file mode 100644
index 588dd1fc75..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeFull.imageset/vol_full@3x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/Contents.json
deleted file mode 100644
index b1f9d81cc4..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "vol_half@2x.png",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "vol_half@3x.png",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@2x.png b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@2x.png
deleted file mode 100644
index 0f740dd595..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@2x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@3x.png b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@3x.png
deleted file mode 100644
index aae43d9942..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeHalf.imageset/vol_half@3x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/Contents.json
deleted file mode 100644
index ae52cb0a23..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "vol_off@2x.png",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "vol_off@3x.png",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@2x.png b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@2x.png
deleted file mode 100644
index 44740d8972..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@2x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@3x.png b/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@3x.png
deleted file mode 100644
index 3270c2e766..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Components/Volume/VolumeOff.imageset/vol_off@3x.png and /dev/null differ
diff --git a/submodules/TelegramUI/TelegramUI/AppDelegate.swift b/submodules/TelegramUI/TelegramUI/AppDelegate.swift
index 9be8def29c..444072d94a 100644
--- a/submodules/TelegramUI/TelegramUI/AppDelegate.swift
+++ b/submodules/TelegramUI/TelegramUI/AppDelegate.swift
@@ -33,6 +33,7 @@ import WalletCore
import OpenSSLEncryptionProvider
import AppLock
import PresentationDataUtils
+import AppIntents
#if canImport(BackgroundTasks)
import BackgroundTasks
@@ -179,6 +180,8 @@ final class SharedApplicationContext {
private let authContext = Promise()
private let authContextDisposable = MetaDisposable()
+ private let logoutDisposable = MetaDisposable()
+
private let openChatWhenReadyDisposable = MetaDisposable()
private let openUrlWhenReadyDisposable = MetaDisposable()
@@ -1147,8 +1150,22 @@ final class SharedApplicationContext {
if let authContextValue = self.authContextValue {
authContextValue.account.shouldBeServiceTaskMaster.set(.single(.never))
- authContextValue.rootController.view.endEditing(true)
- authContextValue.rootController.dismiss()
+ if authContextValue.authorizationCompleted {
+ let accountId = authContextValue.account.id
+ let _ = (self.context.get()
+ |> filter { context in
+ return context?.context.account.id == accountId
+ }
+ |> take(1)
+ |> timeout(4.0, queue: .mainQueue(), alternate: .complete())
+ |> deliverOnMainQueue).start(completed: {
+ authContextValue.rootController.view.endEditing(true)
+ authContextValue.rootController.dismiss()
+ })
+ } else {
+ authContextValue.rootController.view.endEditing(true)
+ authContextValue.rootController.dismiss()
+ }
}
self.authContextValue = context
if let context = context {
@@ -1161,12 +1178,32 @@ final class SharedApplicationContext {
|> take(1)
|> deliverOnMainQueue).start(next: { _ in
statusController.dismiss()
- self.mainWindow.present(context.rootController, on: .root) }))
+ self.mainWindow.present(context.rootController, on: .root)
+ }))
} else {
authContextReadyDisposable.set(nil)
}
}))
+ self.logoutDisposable.set((self.sharedContextPromise.get()
+ |> take(1)
+ |> mapToSignal { sharedContext -> Signal, NoError> in
+ return sharedContext.sharedContext.activeAccounts
+ |> map { _, accounts, _ -> Set in
+ return Set(accounts.map { $0.1.peerId })
+ }
+ |> reduceLeft(value: Set()) { current, updated, emit in
+ if !current.isEmpty {
+ emit(current.subtracting(current.intersection(updated)))
+ }
+ return updated
+ }
+ }).start(next: { loggedOutAccountPeerIds in
+ for peerId in loggedOutAccountPeerIds {
+ deleteAllSendMessageIntents(accountPeerId: peerId)
+ }
+ }))
+
self.watchCommunicationManagerPromise.set(watchCommunicationManager(context: self.context.get() |> flatMap { WatchCommunicationManagerContext(context: $0.context) }, allowBackgroundTimeExtension: { timeout in
let _ = (self.sharedContextPromise.get()
|> take(1)).start(next: { sharedContext in
@@ -1457,7 +1494,7 @@ final class SharedApplicationContext {
public func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType) {
if #available(iOS 9.0, *) {
- guard var encryptedPayload = payload.dictionaryPayload["p"] as? String else {
+ /*guard var encryptedPayload = payload.dictionaryPayload["p"] as? String else {
return
}
encryptedPayload = encryptedPayload.replacingOccurrences(of: "-", with: "+")
@@ -1525,16 +1562,61 @@ final class SharedApplicationContext {
}
}
}
- }
-
- /*.start(next: { sharedApplicationContext in
+ }*/
+ let _ = (self.sharedContextPromise.get()
+ |> take(1)
+ |> deliverOnMainQueue).start(next: { sharedApplicationContext in
+ if var encryptedPayload = payload.dictionaryPayload["p"] as? String {
+ encryptedPayload = encryptedPayload.replacingOccurrences(of: "-", with: "+")
+ encryptedPayload = encryptedPayload.replacingOccurrences(of: "_", with: "/")
+ while encryptedPayload.count % 4 != 0 {
+ encryptedPayload.append("=")
+ }
+ if let data = Data(base64Encoded: encryptedPayload) {
+ let _ = (sharedApplicationContext.sharedContext.activeAccounts
+ |> take(1)
+ |> mapToSignal { activeAccounts -> Signal<[(Account, MasterNotificationKey)], NoError> in
+ return combineLatest(activeAccounts.accounts.map { account -> Signal<(Account, MasterNotificationKey), NoError> in
+ return masterNotificationsKey(account: account.1, ignoreDisabled: true)
+ |> map { key -> (Account, MasterNotificationKey) in
+ return (account.1, key)
+ }
+ })
+ }
+ |> deliverOnMainQueue).start(next: { accountsAndKeys in
+ var accountAndDecryptedPayload: (Account, Data)?
+ for (account, key) in accountsAndKeys {
+ if let decryptedData = decryptedNotificationPayload(key: key, data: data) {
+ accountAndDecryptedPayload = (account, decryptedData)
+ break
+ }
+ }
+
+ if let (account, decryptedData) = accountAndDecryptedPayload {
+ if let decryptedDict = (try? JSONSerialization.jsonObject(with: decryptedData, options: [])) as? [AnyHashable: Any] {
+ if var updateString = decryptedDict["updates"] as? String {
+ updateString = updateString.replacingOccurrences(of: "-", with: "+")
+ updateString = updateString.replacingOccurrences(of: "_", with: "/")
+ while updateString.count % 4 != 0 {
+ updateString.append("=")
+ }
+ if let updateData = Data(base64Encoded: updateString) {
+ account.stateManager.processIncomingCallUpdate(data: updateData, completion: { _ in
+ })
+ }
+ }
+ }
+ }
+ })
+ }
+ }
sharedApplicationContext.wakeupManager.allowBackgroundTimeExtension(timeout: 2.0)
if case PKPushType.voIP = type {
Logger.shared.log("App \(self.episodeId)", "pushRegistry payload: \(payload.dictionaryPayload)")
sharedApplicationContext.notificationManager.addNotification(payload.dictionaryPayload)
}
- })*/
+ })
}
}
@@ -1797,7 +1879,7 @@ final class SharedApplicationContext {
|> take(1)
|> deliverOnMainQueue
|> mapToSignal { sharedContext -> Signal in
- sharedContext.wakeupManager.allowBackgroundTimeExtension(timeout: 2.0)
+ sharedContext.wakeupManager.allowBackgroundTimeExtension(timeout: 2.0, extendNow: true)
return sharedContext.sharedContext.activeAccounts
|> mapToSignal { _, accounts, _ -> Signal in
for account in accounts {
@@ -1901,6 +1983,10 @@ final class SharedApplicationContext {
var carPlayOptions = options
carPlayOptions.insert(.allowInCarPlay)
+ //if #available(iOS 13.2, *) {
+ // carPlayOptions.insert(.allowAnnouncement)
+ //}
+
unknownMessageCategory = UNNotificationCategory(identifier: "unknown", actions: [], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options)
replyMessageCategory = UNNotificationCategory(identifier: "withReply", actions: [reply], intentIdentifiers: [INSearchForMessagesIntentIdentifier], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: carPlayOptions)
replyLegacyMessageCategory = UNNotificationCategory(identifier: "r", actions: [reply], intentIdentifiers: [INSearchForMessagesIntentIdentifier], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: carPlayOptions)
diff --git a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift b/submodules/TelegramUI/TelegramUI/ApplicationContext.swift
index 6e3705877b..95f59825b2 100644
--- a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift
+++ b/submodules/TelegramUI/TelegramUI/ApplicationContext.swift
@@ -31,12 +31,23 @@ final class UnauthorizedApplicationContext {
let isReady = Promise()
+ var authorizationCompleted: Bool = false
+
init(apiId: Int32, apiHash: String, sharedContext: SharedAccountContextImpl, account: UnauthorizedAccount, otherAccountPhoneNumbers: ((String, AccountRecordId, Bool)?, [(String, AccountRecordId, Bool)])) {
self.sharedContext = sharedContext
self.account = account
let presentationData = sharedContext.currentPresentationData.with { $0 }
- self.rootController = AuthorizationSequenceController(sharedContext: sharedContext, account: account, otherAccountPhoneNumbers: otherAccountPhoneNumbers, strings: presentationData.strings, theme: presentationData.theme, openUrl: sharedContext.applicationBindings.openUrl, apiId: apiId, apiHash: apiHash)
+ var authorizationCompleted: (() -> Void)?
+
+ self.rootController = AuthorizationSequenceController(sharedContext: sharedContext, account: account, otherAccountPhoneNumbers: otherAccountPhoneNumbers, strings: presentationData.strings, theme: presentationData.theme, openUrl: sharedContext.applicationBindings.openUrl, apiId: apiId, apiHash: apiHash, authorizationCompleted: {
+ authorizationCompleted?()
+ })
+
+ authorizationCompleted = { [weak self] in
+ self?.authorizationCompleted = true
+ }
+
self.isReady.set(self.rootController.ready.get())
account.shouldBeServiceTaskMaster.set(sharedContext.applicationBindings.applicationInForeground |> map { value -> AccountServiceTaskMasterMode in
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift
index 04fdfb0121..6ff0635478 100644
--- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift
+++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift
@@ -38,6 +38,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
private var strings: PresentationStrings
public let theme: PresentationTheme
private let openUrl: (String) -> Void
+ private let authorizationCompleted: () -> Void
private var stateDisposable: Disposable?
private let actionDisposable = MetaDisposable()
@@ -50,7 +51,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
}
private var didSetReady = false
- public init(sharedContext: SharedAccountContext, account: UnauthorizedAccount, otherAccountPhoneNumbers: ((String, AccountRecordId, Bool)?, [(String, AccountRecordId, Bool)]), strings: PresentationStrings, theme: PresentationTheme, openUrl: @escaping (String) -> Void, apiId: Int32, apiHash: String) {
+ public init(sharedContext: SharedAccountContext, account: UnauthorizedAccount, otherAccountPhoneNumbers: ((String, AccountRecordId, Bool)?, [(String, AccountRecordId, Bool)]), strings: PresentationStrings, theme: PresentationTheme, openUrl: @escaping (String) -> Void, apiId: Int32, apiHash: String, authorizationCompleted: @escaping () -> Void) {
self.sharedContext = sharedContext
self.account = account
self.otherAccountPhoneNumbers = otherAccountPhoneNumbers
@@ -59,6 +60,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
self.strings = strings
self.theme = theme
self.openUrl = openUrl
+ self.authorizationCompleted = authorizationCompleted
let navigationStatusBar: NavigationStatusBarStyle
switch theme.rootController.statusBarStyle {
@@ -719,68 +721,68 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
private func updateState(state: InnerState) {
switch state {
- case .authorized:
- break
- case let .state(state):
- switch state {
- case .empty:
- if let _ = self.viewControllers.last as? AuthorizationSequenceSplashController {
- } else {
- var controllers: [ViewController] = []
- if self.otherAccountPhoneNumbers.1.isEmpty {
- controllers.append(self.splashController())
- } else {
- controllers.append(self.phoneEntryController(countryCode: defaultCountryCode(), number: ""))
- }
- self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
- }
- case let .phoneEntry(countryCode, number):
+ case .authorized:
+ self.authorizationCompleted()
+ case let .state(state):
+ switch state {
+ case .empty:
+ if let _ = self.viewControllers.last as? AuthorizationSequenceSplashController {
+ } else {
var controllers: [ViewController] = []
- if !self.otherAccountPhoneNumbers.1.isEmpty {
- controllers.append(self.splashController())
- }
- controllers.append(self.phoneEntryController(countryCode: countryCode, number: number))
- self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
- case let .confirmationCodeEntry(number, type, _, timeout, nextType, _):
- var controllers: [ViewController] = []
- if !self.otherAccountPhoneNumbers.1.isEmpty {
- controllers.append(self.splashController())
- }
- controllers.append(self.phoneEntryController(countryCode: defaultCountryCode(), number: ""))
- controllers.append(self.codeEntryController(number: number, type: type, nextType: nextType, timeout: timeout, termsOfService: nil))
- self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
- case let .passwordEntry(hint, _, _, suggestReset, syncContacts):
- var controllers: [ViewController] = []
- if !self.otherAccountPhoneNumbers.1.isEmpty {
- controllers.append(self.splashController())
- }
- controllers.append(self.passwordEntryController(hint: hint, suggestReset: suggestReset, syncContacts: syncContacts))
- self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
- case let .passwordRecovery(_, _, _, emailPattern, syncContacts):
- var controllers: [ViewController] = []
- if !self.otherAccountPhoneNumbers.1.isEmpty {
- controllers.append(self.splashController())
- }
- controllers.append(self.passwordRecoveryController(emailPattern: emailPattern, syncContacts: syncContacts))
- self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
- case let .awaitingAccountReset(protectedUntil, number, _):
- var controllers: [ViewController] = []
- if !self.otherAccountPhoneNumbers.1.isEmpty {
- controllers.append(self.splashController())
- }
- controllers.append(self.awaitingAccountResetController(protectedUntil: protectedUntil, number: number))
- self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
- case let .signUp(_, _, firstName, lastName, termsOfService, _):
- var controllers: [ViewController] = []
- var displayCancel = false
- if !self.otherAccountPhoneNumbers.1.isEmpty {
+ if self.otherAccountPhoneNumbers.1.isEmpty {
controllers.append(self.splashController())
} else {
- displayCancel = true
+ controllers.append(self.phoneEntryController(countryCode: defaultCountryCode(), number: ""))
}
- controllers.append(self.signUpController(firstName: firstName, lastName: lastName, termsOfService: termsOfService, displayCancel: displayCancel))
self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
- }
+ }
+ case let .phoneEntry(countryCode, number):
+ var controllers: [ViewController] = []
+ if !self.otherAccountPhoneNumbers.1.isEmpty {
+ controllers.append(self.splashController())
+ }
+ controllers.append(self.phoneEntryController(countryCode: countryCode, number: number))
+ self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
+ case let .confirmationCodeEntry(number, type, _, timeout, nextType, _):
+ var controllers: [ViewController] = []
+ if !self.otherAccountPhoneNumbers.1.isEmpty {
+ controllers.append(self.splashController())
+ }
+ controllers.append(self.phoneEntryController(countryCode: defaultCountryCode(), number: ""))
+ controllers.append(self.codeEntryController(number: number, type: type, nextType: nextType, timeout: timeout, termsOfService: nil))
+ self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
+ case let .passwordEntry(hint, _, _, suggestReset, syncContacts):
+ var controllers: [ViewController] = []
+ if !self.otherAccountPhoneNumbers.1.isEmpty {
+ controllers.append(self.splashController())
+ }
+ controllers.append(self.passwordEntryController(hint: hint, suggestReset: suggestReset, syncContacts: syncContacts))
+ self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
+ case let .passwordRecovery(_, _, _, emailPattern, syncContacts):
+ var controllers: [ViewController] = []
+ if !self.otherAccountPhoneNumbers.1.isEmpty {
+ controllers.append(self.splashController())
+ }
+ controllers.append(self.passwordRecoveryController(emailPattern: emailPattern, syncContacts: syncContacts))
+ self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
+ case let .awaitingAccountReset(protectedUntil, number, _):
+ var controllers: [ViewController] = []
+ if !self.otherAccountPhoneNumbers.1.isEmpty {
+ controllers.append(self.splashController())
+ }
+ controllers.append(self.awaitingAccountResetController(protectedUntil: protectedUntil, number: number))
+ self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
+ case let .signUp(_, _, firstName, lastName, termsOfService, _):
+ var controllers: [ViewController] = []
+ var displayCancel = false
+ if !self.otherAccountPhoneNumbers.1.isEmpty {
+ controllers.append(self.splashController())
+ } else {
+ displayCancel = true
+ }
+ controllers.append(self.signUpController(firstName: firstName, lastName: lastName, termsOfService: termsOfService, displayCancel: displayCancel))
+ self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
+ }
}
}
diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift
index b8f159f12d..db51319f4e 100644
--- a/submodules/TelegramUI/TelegramUI/ChatController.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatController.swift
@@ -55,6 +55,7 @@ import LocalizedPeerData
import PhoneNumberFormat
import SettingsUI
import UrlWhitelist
+import AppIntents
public enum ChatControllerPeekActions {
case standard
@@ -1429,7 +1430,38 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Message] in
return transaction.getMessageFailedGroup(id) ?? []
} |> deliverOnMainQueue).start(next: { messages in
- guard let strongSelf = self, let message = messages.filter({ $0.id == id }).first else {
+ guard let strongSelf = self else {
+ return
+ }
+ var groups: [UInt32: [Message]] = [:]
+ var notGrouped: [Message] = []
+ for message in messages {
+ if let groupInfo = message.groupInfo {
+ if groups[groupInfo.stableId] == nil {
+ groups[groupInfo.stableId] = []
+ }
+ groups[groupInfo.stableId]?.append(message)
+ } else {
+ notGrouped.append(message)
+ }
+ }
+
+ let totalGroupCount = notGrouped.count + groups.count
+
+ var maybeSelectedGroup: [Message]?
+ for (_, group) in groups {
+ if group.contains(where: { $0.id == id}) {
+ maybeSelectedGroup = group
+ break
+ }
+ }
+ for message in notGrouped {
+ if message.id == id {
+ maybeSelectedGroup = [message]
+ }
+ }
+
+ guard let selectedGroup = maybeSelectedGroup, let topMessage = selectedGroup.first else {
return
}
@@ -1438,12 +1470,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.actionSheet.primaryTextColor)
}, action: { [weak self] _, f in
if let strongSelf = self {
- let _ = resendMessages(account: strongSelf.context.account, messageIds: [id]).start()
+ let _ = resendMessages(account: strongSelf.context.account, messageIds: selectedGroup.map({ $0.id })).start()
}
f(.dismissWithoutContent)
})))
- if messages.count != 1 {
- actions.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.Conversation_MessageDialogRetryAll(messages.count).0, icon: { theme in
+ if totalGroupCount != 1 {
+ actions.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.Conversation_MessageDialogRetryAll(totalGroupCount).0, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.actionSheet.primaryTextColor)
}, action: { [weak self] _, f in
if let strongSelf = self {
@@ -1461,7 +1493,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
f(.dismissWithoutContent)
})))
- let controller = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message)), items: .single(actions), reactionItems: [], recognizer: nil)
+ let controller = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: topMessage)), items: .single(actions), reactionItems: [], recognizer: nil)
strongSelf.currentContextController = controller
strongSelf.window?.presentInGlobalOverlay(controller)
})
@@ -1702,7 +1734,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
})
}, displaySwipeToReplyHint: { [weak self] in
- if let strongSelf = self {
+ if let strongSelf = self, let validLayout = strongSelf.validLayout, min(validLayout.size.width, validLayout.size.height) > 320.0 {
strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .swipeToReply(title: strongSelf.presentationData.strings.Conversation_SwipeToReplyHintTitle, text: strongSelf.presentationData.strings.Conversation_SwipeToReplyHintText), elevatedLayout: true, action: { _ in }), in: .window(.root))
}
}, requestMessageUpdate: { [weak self] id in
@@ -2798,7 +2830,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
})
- strongSelf.donateSendMessageIntent()
+ donateSendMessageIntent(account: strongSelf.context.account, sharedContext: strongSelf.context.sharedContext, peerIds: [peerId])
}
}
@@ -3454,8 +3486,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
guard let strongSelf = self, strongSelf.beginMediaRecordingRequestId == requestId else {
return
}
- guard checkAvailableDiskSpace(context: strongSelf.context, present: { [weak self] c, a in
- self?.present(c, in: .window(.root), with: a)
+ guard checkAvailableDiskSpace(context: strongSelf.context, push: { [weak self] c in
+ self?.push(c)
}) else {
return
}
@@ -5292,8 +5324,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
disposable.set((signal
|> deliverOnMainQueue).start(completed: { [weak self] in
if let strongSelf = self, let layout = strongSelf.validLayout {
- let deviceName = UIDevice.current.userInterfaceIdiom == .pad ? "iPad" : "iPhone"
- strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", deviceName).0), elevatedLayout: true, action: { _ in }), in: .current)
+ strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: true, action: { _ in }), in: .current)
}
}))
@@ -5457,12 +5488,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
})
}, openCamera: { [weak self] cameraView, menuController in
if let strongSelf = self, let peer = strongSelf.presentationInterfaceState.renderedPeer?.peer {
- presentedLegacyCamera(context: strongSelf.context, peer: peer, cameraView: cameraView, menuController: menuController, parentController: strongSelf, editingMedia: editMediaOptions != nil, saveCapturedPhotos: settings.storeEditedPhotos, mediaGrouping: true, initialCaption: inputText.string, hasSchedule: !strongSelf.presentationInterfaceState.isScheduledMessages && peer.id.namespace != Namespaces.Peer.SecretChat, sendMessagesWithSignals: { [weak self] signals in
+ presentedLegacyCamera(context: strongSelf.context, peer: peer, cameraView: cameraView, menuController: menuController, parentController: strongSelf, editingMedia: editMediaOptions != nil, saveCapturedPhotos: settings.storeEditedPhotos, mediaGrouping: true, initialCaption: inputText.string, hasSchedule: !strongSelf.presentationInterfaceState.isScheduledMessages && peer.id.namespace != Namespaces.Peer.SecretChat, sendMessagesWithSignals: { [weak self] signals, silentPosting, scheduleTime in
if let strongSelf = self {
if editMediaOptions != nil {
strongSelf.editMessageMediaWithLegacySignals(signals!)
} else {
- strongSelf.enqueueMediaMessages(signals: signals, silentPosting: false)
+ strongSelf.enqueueMediaMessages(signals: signals, silentPosting: silentPosting, scheduleTime: scheduleTime > 0 ? scheduleTime : nil)
}
if !inputText.string.isEmpty {
//strongSelf.clearInputText()
@@ -5674,6 +5705,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
legacyController.statusBar.statusBarStyle = strongSelf.presentationData.theme.rootController.statusBarStyle.style
legacyController.controllerLoaded = { [weak legacyController] in
legacyController?.view.disablesInteractiveTransitionGestureRecognizer = true
+ legacyController?.view.disablesInteractiveModalDismiss = true
}
let controller = generator(legacyController.context)
legacyController.bind(controller: controller)
@@ -5995,7 +6027,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
})
- self.donateSendMessageIntent()
+ donateSendMessageIntent(account: self.context.account, sharedContext: self.context.sharedContext, peerIds: [peerId])
} else {
let mode: ChatScheduleTimeControllerMode
if peerId == self.context.account.peerId {
@@ -7773,23 +7805,22 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
items.append(DeleteChatPeerActionSheetItem(context: self.context, peer: peer, chatPeer: peer, action: .clearCacheSuggestion, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder))
+ var presented = false
items.append(ActionSheetButtonItem(title: self.presentationData.strings.ClearCache_FreeSpace, color: .accent, action: { [weak self, weak actionSheet] in
actionSheet?.dismissAnimated()
- if let strongSelf = self {
- let controller = storageUsageController(context: strongSelf.context, isModal: true)
- strongSelf.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+ if let strongSelf = self, !presented {
+ presented = true
+ strongSelf.push(storageUsageController(context: strongSelf.context, isModal: true))
}
}))
actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
ActionSheetButtonItem(title: self.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
actionSheet?.dismissAnimated()
-
})
])])
self.chatDisplayNode.dismissInput()
self.presentInGlobalOverlay(actionSheet)
- //self.present(actionSheet, in: .window(.root))
}
@available(iOSApplicationExtension 11.0, iOS 11.0, *)
@@ -8068,44 +8099,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
})
}
- private func donateSendMessageIntent() {
- guard case let .peer(peerId) = self.chatLocation, peerId.namespace == Namespaces.Peer.CloudUser && peerId != self.context.account.peerId else {
- return
- }
- if #available(iOSApplicationExtension 13.2, iOS 13.2, *) {
- let _ = (self.context.account.postbox.loadedPeerWithId(peerId)
- |> mapToSignal { peer -> Signal<(Peer, UIImage?), NoError> in
- let avatarImage = peerAvatarImage(account: self.context.account, peer: peer, authorOfMessage: nil, representation: peer.smallProfileImage, round: false) ?? .single(nil)
- return avatarImage
- |> map { avatarImage in
- return (peer, avatarImage)
- }
- }
- |> deliverOnMainQueue).start(next: { [weak self] peer, avatarImage in
- if let strongSelf = self, let peer = peer as? TelegramUser {
- let recipientHandle = INPersonHandle(value: "tg\(peerId.id)", type: .unknown)
- var nameComponents = PersonNameComponents()
- nameComponents.givenName = peer.firstName
- nameComponents.familyName = peer.lastName
- let displayTitle = peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)
- let recipient = INPerson(personHandle: recipientHandle, nameComponents: nameComponents, displayName: displayTitle, image: nil, contactIdentifier: nil, customIdentifier: "tg\(peerId.id)")
- let intent = INSendMessageIntent(recipients: [recipient], content: nil, speakableGroupName: INSpeakableString(spokenPhrase: displayTitle), conversationIdentifier: "tg\(peerId.id)", serviceName: nil, sender: nil)
- if #available(iOS 12.0, *), let avatarImage = avatarImage, let avatarImageData = avatarImage.jpegData(compressionQuality: 0.8) {
- intent.setImage(INImage(imageData: avatarImageData), forParameterNamed: \.groupName)
- }
- let interaction = INInteraction(intent: intent, response: nil)
- interaction.direction = .outgoing
- interaction.groupIdentifier = "sendMessage_\(strongSelf.context.account.peerId.toInt64())"
- interaction.donate { error in
- if let error = error {
- print(error.localizedDescription)
- }
- }
- }
- })
- }
- }
-
private func updateReminderActivity() {
if self.isReminderActivityEnabled && false {
if #available(iOS 9.0, *) {
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift
index 42c04af47e..bca596e929 100644
--- a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift
@@ -11,13 +11,17 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView,
}
var entries: [ChatHistoryEntry] = []
var adminRanks: [PeerId: CachedChannelAdminRank] = [:]
+ var stickersEnabled = true
if case let .peer(peerId) = location, peerId.namespace == Namespaces.Peer.CloudChannel {
for additionalEntry in view.additionalData {
if case let .cacheEntry(id, data) = additionalEntry {
if id == cachedChannelAdminRanksEntryId(peerId: peerId), let data = data as? CachedChannelAdminRanks {
adminRanks = data.ranks
}
- break
+ } else if case let .peer(_, peer) = additionalEntry, let channel = peer as? TelegramChannel {
+ if let defaultBannedRights = channel.defaultBannedRights, defaultBannedRights.flags.contains(.banSendStickers) {
+ stickersEnabled = false
+ }
}
}
}
@@ -42,7 +46,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView,
var contentTypeHint: ChatMessageEntryContentType = .generic
if presentationData.largeEmoji, entry.message.media.isEmpty {
- if entry.message.text.count == 1, let _ = associatedData.animatedEmojiStickers[entry.message.text.basicEmoji.0] {
+ if stickersEnabled && entry.message.text.count == 1, let _ = associatedData.animatedEmojiStickers[entry.message.text.basicEmoji.0] {
contentTypeHint = .animatedEmoji
} else if messageIsElligibleForLargeEmoji(entry.message) {
contentTypeHint = .largeEmoji
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift
index 250f459485..7aaa8cee48 100644
--- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift
@@ -571,7 +571,14 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
let nextTransitionVersion = Atomic(value: 0)
- let historyViewTransitionDisposable = combineLatest(queue: messageViewQueue, historyViewUpdate, self.chatPresentationDataPromise.get(), selectedMessages, automaticDownloadNetworkType, self.historyAppearsClearedPromise.get(), animatedEmojiStickers).start(next: { [weak self] update, chatPresentationData, selectedMessages, networkType, historyAppearsCleared, animatedEmojiStickers in
+ let historyViewTransitionDisposable = combineLatest(queue: messageViewQueue,
+ historyViewUpdate,
+ self.chatPresentationDataPromise.get(),
+ selectedMessages,
+ automaticDownloadNetworkType,
+ self.historyAppearsClearedPromise.get(),
+ animatedEmojiStickers
+ ).start(next: { [weak self] update, chatPresentationData, selectedMessages, networkType, historyAppearsCleared, animatedEmojiStickers in
func applyHole() {
Queue.mainQueue().async {
if let strongSelf = self {
@@ -783,7 +790,10 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
return view.values[PreferencesKeys.appConfiguration] as? AppConfiguration ?? .defaultValue
}
- self.presentationDataDisposable = (combineLatest(context.sharedContext.presentationData, appConfiguration)
+ self.presentationDataDisposable = (
+ combineLatest(queue: .mainQueue(),
+ context.sharedContext.presentationData,
+ appConfiguration)
|> deliverOnMainQueue).start(next: { [weak self] presentationData, appConfiguration in
if let strongSelf = self {
let previousTheme = strongSelf.currentPresentationData.theme
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputGifPane.swift b/submodules/TelegramUI/TelegramUI/ChatMediaInputGifPane.swift
index 73fc9515e6..f7af875c4e 100644
--- a/submodules/TelegramUI/TelegramUI/ChatMediaInputGifPane.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatMediaInputGifPane.swift
@@ -96,6 +96,32 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
let emptySize = self.emptyNode.updateLayout(size)
transition.updateFrame(node: self.emptyNode, frame: CGRect(origin: CGPoint(x: floor(size.width - emptySize.width) / 2.0, y: topInset + floor(size.height - topInset - emptySize.height) / 2.0), size: emptySize))
+ self.updateMultiplexedNodeLayout(changedIsExpanded: changedIsExpanded, transition: transition)
+ }
+
+ func fileAt(point: CGPoint) -> (FileMediaReference, CGRect)? {
+ if let multiplexedNode = self.multiplexedNode {
+ return multiplexedNode.fileAt(point: point.offsetBy(dx: -multiplexedNode.frame.minX, dy: -multiplexedNode.frame.minY))
+ } else {
+ return nil
+ }
+ }
+
+ override var isEmpty: Bool {
+ return self.multiplexedNode?.files.isEmpty ?? true
+ }
+
+ override func willEnterHierarchy() {
+ super.willEnterHierarchy()
+
+ self.initializeIfNeeded()
+ }
+
+ private func updateMultiplexedNodeLayout(changedIsExpanded: Bool, transition: ContainedViewLayoutTransition) {
+ guard let (size, topInset, bottomInset, isExpanded, isVisible, deviceMetrics) = self.validLayout else {
+ return
+ }
+
if let multiplexedNode = self.multiplexedNode {
let previousBounds = multiplexedNode.scrollNode.layer.bounds
multiplexedNode.topInset = topInset + 60.0
@@ -122,24 +148,6 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
}
}
- func fileAt(point: CGPoint) -> (FileMediaReference, CGRect)? {
- if let multiplexedNode = self.multiplexedNode {
- return multiplexedNode.fileAt(point: point.offsetBy(dx: -multiplexedNode.frame.minX, dy: -multiplexedNode.frame.minY))
- } else {
- return nil
- }
- }
-
- override var isEmpty: Bool {
- return self.multiplexedNode?.files.isEmpty ?? true
- }
-
- override func willEnterHierarchy() {
- super.willEnterHierarchy()
-
- self.initializeIfNeeded()
- }
-
func initializeIfNeeded() {
if self.multiplexedNode == nil {
self.trendingPromise.set(paneGifSearchForQuery(account: account, query: "", updateActivity: nil))
@@ -215,6 +223,8 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
fixListScrolling(multiplexedNode)
}
}
+
+ self.updateMultiplexedNodeLayout(changedIsExpanded: false, transition: .immediate)
}
}
}
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift
index e55d712ebd..28db418c60 100644
--- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift
@@ -757,7 +757,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
if self.iconNode != nil {
statusForegroundColor = presentationData.theme.chat.message.mediaOverlayControlColors.foregroundColor
} else {
- statusForegroundColor = bubbleColorComponents(theme: presentationData.theme, incoming: incoming, wallpaper: !presentationData.wallpaper.isEmpty).fill
+ statusForegroundColor = incoming ? presentationData.theme.chat.message.incoming.mediaControlInnerBackgroundColor : presentationData.theme.chat.message.outgoing.mediaControlInnerBackgroundColor
}
switch resourceStatus.mediaStatus {
case var .fetchStatus(fetchStatus):
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
index a46bf3c758..437411d05e 100644
--- a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
@@ -405,10 +405,15 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
}
if viewClassName == ChatMessageBubbleItemNode.self && self.presentationData.largeEmoji && self.message.media.isEmpty {
- if self.message.text.count == 1, let _ = self.associatedData.animatedEmojiStickers[self.message.text.basicEmoji.0] {
- viewClassName = ChatMessageAnimatedStickerItemNode.self
- } else if messageIsElligibleForLargeEmoji(self.message) {
- viewClassName = ChatMessageStickerItemNode.self
+ if case let .message(_, _, _, attributes) = self.content {
+ switch attributes.contentTypeHint {
+ case .largeEmoji:
+ viewClassName = ChatMessageStickerItemNode.self
+ case .animatedEmoji:
+ viewClassName = ChatMessageAnimatedStickerItemNode.self
+ default:
+ break
+ }
}
}
diff --git a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift
index 4b77d486aa..b8174870dd 100644
--- a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift
@@ -103,7 +103,7 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel
self.contentContainerNode.addSubnode(self.cancelButton)
self.contentContainerNode.addSubnode(self.doneButton)
if case .scheduledMessages(true) = self.mode {
- self.contentContainerNode.addSubnode(self.onlineButton)
+ //self.contentContainerNode.addSubnode(self.onlineButton)
}
self.cancelButton.addTarget(self, action: #selector(self.cancelButtonPressed), forControlEvents: .touchUpInside)
@@ -316,7 +316,7 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel
var buttonOffset: CGFloat = 0.0
if case .scheduledMessages(true) = self.mode {
- buttonOffset += 60.0
+ //buttonOffset += 60.0
}
let bottomInset: CGFloat = 10.0 + cleanInsets.bottom
diff --git a/submodules/TelegramUI/TelegramUI/CheckDiskSpace.swift b/submodules/TelegramUI/TelegramUI/CheckDiskSpace.swift
index 4d0ae940cc..5e8ed7bf52 100644
--- a/submodules/TelegramUI/TelegramUI/CheckDiskSpace.swift
+++ b/submodules/TelegramUI/TelegramUI/CheckDiskSpace.swift
@@ -7,7 +7,7 @@ import AlertUI
import PresentationDataUtils
import SettingsUI
-func totalDiskSpace() -> Int64 {
+private func totalDiskSpace() -> Int64 {
do {
let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: NSHomeDirectory() as String)
return (systemAttributes[FileAttributeKey.systemSize] as? NSNumber)?.int64Value ?? 0
@@ -16,7 +16,7 @@ func totalDiskSpace() -> Int64 {
}
}
-func freeDiskSpace() -> Int64 {
+private func freeDiskSpace() -> Int64 {
do {
let systemAttributes = try FileManager.default.attributesOfFileSystem(forPath: NSHomeDirectory() as String)
return (systemAttributes[FileAttributeKey.systemFreeSize] as? NSNumber)?.int64Value ?? 0
@@ -25,18 +25,16 @@ func freeDiskSpace() -> Int64 {
}
}
-func checkAvailableDiskSpace(context: AccountContext, threshold: Int64 = 100 * 1024 * 1024, present: @escaping (ViewController, Any?) -> Void) -> Bool {
+func checkAvailableDiskSpace(context: AccountContext, threshold: Int64 = 100 * 1024 * 1024, push: @escaping (ViewController) -> Void) -> Bool {
guard freeDiskSpace() < threshold else {
return true
}
let presentationData = context.sharedContext.currentPresentationData.with { $0 }
let controller = textAlertController(context: context, title: nil, text: presentationData.strings.Cache_LowDiskSpaceText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.AccessDenied_Settings, action: {
- let controller = storageUsageController(context: context, isModal: true)
- present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-
+ push(storageUsageController(context: context, isModal: true))
}), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})])
- present(controller, nil)
+ push(controller)
return false
}
diff --git a/submodules/TelegramUI/TelegramUI/LegacyCamera.swift b/submodules/TelegramUI/TelegramUI/LegacyCamera.swift
index 10b972611e..d745057a2d 100644
--- a/submodules/TelegramUI/TelegramUI/LegacyCamera.swift
+++ b/submodules/TelegramUI/TelegramUI/LegacyCamera.swift
@@ -11,7 +11,7 @@ import ShareController
import LegacyUI
import LegacyMediaPickerUI
-func presentedLegacyCamera(context: AccountContext, peer: Peer, cameraView: TGAttachmentCameraView?, menuController: TGMenuSheetController?, parentController: ViewController, editingMedia: Bool, saveCapturedPhotos: Bool, mediaGrouping: Bool, initialCaption: String, hasSchedule: Bool, sendMessagesWithSignals: @escaping ([Any]?) -> Void, recognizedQRCode: @escaping (String) -> Void = { _ in }, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void) {
+func presentedLegacyCamera(context: AccountContext, peer: Peer, cameraView: TGAttachmentCameraView?, menuController: TGMenuSheetController?, parentController: ViewController, editingMedia: Bool, saveCapturedPhotos: Bool, mediaGrouping: Bool, initialCaption: String, hasSchedule: Bool, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32) -> Void, recognizedQRCode: @escaping (String) -> Void = { _ in }, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void) {
let presentationData = context.sharedContext.currentPresentationData.with { $0 }
let legacyController = LegacyController(presentation: .custom, theme: presentationData.theme)
legacyController.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .portrait, compactSize: .portrait)
@@ -29,6 +29,12 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, cameraView: TGAt
controller = TGCameraController()
}
+ controller.presentScheduleController = { done in
+ presentSchedulePicker { time in
+ done?(time)
+ }
+ }
+
if #available(iOSApplicationExtension 11.0, iOS 11.0, *) {
} else {
controller.customPresentOverlayController = { [weak legacyController] generateController in
@@ -99,10 +105,10 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, cameraView: TGAt
legacyController?.dismiss()
}
- controller.finishedWithResults = { [weak menuController, weak legacyController] overlayController, selectionContext, editingContext, currentItem in
+ controller.finishedWithResults = { [weak menuController, weak legacyController] overlayController, selectionContext, editingContext, currentItem, silentPosting, scheduleTime in
if let selectionContext = selectionContext, let editingContext = editingContext {
let signals = TGCameraController.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, storeAssets: saveCapturedPhotos && !isSecretChat, saveEditedPhotos: saveCapturedPhotos && !isSecretChat, descriptionGenerator: legacyAssetPickerItemGenerator())
- sendMessagesWithSignals(signals)
+ sendMessagesWithSignals(signals, silentPosting, scheduleTime)
}
menuController?.dismiss(animated: false)
@@ -118,7 +124,7 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, cameraView: TGAt
description["timer"] = timer
}
if let item = legacyAssetPickerItemGenerator()(description, caption, entities, nil) {
- sendMessagesWithSignals([SSignal.single(item)])
+ sendMessagesWithSignals([SSignal.single(item)], false, 0)
}
}
@@ -143,7 +149,7 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, cameraView: TGAt
description["timer"] = timer
}
if let item = legacyAssetPickerItemGenerator()(description, caption, entities, nil) {
- sendMessagesWithSignals([SSignal.single(item)])
+ sendMessagesWithSignals([SSignal.single(item)], false, 0)
}
}
menuController?.dismiss(animated: false)
@@ -193,7 +199,7 @@ func presentedLegacyShortcutCamera(context: AccountContext, saveCapturedMedia: B
legacyController?.dismiss()
}
- controller.finishedWithResults = { [weak controller, weak parentController, weak legacyController] overlayController, selectionContext, editingContext, currentItem in
+ controller.finishedWithResults = { [weak controller, weak parentController, weak legacyController] overlayController, selectionContext, editingContext, currentItem, _, _ in
if let selectionContext = selectionContext, let editingContext = editingContext {
let signals = TGCameraController.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, storeAssets: saveCapturedMedia, saveEditedPhotos: saveEditedPhotos, descriptionGenerator: legacyAssetPickerItemGenerator())
if let parentController = parentController {
@@ -218,77 +224,7 @@ func presentedLegacyShortcutCamera(context: AccountContext, saveCapturedMedia: B
}), showInChat: nil, externalShare: false), in: .window(.root))
}
}
-
- //legacyController?.dismissWithAnimation()
}
parentController.present(legacyController, in: .window(.root))
-
-
- /*TGCameraControllerWindow *controllerWindow = [[TGCameraControllerWindow alloc] initWithManager:[[TGLegacyComponentsContext shared] makeOverlayWindowManager] parentController:TGAppDelegateInstance.rootController contentController:controller];
- controllerWindow.hidden = false;
-
- CGSize screenSize = TGScreenSize();
- if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone)
- controllerWindow.frame = CGRectMake(0, 0, screenSize.width, screenSize.height);
-
- CGRect startFrame = CGRectMake(0, screenSize.height, screenSize.width, screenSize.height);
- [controller beginTransitionInFromRect:startFrame];
-
- __weak TGCameraController *weakCameraController = controller;
- controller.finishedWithResults = ^(TGOverlayController *controller, TGMediaSelectionContext *selectionContext, TGMediaEditingContext *editingContext, id currentItem)
- {
- __autoreleasing NSString *disabledMessage = nil;
- if (![TGApplicationFeatures isPhotoUploadEnabledForPeerType:TGApplicationFeaturePeerPrivate disabledMessage:&disabledMessage])
- {
- [TGCustomAlertView presentAlertWithTitle:TGLocalized(@"FeatureDisabled.Oops") message:disabledMessage cancelButtonTitle:TGLocalized(@"Common.OK") okButtonTitle:nil completionBlock:nil];
- return;
- }
-
- __strong TGCameraController *strongCameraController = weakCameraController;
- if (strongCameraController == nil)
- return;
-
- [TGCameraController showTargetController:[TGCameraController resultSignalsForSelectionContext:selectionContext editingContext:editingContext currentItem:currentItem storeAssets:false saveEditedPhotos:false descriptionGenerator:^id(id item, NSString *caption, NSArray *entities, __unused NSString *stickers)
- {
- if ([item isKindOfClass:[NSDictionary class]])
- {
- NSDictionary *dict = (NSDictionary *)item;
- NSString *type = dict[@"type"];
-
- if ([type isEqualToString:@"editedPhoto"])
- {
- NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
- result[@"type"] = @"image";
- result[@"image"] = dict[@"image"];
- if (caption.length > 0)
- result[@"caption"] = caption;
- if (entities.count > 0)
- result[@"entities"] = entities;
- if (dict[@"stickers"] != nil)
- result[@"stickers"] = dict[@"stickers"];
-
- return result;
- }
- else if ([type isEqualToString:@"cameraVideo"])
- {
- NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
- result[@"type"] = @"cameraVideo";
- result[@"url"] = dict[@"url"];
- if (dict[@"adjustments"] != nil)
- result[@"adjustments"] = dict[@"adjustments"];
- if (entities.count > 0)
- result[@"entities"] = entities;
- if (dict[@"stickers"] != nil)
- result[@"stickers"] = dict[@"stickers"];
- if (dict[@"previewImage"] != nil)
- result[@"previewImage"] = dict[@"previewImage"];
-
- return result;
- }
- }
-
- return nil;
- }] cameraController:strongCameraController resultController:controller navigationController:(TGNavigationController *)controller.navigationController];
- };*/
}
diff --git a/submodules/TelegramUI/TelegramUI/MultiplexedVideoNode.swift b/submodules/TelegramUI/TelegramUI/MultiplexedVideoNode.swift
index 5652a4560f..d44fa7cf3a 100644
--- a/submodules/TelegramUI/TelegramUI/MultiplexedVideoNode.swift
+++ b/submodules/TelegramUI/TelegramUI/MultiplexedVideoNode.swift
@@ -61,7 +61,9 @@ final class MultiplexedVideoNode: ASDisplayNode, UIScrollViewDelegate {
var files: [FileMediaReference] = [] {
didSet {
+ let startTime = CFAbsoluteTimeGetCurrent()
self.updateVisibleItems()
+ print("MultiplexedVideoNode files updateVisibleItems: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
}
}
private var displayItems: [VisibleVideoItem] = []
@@ -219,7 +221,9 @@ final class MultiplexedVideoNode: ASDisplayNode, UIScrollViewDelegate {
self.validSize = size
self.contextContainerNode.frame = CGRect(origin: CGPoint(), size: size)
self.scrollNode.frame = CGRect(origin: CGPoint(), size: size)
+ let startTime = CFAbsoluteTimeGetCurrent()
self.updateVisibleItems(transition: transition)
+ print("MultiplexedVideoNode layout updateVisibleItems: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
}
}
@@ -465,7 +469,7 @@ final class MultiplexedVideoNode: ASDisplayNode, UIScrollViewDelegate {
@objc func tapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) {
if case .ended = recognizer.state {
let point = recognizer.location(in: self.view)
- if let (file, rect) = self.offsetFileAt(point: point) {
+ if let (file, rect) = self.fileAt(point: point) {
self.fileSelected?(file, self, rect)
}
}
diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift
index 1ae724136c..653c05a846 100644
--- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift
+++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift
@@ -942,5 +942,6 @@ private final class ContextControllerContentSourceImpl: ContextControllerContent
}
func animatedIn() {
+ self.controller.didAppearInContextPreview()
}
}
diff --git a/submodules/TelegramUI/TelegramUI/PreparedChatHistoryViewTransition.swift b/submodules/TelegramUI/TelegramUI/PreparedChatHistoryViewTransition.swift
index 41732298c8..8d0a8134ae 100644
--- a/submodules/TelegramUI/TelegramUI/PreparedChatHistoryViewTransition.swift
+++ b/submodules/TelegramUI/TelegramUI/PreparedChatHistoryViewTransition.swift
@@ -37,28 +37,28 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
var scrollToItem: ListViewScrollToItem?
switch reason {
- case let .Initial(fadeIn):
- if fadeIn {
- animateIn = true
- } else {
- let _ = options.insert(.LowLatency)
- let _ = options.insert(.Synchronous)
- let _ = options.insert(.PreferSynchronousResourceLoading)
+ case let .Initial(fadeIn):
+ if fadeIn {
+ animateIn = true
+ } else {
+ let _ = options.insert(.LowLatency)
+ let _ = options.insert(.Synchronous)
+ let _ = options.insert(.PreferSynchronousResourceLoading)
+ }
+ case .InteractiveChanges:
+ let _ = options.insert(.AnimateAlpha)
+ let _ = options.insert(.AnimateInsertion)
+
+ for (index, _, _) in mergeResult.indicesAndItems.sorted(by: { $0.0 > $1.0 }) {
+ let adjustedIndex = updatedCount - 1 - index
+ if adjustedIndex == maxAnimatedInsertionIndex + 1 {
+ maxAnimatedInsertionIndex += 1
}
- case .InteractiveChanges:
- let _ = options.insert(.AnimateAlpha)
- let _ = options.insert(.AnimateInsertion)
-
- for (index, _, _) in mergeResult.indicesAndItems.sorted(by: { $0.0 > $1.0 }) {
- let adjustedIndex = updatedCount - 1 - index
- if adjustedIndex == maxAnimatedInsertionIndex + 1 {
- maxAnimatedInsertionIndex += 1
- }
- }
- case .Reload:
- stationaryItemRange = (0, Int.max)
- case .HoleReload:
- stationaryItemRange = (0, Int.max)
+ }
+ case .Reload:
+ stationaryItemRange = (0, Int.max)
+ case .HoleReload:
+ stationaryItemRange = (0, Int.max)
}
for (index, entry, previousIndex) in mergeResult.indicesAndItems {
diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping
index 210d36c082..b01c7bc5d0 100644
Binary files a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping and b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping differ
diff --git a/submodules/TelegramUI/TelegramUI/ShareExtensionContext.swift b/submodules/TelegramUI/TelegramUI/ShareExtensionContext.swift
index 6304d1cdcd..a75d65678b 100644
--- a/submodules/TelegramUI/TelegramUI/ShareExtensionContext.swift
+++ b/submodules/TelegramUI/TelegramUI/ShareExtensionContext.swift
@@ -122,8 +122,10 @@ public class ShareRootControllerImpl {
mainWindow.hostView.eventView.isHidden = false
self.mainWindow = mainWindow
+ let bounds = view.bounds
+
view.addSubview(mainWindow.hostView.containerView)
- mainWindow.hostView.containerView.frame = view.bounds
+ mainWindow.hostView.containerView.frame = bounds
let rootPath = rootPathForBasePath(self.initializationData.appGroupPath)
performAppGroupUpgrades(appGroupPath: self.initializationData.appGroupPath, rootPath: rootPath)
@@ -162,11 +164,12 @@ public class ShareRootControllerImpl {
let internalContext: InternalContext
+ let accountManager = AccountManager(basePath: rootPath + "/accounts-metadata")
+
if let globalInternalContext = globalInternalContext {
internalContext = globalInternalContext
} else {
initializeAccountManagement()
- let accountManager = AccountManager(basePath: rootPath + "/accounts-metadata")
var initialPresentationDataAndSettings: InitialPresentationDataAndSettings?
let semaphore = DispatchSemaphore(value: 0)
let systemUserInterfaceStyle: WindowUserInterfaceStyle
@@ -203,16 +206,28 @@ public class ShareRootControllerImpl {
Logger.shared.redactSensitiveData = loggingSettings.redactSensitiveData
- return sharedContext.activeAccountsWithInfo
+ return combineLatest(sharedContext.activeAccountsWithInfo, accountManager.transaction { transaction -> Set in
+ return Set(transaction.getRecords().map { record in
+ return record.id
+ })
+ })
|> castError(ShareAuthorizationError.self)
|> take(1)
- |> mapToSignal { primary, accounts -> Signal<(SharedAccountContextImpl, Account, [AccountWithInfo]), ShareAuthorizationError> in
- guard let primary = primary else {
+ |> mapToSignal { primaryAndAccounts, validAccountIds -> Signal<(SharedAccountContextImpl, Account, [AccountWithInfo]), ShareAuthorizationError> in
+ var (maybePrimary, accounts) = primaryAndAccounts
+ for i in (0 ..< accounts.count).reversed() {
+ if !validAccountIds.contains(accounts[i].account.id) {
+ accounts.remove(at: i)
+ }
+ }
+
+ guard let primary = maybePrimary, validAccountIds.contains(primary) else {
return .fail(.unauthorized)
}
guard let info = accounts.first(where: { $0.account.id == primary }) else {
return .fail(.unauthorized)
}
+
return .single((sharedContext, info.account, Array(accounts)))
}
}
@@ -340,7 +355,14 @@ public class ShareRootControllerImpl {
context.account.resetStateManagement()
}
- let _ = passcodeEntryController(context: context, animateIn: true, completion: { value in
+ let modalPresentation: Bool
+ if #available(iOSApplicationExtension 13.0, iOS 13.0, *) {
+ modalPresentation = true
+ } else {
+ modalPresentation = false
+ }
+
+ let _ = passcodeEntryController(context: context, animateIn: true, modalPresentation: modalPresentation, completion: { value in
if value {
displayShare()
} else {
diff --git a/submodules/TelegramUI/TelegramUI/StickerPanePeerSpecificSetupGridItem.swift b/submodules/TelegramUI/TelegramUI/StickerPanePeerSpecificSetupGridItem.swift
index dfe5ac122b..664cd70303 100644
--- a/submodules/TelegramUI/TelegramUI/StickerPanePeerSpecificSetupGridItem.swift
+++ b/submodules/TelegramUI/TelegramUI/StickerPanePeerSpecificSetupGridItem.swift
@@ -24,7 +24,7 @@ final class StickerPanePeerSpecificSetupGridItem: GridItem {
self.dismiss = dismiss
self.fillsRowWithDynamicHeight = { width in
let makeDescriptionLayout = TextNode.asyncLayout(nil)
- let params = ListViewItemLayoutParams(width: width, leftInset: 0.0, rightInset: 0.0)
+ let params = ListViewItemLayoutParams(width: width, leftInset: 0.0, rightInset: 0.0, availableHeight: 0.0)
let leftInset: CGFloat = 12.0
let rightInset: CGFloat = 16.0
let (descriptionLayout, _) = makeDescriptionLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: strings.Stickers_GroupStickersHelp, font: statusFont, textColor: .black), backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - leftInset - rightInset - 20.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
@@ -127,7 +127,7 @@ class StickerPanePeerSpecificSetupGridItemNode: GridItemNode {
return
}
- let params = ListViewItemLayoutParams(width: self.bounds.size.width, leftInset: 0.0, rightInset: 0.0)
+ let params = ListViewItemLayoutParams(width: self.bounds.size.width, leftInset: 0.0, rightInset: 0.0, availableHeight: self.bounds.size.height)
let makeInstallLayout = TextNode.asyncLayout(self.installTextNode)
let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
diff --git a/submodules/TelegramUI/TelegramUI/StickerPaneSearchGlobaltem.swift b/submodules/TelegramUI/TelegramUI/StickerPaneSearchGlobaltem.swift
index 8a0800ee40..a8754bcf8f 100644
--- a/submodules/TelegramUI/TelegramUI/StickerPaneSearchGlobaltem.swift
+++ b/submodules/TelegramUI/TelegramUI/StickerPaneSearchGlobaltem.swift
@@ -191,7 +191,7 @@ class StickerPaneSearchGlobalItemNode: GridItemNode {
return
}
- let params = ListViewItemLayoutParams(width: self.bounds.size.width, leftInset: 0.0, rightInset: 0.0)
+ let params = ListViewItemLayoutParams(width: self.bounds.size.width, leftInset: 0.0, rightInset: 0.0, availableHeight: self.bounds.height)
let makeInstallLayout = TextNode.asyncLayout(self.installTextNode)
let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
diff --git a/submodules/TelegramUniversalVideoContent/Sources/SystemVideoContent.swift b/submodules/TelegramUniversalVideoContent/Sources/SystemVideoContent.swift
index 77d17d9814..c3f0eefb31 100644
--- a/submodules/TelegramUniversalVideoContent/Sources/SystemVideoContent.swift
+++ b/submodules/TelegramUniversalVideoContent/Sources/SystemVideoContent.swift
@@ -79,6 +79,8 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
private var didPlayToEndTimeObserver: NSObjectProtocol?
private var timeObserver: Any?
+ private var seekId: Int = 0
+
init(postbox: Postbox, audioSessionManager: ManagedAudioSession, url: String, imageReference: ImageMediaReference, intrinsicDimensions: CGSize, approximateDuration: Int32) {
self.audioSessionManager = audioSessionManager
@@ -131,7 +133,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
guard let strongSelf = self else {
return
}
- strongSelf.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: strongSelf.statusValue.duration, dimensions: CGSize(), timestamp: CMTimeGetSeconds(time), baseRate: 1.0, seekId: 0, status: strongSelf.statusValue.status, soundEnabled: true)
+ strongSelf.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: strongSelf.statusValue.duration, dimensions: CGSize(), timestamp: CMTimeGetSeconds(time), baseRate: 1.0, seekId: strongSelf.seekId, status: strongSelf.statusValue.status, soundEnabled: true)
strongSelf._status.set(strongSelf.statusValue)
}
}
@@ -171,7 +173,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
} else {
status = isPlaying ? .playing : .paused
}
- self.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: duration, dimensions: CGSize(), timestamp: self.statusValue.timestamp, baseRate: 1.0, seekId: 0, status: status, soundEnabled: true)
+ self.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: duration, dimensions: CGSize(), timestamp: self.statusValue.timestamp, baseRate: 1.0, seekId: self.seekId, status: status, soundEnabled: true)
self._status.set(self.statusValue)
} else if keyPath == "playbackBufferEmpty" {
let isPlaying = !self.player.rate.isZero
@@ -182,7 +184,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
} else {
status = isPlaying ? .playing : .paused
}
- self.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: duration, dimensions: CGSize(), timestamp: self.statusValue.timestamp, baseRate: 1.0, seekId: 0, status: status, soundEnabled: true)
+ self.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: duration, dimensions: CGSize(), timestamp: self.statusValue.timestamp, baseRate: 1.0, seekId: self.seekId, status: status, soundEnabled: true)
self._status.set(self.statusValue)
} else if keyPath == "playbackLikelyToKeepUp" || keyPath == "playbackBufferFull" {
let isPlaying = !self.player.rate.isZero
@@ -193,7 +195,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
} else {
status = isPlaying ? .playing : .paused
}
- self.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: duration, dimensions: CGSize(), timestamp: self.statusValue.timestamp, baseRate: 1.0, seekId: 0, status: status, soundEnabled: true)
+ self.statusValue = MediaPlayerStatus(generationTimestamp: 0.0, duration: duration, dimensions: CGSize(), timestamp: self.statusValue.timestamp, baseRate: 1.0, seekId: self.seekId, status: status, soundEnabled: true)
self._status.set(self.statusValue)
if !self.didBeginPlaying {
@@ -217,7 +219,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
func play() {
assert(Queue.mainQueue().isCurrent())
if !self.initializedStatus {
- self._status.set(MediaPlayerStatus(generationTimestamp: 0.0, duration: Double(self.approximateDuration), dimensions: CGSize(), timestamp: 0.0, baseRate: 1.0, seekId: 0, status: .buffering(initial: true, whilePlaying: true), soundEnabled: true))
+ self._status.set(MediaPlayerStatus(generationTimestamp: 0.0, duration: Double(self.approximateDuration), dimensions: CGSize(), timestamp: 0.0, baseRate: 1.0, seekId: self.seekId, status: .buffering(initial: true, whilePlaying: true), soundEnabled: true))
}
if !self.hasAudioSession {
self.audioSessionDisposable.set(self.audioSessionManager.push(audioSessionType: .play, activate: { [weak self] _ in
@@ -236,7 +238,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
func pause() {
assert(Queue.mainQueue().isCurrent())
if !self.initializedStatus {
- self._status.set(MediaPlayerStatus(generationTimestamp: 0.0, duration: Double(self.approximateDuration), dimensions: CGSize(), timestamp: 0.0, baseRate: 1.0, seekId: 0, status: .paused, soundEnabled: true))
+ self._status.set(MediaPlayerStatus(generationTimestamp: 0.0, duration: Double(self.approximateDuration), dimensions: CGSize(), timestamp: 0.0, baseRate: 1.0, seekId: self.seekId, status: .paused, soundEnabled: true))
}
self.player.pause()
}
@@ -256,6 +258,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent
func seek(_ timestamp: Double) {
assert(Queue.mainQueue().isCurrent())
+ self.seekId += 1
self.playerItem.seek(to: CMTimeMake(value: Int64(timestamp) * 1000, timescale: 1000))
}
diff --git a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift
index 956e709334..f89c417530 100644
--- a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift
+++ b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift
@@ -31,7 +31,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
private let effectView: UIView
private let animationBackgroundColor: UIColor
-
+
private var originalRemainingSeconds: Int
private var remainingSeconds: Int
private var timer: SwiftSignalKit.Timer?
@@ -261,7 +261,12 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
let firstLayout = self.validLayout == nil
self.validLayout = layout
- let leftInset: CGFloat = 50.0
+ var leftInset: CGFloat = 50.0
+ if let animationNode = self.animationNode, let iconSize = animationNode.preferredSize() {
+ if iconSize.width > leftInset {
+ leftInset = iconSize.width - 8.0
+ }
+ }
let rightInset: CGFloat = 16.0
var contentHeight: CGFloat = 20.0
diff --git a/submodules/WalletUI/Resources/WalletStrings.mapping b/submodules/WalletUI/Resources/WalletStrings.mapping
index c1d9aa47b1..9f7c348920 100644
Binary files a/submodules/WalletUI/Resources/WalletStrings.mapping and b/submodules/WalletUI/Resources/WalletStrings.mapping differ
diff --git a/submodules/WalletUI/Sources/WalletAmountItem.swift b/submodules/WalletUI/Sources/WalletAmountItem.swift
index 706f76b062..39049b3362 100644
--- a/submodules/WalletUI/Sources/WalletAmountItem.swift
+++ b/submodules/WalletUI/Sources/WalletAmountItem.swift
@@ -78,7 +78,7 @@ class WalletAmountItemNode: ListViewItemNode, UITextFieldDelegate, ItemListItemN
private let measureNode: TextNode
private var item: WalletAmountItem?
- private var validLayout: (CGFloat, CGFloat, CGFloat)?
+ private var validLayout: (CGFloat, CGFloat, CGFloat, CGFloat)?
var tag: ItemListItemTag? {
return self.item?.tag
@@ -166,7 +166,7 @@ class WalletAmountItemNode: ListViewItemNode, UITextFieldDelegate, ItemListItemN
return
}
let makeInputFieldLayout = self.inputFieldAsyncLayout()
- let (_, _, inputFieldApply) = makeInputFieldLayout(item, ListViewItemLayoutParams(width: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2))
+ let (_, _, inputFieldApply) = makeInputFieldLayout(item, ListViewItemLayoutParams(width: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2, availableHeight: validLayout.3))
inputFieldApply()
}
@@ -196,7 +196,7 @@ class WalletAmountItemNode: ListViewItemNode, UITextFieldDelegate, ItemListItemN
return (layout, { [weak self] in
if let strongSelf = self {
strongSelf.item = item
- strongSelf.validLayout = (params.width, params.leftInset, params.rightInset)
+ strongSelf.validLayout = (params.width, params.leftInset, params.rightInset, params.availableHeight)
if let _ = updatedTheme {
strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
diff --git a/submodules/WalletUI/Sources/WalletCreateInvoiceScreen.swift b/submodules/WalletUI/Sources/WalletCreateInvoiceScreen.swift
index f1d287c1e9..e8efb2c6a2 100644
--- a/submodules/WalletUI/Sources/WalletCreateInvoiceScreen.swift
+++ b/submodules/WalletUI/Sources/WalletCreateInvoiceScreen.swift
@@ -216,7 +216,7 @@ func walletCreateInvoiceScreen(context: WalletContext, address: String) -> ViewC
}
return state
}
- ensureItemVisibleImpl?(tag, false)
+ ensureItemVisibleImpl?(tag, true)
}, dismissInput: {
dismissInputImpl?()
}, scrollToBottom: {
diff --git a/submodules/WalletUI/Sources/WalletInfoEmptyNode.swift b/submodules/WalletUI/Sources/WalletInfoEmptyNode.swift
index 1e8583ee53..5aad2c0147 100644
--- a/submodules/WalletUI/Sources/WalletInfoEmptyNode.swift
+++ b/submodules/WalletUI/Sources/WalletInfoEmptyNode.swift
@@ -118,21 +118,16 @@ final class WalletInfoEmptyItemNode: ListViewItemNode {
}
func asyncLayout() -> (_ item: WalletInfoEmptyItem, _ params: ListViewItemLayoutParams) -> (ListViewItemNodeLayout, () -> Void) {
- let sideInset: CGFloat = 32.0
- let buttonSideInset: CGFloat = 48.0
- let iconSpacing: CGFloat = 5.0
- let titleSpacing: CGFloat = 19.0
- let termsSpacing: CGFloat = 11.0
- let buttonHeight: CGFloat = 50.0
-
- let iconSize = CGSize(width: 140.0, height: 140.0)
- self.animationNode.updateLayout(size: iconSize)
-
let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
let makeTextLayout = TextNode.asyncLayout(self.textNode)
let makeAddressLayout = TextNode.asyncLayout(self.addressNode)
return { [weak self] item, params in
+ var iconSpacing: CGFloat = 5.0
+ var titleSpacing: CGFloat = 19.0
+ var iconSize = CGSize(width: 140.0, height: 140.0)
+ let contentVerticalOrigin: CGFloat = 10.0
+
let sideInset: CGFloat = 16.0
var iconOffset = CGPoint()
@@ -149,14 +144,25 @@ final class WalletInfoEmptyItemNode: ListViewItemNode {
addressString.insert("\n", at: addressString.index(addressString.startIndex, offsetBy: addressString.count / 2))
let (addressLayout, addressApply) = makeAddressLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: addressString, font: Font.monospace(16.0), textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - sideInset * 2.0, height: .greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.1, cutout: nil, insets: UIEdgeInsets()))
- let contentVerticalOrigin: CGFloat = 32.0
+ let availableHeight = params.availableHeight - contentVerticalOrigin * 2.0
+
+ let rawContentHeight: CGFloat = iconSize.height + titleLayout.size.height + textLayout.size.height + addressLayout.size.height
+ let contentSpacing = iconSpacing + titleSpacing + titleSpacing
+ let contentSpacingFactor = max(0.2, min(1.0, (availableHeight - rawContentHeight) / contentSpacing))
+
+ if contentSpacingFactor < 0.25 {
+ iconSize = CGSize(width: 90.0, height: 90.0)
+ }
+
+ iconSpacing = floor(iconSpacing * contentSpacingFactor)
+ titleSpacing = floor(titleSpacing * contentSpacingFactor)
let iconFrame = CGRect(origin: CGPoint(x: floor((params.width - iconSize.width) / 2.0), y: contentVerticalOrigin), size: iconSize).offsetBy(dx: iconOffset.x, dy: iconOffset.y)
let titleFrame = CGRect(origin: CGPoint(x: floor((params.width - titleLayout.size.width) / 2.0), y: iconFrame.maxY + iconSpacing), size: titleLayout.size)
let textFrame = CGRect(origin: CGPoint(x: floor((params.width - textLayout.size.width) / 2.0), y: titleFrame.maxY + titleSpacing), size: textLayout.size)
let addressFrame = CGRect(origin: CGPoint(x: floor((params.width - addressLayout.size.width) / 2.0), y: textFrame.maxY + titleSpacing), size: addressLayout.size)
- let layout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: (item.loading ? iconFrame.maxY : addressFrame.maxY) + 32.0), insets: UIEdgeInsets())
+ let layout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: (item.loading ? iconFrame.maxY : addressFrame.maxY) + contentVerticalOrigin), insets: UIEdgeInsets())
return (layout, {
guard let strongSelf = self else {
@@ -179,6 +185,8 @@ final class WalletInfoEmptyItemNode: ListViewItemNode {
strongSelf.item = item
+ strongSelf.animationNode.updateLayout(size: iconSize)
+
strongSelf.offsetContainer.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
let _ = titleApply()
diff --git a/submodules/WalletUI/Sources/WalletInfoScreen.swift b/submodules/WalletUI/Sources/WalletInfoScreen.swift
index 3cb1d9a1b3..21624b1ffb 100644
--- a/submodules/WalletUI/Sources/WalletInfoScreen.swift
+++ b/submodules/WalletUI/Sources/WalletInfoScreen.swift
@@ -130,7 +130,7 @@ public final class WalletInfoScreen: ViewController {
guard let strongSelf = self else {
return
}
- strongSelf.push(WalletTransactionInfoScreen(context: strongSelf.context, walletInfo: strongSelf.walletInfo, walletTransaction: transaction, enableDebugActions: strongSelf.enableDebugActions))
+ strongSelf.push(WalletTransactionInfoScreen(context: strongSelf.context, walletInfo: strongSelf.walletInfo, walletTransaction: transaction, walletState: (strongSelf.displayNode as! WalletInfoScreenNode).statePromise.get(), enableDebugActions: strongSelf.enableDebugActions))
}, present: { [weak self] c, a in
guard let strongSelf = self else {
return
@@ -578,6 +578,8 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
fileprivate var combinedState: CombinedWalletState?
private var currentEntries: [WalletInfoListEntry]?
+ fileprivate let statePromise = Promise<(CombinedWalletState, Bool)>()
+
private var isReady: Bool = false
let contentReady = Promise()
@@ -817,6 +819,7 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
self.transactionListDisposable.set(nil)
self.loadingMoreTransactions = true
self.reloadingState = true
+ self.updateStatePromise()
self.headerNode.isRefreshing = true
self.headerNode.refreshNode.refreshProgress = 0.0
@@ -852,7 +855,8 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
return
}
- strongSelf.reloadingState = false
+ strongSelf.reloadingState = false
+ strongSelf.updateStatePromise()
if let combinedState = strongSelf.combinedState {
strongSelf.headerNode.timestamp = Int32(clamping: combinedState.timestamp)
@@ -962,6 +966,14 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
self.didSetContentReady = true
self.contentReady.set(.single(true))
}
+
+ self.updateStatePromise()
+ }
+
+ private func updateStatePromise() {
+ if let combinedState = self.combinedState {
+ self.statePromise.set(.single((combinedState, self.reloadingState)))
+ }
}
private func loadMoreTransactions() {
@@ -1105,6 +1117,10 @@ private final class WalletApplicationSplashScreenNode: ASDisplayNode {
private let headerBackgroundNode: ASDisplayNode
private let headerCornerNode: ASImageNode
+ private var isDismissed = false
+
+ private var validLayout: (layout: ContainerViewLayout, navigationHeight: CGFloat)?
+
init(theme: WalletTheme) {
self.headerBackgroundNode = ASDisplayNode()
self.headerBackgroundNode.backgroundColor = .black
@@ -1129,11 +1145,32 @@ private final class WalletApplicationSplashScreenNode: ASDisplayNode {
}
func containerLayoutUpdated(layout: ContainerViewLayout, navigationHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+ if self.isDismissed {
+ return
+ }
+ self.validLayout = (layout, navigationHeight)
+
let headerHeight = navigationHeight + 260.0
transition.updateFrame(node: self.headerBackgroundNode, frame: CGRect(origin: CGPoint(x: -1.0, y: 0), size: CGSize(width: layout.size.width + 2.0, height: headerHeight)))
transition.updateFrame(node: self.headerCornerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: headerHeight), size: CGSize(width: layout.size.width, height: 10.0)))
}
+
+ func animateOut(completion: @escaping () -> Void) {
+ guard let (layout, navigationHeight) = self.validLayout else {
+ completion()
+ return
+ }
+ self.isDismissed = true
+ let transition: ContainedViewLayoutTransition = .animated(duration: 0.4, curve: .spring)
+
+ let headerHeight = navigationHeight + 260.0
+
+ transition.updateFrame(node: self.headerBackgroundNode, frame: CGRect(origin: CGPoint(x: -1.0, y: -headerHeight - 10.0), size: CGSize(width: layout.size.width + 2.0, height: headerHeight)), completion: { _ in
+ completion()
+ })
+ transition.updateFrame(node: self.headerCornerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -10.0), size: CGSize(width: layout.size.width, height: 10.0)))
+ }
}
public final class WalletApplicationSplashScreen: ViewController {
@@ -1162,4 +1199,9 @@ public final class WalletApplicationSplashScreen: ViewController {
(self.displayNode as! WalletApplicationSplashScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationHeight, transition: transition)
}
+
+ public func animateOut(completion: @escaping () -> Void) {
+ self.statusBar.statusBarStyle = .Black
+ (self.displayNode as! WalletApplicationSplashScreenNode).animateOut(completion: completion)
+ }
}
diff --git a/submodules/WalletUI/Sources/WalletSendScreen.swift b/submodules/WalletUI/Sources/WalletSendScreen.swift
index f4a5a3553e..c29ae89bf5 100644
--- a/submodules/WalletUI/Sources/WalletSendScreen.swift
+++ b/submodules/WalletUI/Sources/WalletSendScreen.swift
@@ -16,17 +16,17 @@ private final class WalletSendScreenArguments {
let context: WalletContext
let updateState: ((WalletSendScreenState) -> WalletSendScreenState) -> Void
let updateText: (WalletSendScreenEntryTag, String) -> Void
- let selectNextInputItem: (WalletSendScreenEntryTag) -> Void
+ let selectInputItem: (WalletSendScreenEntryTag) -> Void
let scrollToBottom: () -> Void
let dismissInput: () -> Void
let openQrScanner: () -> Void
let proceed: () -> Void
- init(context: WalletContext, updateState: @escaping ((WalletSendScreenState) -> WalletSendScreenState) -> Void, updateText: @escaping (WalletSendScreenEntryTag, String) -> Void, selectNextInputItem: @escaping (WalletSendScreenEntryTag) -> Void, scrollToBottom: @escaping () -> Void, dismissInput: @escaping () -> Void, openQrScanner: @escaping () -> Void, proceed: @escaping () -> Void) {
+ init(context: WalletContext, updateState: @escaping ((WalletSendScreenState) -> WalletSendScreenState) -> Void, updateText: @escaping (WalletSendScreenEntryTag, String) -> Void, selectInputItem: @escaping (WalletSendScreenEntryTag) -> Void, scrollToBottom: @escaping () -> Void, dismissInput: @escaping () -> Void, openQrScanner: @escaping () -> Void, proceed: @escaping () -> Void) {
self.context = context
self.updateState = updateState
self.updateText = updateText
- self.selectNextInputItem = selectNextInputItem
+ self.selectInputItem = selectInputItem
self.scrollToBottom = scrollToBottom
self.dismissInput = dismissInput
self.openQrScanner = openQrScanner
@@ -61,7 +61,7 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
case address(WalletTheme, String, String)
case addressInfo(WalletTheme, String)
case commentHeader(WalletTheme, String)
- case comment(WalletTheme, String, String)
+ case comment(WalletTheme, String, String, Bool)
var section: ItemListSectionId {
switch self {
@@ -131,8 +131,8 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
} else {
return false
}
- case let .comment(lhsTheme, lhsPlaceholder, lhsText):
- if case let .comment(rhsTheme, rhsPlaceholder, rhsText) = rhs, lhsTheme === rhsTheme, lhsPlaceholder == rhsPlaceholder, lhsText == rhsText {
+ case let .comment(lhsTheme, lhsPlaceholder, lhsText, lhsSendEnabled):
+ if case let .comment(rhsTheme, rhsPlaceholder, rhsText, rhsSendEnabled) = rhs, lhsTheme === rhsTheme, lhsPlaceholder == rhsPlaceholder, lhsText == rhsText, lhsSendEnabled == rhsSendEnabled {
return true
} else {
return false
@@ -190,28 +190,54 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
if let amount = parsedUrl.amount {
state.amount = formatBalanceText(amount, decimalSeparator: arguments.context.presentationData.dateTimeFormat.decimalSeparator)
} else if state.amount.isEmpty {
- focusItemTag = WalletSendScreenEntryTag.address
+ focusItemTag = WalletSendScreenEntryTag.amount
}
if let comment = parsedUrl.comment {
state.comment = comment
} else if state.comment.isEmpty && focusItemTag == nil {
- focusItemTag = WalletSendScreenEntryTag.amount
+ focusItemTag = WalletSendScreenEntryTag.comment
}
return state
}
if let focusItemTag = focusItemTag {
- arguments.selectNextInputItem(focusItemTag)
+ arguments.selectInputItem(focusItemTag)
} else {
arguments.dismissInput()
}
} else if isValidAddress(text) {
arguments.updateText(WalletSendScreenEntryTag.address, text)
if isValidAddress(text, exactLength: true) {
- arguments.selectNextInputItem(WalletSendScreenEntryTag.address)
+ var focusItemTag: WalletSendScreenEntryTag? = .comment
+ arguments.updateState { state in
+ if state.amount.isEmpty {
+ focusItemTag = .amount
+ } else if state.comment.isEmpty {
+ focusItemTag = .comment
+ }
+ return state
+ }
+ if let focusItemTag = focusItemTag {
+ arguments.selectInputItem(focusItemTag)
+ } else {
+ arguments.dismissInput()
+ }
}
}
}, tag: WalletSendScreenEntryTag.address, action: {
- arguments.selectNextInputItem(WalletSendScreenEntryTag.address)
+ var focusItemTag: WalletSendScreenEntryTag?
+ arguments.updateState { state in
+ if state.amount.isEmpty {
+ focusItemTag = .amount
+ } else if state.comment.isEmpty {
+ focusItemTag = .comment
+ }
+ return state
+ }
+ if let focusItemTag = focusItemTag {
+ arguments.selectInputItem(focusItemTag)
+ } else {
+ arguments.dismissInput()
+ }
}, inlineAction: ItemListMultilineInputInlineAction(icon: UIImage(bundleImageName: "Wallet/QrIcon")!, action: {
arguments.openQrScanner()
}))
@@ -219,7 +245,7 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
return ItemListTextItem(theme: theme, text: .markdown(text), sectionId: self.section)
case let .commentHeader(theme, text):
return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
- case let .comment(theme, placeholder, value):
+ case let .comment(theme, placeholder, value, sendEnabled):
return ItemListMultilineInputItem(theme: theme, text: value, placeholder: placeholder, maxLength: ItemListMultilineInputItemTextLimit(value: walletTextLimit, display: true, mode: .bytes), sectionId: self.section, style: .blocks, returnKeyType: .send, textUpdated: { text in
arguments.updateText(WalletSendScreenEntryTag.comment, text)
}, updatedFocus: { focus in
@@ -227,7 +253,9 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
arguments.scrollToBottom()
}
}, tag: WalletSendScreenEntryTag.comment, action: {
- arguments.proceed()
+ if sendEnabled {
+ arguments.proceed()
+ }
})
}
}
@@ -239,7 +267,7 @@ private struct WalletSendScreenState: Equatable {
var comment: String
}
-private func walletSendScreenEntries(presentationData: WalletPresentationData, balance: Int64?, state: WalletSendScreenState) -> [WalletSendScreenEntry] {
+private func walletSendScreenEntries(presentationData: WalletPresentationData, balance: Int64?, state: WalletSendScreenState, sendEnabled: Bool) -> [WalletSendScreenEntry] {
if balance == nil {
return []
}
@@ -255,7 +283,7 @@ private func walletSendScreenEntries(presentationData: WalletPresentationData, b
entries.append(.addressInfo(presentationData.theme, presentationData.strings.Wallet_Send_AddressInfo))
entries.append(.commentHeader(presentationData.theme, presentationData.strings.Wallet_Receive_CommentHeader))
- entries.append(.comment(presentationData.theme, presentationData.strings.Wallet_Receive_CommentInfo, state.comment))
+ entries.append(.comment(presentationData.theme, presentationData.strings.Wallet_Receive_CommentInfo, state.comment, sendEnabled))
return entries
}
@@ -290,7 +318,7 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
var popImpl: (() -> Void)?
var dismissImpl: (() -> Void)?
var dismissInputImpl: (() -> Void)?
- var selectNextInputItemImpl: ((WalletSendScreenEntryTag) -> Void)?
+ var selectInputItemImpl: ((WalletSendScreenEntryTag) -> Void)?
var ensureItemVisibleImpl: ((WalletSendScreenEntryTag, Bool) -> Void)?
let arguments = WalletSendScreenArguments(context: context, updateState: { f in
@@ -309,8 +337,8 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
return state
}
ensureItemVisibleImpl?(tag, false)
- }, selectNextInputItem: { tag in
- selectNextInputItemImpl?(tag)
+ }, selectInputItem: { tag in
+ selectInputItemImpl?(tag)
}, scrollToBottom: {
ensureItemVisibleImpl?(WalletSendScreenEntryTag.comment, true)
}, dismissInput: {
@@ -336,9 +364,9 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
popImpl?()
if let updatedState = updatedState {
if updatedState.amount.isEmpty {
- selectNextInputItemImpl?(WalletSendScreenEntryTag.amount)
+ selectInputItemImpl?(WalletSendScreenEntryTag.amount)
} else if updatedState.comment.isEmpty {
- selectNextInputItemImpl?(WalletSendScreenEntryTag.comment)
+ selectInputItemImpl?(WalletSendScreenEntryTag.comment)
}
}
}))
@@ -348,6 +376,10 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
let presentationData = context.presentationData
let state = stateValue.with { $0 }
let amount = amountValue(state.amount)
+ guard amount > 0 else {
+ return
+ }
+
let commentData = state.comment.data(using: .utf8)
let formattedAddress = String(state.address[state.address.startIndex.. (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[133]!, self._r[133]!, [_0])
+ return formatWithArgumentRanges(self._s[135]!, self._r[135]!, [_0])
}
public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[134]!, self._r[134]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[136]!, self._r[136]!, [_1, _2, _3])
}
- public var Wallet_RestoreFailed_CreateWallet: String { return self._s[135]! }
- public var Wallet_Weekday_Yesterday: String { return self._s[136]! }
- public var Wallet_Receive_AmountHeader: String { return self._s[137]! }
- public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[138]! }
- public var Wallet_Month_ShortFebruary: String { return self._s[139]! }
- public var Wallet_Configuration_SourceJSON: String { return self._s[140]! }
- public var Wallet_Alert_Cancel: String { return self._s[141]! }
- public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[142]! }
- public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[143]! }
- public var Wallet_Info_TransactionFrom: String { return self._s[144]! }
- public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[145]! }
- public var Wallet_Send_OwnAddressAlertText: String { return self._s[146]! }
- public var Wallet_Words_NotDoneTitle: String { return self._s[147]! }
- public var Wallet_Month_ShortOctober: String { return self._s[148]! }
- public var Wallet_Month_GenMay: String { return self._s[149]! }
- public var Wallet_Intro_CreateErrorTitle: String { return self._s[150]! }
- public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[151]! }
- public var Wallet_Month_ShortJanuary: String { return self._s[152]! }
- public var Wallet_Month_GenMarch: String { return self._s[153]! }
- public var Wallet_Sending_Text: String { return self._s[154]! }
- public var Wallet_Month_GenOctober: String { return self._s[155]! }
- public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[156]! }
- public var Wallet_ContextMenuCopy: String { return self._s[157]! }
+ public var Wallet_RestoreFailed_CreateWallet: String { return self._s[137]! }
+ public var Wallet_Weekday_Yesterday: String { return self._s[138]! }
+ public var Wallet_Receive_AmountHeader: String { return self._s[139]! }
+ public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[140]! }
+ public var Wallet_Month_ShortFebruary: String { return self._s[141]! }
+ public var Wallet_Configuration_SourceJSON: String { return self._s[142]! }
+ public var Wallet_Alert_Cancel: String { return self._s[143]! }
+ public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[144]! }
+ public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[145]! }
+ public var Wallet_Info_TransactionFrom: String { return self._s[146]! }
+ public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[147]! }
+ public var Wallet_Send_OwnAddressAlertText: String { return self._s[148]! }
+ public var Wallet_Words_NotDoneTitle: String { return self._s[149]! }
+ public var Wallet_Month_ShortOctober: String { return self._s[150]! }
+ public var Wallet_Month_GenMay: String { return self._s[151]! }
+ public var Wallet_Intro_CreateErrorTitle: String { return self._s[152]! }
+ public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[153]! }
+ public var Wallet_Month_ShortJanuary: String { return self._s[154]! }
+ public var Wallet_Month_GenMarch: String { return self._s[155]! }
+ public var Wallet_AccessDenied_Camera: String { return self._s[156]! }
+ public var Wallet_Sending_Text: String { return self._s[157]! }
+ public var Wallet_Month_GenOctober: String { return self._s[158]! }
+ public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[159]! }
+ public var Wallet_ContextMenuCopy: String { return self._s[160]! }
public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[158]!, self._r[158]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[161]!, self._r[161]!, [_1, _2, _3])
}
- public var Wallet_Info_Updating: String { return self._s[160]! }
- public var Wallet_Created_ExportErrorTitle: String { return self._s[161]! }
- public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[162]! }
- public var Wallet_Sending_Title: String { return self._s[163]! }
- public var Wallet_Navigation_Done: String { return self._s[164]! }
- public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[165]! }
- public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[166]! }
- public var Wallet_Settings_Title: String { return self._s[167]! }
+ public var Wallet_Info_Updating: String { return self._s[163]! }
+ public var Wallet_Created_ExportErrorTitle: String { return self._s[164]! }
+ public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[165]! }
+ public var Wallet_Sending_Title: String { return self._s[166]! }
+ public var Wallet_Navigation_Done: String { return self._s[167]! }
+ public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[168]! }
+ public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[169]! }
+ public var Wallet_Settings_Title: String { return self._s[170]! }
public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[168]!, self._r[168]!, [_0])
+ return formatWithArgumentRanges(self._s[171]!, self._r[171]!, [_0])
}
- public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[169]! }
- public var Wallet_Weekday_Today: String { return self._s[171]! }
- public var Wallet_Month_ShortDecember: String { return self._s[172]! }
- public var Wallet_Words_Text: String { return self._s[173]! }
- public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[174]! }
- public var Wallet_WordCheck_ViewWords: String { return self._s[175]! }
- public var Wallet_Send_AddressInfo: String { return self._s[176]! }
+ public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[172]! }
+ public var Wallet_Weekday_Today: String { return self._s[174]! }
+ public var Wallet_Month_ShortDecember: String { return self._s[175]! }
+ public var Wallet_Words_Text: String { return self._s[176]! }
+ public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[177]! }
+ public var Wallet_WordCheck_ViewWords: String { return self._s[178]! }
+ public var Wallet_Send_AddressInfo: String { return self._s[179]! }
public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[177]!, self._r[177]!, [_0])
+ return formatWithArgumentRanges(self._s[180]!, self._r[180]!, [_0])
}
- public var Wallet_Intro_NotNow: String { return self._s[178]! }
- public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[179]! }
- public var Wallet_Navigation_Close: String { return self._s[180]! }
- public var Wallet_Month_GenDecember: String { return self._s[182]! }
- public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[183]! }
- public var Wallet_WordImport_IncorrectTitle: String { return self._s[184]! }
- public var Wallet_Send_AddressText: String { return self._s[185]! }
- public var Wallet_Receive_AmountInfo: String { return self._s[186]! }
+ public var Wallet_Intro_NotNow: String { return self._s[181]! }
+ public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[182]! }
+ public var Wallet_Navigation_Close: String { return self._s[183]! }
+ public var Wallet_Month_GenDecember: String { return self._s[185]! }
+ public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[186]! }
+ public var Wallet_WordImport_IncorrectTitle: String { return self._s[187]! }
+ public var Wallet_Send_AddressText: String { return self._s[188]! }
+ public var Wallet_Receive_AmountInfo: String { return self._s[189]! }
public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[187]!, self._r[187]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[190]!, self._r[190]!, [_1, _2, _3])
}
- public var Wallet_Month_ShortAugust: String { return self._s[188]! }
- public var Wallet_Qr_Title: String { return self._s[189]! }
- public var Wallet_Settings_Configuration: String { return self._s[190]! }
- public var Wallet_WordCheck_TryAgain: String { return self._s[191]! }
- public var Wallet_Info_TransactionPendingHeader: String { return self._s[192]! }
- public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[193]! }
- public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[194]! }
- public var Wallet_Send_TransactionInProgress: String { return self._s[195]! }
- public var Wallet_Created_Text: String { return self._s[196]! }
- public var Wallet_Created_Proceed: String { return self._s[197]! }
- public var Wallet_Words_Done: String { return self._s[198]! }
- public var Wallet_WordImport_Continue: String { return self._s[199]! }
- public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[200]! }
- public var Wallet_WordImport_CanNotRemember: String { return self._s[201]! }
+ public var Wallet_Month_ShortAugust: String { return self._s[191]! }
+ public var Wallet_Qr_Title: String { return self._s[192]! }
+ public var Wallet_Settings_Configuration: String { return self._s[193]! }
+ public var Wallet_WordCheck_TryAgain: String { return self._s[194]! }
+ public var Wallet_Info_TransactionPendingHeader: String { return self._s[195]! }
+ public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[196]! }
+ public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[197]! }
+ public var Wallet_Send_TransactionInProgress: String { return self._s[198]! }
+ public var Wallet_Created_Text: String { return self._s[199]! }
+ public var Wallet_Created_Proceed: String { return self._s[200]! }
+ public var Wallet_Words_Done: String { return self._s[201]! }
+ public var Wallet_WordImport_Continue: String { return self._s[202]! }
+ public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[203]! }
+ public var Wallet_WordImport_CanNotRemember: String { return self._s[204]! }
public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[202]!, self._r[202]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[205]!, self._r[205]!, [_1, _2, _3])
}
public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[203]!, self._r[203]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[206]!, self._r[206]!, [_1, _2, _3])
}
- public var Wallet_Created_ExportErrorText: String { return self._s[205]! }
+ public var Wallet_Created_ExportErrorText: String { return self._s[208]! }
public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[206]!, self._r[206]!, [_0])
+ return formatWithArgumentRanges(self._s[209]!, self._r[209]!, [_0])
}
- public var Wallet_Settings_DeleteWalletInfo: String { return self._s[207]! }
- public var Wallet_Intro_CreateErrorText: String { return self._s[208]! }
- public var Wallet_Sent_ViewWallet: String { return self._s[209]! }
- public var Wallet_Send_ErrorInvalidAddress: String { return self._s[210]! }
- public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[211]! }
+ public var Wallet_Settings_DeleteWalletInfo: String { return self._s[210]! }
+ public var Wallet_Intro_CreateErrorText: String { return self._s[211]! }
+ public var Wallet_Sent_ViewWallet: String { return self._s[212]! }
+ public var Wallet_Send_ErrorInvalidAddress: String { return self._s[213]! }
+ public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[214]! }
public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
- return formatWithArgumentRanges(self._s[212]!, self._r[212]!, [_1, _2, _3])
+ return formatWithArgumentRanges(self._s[215]!, self._r[215]!, [_1, _2, _3])
}
- public var Wallet_Send_Title: String { return self._s[213]! }
- public var Wallet_Info_RefreshErrorText: String { return self._s[214]! }
- public var Wallet_SecureStorageReset_Title: String { return self._s[215]! }
- public var Wallet_Receive_CommentHeader: String { return self._s[216]! }
- public var Wallet_Info_ReceiveGrams: String { return self._s[217]! }
- public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
+ public var Wallet_Send_Title: String { return self._s[216]! }
+ public var Wallet_Info_RefreshErrorText: String { return self._s[217]! }
+ public var Wallet_SecureStorageReset_Title: String { return self._s[218]! }
+ public var Wallet_Receive_CommentHeader: String { return self._s[219]! }
+ public var Wallet_Info_ReceiveGrams: String { return self._s[220]! }
+ public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue)
}
- public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
+ public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue)
diff --git a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift
index 661463aa3b..12b9061deb 100644
--- a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift
+++ b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift
@@ -147,16 +147,22 @@ final class WalletTransactionInfoScreen: ViewController {
private let context: WalletContext
private let walletInfo: WalletInfo?
private let walletTransaction: WalletInfoTransaction
+ private let walletState: Signal<(CombinedWalletState, Bool), NoError>
private var presentationData: WalletPresentationData
+
+ private var walletStateDisposable: Disposable?
+ private var combinedState: CombinedWalletState?
+ private var reloadingState = false
private var previousScreenBrightness: CGFloat?
private var displayLinkAnimator: DisplayLinkAnimator?
private let idleTimerExtensionDisposable: Disposable
- public init(context: WalletContext, walletInfo: WalletInfo?, walletTransaction: WalletInfoTransaction, enableDebugActions: Bool) {
+ public init(context: WalletContext, walletInfo: WalletInfo?, walletTransaction: WalletInfoTransaction, walletState: Signal<(CombinedWalletState, Bool), NoError>, enableDebugActions: Bool) {
self.context = context
self.walletInfo = walletInfo
self.walletTransaction = walletTransaction
+ self.walletState = walletState
self.presentationData = context.presentationData
@@ -174,10 +180,21 @@ final class WalletTransactionInfoScreen: ViewController {
self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: UIView())
self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Wallet_Navigation_Back, style: .plain, target: nil, action: nil)
self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Wallet_Navigation_Done, style: .done, target: self, action: #selector(self.donePressed))
+
+ self.walletStateDisposable = (walletState
+ |> deliverOnMainQueue).start(next: { [weak self] combinedState, reloadingState in
+ guard let strongSelf = self else {
+ return
+ }
+
+ strongSelf.combinedState = combinedState
+ strongSelf.reloadingState = reloadingState
+ })
}
deinit {
self.idleTimerExtensionDisposable.dispose()
+ self.walletStateDisposable?.dispose()
}
required init(coder aDecoder: NSCoder) {
@@ -190,11 +207,24 @@ final class WalletTransactionInfoScreen: ViewController {
guard let strongSelf = self else {
return
}
- var randomId: Int64 = 0
- arc4random_buf(&randomId, 8)
- if let walletInfo = strongSelf.walletInfo {
- strongSelf.push(walletSendScreen(context: strongSelf.context, randomId: randomId, walletInfo: walletInfo, address: address))
- strongSelf.dismiss()
+
+ if strongSelf.reloadingState {
+ strongSelf.present(standardTextAlertController(theme: strongSelf.presentationData.theme.alert, title: nil, text: strongSelf.presentationData.strings.Wallet_Send_SyncInProgress, actions: [
+ TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Wallet_Alert_OK, action: {
+ })
+ ]), in: .window(.root))
+ } else if let combinedState = strongSelf.combinedState, !combinedState.pendingTransactions.isEmpty {
+ strongSelf.present(standardTextAlertController(theme: strongSelf.presentationData.theme.alert, title: nil, text: strongSelf.presentationData.strings.Wallet_Send_TransactionInProgress, actions: [
+ TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Wallet_Alert_OK, action: {
+ })
+ ]), in: .window(.root))
+ } else {
+ var randomId: Int64 = 0
+ arc4random_buf(&randomId, 8)
+ if let walletInfo = strongSelf.walletInfo {
+ strongSelf.push(walletSendScreen(context: strongSelf.context, randomId: randomId, walletInfo: walletInfo, address: address))
+ strongSelf.dismiss()
+ }
}
}
(self.displayNode as! WalletTransactionInfoScreenNode).displayFeesTooltip = { [weak self] node, rect in
@@ -465,7 +495,7 @@ private final class WalletTransactionInfoScreenNode: ViewControllerTracingNode,
}
}
}
-
+
override func didLoad() {
super.didLoad()
diff --git a/submodules/WalletUI/Sources/WalletWordCheckScreen.swift b/submodules/WalletUI/Sources/WalletWordCheckScreen.swift
index 86152a7da9..e66231cc9c 100644
--- a/submodules/WalletUI/Sources/WalletWordCheckScreen.swift
+++ b/submodules/WalletUI/Sources/WalletWordCheckScreen.swift
@@ -2731,14 +2731,12 @@ private final class WalletWordCheckScreenNode: ViewControllerTracingNode, UIScro
guard let strongSelf = self else {
return
}
- if node.isLast {
- if done {
- action()
+ if let index = strongSelf.inputNodes.firstIndex(where: { $0 === node }) {
+ if index == strongSelf.inputNodes.count - 1 {
+ if done {
+ action()
+ }
} else {
- strongSelf.scrollNode.view.scrollRectToVisible(strongSelf.buttonNode.frame.insetBy(dx: 0.0, dy: -20.0), animated: true)
- }
- } else {
- if let index = strongSelf.inputNodes.firstIndex(where: { $0 === node }), index != strongSelf.inputNodes.count - 1 {
strongSelf.inputNodes[index + 1].focus()
}
}
@@ -2749,7 +2747,9 @@ private final class WalletWordCheckScreenNode: ViewControllerTracingNode, UIScro
return
}
if node.isLast {
- strongSelf.scrollNode.view.scrollRectToVisible(strongSelf.buttonNode.frame.insetBy(dx: 0.0, dy: -10.0), animated: true)
+ UIView.animate(withDuration: 0.3, animations: {
+ strongSelf.scrollNode.view.scrollRectToVisible(strongSelf.buttonNode.frame.insetBy(dx: 0.0, dy: -20.0), animated: false)
+ })
} else {
strongSelf.scrollNode.view.scrollRectToVisible(node.frame.insetBy(dx: 0.0, dy: -10.0), animated: true)
}
diff --git a/submodules/WatchBridge/Sources/WatchRequestHandlers.swift b/submodules/WatchBridge/Sources/WatchRequestHandlers.swift
index b42e8c9375..95f32f18e2 100644
--- a/submodules/WatchBridge/Sources/WatchRequestHandlers.swift
+++ b/submodules/WatchBridge/Sources/WatchRequestHandlers.swift
@@ -402,7 +402,7 @@ final class WatchMediaHandler: WatchRequestHandler {
if let peer = peer, let representation = peer.smallProfileImage {
let imageData = peerAvatarImageData(account: context.account, peer: peer, authorOfMessage: nil, representation: representation, synchronousLoad: false)
if let imageData = imageData {
- return imageData |> deliverOn(Queue.concurrentDefaultQueue())
+ return imageData
|> map { data -> UIImage? in
if let data = data, let image = generateImage(targetSize, contextGenerator: { size, context -> Void in
if let imageSource = CGImageSourceCreateWithData(data as CFData, nil), let dataImage = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) {
@@ -429,7 +429,7 @@ final class WatchMediaHandler: WatchRequestHandler {
let disposable = signal.start(next: { image in
if let image = image, let imageData = image.jpegData(compressionQuality: compressionRate) {
- sendData(manager: manager, data: imageData, key: key, ext: ".jpg", type: TGBridgeIncomingFileTypeImage)
+ sendData(manager: manager, data: imageData, key: key, ext: ".jpg", type: TGBridgeIncomingFileTypeImage, forceAsData: true)
}
subscriber?.putNext(key)
}, completed: {