diff --git a/Telegram-iOS/Resources/Dice_1.tgs b/Telegram-iOS/Resources/Dice_1.tgs deleted file mode 100644 index e078e6b6de..0000000000 Binary files a/Telegram-iOS/Resources/Dice_1.tgs and /dev/null differ diff --git a/Telegram-iOS/Resources/Dice_2.tgs b/Telegram-iOS/Resources/Dice_2.tgs deleted file mode 100644 index c350c4d88c..0000000000 Binary files a/Telegram-iOS/Resources/Dice_2.tgs and /dev/null differ diff --git a/Telegram-iOS/Resources/Dice_3.tgs b/Telegram-iOS/Resources/Dice_3.tgs deleted file mode 100644 index 388043434d..0000000000 Binary files a/Telegram-iOS/Resources/Dice_3.tgs and /dev/null differ diff --git a/Telegram-iOS/Resources/Dice_4.tgs b/Telegram-iOS/Resources/Dice_4.tgs deleted file mode 100644 index 0cc05f7cea..0000000000 Binary files a/Telegram-iOS/Resources/Dice_4.tgs and /dev/null differ diff --git a/Telegram-iOS/Resources/Dice_5.tgs b/Telegram-iOS/Resources/Dice_5.tgs deleted file mode 100644 index 2005eef2f4..0000000000 Binary files a/Telegram-iOS/Resources/Dice_5.tgs and /dev/null differ diff --git a/Telegram-iOS/Resources/Dice_6.tgs b/Telegram-iOS/Resources/Dice_6.tgs deleted file mode 100644 index 6c298dde36..0000000000 Binary files a/Telegram-iOS/Resources/Dice_6.tgs and /dev/null differ diff --git a/Telegram-iOS/Resources/Dice_Rolling.tgs b/Telegram-iOS/Resources/Dice_Rolling.tgs new file mode 100644 index 0000000000..aad33bffe1 Binary files /dev/null and b/Telegram-iOS/Resources/Dice_Rolling.tgs differ diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index a0af4e214f..710bcd7c41 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -5363,6 +5363,30 @@ Any member of this group will be able to see messages in the channel."; "Stats.FollowersTitle" = "FOLLOWERS"; "Stats.NotificationsTitle" = "NOTIFICATIONS"; "Stats.InteractionsTitle" = "INTERACTIONS"; +"Stats.InstantViewInteractionsTitle" = "INSTANT VIEW INTERACTIONS"; "Stats.ViewsBySourceTitle" = "VIEWS BY SOURCE"; "Stats.FollowersBySourceTitle" = "FOLLOWERS BY SOURCE"; "Stats.LanguagesTitle" = "LANGUAGES"; +"Stats.PostsTitle" = "RECENT POSTS"; + +"Stats.MessageViews_0" = "%@ views"; +"Stats.MessageViews_1" = "%@ view"; +"Stats.MessageViews_2" = "%@ views"; +"Stats.MessageViews_3_10" = "%@ views"; +"Stats.MessageViews_many" = "%@ views"; +"Stats.MessageViews_any" = "%@ views"; + +"Stats.MessageForwards_0" = "%@ forwards"; +"Stats.MessageForwards_1" = "%@ forward"; +"Stats.MessageForwards_2" = "%@ forwards"; +"Stats.MessageForwards_3_10" = "%@ forwardss"; +"Stats.MessageForwards_many" = "%@ forwards"; +"Stats.MessageForwards_any" = "%@ forwards"; + +"InstantPage.Views_0" = "%@ views"; +"InstantPage.Views_1" = "%@ view"; +"InstantPage.Views_2" = "%@ views"; +"InstantPage.Views_3_10" = "%@ views"; +"InstantPage.Views_many" = "%@ views"; +"InstantPage.Views_any" = "%@ views"; +"InstantPage.FeedbackButtonShort" = "Leave feedback"; diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift index a589d54f23..cb51c254cc 100644 --- a/submodules/AccountContext/Sources/AccountContext.swift +++ b/submodules/AccountContext/Sources/AccountContext.swift @@ -200,6 +200,7 @@ public final class NavigateToChatControllerParams { public let updateTextInputState: ChatTextInputState? public let activateInput: Bool public let keepStack: NavigateToChatKeepStack + public let useExisting: Bool public let purposefulAction: (() -> Void)? public let scrollToEndIfExists: Bool public let activateMessageSearch: Bool @@ -208,7 +209,7 @@ public final class NavigateToChatControllerParams { public let parentGroupId: PeerGroupId? public let completion: () -> Void - public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: Bool = false, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping () -> Void = {}) { + public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, useExisting: Bool = true, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: Bool = false, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping () -> Void = {}) { self.navigationController = navigationController self.chatController = chatController self.context = context @@ -218,6 +219,7 @@ public final class NavigateToChatControllerParams { self.updateTextInputState = updateTextInputState self.activateInput = activateInput self.keepStack = keepStack + self.useExisting = useExisting self.purposefulAction = purposefulAction self.scrollToEndIfExists = scrollToEndIfExists self.activateMessageSearch = activateMessageSearch diff --git a/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift b/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift index 384ffae882..0d42f38bf3 100644 --- a/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift +++ b/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift @@ -194,7 +194,7 @@ private final class AuthDataTransferSplashScreenNode: ViewControllerTracingNode let badgeTextNode = ImmediateTextNode() badgeTextNode.displaysAsynchronously = false - badgeTextNode.attributedText = NSAttributedString(string: "\(i + 1)", font: badgeFont, textColor: self.presentationData.theme.list.itemCheckColors.foregroundColor) + badgeTextNode.attributedText = NSAttributedString(string: "\(i + 1)", font: badgeFont, textColor: self.presentationData.theme.list.itemCheckColors.foregroundColor, paragraphAlignment: .natural) badgeTextNode.maximumNumberOfLines = 0 badgeTextNode.lineSpacing = 0.1 badgeTextNodes.append(badgeTextNode) @@ -314,6 +314,8 @@ private final class AuthDataTransferSplashScreenNode: ViewControllerTracingNode let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width - sideInset * 2.0, height: layout.size.height)) + let hasRTL = self.badgeTextNodes.first?.cachedLayout?.hasRTL ?? false + var badgeTextSizes: [CGSize] = [] var textSizes: [CGSize] = [] var textContentHeight: CGFloat = 0.0 diff --git a/submodules/Charts/Sources/Chart Screen/ChartStackSection.xib b/submodules/Charts/Sources/Chart Screen/ChartStackSection.xib deleted file mode 100644 index fc883dd96c..0000000000 --- a/submodules/Charts/Sources/Chart Screen/ChartStackSection.xib +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/submodules/Charts/Sources/Chart Screen/ChartsDataLoader.swift b/submodules/Charts/Sources/Chart Screen/ChartsDataLoader.swift deleted file mode 100644 index 085e4689bd..0000000000 --- a/submodules/Charts/Sources/Chart Screen/ChartsDataLoader.swift +++ /dev/null @@ -1,51 +0,0 @@ -// -// ChartsDataLoader.swift -// GraphTest -// -// Created by Andrei Salavei on 4/8/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import Foundation - -enum ChartsDataType: String { - case generalLines = "1" - case twoAxisLines = "2" - case stackedBars = "3" - case dailyBars = "4" - case percentPie = "5" -} - -private enum Constants { - static let overviewFilename = "overview.json" - static let dataDir = "data" -} - -class ChartsDataLoader { - static var documentDirectoryURL: URL { - let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask) - let documentsDirectory = paths[0] - return documentsDirectory - } - - static func overviewData(type: ChartsDataType, extraCopiesCount: Int = 0, sync: Bool = false, success: @escaping (ChartsCollection) -> Void) { - let path = Bundle.main.bundleURL - .appendingPathComponent(Constants.dataDir) - .appendingPathComponent(type.rawValue) - .appendingPathComponent(Constants.overviewFilename) - ChartsDataManager().readChart(file: path, extraCopiesCount: extraCopiesCount, sync: sync, success: success, failure: { _ in }) - } - - static func detaildData(type: ChartsDataType, extraCopiesCount: Int = 0, date: Date, success: @escaping (ChartsCollection) -> Void, failure: @escaping (Error) -> Void) { - let dateComponents = Calendar.utc.dateComponents([.day, .month, .year], from: date) - let yearMonth = String(format: "%04d-%02d", dateComponents.year ?? 0, dateComponents.month ?? 0) - let day = String(format: "%02d.json", dateComponents.day ?? 0) - - let path = Bundle.main.bundleURL - .appendingPathComponent(Constants.dataDir) - .appendingPathComponent(type.rawValue) - .appendingPathComponent(yearMonth) - .appendingPathComponent(day) - ChartsDataManager().readChart(file: path, extraCopiesCount: extraCopiesCount, sync: false, success: success, failure: failure) - } -} diff --git a/submodules/Charts/Sources/Charts Reader/ChartsCollection.swift b/submodules/Charts/Sources/Charts Reader/ChartsCollection.swift deleted file mode 100644 index f0348f7ab6..0000000000 --- a/submodules/Charts/Sources/Charts Reader/ChartsCollection.swift +++ /dev/null @@ -1,92 +0,0 @@ -// -// ChardData.swift -// GraphTest -// -// Created by Andrei Salavei on 3/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import Foundation -import UIKit - -struct ChartsCollection { - struct Chart { - var color: UIColor - var name: String - var values: [Double] - } - - var axisValues: [Date] - var chartValues: [Chart] - - static let blank = ChartsCollection(axisValues: [], chartValues: []) - var isBlank: Bool { - return axisValues.isEmpty || chartValues.isEmpty - } -} - -extension ChartsCollection { - public init(from decodedData: [String: Any]) throws { - guard let columns = decodedData["columns"] as? [[Any]] else { - throw ChartsError.generalConversion("Unable to get columns from: \(decodedData)") - } - guard let types = decodedData["types"] as? [String: String] else { - throw ChartsError.generalConversion("Unable to get types from: \(decodedData)") - } - guard let names = decodedData["names"] as? [String: String] else { - throw ChartsError.generalConversion("Unable to get names from: \(decodedData)") - } - guard let colors = decodedData["colors"] as? [String: String] else { - throw ChartsError.generalConversion("Unable to get colors from: \(decodedData)") - } - -// chart.colors – Color for each variable in 6-hex-digit format (e.g. "#AAAAAA"). -// chart.names – Name for each variable. -// chart.percentage – true for percentage based values. -// chart.stacked – true for values stacking on top of each other. -// chart.y_scaled – true for charts with 2 Y axes. - - var axixValuesToSetup: [Date] = [] - var chartToSetup: [Chart] = [] - for column in columns { - guard let columnId = column.first as? String else { - throw ChartsError.generalConversion("Unable to get column name from: \(column)") - } - guard let typeString = types[columnId], let type = ColumnType(rawValue: typeString) else { - throw ChartsError.generalConversion("Unable to get column type from: \(types) - \(columnId)") - } - switch type { - case .axix: - axixValuesToSetup = try column.dropFirst().map { Date(timeIntervalSince1970: try Convert.doubleFrom($0) / 1000) } - case .chart, .bar, .area, .step: - guard let colorString = colors[columnId], - let color = UIColor(hexString: colorString) else { - throw ChartsError.generalConversion("Unable to get color name from: \(colors) - \(columnId)") - } - guard let name = names[columnId] else { - throw ChartsError.generalConversion("Unable to get column name from: \(names) - \(columnId)") - } - let values = try column.dropFirst().map { try Convert.doubleFrom($0) } - chartToSetup.append(Chart(color: color, - name: name, - values: values)) - } - } - - guard axixValuesToSetup.isEmpty == false, - chartToSetup.isEmpty == false, - chartToSetup.firstIndex(where: { $0.values.count != axixValuesToSetup.count }) == nil else { - throw ChartsError.generalConversion("Sanitazing: Invalid number of items: \(axixValuesToSetup), \(chartToSetup)") - } - self.axisValues = axixValuesToSetup - self.chartValues = chartToSetup - } -} - -private enum ColumnType: String { - case axix = "x" - case chart = "line" - case area = "area" - case bar = "bar" - case step = "step" -} diff --git a/submodules/Charts/Sources/Charts Reader/ChartsDataManager.swift b/submodules/Charts/Sources/Charts Reader/ChartsDataManager.swift deleted file mode 100644 index 1a32f9bcee..0000000000 --- a/submodules/Charts/Sources/Charts Reader/ChartsDataManager.swift +++ /dev/null @@ -1,191 +0,0 @@ -// -// ChartsDataManager.swift -// GraphTest -// -// Created by Andrei Salavei on 3/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import Foundation - -class ChartsDataManager { - func readChart(item: [String: Any], extraCopiesCount: Int = 0, sync: Bool, success: @escaping (ChartsCollection) -> Void, failure: @escaping (Error) -> Void) { - let workItem: (() -> Void) = { - do { - var collection = try ChartsCollection(from: item) - for _ in 0.. Void, failure: @escaping (Error) -> Void) { - let workItem: (() -> Void) = { - do { - let decoded = try JSONSerialization.jsonObject(with: data, options: []) - guard let item = decoded as? [String: Any] else { - throw ChartsError.invalidJson - } - var collection = try ChartsCollection(from: item) - for _ in 0.. Void, failure: @escaping (Error) -> Void) { - let workItem: (() -> Void) = { - do { - let data = try Data(contentsOf: file) - let decoded = try JSONSerialization.jsonObject(with: data, options: []) - guard let item = decoded as? [String: Any] else { - throw ChartsError.invalidJson - } - var collection = try ChartsCollection(from: item) - for _ in 0.. Void, failure: @escaping (Error) -> Void) { - let workItem: (() -> Void) = { - do { - let data = try Data(contentsOf: file) - let decoded = try JSONSerialization.jsonObject(with: data, options: []) - guard let items = decoded as? [[String: Any]] else { - throw ChartsError.invalidJson - } - var collections = try items.map { try ChartsCollection(from: $0) } - for _ in 0.. Double { - guard let double = try doubleFrom(value, lenientCast: false) else { - throw ChartsError.generalConversion("Unable to cast \(String(describing: value)) to \(Double.self)") - } - return double - } - - public static func doubleFrom(_ value: Any?, lenientCast: Bool = false) throws -> Double? { - guard let value = value else { - return nil - } - if let intValue = value as? Int { - return Double(intValue) - } else if let floatValue = value as? Float { - return Double(floatValue) - } else if let int64Value = value as? Int64 { - return Double(int64Value) - } else if let intValue = value as? Int { - return Double(intValue) - } else if let stringValue = value as? String { - if let doubleValue = Double(stringValue) { - return doubleValue - } - } - if lenientCast { - return nil - } else { - throw ChartsError.generalConversion("Unable to cast \(String(describing: value)) to \(Double.self)") - } - } -} diff --git a/submodules/Charts/Sources/Charts.h b/submodules/Charts/Sources/Charts.h deleted file mode 100644 index 89573b3f16..0000000000 --- a/submodules/Charts/Sources/Charts.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// StatisticsUI.h -// StatisticsUI -// -// Created by Peter on 8/13/19. -// Copyright © 2019 Telegram Messenger LLP. All rights reserved. -// - -#import - -//! Project version number for StatisticsUI. -FOUNDATION_EXPORT double StatisticsUIVersionNumber; - -//! Project version string for StatisticsUI. -FOUNDATION_EXPORT const unsigned char StatisticsUIVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/submodules/Charts/Sources/Charts/Controllers/BaseChartController.swift b/submodules/Charts/Sources/Charts/Controllers/BaseChartController.swift deleted file mode 100644 index 0fcaef599f..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/BaseChartController.swift +++ /dev/null @@ -1,170 +0,0 @@ -// -// BaseChartController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -enum BaseConstants { - static let defaultRange: ClosedRange = 0...1 - static let minimumAxisYLabelsDistance: CGFloat = 90 - static let monthDayDateFormatter = DateFormatter.utc(format: "MMM d") - static let timeDateFormatter = DateFormatter.utc(format: "HH:mm") - static let headerFullRangeFormatter: DateFormatter = { - let formatter = DateFormatter.utc() - formatter.calendar = Calendar.utc - formatter.dateStyle = .long - return formatter - }() - static let headerMediumRangeFormatter: DateFormatter = { - let formatter = DateFormatter.utc() - formatter.dateStyle = .medium - return formatter - }() - static let headerFullZoomedFormatter: DateFormatter = { - let formatter = DateFormatter.utc() - formatter.dateStyle = .full - return formatter - }() - - static let verticalBaseAnchors: [CGFloat] = [8, 5, 2.5, 2, 1] - static let defaultVerticalBaseAnchor: CGFloat = 1 - - static let mainChartLineWidth: CGFloat = 2 - static let previewChartLineWidth: CGFloat = 1 - - static let previewLinesChartOptimizationLevel: CGFloat = 1.5 - static let linesChartOptimizationLevel: CGFloat = 1.0 - static let barsChartOptimizationLevel: CGFloat = 0.75 - - static let defaultRangePresetLength = TimeInterval.day * 60 - - static let chartNumberFormatter: ScalesNumberFormatter = { - let numberFormatter = ScalesNumberFormatter() - numberFormatter.allowsFloats = true - numberFormatter.numberStyle = .decimal - numberFormatter.usesGroupingSeparator = true - numberFormatter.groupingSeparator = " " - numberFormatter.minimumIntegerDigits = 1 - numberFormatter.minimumFractionDigits = 0 - numberFormatter.maximumFractionDigits = 2 - return numberFormatter - }() - - static let detailsNumberFormatter: NumberFormatter = { - let detailsNumberFormatter = NumberFormatter() - detailsNumberFormatter.allowsFloats = false - detailsNumberFormatter.numberStyle = .decimal - detailsNumberFormatter.usesGroupingSeparator = true - detailsNumberFormatter.groupingSeparator = " " - return detailsNumberFormatter - }() -} - -class BaseChartController: ColorModeContainer { - //let performanceRenderer = PerformanceRenderer() - var initialChartsCollection: ChartsCollection - var isZoomed: Bool = false - - var chartTitle: String = "" - - init(chartsCollection: ChartsCollection) { - self.initialChartsCollection = chartsCollection - } - - var mainChartRenderers: [ChartViewRenderer] { - fatalError("Abstract") - } - - var navigationRenderers: [ChartViewRenderer] { - fatalError("Abstract") - } - - var cartViewBounds: (() -> CGRect) = { fatalError() } - var chartFrame: (() -> CGRect) = { fatalError() } - - func initializeChart() { - fatalError("Abstract") - } - - func chartInteractionDidBegin(point: CGPoint) { - fatalError("Abstract") - } - - func chartInteractionDidEnd() { - fatalError("Abstract") - } - - func cancelChartInteraction() { - fatalError("Abstract") - } - - func didTapZoomOut() { - fatalError("Abstract") - } - - func updateChartsVisibility(visibility: [Bool], animated: Bool) { - fatalError("Abstract") - } - - var currentHorizontalRange: ClosedRange { - fatalError("Abstract") - } - - var isChartRangePagingEnabled: Bool = false - var minimumSelectedChartRange: CGFloat = 0.05 - var chartRangePagingClosure: ((Bool, CGFloat) -> Void)? // isEnabled, PageSize - func setChartRangePagingEnabled(isEnabled: Bool, minimumSelectionSize: CGFloat) { - isChartRangePagingEnabled = isEnabled - minimumSelectedChartRange = minimumSelectionSize - chartRangePagingClosure?(isChartRangePagingEnabled, minimumSelectedChartRange) - } - - var chartRangeUpdatedClosure: ((ClosedRange, Bool) -> Void)? - var currentChartHorizontalRangeFraction: ClosedRange { - fatalError("Abstract") - } - - func updateChartRangeTitle(animated: Bool) { - - } - - func updateChartRange(_ rangeFraction: ClosedRange, animated: Bool = true) { - fatalError("Abstract") - } - - var actualChartVisibility: [Bool] { - fatalError("Abstract") - } - - var actualChartsCollection: ChartsCollection { - fatalError("Abstract") - } - - var drawChartVisibity: Bool { - return true - } - - var drawChartNavigation: Bool { - return true - } - - var setDetailsViewPositionClosure: ((CGFloat) -> Void)? - var setDetailsChartVisibleClosure: ((Bool, Bool) -> Void)? - var setDetailsViewModel: ((ChartDetailsViewModel, Bool) -> Void)? - var getDetailsData: ((Date, @escaping (ChartsCollection?) -> Void) -> Void)? - var setChartTitleClosure: ((String, Bool) -> Void)? - var setBackButtonVisibilityClosure: ((Bool, Bool) -> Void)? - var refreshChartToolsClosure: ((Bool) -> Void)? - - func didTapZoomIn(date: Date) { - fatalError("Abstract") - } - - func apply(colorMode: ColorMode, animated: Bool) { - - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/GeneralChartComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/GeneralChartComponentController.swift deleted file mode 100644 index 284be92d3b..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/GeneralChartComponentController.swift +++ /dev/null @@ -1,328 +0,0 @@ -// -// GeneralChartComponentController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -enum GeneralChartComponentConstants { - static let defaultInitialRangeLength = CGFloat(TimeInterval.day * 60) - static let defaultZoomedRangeLength = CGFloat(TimeInterval.day) -} - -class GeneralChartComponentController: ColorModeContainer { - var chartsCollection: ChartsCollection = ChartsCollection.blank - var chartVisibility: [Bool] = [] - var lastChartInteractionPoint: CGPoint = .zero - var isChartInteractionBegun: Bool = false - var isChartInteracting: Bool = false - let isZoomed: Bool - - var colorMode: ColorMode = .day - var totalHorizontalRange: ClosedRange = BaseConstants.defaultRange - var totalVerticalRange: ClosedRange = BaseConstants.defaultRange - var initialHorizontalRange: ClosedRange = BaseConstants.defaultRange - var initialVerticalRange: ClosedRange = BaseConstants.defaultRange - - var cartViewBounds: (() -> CGRect) = { fatalError() } - var chartFrame: (() -> CGRect) = { fatalError() } - - init(isZoomed: Bool) { - self.isZoomed = isZoomed - } - - func initialize(chartsCollection: ChartsCollection, - initialDate: Date, - totalHorizontalRange: ClosedRange, - totalVerticalRange: ClosedRange) { - self.chartsCollection = chartsCollection - self.chartVisibility = Array(repeating: true, count: chartsCollection.chartValues.count) - self.totalHorizontalRange = totalHorizontalRange - self.totalVerticalRange = totalVerticalRange - self.initialHorizontalRange = totalHorizontalRange - self.initialVerticalRange = totalVerticalRange - - didLoad() - setupInitialChartRange(initialDate: initialDate) - } - - func didLoad() { - hideDetailsView(animated: false) - } - func willAppear(animated: Bool) { - updateChartRangeTitle(animated: animated) - setupChartRangePaging() - } - func willDisappear(animated: Bool) { - } - - func setupInitialChartRange(initialDate: Date) { - guard let first = chartsCollection.axisValues.first?.timeIntervalSince1970, - let last = chartsCollection.axisValues.last?.timeIntervalSince1970 else { return } - - let rangeStart = CGFloat(first) - let rangeEnd = CGFloat(last) - - if isZoomed { - let initalDate = CGFloat(initialDate.timeIntervalSince1970) - - initialHorizontalRange = max(initalDate, rangeStart)...min(initalDate + GeneralChartComponentConstants.defaultZoomedRangeLength, rangeEnd) - initialVerticalRange = totalVerticalRange - } else { - initialHorizontalRange = max(rangeStart, rangeEnd - GeneralChartComponentConstants.defaultInitialRangeLength)...rangeEnd - initialVerticalRange = totalVerticalRange - } - } - func setupChartRangePaging() { - chartRangePagingClosure?(false, 0.05) - } - - var visibleHorizontalMainChartRange: ClosedRange { - return currentMainRangeRenderer.verticalRange.current - } - var visibleVerticalMainChartRange: ClosedRange { - return currentMainRangeRenderer.verticalRange.current - } - var currentHorizontalMainChartRange: ClosedRange { - return currentMainRangeRenderer.horizontalRange.end - } - var currentVerticalMainChartRange: ClosedRange { - return currentMainRangeRenderer.verticalRange.end - } - var currentMainRangeRenderer: BaseChartRenderer { - fatalError("Abstract") - } - - var visiblePreviewHorizontalRange: ClosedRange { - return currentPreviewRangeRenderer.verticalRange.current - } - var visiblePreviewVerticalRange: ClosedRange { - return currentPreviewRangeRenderer.verticalRange.current - } - var currentPreviewHorizontalRange: ClosedRange { - return currentPreviewRangeRenderer.horizontalRange.end - } - var currentPreviewVerticalRange: ClosedRange { - return currentPreviewRangeRenderer.verticalRange.end - } - var currentPreviewRangeRenderer: BaseChartRenderer { - fatalError("Abstract") - } - - var mainChartRenderers: [ChartViewRenderer] { - fatalError("Abstract") - } - var previewRenderers: [ChartViewRenderer] { - fatalError("Abstract") - } - - func updateChartsVisibility(visibility: [Bool], animated: Bool) { - self.chartVisibility = visibility - if isChartInteractionBegun { - chartInteractionDidBegin(point: lastChartInteractionPoint) - } - } - - var currentChartHorizontalRangeFraction: ClosedRange { - let lowerPercent = (currentHorizontalMainChartRange.lowerBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance - let upperPercent = (currentHorizontalMainChartRange.upperBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance - return lowerPercent...upperPercent - } - - func chartRangeFractionDidUpdated(_ rangeFraction: ClosedRange) { - let horizontalRange = ClosedRange(uncheckedBounds: - (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, - upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) - chartRangeDidUpdated(horizontalRange) - updateChartRangeTitle(animated: true) - } - - func chartRangeDidUpdated(_ updatedRange: ClosedRange) { - hideDetailsView(animated: true) - - if isChartInteractionBegun { - chartInteractionDidBegin(point: lastChartInteractionPoint) - } - } - - // MARK: - Details & Interaction - func findClosestDateTo(dateToFind: Date) -> (Date, Int)? { - guard chartsCollection.axisValues.count > 0 else { return nil } - var closestDate = chartsCollection.axisValues[0] - var minIndex = 0 - for (index, date) in chartsCollection.axisValues.enumerated() { - if abs(dateToFind.timeIntervalSince(date)) < abs(dateToFind.timeIntervalSince(closestDate)) { - closestDate = date - minIndex = index - } - } - return (closestDate, minIndex) - } - - func chartInteractionDidBegin(point: CGPoint) { - let chartFrame = self.chartFrame() - guard chartFrame.width > 0 else { return } - let horizontalRange = currentHorizontalMainChartRange - let dateToFind = Date(timeIntervalSince1970: TimeInterval(horizontalRange.distance * point.x + horizontalRange.lowerBound)) - guard let (closestDate, minIndex) = findClosestDateTo(dateToFind: dateToFind) else { return } - - let chartWasInteracting = isChartInteractionBegun - lastChartInteractionPoint = point - isChartInteractionBegun = true - isChartInteracting = true - - let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) - let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX - showDetailsView(at: chartValue, detailsViewPosition: detailsViewPosition, dataIndex: minIndex, date: closestDate, animted: chartWasInteracting) - } - - func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { - setDetailsViewModel?(chartDetailsViewModel(closestDate: date, pointIndex: dataIndex), animted) - setDetailsChartVisibleClosure?(true, true) - setDetailsViewPositionClosure?(detailsViewPosition) - } - - func chartInteractionDidEnd() { - isChartInteracting = false - } - - func hideDetailsView(animated: Bool) { - isChartInteractionBegun = false - setDetailsChartVisibleClosure?(false, animated) - } - - var visibleDetailsChartValues: [ChartsCollection.Chart] { - let visibleCharts: [ChartsCollection.Chart] = chartVisibility.enumerated().compactMap { args in - args.element ? chartsCollection.chartValues[args.offset] : nil - } - return visibleCharts - } - - var updatePreviewRangeClosure: ((ClosedRange, Bool) -> Void)? - var zoomInOnDateClosure: ((Date) -> Void)? - var setChartTitleClosure: ((String, Bool) -> Void)? - var setDetailsViewPositionClosure: ((CGFloat) -> Void)? - var setDetailsChartVisibleClosure: ((Bool, Bool) -> Void)? - var setDetailsViewModel: ((ChartDetailsViewModel, Bool) -> Void)? - var chartRangePagingClosure: ((Bool, CGFloat) -> Void)? // isEnabled, PageSize - - func apply(colorMode: ColorMode, animated: Bool) { - self.colorMode = colorMode - } - -// MARK: - Helpers - var prevoiusHorizontalStrideInterval: Int = -1 - func updateHorizontalLimitLabels(horizontalScalesRenderer: HorizontalScalesRenderer, - horizontalRange: ClosedRange, - scaleType: ChartScaleType, - forceUpdate: Bool, - animated: Bool) { - let scaleTimeInterval: TimeInterval - if chartsCollection.axisValues.count >= 1 { - scaleTimeInterval = chartsCollection.axisValues[1].timeIntervalSince1970 - chartsCollection.axisValues[0].timeIntervalSince1970 - } else { - scaleTimeInterval = scaleType.timeInterval - } - - let numberOfItems = horizontalRange.distance / CGFloat(scaleTimeInterval) - let maximumNumberOfItems = chartFrame().width / scaleType.minimumAxisXDistance - let tempStride = max(1, Int((numberOfItems / maximumNumberOfItems).rounded(.up))) - var strideInterval = 1 - while strideInterval < tempStride { - strideInterval *= 2 - } - - if forceUpdate || (strideInterval != prevoiusHorizontalStrideInterval && strideInterval > 0) { - var labels: [LinesChartLabel] = [] - for index in stride(from: chartsCollection.axisValues.count - 1, to: -1, by: -strideInterval).reversed() { - let date = chartsCollection.axisValues[index] - labels.append(LinesChartLabel(value: CGFloat(date.timeIntervalSince1970), - text: scaleType.dateFormatter.string(from: date))) - } - prevoiusHorizontalStrideInterval = strideInterval - horizontalScalesRenderer.setup(labels: labels, animated: animated) - } - } - - func verticalLimitsLabels(verticalRange: ClosedRange) -> (ClosedRange, [LinesChartLabel]) { - let ditance = verticalRange.distance - let chartHeight = chartFrame().height - - guard ditance > 0, chartHeight > 0 else { return (BaseConstants.defaultRange, []) } - - let approximateNumberOfChartValues = (chartHeight / BaseConstants.minimumAxisYLabelsDistance) - - var numberOfOffsetsPerItem = ditance / approximateNumberOfChartValues - var multiplier: CGFloat = 1.0 - while numberOfOffsetsPerItem > 10 { - numberOfOffsetsPerItem /= 10 - multiplier *= 10 - } - var dividor: CGFloat = 1.0 - var maximumNumberOfDecimals = 2 - while numberOfOffsetsPerItem < 1 { - numberOfOffsetsPerItem *= 10 - dividor *= 10 - maximumNumberOfDecimals += 1 - } - - var base: CGFloat = BaseConstants.verticalBaseAnchors.first { numberOfOffsetsPerItem > $0 } ?? BaseConstants.defaultVerticalBaseAnchor - base = base * multiplier / dividor - - var verticalLabels: [LinesChartLabel] = [] - var verticalValue = (verticalRange.lowerBound / base).rounded(.down) * base - let lowerBound = verticalValue - - let numberFormatter = BaseConstants.chartNumberFormatter - numberFormatter.maximumFractionDigits = maximumNumberOfDecimals - while verticalValue < verticalRange.upperBound { - let text: String = numberFormatter.string(from: NSNumber(value: Double(verticalValue))) ?? "" - - verticalLabels.append(LinesChartLabel(value: verticalValue, text: text)) - verticalValue += base - } - let updatedRange = lowerBound...verticalValue - - return (updatedRange, verticalLabels) - } - - func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { - let values: [ChartDetailsViewModel.Value] = chartsCollection.chartValues.enumerated().map { arg in - let (index, component) = arg - return ChartDetailsViewModel.Value(prefix: nil, - title: component.name, - value: BaseConstants.detailsNumberFormatter.string(from: NSNumber(value: component.values[pointIndex])) ?? "", - color: component.color, - visible: chartVisibility[index]) - } - let dateString: String - if isZoomed { - dateString = BaseConstants.timeDateFormatter.string(from: closestDate) - } else { - dateString = BaseConstants.headerMediumRangeFormatter.string(from: closestDate) - } - let viewModel = ChartDetailsViewModel(title: dateString, - showArrow: !self.isZoomed, - showPrefixes: false, - values: values, - totalValue: nil, - tapAction: { [weak self] in - self?.zoomInOnDateClosure?(closestDate) }) - return viewModel - } - - func updateChartRangeTitle(animated: Bool) { - let fromDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.lowerBound) + 1) - let toDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.upperBound)) - if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { - let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) - self.setChartTitleClosure?(stirng, animated) - } else { - let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" - self.setChartTitleClosure?(stirng, animated) - } - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift deleted file mode 100644 index d7b67c4a21..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift +++ /dev/null @@ -1,236 +0,0 @@ -// -// BaseLinesChartController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/14/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class BaseLinesChartController: BaseChartController { - var chartVisibility: [Bool] - var zoomChartVisibility: [Bool] - var lastChartInteractionPoint: CGPoint = .zero - var isChartInteractionBegun: Bool = false - - var initialChartRange: ClosedRange = BaseConstants.defaultRange - var zoomedChartRange: ClosedRange = BaseConstants.defaultRange - - override init(chartsCollection: ChartsCollection) { - self.chartVisibility = Array(repeating: true, count: chartsCollection.chartValues.count) - self.zoomChartVisibility = [] - super.init(chartsCollection: chartsCollection) - } - - func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { - if animated { - TimeInterval.setDefaultDuration(.expandAnimationDuration) - DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { - TimeInterval.setDefaultDuration(.osXDuration) - } - } - - self.initialChartsCollection = chartsCollection - self.isZoomed = isZoomed - - self.setBackButtonVisibilityClosure?(isZoomed, animated) - - updateChartRangeTitle(animated: animated) - } - - override func updateChartRangeTitle(animated: Bool) { - let fromDate = Date(timeIntervalSince1970: TimeInterval(zoomedChartRange.lowerBound) + .hour) - let toDate = Date(timeIntervalSince1970: TimeInterval(zoomedChartRange.upperBound)) - if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { - let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) - self.setChartTitleClosure?(stirng, animated) - } else { - let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" - self.setChartTitleClosure?(stirng, animated) - } - } - - override func chartInteractionDidBegin(point: CGPoint) { - lastChartInteractionPoint = point - isChartInteractionBegun = true - } - - override func chartInteractionDidEnd() { - - } - - override func cancelChartInteraction() { - isChartInteractionBegun = false - } - - override func updateChartRange(_ rangeFraction: ClosedRange, animated: Bool) { - - } - - override var actualChartVisibility: [Bool] { - return isZoomed ? zoomChartVisibility : chartVisibility - } - - override var actualChartsCollection: ChartsCollection { - return initialChartsCollection - } - - var visibleChartValues: [ChartsCollection.Chart] { - let visibleCharts: [ChartsCollection.Chart] = actualChartVisibility.enumerated().compactMap { args in - args.element ? initialChartsCollection.chartValues[args.offset] : nil - } - return visibleCharts - } - - - func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { - let values: [ChartDetailsViewModel.Value] = actualChartsCollection.chartValues.enumerated().map { arg in - let (index, component) = arg - return ChartDetailsViewModel.Value(prefix: nil, - title: component.name, - value: BaseConstants.detailsNumberFormatter.string(from: component.values[pointIndex]), - color: component.color, - visible: actualChartVisibility[index]) - } - let dateString: String - if isZoomed { - dateString = BaseConstants.timeDateFormatter.string(from: closestDate) - } else { - dateString = BaseConstants.headerMediumRangeFormatter.string(from: closestDate) - } - let viewModel = ChartDetailsViewModel(title: dateString, - showArrow: !self.isZoomed, - showPrefixes: false, - values: values, - totalValue: nil, - tapAction: { [weak self] in self?.didTapZoomIn(date: closestDate) }) - return viewModel - } - - override func didTapZoomIn(date: Date) { - guard isZoomed == false else { return } - cancelChartInteraction() - self.getDetailsData?(date, { updatedCollection in - if let updatedCollection = updatedCollection { - self.initialChartRange = self.currentHorizontalRange - if let startDate = updatedCollection.axisValues.first, - let endDate = updatedCollection.axisValues.last { - self.zoomedChartRange = CGFloat(max(date.timeIntervalSince1970, startDate.timeIntervalSince1970))...CGFloat(min(date.timeIntervalSince1970 + .day - .hour, endDate.timeIntervalSince1970)) - } else { - self.zoomedChartRange = CGFloat(date.timeIntervalSince1970)...CGFloat(date.timeIntervalSince1970 + .day - 1) - } - self.setupChartCollection(chartsCollection: updatedCollection, animated: true, isZoomed: true) - } - }) - } - - func horizontalLimitsLabels(horizontalRange: ClosedRange, - scaleType: ChartScaleType, - prevoiusHorizontalStrideInterval: Int) -> (Int, [LinesChartLabel])? { - let numberOfItems = horizontalRange.distance / CGFloat(scaleType.timeInterval) - let maximumNumberOfItems = chartFrame().width / scaleType.minimumAxisXDistance - let tempStride = max(1, Int((numberOfItems / maximumNumberOfItems).rounded(.up))) - var strideInterval = 1 - while strideInterval < tempStride { - strideInterval *= 2 - } - - if strideInterval != prevoiusHorizontalStrideInterval && strideInterval > 0 { - var labels: [LinesChartLabel] = [] - for index in stride(from: initialChartsCollection.axisValues.count - 1, to: -1, by: -strideInterval).reversed() { - let date = initialChartsCollection.axisValues[index] - labels.append(LinesChartLabel(value: CGFloat(date.timeIntervalSince1970), - text: scaleType.dateFormatter.string(from: date))) - } - return (strideInterval, labels) - } - return nil - } - - func findClosestDateTo(dateToFind: Date) -> (Date, Int)? { - guard initialChartsCollection.axisValues.count > 0 else { return nil } - var closestDate = initialChartsCollection.axisValues[0] - var minIndex = 0 - for (index, date) in initialChartsCollection.axisValues.enumerated() { - if abs(dateToFind.timeIntervalSince(date)) < abs(dateToFind.timeIntervalSince(closestDate)) { - closestDate = date - minIndex = index - } - } - return (closestDate, minIndex) - } - - func verticalLimitsLabels(verticalRange: ClosedRange) -> (ClosedRange, [LinesChartLabel]) { - let ditance = verticalRange.distance - let chartHeight = chartFrame().height - - guard ditance > 0, chartHeight > 0 else { return (BaseConstants.defaultRange, []) } - - let approximateNumberOfChartValues = (chartHeight / BaseConstants.minimumAxisYLabelsDistance) - - var numberOfOffsetsPerItem = ditance / approximateNumberOfChartValues - var multiplier: CGFloat = 1.0 - while numberOfOffsetsPerItem > 10 { - numberOfOffsetsPerItem /= 10 - multiplier *= 10 - } - var dividor: CGFloat = 1.0 - var maximumNumberOfDecimals = 2 - while numberOfOffsetsPerItem < 1 { - numberOfOffsetsPerItem *= 10 - dividor *= 10 - maximumNumberOfDecimals += 1 - } - - var base: CGFloat = BaseConstants.verticalBaseAnchors.first { numberOfOffsetsPerItem > $0 } ?? BaseConstants.defaultVerticalBaseAnchor - base = base * multiplier / dividor - - var verticalLabels: [LinesChartLabel] = [] - var verticalValue = (verticalRange.lowerBound / base).rounded(.down) * base - let lowerBound = verticalValue - - let numberFormatter = BaseConstants.chartNumberFormatter - numberFormatter.maximumFractionDigits = maximumNumberOfDecimals - while verticalValue < verticalRange.upperBound { - let text: String = numberFormatter.string(from: NSNumber(value: Double(verticalValue))) ?? "" - - verticalLabels.append(LinesChartLabel(value: verticalValue, text: text)) - verticalValue += base - } - let updatedRange = lowerBound...verticalValue - - return (updatedRange, verticalLabels) - } -} - -enum ChartScaleType { - case day - case hour - case minutes5 -} - -extension ChartScaleType { - var timeInterval: TimeInterval { - switch self { - case .day: return .day - case .hour: return .hour - case .minutes5: return .minute * 5 - } - } - - var minimumAxisXDistance: CGFloat { - switch self { - case .day: return 50 - case .hour: return 40 - case .minutes5: return 40 - } - } - var dateFormatter: DateFormatter { - switch self { - case .day: return BaseConstants.monthDayDateFormatter - case .hour: return BaseConstants.timeDateFormatter - case .minutes5: return BaseConstants.timeDateFormatter - } - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift deleted file mode 100644 index e122468207..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift +++ /dev/null @@ -1,247 +0,0 @@ -// -// LinesChartController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -private enum Constants { - static let defaultRange: ClosedRange = 0...1 -} - -class GeneralLinesChartController: BaseLinesChartController { - private let initialChartCollection: ChartsCollection - - private let mainLinesRenderer = LinesChartRenderer() - private let horizontalScalesRenderer = HorizontalScalesRenderer() - private let verticalScalesRenderer = VerticalScalesRenderer() - private let verticalLineRenderer = VerticalLinesRenderer() - private let lineBulletsRenerer = LineBulletsRenerer() - - private let previewLinesRenderer = LinesChartRenderer() - - private var totalVerticalRange: ClosedRange = Constants.defaultRange - private var totalHorizontalRange: ClosedRange = Constants.defaultRange - - private var prevoiusHorizontalStrideInterval: Int = 1 - - private (set) var chartLines: [LinesChartRenderer.LineData] = [] - - override init(chartsCollection: ChartsCollection) { - self.initialChartCollection = chartsCollection - self.mainLinesRenderer.lineWidth = 2 - self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel - self.previewLinesRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel - - self.lineBulletsRenerer.isEnabled = false - - super.init(chartsCollection: chartsCollection) - self.zoomChartVisibility = chartVisibility - } - - override func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { - super.setupChartCollection(chartsCollection: chartsCollection, animated: animated, isZoomed: isZoomed) - - self.chartLines = chartsCollection.chartValues.map { chart in - let points = chart.values.enumerated().map({ (arg) -> CGPoint in - return CGPoint(x: chartsCollection.axisValues[arg.offset].timeIntervalSince1970, - y: arg.element) - }) - return LinesChartRenderer.LineData(color: chart.color, points: points) - } - - self.prevoiusHorizontalStrideInterval = -1 - self.totalVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: chartLines) ?? Constants.defaultRange - self.totalHorizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: chartLines) ?? Constants.defaultRange - self.lineBulletsRenerer.bullets = self.chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, - color: $0.color)} - - let chartRange: ClosedRange - if isZoomed { - chartRange = zoomedChartRange - } else { - chartRange = initialChartRange - } - - self.previewLinesRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) - self.previewLinesRenderer.setup(verticalRange: totalVerticalRange, animated: animated) - - self.mainLinesRenderer.setLines(lines: chartLines, animated: animated) - self.previewLinesRenderer.setLines(lines: chartLines, animated: animated) - - updateHorizontalLimists(horizontalRange: chartRange, animated: animated) - updateMainChartHorizontalRange(range: chartRange, animated: animated) - updateVerticalLimitsAndRange(horizontalRange: chartRange, animated: animated) - - self.chartRangeUpdatedClosure?(currentChartHorizontalRangeFraction, animated) - } - - override func initializeChart() { - if let first = initialChartCollection.axisValues.first?.timeIntervalSince1970, - let last = initialChartCollection.axisValues.last?.timeIntervalSince1970 { - initialChartRange = CGFloat(max(first, last - BaseConstants.defaultRangePresetLength))...CGFloat(last) - } - setupChartCollection(chartsCollection: initialChartCollection, animated: false, isZoomed: false) - } - - override var mainChartRenderers: [ChartViewRenderer] { - return [//performanceRenderer, - mainLinesRenderer, - horizontalScalesRenderer, - verticalScalesRenderer, - verticalLineRenderer, - lineBulletsRenerer - ] - } - - override var navigationRenderers: [ChartViewRenderer] { - return [previewLinesRenderer] - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - chartVisibility = visibility - zoomChartVisibility = visibility - for (index, isVisible) in visibility.enumerated() { - mainLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) - previewLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) - lineBulletsRenerer.setLineVisible(isVisible, at: index, animated: animated) - } - - updateVerticalLimitsAndRange(horizontalRange: currentHorizontalRange, animated: true) - - if isChartInteractionBegun { - chartInteractionDidBegin(point: lastChartInteractionPoint) - } - } - - override func chartInteractionDidBegin(point: CGPoint) { - let horizontalRange = mainLinesRenderer.horizontalRange.current - let chartFrame = self.chartFrame() - guard chartFrame.width > 0 else { return } - let chartInteractionWasBegin = isChartInteractionBegun - - let dateToFind = Date(timeIntervalSince1970: TimeInterval(horizontalRange.distance * point.x + horizontalRange.lowerBound)) - guard let (closestDate, minIndex) = findClosestDateTo(dateToFind: dateToFind) else { return } - - super.chartInteractionDidBegin(point: point) - - self.lineBulletsRenerer.bullets = chartLines.compactMap { chart in - return LineBulletsRenerer.Bullet(coordinate: chart.points[minIndex], color: chart.color) - } - self.lineBulletsRenerer.isEnabled = true - - let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) - let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX - self.setDetailsViewModel?(chartDetailsViewModel(closestDate: closestDate, pointIndex: minIndex), chartInteractionWasBegin) - self.setDetailsChartVisibleClosure?(true, true) - self.setDetailsViewPositionClosure?(detailsViewPosition) - self.verticalLineRenderer.values = [chartValue] - } - - - override var currentChartHorizontalRangeFraction: ClosedRange { - let lowerPercent = (currentHorizontalRange.lowerBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance - let upperPercent = (currentHorizontalRange.upperBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance - return lowerPercent...upperPercent - } - - override var currentHorizontalRange: ClosedRange { - return mainLinesRenderer.horizontalRange.end - } - - override func cancelChartInteraction() { - super.cancelChartInteraction() - self.lineBulletsRenerer.isEnabled = false - - self.setDetailsChartVisibleClosure?(false, true) - self.verticalLineRenderer.values = [] - } - - override func didTapZoomOut() { - cancelChartInteraction() - self.setupChartCollection(chartsCollection: initialChartCollection, animated: true, isZoomed: false) - } - - var visibleCharts: [LinesChartRenderer.LineData] { - let visibleCharts: [LinesChartRenderer.LineData] = chartVisibility.enumerated().compactMap { args in - args.element ? chartLines[args.offset] : nil - } - return visibleCharts - } - - override func updateChartRange(_ rangeFraction: ClosedRange, animated: Bool) { - cancelChartInteraction() - - let horizontalRange = ClosedRange(uncheckedBounds: - (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, - upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) - - zoomedChartRange = horizontalRange - updateChartRangeTitle(animated: true) - - updateMainChartHorizontalRange(range: horizontalRange, animated: false) - updateHorizontalLimists(horizontalRange: horizontalRange, animated: animated) - updateVerticalLimitsAndRange(horizontalRange: horizontalRange, animated: animated) - } - - func updateMainChartHorizontalRange(range: ClosedRange, animated: Bool) { - mainLinesRenderer.setup(horizontalRange: range, animated: animated) - horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) - verticalScalesRenderer.setup(horizontalRange: range, animated: animated) - verticalLineRenderer.setup(horizontalRange: range, animated: animated) - lineBulletsRenerer.setup(horizontalRange: range, animated: animated) - } - - func updateMainChartVerticalRange(range: ClosedRange, animated: Bool) { - mainLinesRenderer.setup(verticalRange: range, animated: animated) - horizontalScalesRenderer.setup(verticalRange: range, animated: animated) - verticalScalesRenderer.setup(verticalRange: range, animated: animated) - verticalLineRenderer.setup(verticalRange: range, animated: animated) - lineBulletsRenerer.setup(verticalRange: range, animated: animated) - } - - func updateHorizontalLimists(horizontalRange: ClosedRange, animated: Bool) { - if let (stride, labels) = horizontalLimitsLabels(horizontalRange: horizontalRange, - scaleType: isZoomed ? .hour : .day, - prevoiusHorizontalStrideInterval: prevoiusHorizontalStrideInterval) { - self.horizontalScalesRenderer.setup(labels: labels, animated: animated) - self.prevoiusHorizontalStrideInterval = stride - } - } - - func updateVerticalLimitsAndRange(horizontalRange: ClosedRange, animated: Bool) { - if let verticalRange = LinesChartRenderer.LineData.verticalRange(lines: visibleCharts, - calculatingRange: horizontalRange, - addBounds: true) { - - - let (range, labels) = verticalLimitsLabels(verticalRange: verticalRange) - - if verticalScalesRenderer.verticalRange.end != range { - verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: animated) - updateMainChartVerticalRange(range: range, animated: animated) - } - verticalScalesRenderer.setVisible(true, animated: animated) - } else { - verticalScalesRenderer.setVisible(false, animated: animated) - } - - guard let previewVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: visibleCharts) else { return } - - if previewLinesRenderer.verticalRange.end != previewVerticalRange { - previewLinesRenderer.setup(verticalRange: previewVerticalRange, animated: animated) - } - } - - override func apply(colorMode: ColorMode, animated: Bool) { - horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor - verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor - lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) - verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift deleted file mode 100644 index a07be6a703..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift +++ /dev/null @@ -1,306 +0,0 @@ -// -// TwoAxisLinesChartController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -private enum Constants { - static let verticalBaseAnchors: [CGFloat] = [8, 5, 4, 2.5, 2, 1] - static let defaultRange: ClosedRange = 0...1 -} - -class TwoAxisLinesChartController: BaseLinesChartController { - class GraphController { - let mainLinesRenderer = LinesChartRenderer() - let verticalScalesRenderer = VerticalScalesRenderer() - let lineBulletsRenerer = LineBulletsRenerer() - let previewLinesRenderer = LinesChartRenderer() - - var chartLines: [LinesChartRenderer.LineData] = [] - - var totalVerticalRange: ClosedRange = Constants.defaultRange - - init() { - self.mainLinesRenderer.lineWidth = 2 - self.previewLinesRenderer.lineWidth = 1 - self.lineBulletsRenerer.isEnabled = false - - self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel - self.previewLinesRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel - } - - func updateMainChartVerticalRange(range: ClosedRange, animated: Bool) { - mainLinesRenderer.setup(verticalRange: range, animated: animated) - verticalScalesRenderer.setup(verticalRange: range, animated: animated) - lineBulletsRenerer.setup(verticalRange: range, animated: animated) - } - } - - private var graphControllers: [GraphController] = [] - private let verticalLineRenderer = VerticalLinesRenderer() - private let horizontalScalesRenderer = HorizontalScalesRenderer() - - var totalHorizontalRange: ClosedRange = Constants.defaultRange - - private let initialChartCollection: ChartsCollection - - private var prevoiusHorizontalStrideInterval: Int = 1 - - override init(chartsCollection: ChartsCollection) { - self.initialChartCollection = chartsCollection - graphControllers = chartsCollection.chartValues.map { _ in GraphController() } - - super.init(chartsCollection: chartsCollection) - self.zoomChartVisibility = chartVisibility - } - - override func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { - super.setupChartCollection(chartsCollection: chartsCollection, animated: animated, isZoomed: isZoomed) - - for (index, controller) in self.graphControllers.enumerated() { - let chart = chartsCollection.chartValues[index] - let points = chart.values.enumerated().map({ (arg) -> CGPoint in - return CGPoint(x: chartsCollection.axisValues[arg.offset].timeIntervalSince1970, - y: arg.element) - }) - let chartLines = [LinesChartRenderer.LineData(color: chart.color, points: points)] - controller.chartLines = [LinesChartRenderer.LineData(color: chart.color, points: points)] - controller.verticalScalesRenderer.labelsColor = chart.color - controller.totalVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: chartLines) ?? Constants.defaultRange - self.totalHorizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: chartLines) ?? Constants.defaultRange - controller.lineBulletsRenerer.bullets = chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, - color: $0.color) } - controller.previewLinesRenderer.setup(horizontalRange: self.totalHorizontalRange, animated: animated) - controller.previewLinesRenderer.setup(verticalRange: controller.totalVerticalRange, animated: animated) - controller.mainLinesRenderer.setLines(lines: chartLines, animated: animated) - controller.previewLinesRenderer.setLines(lines: chartLines, animated: animated) - - controller.verticalScalesRenderer.setHorizontalLinesVisible((index == 0), animated: animated) - controller.verticalScalesRenderer.isRightAligned = (index != 0) - } - - self.prevoiusHorizontalStrideInterval = -1 - - let chartRange: ClosedRange - if isZoomed { - chartRange = zoomedChartRange - } else { - chartRange = initialChartRange - } - - updateHorizontalLimists(horizontalRange: chartRange, animated: animated) - updateMainChartHorizontalRange(range: chartRange, animated: animated) - updateVerticalLimitsAndRange(horizontalRange: chartRange, animated: animated) - - self.chartRangeUpdatedClosure?(currentChartHorizontalRangeFraction, animated) - } - - override func initializeChart() { - if let first = initialChartCollection.axisValues.first?.timeIntervalSince1970, - let last = initialChartCollection.axisValues.last?.timeIntervalSince1970 { - initialChartRange = CGFloat(max(first, last - BaseConstants.defaultRangePresetLength))...CGFloat(last) - } - setupChartCollection(chartsCollection: initialChartCollection, animated: false, isZoomed: false) - } - - override var mainChartRenderers: [ChartViewRenderer] { - return graphControllers.map { $0.mainLinesRenderer } + - graphControllers.flatMap { [$0.verticalScalesRenderer, $0.lineBulletsRenerer] } + - [horizontalScalesRenderer, verticalLineRenderer, -// performanceRenderer - ] - } - - override var navigationRenderers: [ChartViewRenderer] { - return graphControllers.map { $0.previewLinesRenderer } - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - chartVisibility = visibility - zoomChartVisibility = visibility - let firstIndex = visibility.firstIndex(where: { $0 }) - for (index, isVisible) in visibility.enumerated() { - let graph = graphControllers[index] - for graphIndex in graph.chartLines.indices { - graph.mainLinesRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) - graph.previewLinesRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) - graph.lineBulletsRenerer.setLineVisible(isVisible, at: graphIndex, animated: animated) - } - graph.verticalScalesRenderer.setVisible(isVisible, animated: animated) - if let firstIndex = firstIndex { - graph.verticalScalesRenderer.setHorizontalLinesVisible(index == firstIndex, animated: animated) - } - } - - updateVerticalLimitsAndRange(horizontalRange: currentHorizontalRange, animated: true) - - if isChartInteractionBegun { - chartInteractionDidBegin(point: lastChartInteractionPoint) - } - } - - override func chartInteractionDidBegin(point: CGPoint) { - let horizontalRange = currentHorizontalRange - let chartFrame = self.chartFrame() - guard chartFrame.width > 0 else { return } - - let dateToFind = Date(timeIntervalSince1970: TimeInterval(horizontalRange.distance * point.x + horizontalRange.lowerBound)) - guard let (closestDate, minIndex) = findClosestDateTo(dateToFind: dateToFind) else { return } - - let chartInteractionWasBegin = isChartInteractionBegun - super.chartInteractionDidBegin(point: point) - - for graphController in graphControllers { - graphController.lineBulletsRenerer.bullets = graphController.chartLines.map { chart in - LineBulletsRenerer.Bullet(coordinate: chart.points[minIndex], color: chart.color) - } - graphController.lineBulletsRenerer.isEnabled = true - } - - let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) - let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX - self.setDetailsViewModel?(chartDetailsViewModel(closestDate: closestDate, pointIndex: minIndex), chartInteractionWasBegin) - self.setDetailsChartVisibleClosure?(true, true) - self.setDetailsViewPositionClosure?(detailsViewPosition) - self.verticalLineRenderer.values = [chartValue] - } - - override var currentChartHorizontalRangeFraction: ClosedRange { - let lowerPercent = (currentHorizontalRange.lowerBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance - let upperPercent = (currentHorizontalRange.upperBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance - return lowerPercent...upperPercent - } - - override var currentHorizontalRange: ClosedRange { - return graphControllers.first?.mainLinesRenderer.horizontalRange.end ?? Constants.defaultRange - } - - override func cancelChartInteraction() { - super.cancelChartInteraction() - for graphController in graphControllers { - graphController.lineBulletsRenerer.isEnabled = false - } - - self.setDetailsChartVisibleClosure?(false, true) - self.verticalLineRenderer.values = [] - } - - override func didTapZoomOut() { - cancelChartInteraction() - self.setupChartCollection(chartsCollection: initialChartCollection, animated: true, isZoomed: false) - } - - override func updateChartRange(_ rangeFraction: ClosedRange, animated: Bool) { - cancelChartInteraction() - - let horizontalRange = ClosedRange(uncheckedBounds: - (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, - upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) - - zoomedChartRange = horizontalRange - updateChartRangeTitle(animated: true) - - updateMainChartHorizontalRange(range: horizontalRange, animated: false) - updateHorizontalLimists(horizontalRange: horizontalRange, animated: animated) - updateVerticalLimitsAndRange(horizontalRange: horizontalRange, animated: animated) - } - - func updateMainChartHorizontalRange(range: ClosedRange, animated: Bool) { - for controller in graphControllers { - controller.mainLinesRenderer.setup(horizontalRange: range, animated: animated) - controller.verticalScalesRenderer.setup(horizontalRange: range, animated: animated) - controller.lineBulletsRenerer.setup(horizontalRange: range, animated: animated) - } - horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) - verticalLineRenderer.setup(horizontalRange: range, animated: animated) - } - - func updateHorizontalLimists(horizontalRange: ClosedRange, animated: Bool) { - if let (stride, labels) = horizontalLimitsLabels(horizontalRange: horizontalRange, - scaleType: isZoomed ? .hour : .day, - prevoiusHorizontalStrideInterval: prevoiusHorizontalStrideInterval) { - self.horizontalScalesRenderer.setup(labels: labels, animated: animated) - self.prevoiusHorizontalStrideInterval = stride - } - } - - func updateVerticalLimitsAndRange(horizontalRange: ClosedRange, animated: Bool) { - let chartHeight = chartFrame().height - let approximateNumberOfChartValues = (chartHeight / BaseConstants.minimumAxisYLabelsDistance) - - var dividorsAndMultiplers: [(startValue: CGFloat, base: CGFloat, count: Int, maximumNumberOfDecimals: Int)] = graphControllers.enumerated().map { arg in - let (index, controller) = arg - let verticalRange = LinesChartRenderer.LineData.verticalRange(lines: controller.chartLines, - calculatingRange: horizontalRange, - addBounds: true) ?? controller.totalVerticalRange - - var numberOfOffsetsPerItem = verticalRange.distance / approximateNumberOfChartValues - - var multiplier: CGFloat = 1.0 - while numberOfOffsetsPerItem > 10 { - numberOfOffsetsPerItem /= 10 - multiplier *= 10 - } - var dividor: CGFloat = 1.0 - var maximumNumberOfDecimals = 2 - while numberOfOffsetsPerItem < 1 { - numberOfOffsetsPerItem *= 10 - dividor *= 10 - maximumNumberOfDecimals += 1 - } - - let generalBase = Constants.verticalBaseAnchors.first { numberOfOffsetsPerItem > $0 } ?? BaseConstants.defaultVerticalBaseAnchor - let base = generalBase * multiplier / dividor - - var verticalValue = (verticalRange.lowerBound / base).rounded(.down) * base - let startValue = verticalValue - var count = 0 - if chartVisibility[index] { - while verticalValue < verticalRange.upperBound { - count += 1 - verticalValue += base - } - } - return (startValue: startValue, base: base, count: count, maximumNumberOfDecimals: maximumNumberOfDecimals) - } - - let totalCount = dividorsAndMultiplers.map { $0.count }.max() ?? 0 - guard totalCount > 0 else { return } - - let numberFormatter = BaseConstants.chartNumberFormatter - for (index, controller) in graphControllers.enumerated() { - - let (startValue, base, _, maximumNumberOfDecimals) = dividorsAndMultiplers[index] - - let updatedRange = startValue...(startValue + base * CGFloat(totalCount)) - if controller.verticalScalesRenderer.verticalRange.end != updatedRange { - numberFormatter.maximumFractionDigits = maximumNumberOfDecimals - - var verticalLabels: [LinesChartLabel] = [] - for multipler in 0...(totalCount - 1) { - let verticalValue = startValue + base * CGFloat(multipler) - let text: String = numberFormatter.string(from: NSNumber(value: Double(verticalValue))) ?? "" - verticalLabels.append(LinesChartLabel(value: verticalValue, text: text)) - } - - controller.verticalScalesRenderer.setup(verticalLimitsLabels: verticalLabels, animated: animated) - controller.updateMainChartVerticalRange(range: updatedRange, animated: animated) - } - } - } - - override func apply(colorMode: ColorMode, animated: Bool) { - horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor - - for controller in graphControllers { - controller.verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor - controller.lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) - controller.verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor - } - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift deleted file mode 100644 index d75ba09d91..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift +++ /dev/null @@ -1,195 +0,0 @@ -// -// PercentChartComponentController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/14/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class PercentChartComponentController: GeneralChartComponentController { - let mainPecentChartRenderer: PecentChartRenderer - let horizontalScalesRenderer: HorizontalScalesRenderer - let verticalScalesRenderer: VerticalScalesRenderer - let verticalLineRenderer: VerticalLinesRenderer - let previewPercentChartRenderer: PecentChartRenderer - var percentageData: PecentChartRenderer.PercentageData = .blank - - init(isZoomed: Bool, - mainPecentChartRenderer: PecentChartRenderer, - horizontalScalesRenderer: HorizontalScalesRenderer, - verticalScalesRenderer: VerticalScalesRenderer, - verticalLineRenderer: VerticalLinesRenderer, - previewPercentChartRenderer: PecentChartRenderer) { - self.mainPecentChartRenderer = mainPecentChartRenderer - self.horizontalScalesRenderer = horizontalScalesRenderer - self.verticalScalesRenderer = verticalScalesRenderer - self.verticalLineRenderer = verticalLineRenderer - self.previewPercentChartRenderer = previewPercentChartRenderer - - super.init(isZoomed: isZoomed) - } - - override func initialize(chartsCollection: ChartsCollection, initialDate: Date, totalHorizontalRange _: ClosedRange, totalVerticalRange _: ClosedRange) { - let components = chartsCollection.chartValues.map { PecentChartRenderer.PercentageData.Component(color: $0.color, - values: $0.values.map { CGFloat($0) }) } - self.percentageData = PecentChartRenderer.PercentageData(locations: chartsCollection.axisValues.map { CGFloat($0.timeIntervalSince1970) }, - components: components) - let totalHorizontalRange = PecentChartRenderer.PercentageData.horizontalRange(data: self.percentageData) ?? BaseConstants.defaultRange - let totalVerticalRange = BaseConstants.defaultRange - - super.initialize(chartsCollection: chartsCollection, - initialDate: initialDate, - totalHorizontalRange: totalHorizontalRange, - totalVerticalRange: totalVerticalRange) - - mainPecentChartRenderer.percentageData = self.percentageData - previewPercentChartRenderer.percentageData = self.percentageData - - let axisValues: [CGFloat] = [0, 25, 50, 75, 100] - let labels: [LinesChartLabel] = axisValues.map { value in - return LinesChartLabel(value: value / 100, text: BaseConstants.detailsNumberFormatter.string(from: NSNumber(value: Double(value))) ?? "") - } - verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: false) - - setupMainChart(horizontalRange: initialHorizontalRange, animated: false) - setupMainChart(verticalRange: initialVerticalRange, animated: false) - previewPercentChartRenderer.setup(verticalRange: totalVerticalRange, animated: false) - previewPercentChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: false) - updateHorizontalLimitLabels(animated: false) - } - - override func willAppear(animated: Bool) { - previewPercentChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) - previewPercentChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) - - setConponentsVisible(visible: true, animated: true) - - setupMainChart(verticalRange: initialVerticalRange, animated: animated) - setupMainChart(horizontalRange: initialHorizontalRange, animated: animated) - - updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) - - super.willAppear(animated: animated) - } - - override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { - super.chartRangeDidUpdated(updatedRange) - - initialHorizontalRange = updatedRange - setupMainChart(horizontalRange: updatedRange, animated: false) - updateHorizontalLimitLabels(animated: true) - } - - func updateHorizontalLimitLabels(animated: Bool) { - updateHorizontalLimitLabels(horizontalScalesRenderer: horizontalScalesRenderer, - horizontalRange: initialHorizontalRange, - scaleType: isZoomed ? .hour : .day, - forceUpdate: false, - animated: animated) - } - - func prepareAppearanceAnimation(horizontalRnage: ClosedRange) { - setupMainChart(horizontalRange: horizontalRnage, animated: false) - setConponentsVisible(visible: false, animated: false) - } - - func setConponentsVisible(visible: Bool, animated: Bool) { - mainPecentChartRenderer.setVisible(visible, animated: animated) - horizontalScalesRenderer.setVisible(visible, animated: animated) - verticalScalesRenderer.setVisible(visible, animated: animated) - verticalLineRenderer.setVisible(visible, animated: animated) - previewPercentChartRenderer.setVisible(visible, animated: animated) - } - - func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { - mainPecentChartRenderer.setup(horizontalRange: horizontalRange, animated: animated) - horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) - verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) - verticalLineRenderer.setup(horizontalRange: horizontalRange, animated: animated) - } - - func setupMainChart(verticalRange: ClosedRange, animated: Bool) { - mainPecentChartRenderer.setup(verticalRange: verticalRange, animated: animated) - horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) - verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) - verticalLineRenderer.setup(verticalRange: verticalRange, animated: animated) - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - super.updateChartsVisibility(visibility: visibility, animated: animated) - for (index, isVisible) in visibility.enumerated() { - mainPecentChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) - previewPercentChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) - } - verticalScalesRenderer.setVisible(visibility.contains(true), animated: animated) - } - - override func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { - let visibleValues = visibleDetailsChartValues - - let total = visibleValues.map { $0.values[pointIndex] }.reduce(0, +) - - let values: [ChartDetailsViewModel.Value] = chartsCollection.chartValues.enumerated().map { arg in - let (index, component) = arg - return ChartDetailsViewModel.Value(prefix: PercentConstants.percentValueFormatter.string(from: component.values[pointIndex] / total * 100), - title: component.name, - value: BaseConstants.detailsNumberFormatter.string(from: component.values[pointIndex]), - color: component.color, - visible: chartVisibility[index]) - } - let dateString: String - if isZoomed { - dateString = BaseConstants.timeDateFormatter.string(from: closestDate) - } else { - dateString = BaseConstants.headerMediumRangeFormatter.string(from: closestDate) - } - let viewModel = ChartDetailsViewModel(title: dateString, - showArrow: !self.isZoomed, - showPrefixes: true, - values: values, - totalValue: nil, - tapAction: { [weak self] in - self?.hideDetailsView(animated: true) - self?.zoomInOnDateClosure?(closestDate) }) - return viewModel - } - - var currentlyVisiblePercentageData: PecentChartRenderer.PercentageData { - var currentPercentageData = percentageData - currentPercentageData.components = chartVisibility.enumerated().compactMap { $0.element ? currentPercentageData.components[$0.offset] : nil } - return currentPercentageData - } - - override var currentMainRangeRenderer: BaseChartRenderer { - return mainPecentChartRenderer - } - - override var currentPreviewRangeRenderer: BaseChartRenderer { - return previewPercentChartRenderer - } - - override func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { - super.showDetailsView(at: chartPosition, detailsViewPosition: detailsViewPosition, dataIndex: dataIndex, date: date, animted: animted) - verticalLineRenderer.values = [chartPosition] - verticalLineRenderer.isEnabled = true - } - - override func hideDetailsView(animated: Bool) { - super.hideDetailsView(animated: animated) - - verticalLineRenderer.values = [] - verticalLineRenderer.isEnabled = false - } - - override func apply(colorMode: ColorMode, animated: Bool) { - super.apply(colorMode: colorMode, animated: animated) - - horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.axisXColor = colorMode.barChartStrongLinesColor - verticalScalesRenderer.horizontalLinesColor = colorMode.barChartStrongLinesColor - verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift deleted file mode 100644 index b5df648b11..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift +++ /dev/null @@ -1,281 +0,0 @@ -// -// PercentPieChartController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -enum PercentConstants { - static let percentValueFormatter: NumberFormatter = { - let formatter = NumberFormatter() - formatter.positiveSuffix = "%" - return formatter - }() -} - -private enum Constants { - static let zoomedRange = 7 -} - -class PercentPieChartController: BaseChartController { - let percentController: PercentChartComponentController - let pieController: PieChartComponentController - let transitionRenderer: PercentPieAnimationRenderer - - override init(chartsCollection: ChartsCollection) { - transitionRenderer = PercentPieAnimationRenderer() - percentController = PercentChartComponentController(isZoomed: false, - mainPecentChartRenderer: PecentChartRenderer(), - horizontalScalesRenderer: HorizontalScalesRenderer(), - verticalScalesRenderer: VerticalScalesRenderer(), - verticalLineRenderer: VerticalLinesRenderer(), - previewPercentChartRenderer: PecentChartRenderer()) - pieController = PieChartComponentController(isZoomed: true, - pieChartRenderer: PieChartRenderer(), - previewBarChartRenderer: BarChartRenderer()) - - super.init(chartsCollection: chartsCollection) - - [percentController, pieController].forEach { controller in - controller.chartFrame = { [unowned self] in self.chartFrame() } - controller.cartViewBounds = { [unowned self] in self.cartViewBounds() } - controller.zoomInOnDateClosure = { [unowned self] date in - self.didTapZoomIn(date: date) - } - controller.setChartTitleClosure = { [unowned self] (title, animated) in - self.setChartTitleClosure?(title, animated) - } - controller.setDetailsViewPositionClosure = { [unowned self] (position) in - self.setDetailsViewPositionClosure?(position) - } - controller.setDetailsChartVisibleClosure = { [unowned self] (visible, animated) in - self.setDetailsChartVisibleClosure?(visible, animated) - } - controller.setDetailsViewModel = { [unowned self] (viewModel, animated) in - self.setDetailsViewModel?(viewModel, animated) - } - controller.updatePreviewRangeClosure = { [unowned self] (fraction, animated) in - self.chartRangeUpdatedClosure?(fraction, animated) - } - controller.chartRangePagingClosure = { [unowned self] (isEnabled, pageSize) in - self.setChartRangePagingEnabled(isEnabled: isEnabled, minimumSelectionSize: pageSize) - } - } - transitionRenderer.isEnabled = false - } - - override var mainChartRenderers: [ChartViewRenderer] { - return [percentController.mainPecentChartRenderer, - transitionRenderer, - percentController.horizontalScalesRenderer, - percentController.verticalScalesRenderer, - percentController.verticalLineRenderer, - pieController.pieChartRenderer, -// performanceRenderer - ] - } - - override var navigationRenderers: [ChartViewRenderer] { - return [percentController.previewPercentChartRenderer, - pieController.previewBarChartRenderer] - } - - override func initializeChart() { - percentController.initialize(chartsCollection: initialChartsCollection, - initialDate: Date(), - totalHorizontalRange: BaseConstants.defaultRange, - totalVerticalRange: BaseConstants.defaultRange) - switchToChart(chartsCollection: percentController.chartsCollection, isZoomed: false, animated: false) - } - - func switchToChart(chartsCollection: ChartsCollection, isZoomed: Bool, animated: Bool) { - if animated { - TimeInterval.setDefaultDuration(.expandAnimationDuration) - DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { - TimeInterval.setDefaultDuration(.osXDuration) - } - } - - super.isZoomed = isZoomed - if isZoomed { - let toHorizontalRange = pieController.initialHorizontalRange - - pieController.updateChartsVisibility(visibility: percentController.chartVisibility, animated: false) - pieController.pieChartRenderer.setup(horizontalRange: percentController.currentHorizontalMainChartRange, animated: false) - pieController.previewBarChartRenderer.setup(horizontalRange: percentController.currentPreviewHorizontalRange, animated: false) - pieController.pieChartRenderer.setVisible(false, animated: false) - pieController.previewBarChartRenderer.setVisible(true, animated: false) - - pieController.willAppear(animated: animated) - percentController.willDisappear(animated: animated) - - pieController.pieChartRenderer.drawPie = false - percentController.mainPecentChartRenderer.isEnabled = false - - setupTransitionRenderer() - - percentController.setupMainChart(horizontalRange: toHorizontalRange, animated: animated) - percentController.previewPercentChartRenderer.setup(horizontalRange: toHorizontalRange, animated: animated) - percentController.setConponentsVisible(visible: false, animated: animated) - - transitionRenderer.animate(fromDataToPie: true, animated: animated) { [weak self] in - self?.pieController.pieChartRenderer.drawPie = true - self?.percentController.mainPecentChartRenderer.isEnabled = true - } - } else { - if !pieController.chartsCollection.isBlank { - let fromHorizontalRange = pieController.currentHorizontalMainChartRange - let toHorizontalRange = percentController.initialHorizontalRange - - pieController.pieChartRenderer.setup(horizontalRange: toHorizontalRange, animated: animated) - pieController.previewBarChartRenderer.setup(horizontalRange: toHorizontalRange, animated: animated) - pieController.pieChartRenderer.setVisible(false, animated: animated) - pieController.previewBarChartRenderer.setVisible(false, animated: animated) - - percentController.updateChartsVisibility(visibility: pieController.chartVisibility, animated: false) - percentController.setupMainChart(horizontalRange: fromHorizontalRange, animated: false) - percentController.previewPercentChartRenderer.setup(horizontalRange: fromHorizontalRange, animated: false) - percentController.setConponentsVisible(visible: false, animated: false) - } - - percentController.willAppear(animated: animated) - pieController.willDisappear(animated: animated) - - if animated { - pieController.pieChartRenderer.drawPie = false - percentController.mainPecentChartRenderer.isEnabled = false - - setupTransitionRenderer() - - transitionRenderer.animate(fromDataToPie: false, animated: true) { - self.pieController.pieChartRenderer.drawPie = true - self.percentController.mainPecentChartRenderer.isEnabled = true - } - } - } - - self.setBackButtonVisibilityClosure?(isZoomed, animated) - } - - func setupTransitionRenderer() { - transitionRenderer.setup(verticalRange: percentController.currentVerticalMainChartRange, animated: false) - transitionRenderer.setup(horizontalRange: percentController.currentHorizontalMainChartRange, animated: false) - transitionRenderer.visiblePieComponents = pieController.visiblePieDataWithCurrentPreviewRange - transitionRenderer.visiblePercentageData = percentController.currentlyVisiblePercentageData - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - if isZoomed { - pieController.updateChartsVisibility(visibility: visibility, animated: animated) - } else { - percentController.updateChartsVisibility(visibility: visibility, animated: animated) - } - } - - var visibleChartValues: [ChartsCollection.Chart] { - let visibility = isZoomed ? pieController.chartVisibility : percentController.chartVisibility - let collection = isZoomed ? pieController.chartsCollection : percentController.chartsCollection - let visibleCharts: [ChartsCollection.Chart] = visibility.enumerated().compactMap { args in - args.element ? collection.chartValues[args.offset] : nil - } - return visibleCharts - } - - override var actualChartVisibility: [Bool] { - return isZoomed ? pieController.chartVisibility : percentController.chartVisibility - } - - override var actualChartsCollection: ChartsCollection { - return isZoomed ? pieController.chartsCollection : percentController.chartsCollection - } - - override func chartInteractionDidBegin(point: CGPoint) { - if isZoomed { - pieController.chartInteractionDidBegin(point: point) - } else { - percentController.chartInteractionDidBegin(point: point) - } - } - - override func chartInteractionDidEnd() { - if isZoomed { - pieController.chartInteractionDidEnd() - } else { - percentController.chartInteractionDidEnd() - } - } - - override var drawChartVisibity: Bool { - return true - } - - override var currentChartHorizontalRangeFraction: ClosedRange { - if isZoomed { - return pieController.currentChartHorizontalRangeFraction - } else { - return percentController.currentChartHorizontalRangeFraction - } - } - - override func cancelChartInteraction() { - if isZoomed { - return pieController.hideDetailsView(animated: true) - } else { - return percentController.hideDetailsView(animated: true) - } - } - - override func didTapZoomIn(date: Date) { - guard isZoomed == false else { return } - cancelChartInteraction() - let currentCollection = percentController.chartsCollection - let range: Int = Constants.zoomedRange - guard let (foundDate, index) = percentController.findClosestDateTo(dateToFind: date) else { return } - var lowIndex = max(0, index - range / 2) - var highIndex = min(currentCollection.axisValues.count - 1, index + range / 2) - if lowIndex == 0 { - highIndex = lowIndex + (range - 1) - } else if highIndex == currentCollection.axisValues.count - 1 { - lowIndex = highIndex - (range - 1) - } - - let newValues = currentCollection.chartValues.map { chart in - return ChartsCollection.Chart(color: chart.color, - name: chart.name, - values: Array(chart.values[(lowIndex...highIndex)])) - } - let newCollection = ChartsCollection(axisValues: Array(currentCollection.axisValues[(lowIndex...highIndex)]), - chartValues: newValues) - let selectedRange = CGFloat(foundDate.timeIntervalSince1970 - .day)...CGFloat(foundDate.timeIntervalSince1970) - pieController.initialize(chartsCollection: newCollection, initialDate: date, totalHorizontalRange: 0...1, totalVerticalRange: 0...1) - pieController.initialHorizontalRange = selectedRange - - switchToChart(chartsCollection: newCollection, isZoomed: true, animated: true) - } - - override func didTapZoomOut() { - self.pieController.deselectSegment(completion: { [weak self] in - guard let self = self else { return } - self.switchToChart(chartsCollection: self.percentController.chartsCollection, isZoomed: false, animated: true) - }) - } - - override func updateChartRange(_ rangeFraction: ClosedRange, animated: Bool) { - if isZoomed { - return pieController.chartRangeFractionDidUpdated(rangeFraction) - } else { - return percentController.chartRangeFractionDidUpdated(rangeFraction) - } - } - - override func apply(colorMode: ColorMode, animated: Bool) { - super.apply(colorMode: colorMode, animated: animated) - - pieController.apply(colorMode: colorMode, animated: animated) - percentController.apply(colorMode: colorMode, animated: animated) - transitionRenderer.backgroundColor = colorMode.chartBackgroundColor - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift deleted file mode 100644 index 68c3541912..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift +++ /dev/null @@ -1,198 +0,0 @@ -// -// PieChartComponentController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/14/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class PieChartComponentController: GeneralChartComponentController { - let pieChartRenderer: PieChartRenderer - let previewBarChartRenderer: BarChartRenderer - var barWidth: CGFloat = 1 - - var chartBars: BarChartRenderer.BarsData = .blank - - init(isZoomed: Bool, - pieChartRenderer: PieChartRenderer, - previewBarChartRenderer: BarChartRenderer) { - self.pieChartRenderer = pieChartRenderer - self.previewBarChartRenderer = previewBarChartRenderer - super.init(isZoomed: isZoomed) - } - - override func initialize(chartsCollection: ChartsCollection, initialDate: Date, totalHorizontalRange _: ClosedRange, totalVerticalRange _: ClosedRange) { - let (width, chartBars, totalHorizontalRange, _) = BarChartRenderer.BarsData.initialComponents(chartsCollection: chartsCollection) - self.barWidth = width - self.chartBars = chartBars - super.initialize(chartsCollection: chartsCollection, - initialDate: initialDate, - totalHorizontalRange: totalHorizontalRange, - totalVerticalRange: BaseConstants.defaultRange) - - self.previewBarChartRenderer.bars = chartBars - self.previewBarChartRenderer.fillToTop = true - - pieChartRenderer.valuesFormatter = PercentConstants.percentValueFormatter - pieChartRenderer.setup(horizontalRange: initialHorizontalRange, animated: false) - previewBarChartRenderer.setup(verticalRange: initialVerticalRange, animated: false) - previewBarChartRenderer.setup(horizontalRange: initialHorizontalRange, animated: false) - - pieChartRenderer.updatePercentageData(pieDataWithCurrentPreviewRange, animated: false) - pieChartRenderer.selectSegmentAt(at: nil, animated: false) - } - - private var pieDataWithCurrentPreviewRange: [PieChartRenderer.PieComponent] { - let range = currentHorizontalMainChartRange - var pieComponents = chartsCollection.chartValues.map { PieChartRenderer.PieComponent(color: $0.color, - value: 0) } - guard var valueIndex = chartsCollection.axisValues.firstIndex(where: { CGFloat($0.timeIntervalSince1970) > (range.lowerBound + 1)}) else { - return pieComponents - } - var count = 0 - while valueIndex < chartsCollection.axisValues.count, CGFloat(chartsCollection.axisValues[valueIndex].timeIntervalSince1970) <= range.upperBound { - count += 1 - for pieIndex in pieComponents.indices { - pieComponents[pieIndex].value += CGFloat(chartsCollection.chartValues[pieIndex].values[valueIndex]) - } - valueIndex += 1 - } - return pieComponents - } - - var visiblePieDataWithCurrentPreviewRange: [PieChartRenderer.PieComponent] { - let currentData = pieDataWithCurrentPreviewRange - return chartVisibility.enumerated().compactMap { $0.element ? currentData[$0.offset] : nil } - } - - override func willAppear(animated: Bool) { - pieChartRenderer.setup(horizontalRange: initialHorizontalRange, animated: animated) - pieChartRenderer.setVisible(true, animated: animated) - - previewBarChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) - previewBarChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) - previewBarChartRenderer.setVisible(true, animated: animated) - - updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) - pieChartRenderer.updatePercentageData(pieDataWithCurrentPreviewRange, animated: false) - - super.willAppear(animated: animated) - } - - override func setupChartRangePaging() { - let valuesCount = chartsCollection.axisValues.count - guard valuesCount > 0 else { return } - chartRangePagingClosure?(true, 1.0 / CGFloat(valuesCount)) - } - - override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { - if isChartInteractionBegun { - chartInteractionDidBegin(point: lastChartInteractionPoint) - } - initialHorizontalRange = updatedRange - - setupMainChart(horizontalRange: updatedRange, animated: true) - updateSelectedDataLabelIfNeeded() - } - - func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { - pieChartRenderer.setup(horizontalRange: horizontalRange, animated: animated) - pieChartRenderer.updatePercentageData(pieDataWithCurrentPreviewRange, animated: animated) - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - super.updateChartsVisibility(visibility: visibility, animated: animated) - for (index, isVisible) in visibility.enumerated() { - pieChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) - previewBarChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) - } - if let segment = pieChartRenderer.selectedSegment { - if !visibility[segment] { - pieChartRenderer.selectSegmentAt(at: nil, animated: true) - } - } - updateSelectedDataLabelIfNeeded() - } - - func deselectSegment(completion: @escaping () -> Void) { - if pieChartRenderer.hasSelectedSegments { - hideDetailsView(animated: true) - pieChartRenderer.selectSegmentAt(at: nil, animated: true) - DispatchQueue.main.asyncAfter(deadline: .now() + .defaultDuration / 2) { - completion() - } - } else { - completion() - } - } - - func updateSelectedDataLabelIfNeeded() { - if let segment = pieChartRenderer.selectedSegment { - self.setDetailsChartVisibleClosure?(true, true) - self.setDetailsViewModel?(chartDetailsViewModel(segmentInde: segment), false) - self.setDetailsViewPositionClosure?(chartFrame().width / 4) - } else { - self.setDetailsChartVisibleClosure?(false, true) - } - } - - func chartDetailsViewModel(segmentInde: Int) -> ChartDetailsViewModel { - let pieItem = pieDataWithCurrentPreviewRange[segmentInde] - let title = chartsCollection.chartValues[segmentInde].name - let valueString = BaseConstants.detailsNumberFormatter.string(from: pieItem.value) - let viewModel = ChartDetailsViewModel(title: "", - showArrow: false, - showPrefixes: false, - values: [ChartDetailsViewModel.Value(prefix: nil, - title: title, - value: valueString, - color: pieItem.color, - visible: true)], - totalValue: nil, - tapAction: nil) - return viewModel - } - - override var currentMainRangeRenderer: BaseChartRenderer { - return pieChartRenderer - } - - override var currentPreviewRangeRenderer: BaseChartRenderer { - return previewBarChartRenderer - } - - var lastInteractionPoint: CGPoint = .zero - override func chartInteractionDidBegin(point: CGPoint) { - lastInteractionPoint = point - } - - override func chartInteractionDidEnd() { - if let segment = pieChartRenderer.selectedItemIndex(at: lastInteractionPoint) { - if pieChartRenderer.selectedSegment == segment { - pieChartRenderer.selectSegmentAt(at: nil, animated: true) - } else { - pieChartRenderer.selectSegmentAt(at: segment, animated: true) - } - updateSelectedDataLabelIfNeeded() - } - } - - override func hideDetailsView(animated: Bool) { - pieChartRenderer.selectSegmentAt(at: nil, animated: animated) - updateSelectedDataLabelIfNeeded() - } - - override func updateChartRangeTitle(animated: Bool) { - let fromDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.lowerBound) + .day + 1) - let toDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.upperBound)) - if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { - let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) - self.setChartTitleClosure?(stirng, animated) - } else { - let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" - self.setChartTitleClosure?(stirng, animated) - } - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift deleted file mode 100644 index 2e1894465b..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift +++ /dev/null @@ -1,226 +0,0 @@ -// -// BarsComponentController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/14/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class BarsComponentController: GeneralChartComponentController { - let mainBarsRenderer: BarChartRenderer - let horizontalScalesRenderer: HorizontalScalesRenderer - let verticalScalesRenderer: VerticalScalesRenderer - - let previewBarsChartRenderer: BarChartRenderer - private(set) var barsWidth: CGFloat = 1 - - private (set) var chartBars: BarChartRenderer.BarsData = .blank - - init(isZoomed: Bool, - mainBarsRenderer: BarChartRenderer, - horizontalScalesRenderer: HorizontalScalesRenderer, - verticalScalesRenderer: VerticalScalesRenderer, - previewBarsChartRenderer: BarChartRenderer) { - self.mainBarsRenderer = mainBarsRenderer - self.horizontalScalesRenderer = horizontalScalesRenderer - self.verticalScalesRenderer = verticalScalesRenderer - self.previewBarsChartRenderer = previewBarsChartRenderer - - self.mainBarsRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel - self.previewBarsChartRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel - - super.init(isZoomed: isZoomed) - } - - override func initialize(chartsCollection: ChartsCollection, initialDate: Date, totalHorizontalRange _: ClosedRange, totalVerticalRange _: ClosedRange) { - let (width, chartBars, totalHorizontalRange, totalVerticalRange) = BarChartRenderer.BarsData.initialComponents(chartsCollection: chartsCollection) - self.chartBars = chartBars - self.barsWidth = width - - super.initialize(chartsCollection: chartsCollection, - initialDate: initialDate, - totalHorizontalRange: totalHorizontalRange, - totalVerticalRange: totalVerticalRange) - } - - override func setupInitialChartRange(initialDate: Date) { - guard let first = chartsCollection.axisValues.first?.timeIntervalSince1970, - let last = chartsCollection.axisValues.last?.timeIntervalSince1970 else { return } - - let rangeStart = CGFloat(first) - let rangeEnd = CGFloat(last) - - if isZoomed { - let initalDate = CGFloat(initialDate.timeIntervalSince1970) - - initialHorizontalRange = max(initalDate - barsWidth, rangeStart)...min(initalDate + GeneralChartComponentConstants.defaultZoomedRangeLength - barsWidth, rangeEnd) - initialVerticalRange = totalVerticalRange - } else { - super.setupInitialChartRange(initialDate: initialDate) - } - } - - - override func willAppear(animated: Bool) { - mainBarsRenderer.bars = self.chartBars - previewBarsChartRenderer.bars = self.chartBars - - previewBarsChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) - previewBarsChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) - - setupMainChart(verticalRange: initialVerticalRange, animated: animated) - setupMainChart(horizontalRange: initialHorizontalRange, animated: animated) - - updateChartVerticalRanges(horizontalRange: initialHorizontalRange, animated: animated) - - super.willAppear(animated: animated) - - updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) - setConponentsVisible(visible: true, animated: animated) - updateHorizontalLimitLabels(animated: animated, forceUpdate: true) - } - - override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { - super.chartRangeDidUpdated(updatedRange) - if !isZoomed { - initialHorizontalRange = updatedRange - } - setupMainChart(horizontalRange: updatedRange, animated: false) - updateHorizontalLimitLabels(animated: true, forceUpdate: false) - updateChartVerticalRanges(horizontalRange: updatedRange, animated: true) - } - - func updateHorizontalLimitLabels(animated: Bool, forceUpdate: Bool) { - updateHorizontalLimitLabels(horizontalScalesRenderer: horizontalScalesRenderer, - horizontalRange: currentHorizontalMainChartRange, - scaleType: isZoomed ? .hour : .day, - forceUpdate: forceUpdate, - animated: animated) - } - - func prepareAppearanceAnimation(horizontalRnage: ClosedRange) { - setupMainChart(horizontalRange: horizontalRnage, animated: false) - setConponentsVisible(visible: false, animated: false) - } - - func setConponentsVisible(visible: Bool, animated: Bool) { - mainBarsRenderer.setVisible(visible, animated: animated) - horizontalScalesRenderer.setVisible(visible, animated: animated) - verticalScalesRenderer.setVisible(visible, animated: animated) - previewBarsChartRenderer.setVisible(visible, animated: animated) - } - - func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { - mainBarsRenderer.setup(horizontalRange: horizontalRange, animated: animated) - horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) - verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) - } - - var visibleBars: BarChartRenderer.BarsData { - let visibleComponents: [BarChartRenderer.BarsData.Component] = chartVisibility.enumerated().compactMap { args in - args.element ? chartBars.components[args.offset] : nil - } - return BarChartRenderer.BarsData(barWidth: chartBars.barWidth, - locations: chartBars.locations, - components: visibleComponents) - } - - func updateChartVerticalRanges(horizontalRange: ClosedRange, animated: Bool) { - if let range = BarChartRenderer.BarsData.verticalRange(bars: visibleBars, - calculatingRange: horizontalRange, - addBounds: true) { - let (range, labels) = verticalLimitsLabels(verticalRange: range) - if verticalScalesRenderer.verticalRange.end != range { - verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: animated) - } - verticalScalesRenderer.setVisible(true, animated: animated) - - setupMainChart(verticalRange: range, animated: animated) - } else { - verticalScalesRenderer.setVisible(false, animated: animated) - } - - if let range = BarChartRenderer.BarsData.verticalRange(bars: visibleBars) { - previewBarsChartRenderer.setup(verticalRange: range, animated: animated) - } - } - - func setupMainChart(verticalRange: ClosedRange, animated: Bool) { - mainBarsRenderer.setup(verticalRange: verticalRange, animated: animated) - horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) - verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - super.updateChartsVisibility(visibility: visibility, animated: animated) - for (index, isVisible) in visibility.enumerated() { - mainBarsRenderer.setComponentVisible(isVisible, at: index, animated: animated) - previewBarsChartRenderer.setComponentVisible(isVisible, at: index, animated: animated) - } - updateChartVerticalRanges(horizontalRange: currentHorizontalMainChartRange, animated: true) - } - - var visibleChartValues: [ChartsCollection.Chart] { - let visibleCharts: [ChartsCollection.Chart] = chartVisibility.enumerated().compactMap { args in - args.element ? chartsCollection.chartValues[args.offset] : nil - } - return visibleCharts - } - - override func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { - var viewModel = super.chartDetailsViewModel(closestDate: closestDate, pointIndex: pointIndex) - let visibleChartValues = self.visibleChartValues - let totalSumm: CGFloat = visibleChartValues.map { CGFloat($0.values[pointIndex]) }.reduce(0, +) - - viewModel.totalValue = ChartDetailsViewModel.Value(prefix: nil, - title: "Total", - value: BaseConstants.detailsNumberFormatter.string(from: totalSumm), - color: .white, - visible: visibleChartValues.count > 1) - return viewModel - } - - override var currentMainRangeRenderer: BaseChartRenderer { - return mainBarsRenderer - } - - override var currentPreviewRangeRenderer: BaseChartRenderer { - return previewBarsChartRenderer - } - - override func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { - let rangeWithOffset = detailsViewPosition - barsWidth / currentHorizontalMainChartRange.distance * chartFrame().width / 2 - super.showDetailsView(at: chartPosition, detailsViewPosition: rangeWithOffset, dataIndex: dataIndex, date: date, animted: animted) - mainBarsRenderer.setSelectedIndex(dataIndex, animated: true) - } - - override func hideDetailsView(animated: Bool) { - super.hideDetailsView(animated: animated) - - mainBarsRenderer.setSelectedIndex(nil, animated: animated) - } - override func apply(colorMode: ColorMode, animated: Bool) { - super.apply(colorMode: colorMode, animated: animated) - - horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.axisXColor = colorMode.barChartStrongLinesColor - verticalScalesRenderer.horizontalLinesColor = colorMode.barChartStrongLinesColor - mainBarsRenderer.update(backgroundColor: colorMode.chartBackgroundColor, animated: false) - previewBarsChartRenderer.update(backgroundColor: colorMode.chartBackgroundColor, animated: false) - } - - override func updateChartRangeTitle(animated: Bool) { - let fromDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.lowerBound + barsWidth)) - let toDate = Date(timeIntervalSince1970: TimeInterval(currentHorizontalMainChartRange.upperBound)) - if Calendar.utc.startOfDay(for: fromDate) == Calendar.utc.startOfDay(for: toDate) { - let stirng = BaseConstants.headerFullZoomedFormatter.string(from: fromDate) - self.setChartTitleClosure?(stirng, animated) - } else { - let stirng = "\(BaseConstants.headerMediumRangeFormatter.string(from: fromDate)) - \(BaseConstants.headerMediumRangeFormatter.string(from: toDate))" - self.setChartTitleClosure?(stirng, animated) - } - } -} diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift deleted file mode 100644 index 008313d1cf..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift +++ /dev/null @@ -1,249 +0,0 @@ -// -// DailyBarsChartController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class DailyBarsChartController: BaseChartController { - let barsController: BarsComponentController - let linesController: LinesComponentController - - override init(chartsCollection: ChartsCollection) { - let horizontalScalesRenderer = HorizontalScalesRenderer() - let verticalScalesRenderer = VerticalScalesRenderer() - barsController = BarsComponentController(isZoomed: false, - mainBarsRenderer: BarChartRenderer(), - horizontalScalesRenderer: horizontalScalesRenderer, - verticalScalesRenderer: verticalScalesRenderer, - previewBarsChartRenderer: BarChartRenderer()) - linesController = LinesComponentController(isZoomed: true, - userLinesTransitionAnimation: false, - mainLinesRenderer: LinesChartRenderer(), - horizontalScalesRenderer: horizontalScalesRenderer, - verticalScalesRenderer: verticalScalesRenderer, - verticalLineRenderer: VerticalLinesRenderer(), - lineBulletsRenerer: LineBulletsRenerer(), - previewLinesChartRenderer: LinesChartRenderer()) - - super.init(chartsCollection: chartsCollection) - - [barsController, linesController].forEach { controller in - controller.chartFrame = { [unowned self] in self.chartFrame() } - controller.cartViewBounds = { [unowned self] in self.cartViewBounds() } - controller.zoomInOnDateClosure = { [unowned self] date in - self.didTapZoomIn(date: date) - } - controller.setChartTitleClosure = { [unowned self] (title, animated) in - self.setChartTitleClosure?(title, animated) - } - controller.setDetailsViewPositionClosure = { [unowned self] (position) in - self.setDetailsViewPositionClosure?(position) - } - controller.setDetailsChartVisibleClosure = { [unowned self] (visible, animated) in - self.setDetailsChartVisibleClosure?(visible, animated) - } - controller.setDetailsViewModel = { [unowned self] (viewModel, animated) in - self.setDetailsViewModel?(viewModel, animated) - } - controller.updatePreviewRangeClosure = { [unowned self] (fraction, animated) in - self.chartRangeUpdatedClosure?(fraction, animated) - } - controller.chartRangePagingClosure = { [unowned self] (isEnabled, pageSize) in - self.setChartRangePagingEnabled(isEnabled: isEnabled, minimumSelectionSize: pageSize) - } - } - } - - override var mainChartRenderers: [ChartViewRenderer] { - return [barsController.mainBarsRenderer, - linesController.mainLinesRenderer, - barsController.horizontalScalesRenderer, - barsController.verticalScalesRenderer, - linesController.verticalLineRenderer, - linesController.lineBulletsRenerer, -// performanceRenderer - ] - } - - override var navigationRenderers: [ChartViewRenderer] { - return [barsController.previewBarsChartRenderer, - linesController.previewLinesChartRenderer] - } - - override func initializeChart() { - barsController.initialize(chartsCollection: initialChartsCollection, - initialDate: Date(), - totalHorizontalRange: BaseConstants.defaultRange, - totalVerticalRange: BaseConstants.defaultRange) - switchToChart(chartsCollection: barsController.chartsCollection, isZoomed: false, animated: false) - } - - func switchToChart(chartsCollection: ChartsCollection, isZoomed: Bool, animated: Bool) { - if animated { - TimeInterval.setDefaultDuration(.expandAnimationDuration) - DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { - TimeInterval.setDefaultDuration(.osXDuration) - } - } - - super.isZoomed = isZoomed - if isZoomed { - let toHorizontalRange = linesController.initialHorizontalRange - let destinationHorizontalRange = (toHorizontalRange.lowerBound - barsController.barsWidth)...(toHorizontalRange.upperBound - barsController.barsWidth) - let initialChartVerticalRange = lineProportionAnimationRange() - - linesController.mainLinesRenderer.setup(horizontalRange: barsController.currentHorizontalMainChartRange, animated: false) - linesController.previewLinesChartRenderer.setup(horizontalRange: barsController.currentPreviewHorizontalRange, animated: false) - linesController.mainLinesRenderer.setup(verticalRange: initialChartVerticalRange, animated: false) - linesController.previewLinesChartRenderer.setup(verticalRange: initialChartVerticalRange, animated: false) - linesController.mainLinesRenderer.setVisible(false, animated: false) - linesController.previewLinesChartRenderer.setVisible(false, animated: false) - - barsController.setupMainChart(horizontalRange: destinationHorizontalRange, animated: animated) - barsController.previewBarsChartRenderer.setup(horizontalRange: linesController.totalHorizontalRange, animated: animated) - barsController.mainBarsRenderer.setVisible(false, animated: animated) - barsController.previewBarsChartRenderer.setVisible(false, animated: animated) - - linesController.willAppear(animated: animated) - barsController.willDisappear(animated: animated) - - linesController.updateChartsVisibility(visibility: linesController.chartLines.map { _ in true }, animated: false) - } else { - if !linesController.chartsCollection.isBlank { - barsController.hideDetailsView(animated: false) - let visibleVerticalRange = BarChartRenderer.BarsData.verticalRange(bars: barsController.visibleBars, - calculatingRange: barsController.initialHorizontalRange) ?? BaseConstants.defaultRange - barsController.mainBarsRenderer.setup(verticalRange: visibleVerticalRange, animated: false) - - let toHorizontalRange = barsController.initialHorizontalRange - let destinationChartVerticalRange = lineProportionAnimationRange() - - linesController.setupMainChart(horizontalRange: toHorizontalRange, animated: animated) - linesController.mainLinesRenderer.setup(verticalRange: destinationChartVerticalRange, animated: animated) - linesController.previewLinesChartRenderer.setup(verticalRange: destinationChartVerticalRange, animated: animated) - linesController.previewLinesChartRenderer.setup(horizontalRange: barsController.totalHorizontalRange, animated: animated) - linesController.mainLinesRenderer.setVisible(false, animated: animated) - linesController.previewLinesChartRenderer.setVisible(false, animated: animated) - } - - barsController.willAppear(animated: animated) - linesController.willDisappear(animated: animated) - } - - self.setBackButtonVisibilityClosure?(isZoomed, animated) - self.refreshChartToolsClosure?(animated) - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - if isZoomed { - linesController.updateChartsVisibility(visibility: visibility, animated: animated) - } else { - barsController.updateChartsVisibility(visibility: visibility, animated: animated) - } - } - - var visibleChartValues: [ChartsCollection.Chart] { - let visibility = isZoomed ? linesController.chartVisibility : barsController.chartVisibility - let collection = isZoomed ? linesController.chartsCollection : barsController.chartsCollection - let visibleCharts: [ChartsCollection.Chart] = visibility.enumerated().compactMap { args in - args.element ? collection.chartValues[args.offset] : nil - } - return visibleCharts - } - - override var actualChartVisibility: [Bool] { - return isZoomed ? linesController.chartVisibility : barsController.chartVisibility - } - - override var actualChartsCollection: ChartsCollection { - return isZoomed ? linesController.chartsCollection : barsController.chartsCollection - } - - override func chartInteractionDidBegin(point: CGPoint) { - if isZoomed { - linesController.chartInteractionDidBegin(point: point) - } else { - barsController.chartInteractionDidBegin(point: point) - } - } - - override func chartInteractionDidEnd() { - if isZoomed { - linesController.chartInteractionDidEnd() - } else { - barsController.chartInteractionDidEnd() - } - } - - override var currentChartHorizontalRangeFraction: ClosedRange { - if isZoomed { - return linesController.currentChartHorizontalRangeFraction - } else { - return barsController.currentChartHorizontalRangeFraction - } - } - - override func cancelChartInteraction() { - if isZoomed { - return linesController.hideDetailsView(animated: true) - } else { - return barsController.hideDetailsView(animated: true) - } - } - - override func didTapZoomIn(date: Date) { - guard isZoomed == false else { return } - if isZoomed { - return linesController.hideDetailsView(animated: true) - } - self.getDetailsData?(date, { updatedCollection in - if let updatedCollection = updatedCollection { - self.linesController.initialize(chartsCollection: updatedCollection, - initialDate: date, - totalHorizontalRange: 0...1, - totalVerticalRange: 0...1) - self.switchToChart(chartsCollection: updatedCollection, isZoomed: true, animated: true) - } - }) - } - - func lineProportionAnimationRange() -> ClosedRange { - let visibleLines = self.barsController.chartVisibility.enumerated().compactMap { $0.element ? self.linesController.chartLines[$0.offset] : nil } - let linesRange = LinesChartRenderer.LineData.verticalRange(lines: visibleLines) ?? BaseConstants.defaultRange - let barsRange = BarChartRenderer.BarsData.verticalRange(bars: self.barsController.visibleBars, - calculatingRange: self.linesController.totalHorizontalRange) ?? BaseConstants.defaultRange - let range = 0...(linesRange.upperBound / barsRange.distance * self.barsController.currentVerticalMainChartRange.distance) - return range - } - - override func didTapZoomOut() { - cancelChartInteraction() - switchToChart(chartsCollection: barsController.chartsCollection, isZoomed: false, animated: true) - } - - override func updateChartRange(_ rangeFraction: ClosedRange, animated: Bool) { - if isZoomed { - return linesController.chartRangeFractionDidUpdated(rangeFraction) - } else { - return barsController.chartRangeFractionDidUpdated(rangeFraction) - } - } - - override func apply(colorMode: ColorMode, animated: Bool) { - super.apply(colorMode: colorMode, animated: animated) - - linesController.apply(colorMode: colorMode, animated: animated) - barsController.apply(colorMode: colorMode, animated: animated) - } - - override var drawChartVisibity: Bool { - return isZoomed - } -} - -//TODO: Убрать Performance полоски сверзу чартов (Не забыть) -//TODO: Добавить ховеры на кнопки diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift b/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift deleted file mode 100644 index fc39a5f4c6..0000000000 --- a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift +++ /dev/null @@ -1,210 +0,0 @@ -// -// LinesComponentController.swift -// GraphTest -// -// Created by Andrei Salavei on 4/14/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class LinesComponentController: GeneralChartComponentController { - let mainLinesRenderer: LinesChartRenderer - let horizontalScalesRenderer: HorizontalScalesRenderer - let verticalScalesRenderer: VerticalScalesRenderer - let verticalLineRenderer: VerticalLinesRenderer - let lineBulletsRenerer: LineBulletsRenerer - - let previewLinesChartRenderer: LinesChartRenderer - - private let zoomedLinesRenderer = LinesChartRenderer() - private let zoomedPreviewLinesRenderer = LinesChartRenderer() - - private let userLinesTransitionAnimation: Bool - - private(set) var chartLines: [LinesChartRenderer.LineData] = [] - - init(isZoomed: Bool, - userLinesTransitionAnimation: Bool, - mainLinesRenderer: LinesChartRenderer, - horizontalScalesRenderer: HorizontalScalesRenderer, - verticalScalesRenderer: VerticalScalesRenderer, - verticalLineRenderer: VerticalLinesRenderer, - lineBulletsRenerer: LineBulletsRenerer, - previewLinesChartRenderer: LinesChartRenderer) { - self.mainLinesRenderer = mainLinesRenderer - self.horizontalScalesRenderer = horizontalScalesRenderer - self.verticalScalesRenderer = verticalScalesRenderer - self.verticalLineRenderer = verticalLineRenderer - self.lineBulletsRenerer = lineBulletsRenerer - self.previewLinesChartRenderer = previewLinesChartRenderer - self.userLinesTransitionAnimation = userLinesTransitionAnimation - - super.init(isZoomed: isZoomed) - - self.mainLinesRenderer.lineWidth = BaseConstants.mainChartLineWidth - self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel - self.previewLinesChartRenderer.lineWidth = BaseConstants.previewChartLineWidth - self.previewLinesChartRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel - - self.lineBulletsRenerer.isEnabled = false - } - - override func initialize(chartsCollection: ChartsCollection, - initialDate: Date, - totalHorizontalRange _: ClosedRange, - totalVerticalRange _: ClosedRange) { - let (chartLines, totalHorizontalRange, totalVerticalRange) = LinesChartRenderer.LineData.initialComponents(chartsCollection: chartsCollection) - self.chartLines = chartLines - - self.lineBulletsRenerer.bullets = self.chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, - color: $0.color)} - - super.initialize(chartsCollection: chartsCollection, - initialDate: initialDate, - totalHorizontalRange: totalHorizontalRange, - totalVerticalRange: totalVerticalRange) - - self.mainLinesRenderer.setup(verticalRange: totalVerticalRange, animated: true) - } - - override func willAppear(animated: Bool) { - mainLinesRenderer.setLines(lines: self.chartLines, animated: animated && userLinesTransitionAnimation) - previewLinesChartRenderer.setLines(lines: self.chartLines, animated: animated && userLinesTransitionAnimation) - - previewLinesChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) - previewLinesChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) - - setupMainChart(verticalRange: initialVerticalRange, animated: animated) - setupMainChart(horizontalRange: initialHorizontalRange, animated: animated) - - updateChartVerticalRanges(horizontalRange: initialHorizontalRange, animated: animated) - - super.willAppear(animated: animated) - - updatePreviewRangeClosure?(currentChartHorizontalRangeFraction, animated) - setConponentsVisible(visible: true, animated: animated) - updateHorizontalLimitLabels(animated: animated, forceUpdate: true) - } - - override func chartRangeDidUpdated(_ updatedRange: ClosedRange) { - super.chartRangeDidUpdated(updatedRange) - if !isZoomed { - initialHorizontalRange = updatedRange - } - setupMainChart(horizontalRange: updatedRange, animated: false) - updateHorizontalLimitLabels(animated: true, forceUpdate: false) - updateChartVerticalRanges(horizontalRange: updatedRange, animated: true) - } - - func updateHorizontalLimitLabels(animated: Bool, forceUpdate: Bool) { - updateHorizontalLimitLabels(horizontalScalesRenderer: horizontalScalesRenderer, - horizontalRange: currentHorizontalMainChartRange, - scaleType: isZoomed ? .hour : .day, - forceUpdate: forceUpdate, - animated: animated) - } - - func prepareAppearanceAnimation(horizontalRnage: ClosedRange) { - setupMainChart(horizontalRange: horizontalRnage, animated: false) - setConponentsVisible(visible: false, animated: false) - } - - func setConponentsVisible(visible: Bool, animated: Bool) { - mainLinesRenderer.setVisible(visible, animated: animated) - horizontalScalesRenderer.setVisible(visible, animated: animated) - verticalScalesRenderer.setVisible(visible, animated: animated) - verticalLineRenderer.setVisible(visible, animated: animated) - previewLinesChartRenderer.setVisible(visible, animated: animated) - lineBulletsRenerer.setVisible(visible, animated: animated) - } - - func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { - mainLinesRenderer.setup(horizontalRange: horizontalRange, animated: animated) - horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) - verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) - verticalLineRenderer.setup(horizontalRange: horizontalRange, animated: animated) - lineBulletsRenerer.setup(horizontalRange: horizontalRange, animated: animated) - } - - var visibleLines: [LinesChartRenderer.LineData] { - return chartVisibility.enumerated().compactMap { $0.element ? chartLines[$0.offset] : nil } - } - - func updateChartVerticalRanges(horizontalRange: ClosedRange, animated: Bool) { - if let range = LinesChartRenderer.LineData.verticalRange(lines: visibleLines, - calculatingRange: horizontalRange, - addBounds: true) { - let (range, labels) = verticalLimitsLabels(verticalRange: range) - if verticalScalesRenderer.verticalRange.end != range { - verticalScalesRenderer.setup(verticalLimitsLabels: labels, animated: animated) - } - - setupMainChart(verticalRange: range, animated: animated) - verticalScalesRenderer.setVisible(true, animated: animated) - } else { - verticalScalesRenderer.setVisible(false, animated: animated) - } - - if let range = LinesChartRenderer.LineData.verticalRange(lines: visibleLines) { - previewLinesChartRenderer.setup(verticalRange: range, animated: animated) - } - } - - func setupMainChart(verticalRange: ClosedRange, animated: Bool) { - mainLinesRenderer.setup(verticalRange: verticalRange, animated: animated) - horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) - verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) - verticalLineRenderer.setup(verticalRange: verticalRange, animated: animated) - lineBulletsRenerer.setup(verticalRange: verticalRange, animated: animated) - } - - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { - super.updateChartsVisibility(visibility: visibility, animated: animated) - for (index, isVisible) in visibility.enumerated() { - mainLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) - previewLinesChartRenderer.setLineVisible(isVisible, at: index, animated: animated) - lineBulletsRenerer.setLineVisible(isVisible, at: index, animated: animated) - } - updateChartVerticalRanges(horizontalRange: currentHorizontalMainChartRange, animated: true) - } - - override var currentMainRangeRenderer: BaseChartRenderer { - return mainLinesRenderer - } - - override var currentPreviewRangeRenderer: BaseChartRenderer { - return previewLinesChartRenderer - } - - override func showDetailsView(at chartPosition: CGFloat, detailsViewPosition: CGFloat, dataIndex: Int, date: Date, animted: Bool) { - super.showDetailsView(at: chartPosition, detailsViewPosition: detailsViewPosition, dataIndex: dataIndex, date: date, animted: animted) - verticalLineRenderer.values = [chartPosition] - verticalLineRenderer.isEnabled = true - - lineBulletsRenerer.isEnabled = true - lineBulletsRenerer.setVisible(true, animated: animted) - lineBulletsRenerer.bullets = chartLines.compactMap { chart in - return LineBulletsRenerer.Bullet(coordinate: chart.points[dataIndex], color: chart.color) - } - } - - override func hideDetailsView(animated: Bool) { - super.hideDetailsView(animated: animated) - - verticalLineRenderer.values = [] - verticalLineRenderer.isEnabled = false - lineBulletsRenerer.isEnabled = false - } - - override func apply(colorMode: ColorMode, animated: Bool) { - super.apply(colorMode: colorMode, animated: animated) - - horizontalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor - verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor - verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor - lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) - verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/BarChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/BarChartRenderer.swift deleted file mode 100644 index 73a6b52f42..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/BarChartRenderer.swift +++ /dev/null @@ -1,293 +0,0 @@ -// -// BarChartRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class BarChartRenderer: BaseChartRenderer { - struct BarsData { - static let blank = BarsData(barWidth: 1, locations: [], components: []) - var barWidth: CGFloat - var locations: [CGFloat] - var components: [Component] - - struct Component { - var color: UIColor - var values: [CGFloat] - } - } - - var fillToTop: Bool = false - private(set) lazy var selectedIndexAnimator: AnimationController = { - return AnimationController(current: 0, refreshClosure: self.refreshClosure) - }() - func setSelectedIndex(_ index: Int?, animated: Bool) { - let destinationValue: CGFloat = (index == nil) ? 0 : 1 - if animated { - if index != nil { - selectedBarIndex = index - } - self.selectedIndexAnimator.completionClosure = { - self.selectedBarIndex = index - } - guard self.selectedIndexAnimator.end != destinationValue else { return } - self.selectedIndexAnimator.animate(to: destinationValue, duration: .defaultDuration) - } else { - self.selectedIndexAnimator.set(current: destinationValue) - self.selectedBarIndex = index - } - } - - private var selectedBarIndex: Int? { - didSet { - setNeedsDisplay() - } - } - var generalUnselectedAlpha: CGFloat = 0.5 - - private var componentsAnimators: [AnimationController] = [] - var bars: BarsData = BarsData(barWidth: 1, locations: [], components: []) { - willSet { - if bars.components.count != newValue.components.count { - componentsAnimators = newValue.components.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } - } - } - didSet { - setNeedsDisplay() - } - } - - func setComponentVisible(_ isVisible: Bool, at index: Int, animated: Bool) { - componentsAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - - private lazy var backgroundColorAnimator = AnimationController(current: UIColorContainer(color: .white), refreshClosure: refreshClosure) - func update(backgroundColor: UIColor, animated: Bool) { - if animated { - backgroundColorAnimator.animate(to: UIColorContainer(color: backgroundColor), duration: .defaultDuration) - } else { - backgroundColorAnimator.set(current: UIColorContainer(color: backgroundColor)) - } - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - let chartsAlpha = chartAlphaAnimator.current - if chartsAlpha == 0 { return } - - let range = renderRange(bounds: bounds, chartFrame: chartFrame) - - var selectedPaths: [[CGRect]] = bars.components.map { _ in [] } - var unselectedPaths: [[CGRect]] = bars.components.map { _ in [] } - - if var barIndex = bars.locations.firstIndex(where: { $0 >= range.lowerBound }) { - if fillToTop { - barIndex = max(0, barIndex - 1) - - while barIndex < bars.locations.count { - let currentLocation = bars.locations[barIndex] - let right = transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame).roundedUpToPixelGrid() - let left = transform(toChartCoordinateHorizontal: currentLocation - bars.barWidth, chartFrame: chartFrame).roundedUpToPixelGrid() - - var summ: CGFloat = 0 - for (index, component) in bars.components.enumerated() { - summ += componentsAnimators[index].current * component.values[barIndex] - } - guard summ > 0 else { - barIndex += 1 - continue - } - - var stackedValue: CGFloat = 0 - for (index, component) in bars.components.enumerated() { - let visibilityPercent = componentsAnimators[index].current - if visibilityPercent == 0 { continue } - - let bottomFraction = stackedValue - let topFraction = stackedValue + ((component.values[barIndex] * visibilityPercent) / summ) - - let rect = CGRect(x: left, - y: chartFrame.maxY - chartFrame.height * topFraction, - width: right - left, - height: chartFrame.height * (topFraction - bottomFraction)) - if selectedBarIndex == barIndex { - selectedPaths[index].append(rect) - } else { - unselectedPaths[index].append(rect) - } - stackedValue = topFraction - } - if currentLocation > range.upperBound { - break - } - barIndex += 1 - } - - for (index, component) in bars.components.enumerated() { - context.saveGState() - context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue).cgColor) - context.fill(selectedPaths[index]) - let resultAlpha: CGFloat = 1.0 - (1.0 - generalUnselectedAlpha) * selectedIndexAnimator.current - context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue * resultAlpha).cgColor) - context.fill(unselectedPaths[index]) - context.restoreGState() - } - } else { - var selectedPaths: [[CGRect]] = bars.components.map { _ in [] } - barIndex = max(0, barIndex - 1) - - var currentLocation = bars.locations[barIndex] - var leftX = transform(toChartCoordinateHorizontal: currentLocation - bars.barWidth, chartFrame: chartFrame) - var rightX: CGFloat = 0 - - let startPoint = CGPoint(x: leftX, - y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - - var backgourndPaths: [[CGPoint]] = bars.components.map { _ in Array() } - let itemsCount = ((bars.locations.count - barIndex) * 2) + 4 - for path in backgourndPaths.indices { - backgourndPaths[path].reserveCapacity(itemsCount) - backgourndPaths[path].append(startPoint) - } - var maxValues: [CGFloat] = bars.components.map { _ in 0 } - while barIndex < bars.locations.count { - currentLocation = bars.locations[barIndex] - rightX = transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame) - - var stackedValue: CGFloat = 0 - var bottomY: CGFloat = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) - for (index, component) in bars.components.enumerated() { - let visibilityPercent = componentsAnimators[index].current - if visibilityPercent == 0 { continue } - - let height = component.values[barIndex] * visibilityPercent - stackedValue += height - let topY = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) - let componentHeight = (bottomY - topY) - maxValues[index] = max(maxValues[index], componentHeight) - if selectedBarIndex == barIndex { - let rect = CGRect(x: leftX, - y: topY, - width: rightX - leftX, - height: componentHeight) - selectedPaths[index].append(rect) - } - backgourndPaths[index].append(CGPoint(x: leftX, y: topY)) - backgourndPaths[index].append(CGPoint(x: rightX, y: topY)) - bottomY = topY - } - if currentLocation > range.upperBound { - break - } - leftX = rightX - barIndex += 1 - } - - let endPoint = CGPoint(x: transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame).roundedUpToPixelGrid(), - y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - let colorOffset = Double((1.0 - (1.0 - generalUnselectedAlpha) * selectedIndexAnimator.current) * chartsAlpha) - - for (index, component) in bars.components.enumerated().reversed() { - if maxValues[index] < optimizationLevel { - continue - } - context.saveGState() - backgourndPaths[index].append(endPoint) - - context.setFillColor(UIColor.valueBetween(start: backgroundColorAnimator.current.color, - end: component.color, - offset: colorOffset).cgColor) - context.beginPath() - context.addLines(between: backgourndPaths[index]) - context.closePath() - context.fillPath() - context.restoreGState() - } - - for (index, component) in bars.components.enumerated().reversed() { - context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue).cgColor) - context.fill(selectedPaths[index]) - } - } - } - } -} - -extension BarChartRenderer.BarsData { - static func initialComponents(chartsCollection: ChartsCollection) -> - (width: CGFloat, - chartBars: BarChartRenderer.BarsData, - totalHorizontalRange: ClosedRange, - totalVerticalRange: ClosedRange) { - let width: CGFloat - if chartsCollection.axisValues.count > 1 { - width = CGFloat(abs(chartsCollection.axisValues[1].timeIntervalSince1970 - chartsCollection.axisValues[0].timeIntervalSince1970)) - } else { - width = 1 - } - let components = chartsCollection.chartValues.map { BarChartRenderer.BarsData.Component(color: $0.color, - values: $0.values.map { CGFloat($0) }) } - let chartBars = BarChartRenderer.BarsData(barWidth: width, - locations: chartsCollection.axisValues.map { CGFloat($0.timeIntervalSince1970) }, - components: components) - - - - let totalVerticalRange = BarChartRenderer.BarsData.verticalRange(bars: chartBars) ?? 0...1 - let totalHorizontalRange = BarChartRenderer.BarsData.visibleHorizontalRange(bars: chartBars, width: width) ?? 0...1 - return (width: width, chartBars: chartBars, totalHorizontalRange: totalHorizontalRange, totalVerticalRange: totalVerticalRange) - } - - static func visibleHorizontalRange(bars: BarChartRenderer.BarsData, width: CGFloat) -> ClosedRange? { - guard let firstPoint = bars.locations.first, - let lastPoint = bars.locations.last, - firstPoint <= lastPoint else { - return nil - } - - return (firstPoint - width)...lastPoint - } - - static func verticalRange(bars: BarChartRenderer.BarsData, calculatingRange: ClosedRange? = nil, addBounds: Bool = false) -> ClosedRange? { - guard bars.components.count > 0 else { - return nil - } - if let calculatingRange = calculatingRange { - guard var index = bars.locations.firstIndex(where: { $0 >= calculatingRange.lowerBound && $0 <= calculatingRange.upperBound }) else { - return nil - } - - var vMax: CGFloat = bars.components[0].values[index] - while index < bars.locations.count { - var summ: CGFloat = 0 - for component in bars.components { - summ += component.values[index] - } - vMax = max(vMax, summ) - - if bars.locations[index] > calculatingRange.upperBound { - break - } - index += 1 - } - return 0...vMax - } else { - var index = 0 - - var vMax: CGFloat = bars.components[0].values[index] - while index < bars.locations.count { - var summ: CGFloat = 0 - for component in bars.components { - summ += component.values[index] - } - vMax = max(vMax, summ) - index += 1 - } - return 0...vMax - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/BaseChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/BaseChartRenderer.swift deleted file mode 100644 index 63627566e7..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/BaseChartRenderer.swift +++ /dev/null @@ -1,116 +0,0 @@ -// -// BaseChartRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -private let exponentialAnimationTrashold: CGFloat = 100 - -class BaseChartRenderer: ChartViewRenderer { - var containerViews: [UIView] = [] - - var optimizationLevel: CGFloat = 1 { - didSet { - setNeedsDisplay() - } - } - var isEnabled: Bool = true { - didSet { - setNeedsDisplay() - } - } - - private(set) lazy var chartAlphaAnimator: AnimationController = { - return AnimationController(current: 1, refreshClosure: self.refreshClosure) - }() - func setVisible(_ visible: Bool, animated: Bool) { - let destinationValue: CGFloat = visible ? 1 : 0 - guard self.chartAlphaAnimator.end != destinationValue else { return } - if animated { - self.chartAlphaAnimator.animate(to: destinationValue, duration: .defaultDuration) - } else { - self.chartAlphaAnimator.set(current: destinationValue) - } - } - - lazy var horizontalRange = AnimationController>(current: 0...1, refreshClosure: refreshClosure) - lazy var verticalRange = AnimationController>(current: 0...1, refreshClosure: refreshClosure) - - func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { - guard self.verticalRange.end != verticalRange else { - self.verticalRange.timeFunction = timeFunction ?? .linear - return - } - if animated { - let function: TimeFunction - if let timeFunction = timeFunction { - function = timeFunction - } else if self.verticalRange.current.distance > 0 && verticalRange.distance > 0 { - if self.verticalRange.current.distance / verticalRange.distance > exponentialAnimationTrashold { - function = .easeIn - } else if verticalRange.distance / self.verticalRange.current.distance > exponentialAnimationTrashold { - function = .easeOut - } else { - function = .linear - } - } else { - function = .linear - } - - self.verticalRange.animate(to: verticalRange, duration: .defaultDuration, timeFunction: function) - } else { - self.verticalRange.set(current: verticalRange) - } - } - - func setup(horizontalRange: ClosedRange, animated: Bool) { - guard self.horizontalRange.end != horizontalRange else { return } - if animated { - let animationCurve: TimeFunction = self.horizontalRange.current.distance > horizontalRange.distance ? .easeOut : .easeIn - self.horizontalRange.animate(to: horizontalRange, duration: .defaultDuration, timeFunction: animationCurve) - } else { - self.horizontalRange.set(current: horizontalRange) - } - } - - func transform(toChartCoordinateHorizontal x: CGFloat, chartFrame: CGRect) -> CGFloat { - return chartFrame.origin.x + (x - horizontalRange.current.lowerBound) / horizontalRange.current.distance * chartFrame.width - } - - func transform(toChartCoordinateVertical y: CGFloat, chartFrame: CGRect) -> CGFloat { - return chartFrame.height + chartFrame.origin.y - (y - verticalRange.current.lowerBound) / verticalRange.current.distance * chartFrame.height - } - - func transform(toChartCoordinate point: CGPoint, chartFrame: CGRect) -> CGPoint { - return CGPoint(x: transform(toChartCoordinateHorizontal: point.x, chartFrame: chartFrame), - y: transform(toChartCoordinateVertical: point.y, chartFrame: chartFrame)) - } - - func renderRange(bounds: CGRect, chartFrame: CGRect) -> ClosedRange { - let lowerBound = horizontalRange.current.lowerBound - chartFrame.origin.x / chartFrame.width * horizontalRange.current.distance - let upperBound = horizontalRange.current.upperBound + (bounds.width - chartFrame.width - chartFrame.origin.x) / chartFrame.width * horizontalRange.current.distance - guard lowerBound <= upperBound else { - print("Error: Unexpecated bounds range!") - return 0...1 - } - return lowerBound...upperBound - } - - func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - fatalError("abstract") - } - - func setNeedsDisplay() { - containerViews.forEach { $0.setNeedsDisplay() } - } - - var refreshClosure: () -> Void { - return { [weak self] in - self?.setNeedsDisplay() - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/ChartDetailsRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/ChartDetailsRenderer.swift deleted file mode 100644 index ad61ff5dd9..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/ChartDetailsRenderer.swift +++ /dev/null @@ -1,147 +0,0 @@ -// -// ChartDetailsRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/13/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class ChartDetailsRenderer: BaseChartRenderer, ColorModeContainer { - private lazy var colorAnimator = AnimationController(current: 1, refreshClosure: refreshClosure) - private var fromColorMode: ColorMode = .day - private var currentColorMode: ColorMode = .day - func apply(colorMode: ColorMode, animated: Bool) { - if currentColorMode != colorMode { - fromColorMode = currentColorMode - currentColorMode = colorMode - if animated { - colorAnimator.set(current: 0) - colorAnimator.animate(to: 1, duration: .defaultDuration) - } else { - colorAnimator.set(current: 1) - } - } - } - - private var valuesAnimators: [AnimationController] = [] - func setValueVisible(_ isVisible: Bool, at index: Int, animated: Bool) { - valuesAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - var detailsViewModel: ChartDetailsViewModel = .blank { - didSet { - if detailsViewModel.values.count != valuesAnimators.count { - valuesAnimators = detailsViewModel.values.map { _ in AnimationController(current: 1, refreshClosure: refreshClosure) } - } - setNeedsDisplay() - } - } - - var detailsViewPosition: CGFloat = 0 { - didSet { - setNeedsDisplay() - } - } - var detailViewPositionOffset: CGFloat = 10 - var detailViewTopOffset: CGFloat = 10 - private var iconWidth: CGFloat = 10 - private var margins: CGFloat = 10 - private let cornerRadius: CGFloat = 5 - private var rowHeight: CGFloat = 20 - private let titleFont = UIFont.systemFont(ofSize: 14, weight: .bold) - private let prefixFont = UIFont.systemFont(ofSize: 14, weight: .bold) - private let labelsFont = UIFont.systemFont(ofSize: 14, weight: .medium) - private let valuesFont = UIFont.systemFont(ofSize: 14, weight: .bold) - private let labelsColor: UIColor = .black - - private(set) var previousRenderBannerFrame: CGRect = .zero - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - previousRenderBannerFrame = .zero - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - let generalAlpha = chartAlphaAnimator.current - if generalAlpha == 0 { return } - - let widths: [(prefix: CGFloat, label: CGFloat, value: CGFloat)] = detailsViewModel.values.map { value in - var prefixWidth: CGFloat = 0 - if let prefixText = value.prefix { - prefixWidth = (prefixText as NSString).boundingRect(with: bounds.size, - options: .usesLineFragmentOrigin, - attributes: [.font: prefixFont], - context: nil).width.rounded(.up) + margins - } - - let labelWidth = (value.title as NSString).boundingRect(with: bounds.size, - options: .usesLineFragmentOrigin, - attributes: [.font: labelsFont], - context: nil).width.rounded(.up) + margins - - let valueWidth = (value.value as NSString).boundingRect(with: bounds.size, - options: .usesLineFragmentOrigin, - attributes: [.font: valuesFont], - context: nil).width.rounded(.up) - return (prefixWidth, labelWidth, valueWidth) - } - - let titleWidth = (detailsViewModel.title as NSString).boundingRect(with: bounds.size, - options: .usesLineFragmentOrigin, - attributes: [.font: titleFont], - context: nil).width - let prefixesWidth = widths.map { $0.prefix }.max() ?? 0 - let labelsWidth = widths.map { $0.label }.max() ?? 0 - let valuesWidth = widths.map { $0.value }.max() ?? 0 - - let totalWidth: CGFloat = max(prefixesWidth + labelsWidth + valuesWidth, titleWidth + iconWidth) + margins * 2 - let totalHeight: CGFloat = CGFloat(detailsViewModel.values.count + 1) * rowHeight + margins * 2 - let backgroundColor = UIColor.valueBetween(start: fromColorMode.chartDetailsViewColor, - end: currentColorMode.chartDetailsViewColor, - offset: Double(colorAnimator.current)) - let titleAndTextColor = UIColor.valueBetween(start: fromColorMode.chartDetailsTextColor, - end: currentColorMode.chartDetailsTextColor, - offset: Double(colorAnimator.current)) - let detailsViewFrame: CGRect - if totalWidth + detailViewTopOffset > detailsViewPosition { - detailsViewFrame = CGRect(x: detailsViewPosition + detailViewTopOffset, - y: detailViewTopOffset + chartFrame.minY, - width: totalWidth, - height: totalHeight) - } else { - detailsViewFrame = CGRect(x: detailsViewPosition - totalWidth - detailViewTopOffset, - y: detailViewTopOffset + chartFrame.minY, - width: totalWidth, - height: totalHeight) - } - previousRenderBannerFrame = detailsViewFrame - context.saveGState() - context.setFillColor(backgroundColor.cgColor) - context.beginPath() - context.addPath(CGPath(roundedRect: detailsViewFrame, cornerWidth: 5, cornerHeight: 5, transform: nil)) - context.fillPath() - context.endPage() - context.restoreGState() - - var drawY = detailsViewFrame.minY + margins + (rowHeight - titleFont.pointSize) / 2 - (detailsViewModel.title as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + margins, y: drawY), withAttributes: [.font: titleFont, - .foregroundColor: titleAndTextColor]) - drawY += rowHeight - - for (index, row) in widths.enumerated() { - let value = detailsViewModel.values[index] - if let prefixText = value.prefix { - (prefixText as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + prefixesWidth - row.prefix, - y: drawY), - withAttributes: [.font: prefixText, .foregroundColor: titleAndTextColor]) - } - - (value.title as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + prefixesWidth + margins, - y: drawY), - withAttributes: [.font: labelsFont, .foregroundColor: titleAndTextColor]) - - (value.value as NSString).draw(at: CGPoint(x: detailsViewFrame.minX + prefixesWidth + labelsWidth + valuesWidth - row.value + margins, - y: drawY), - withAttributes: [.font: labelsFont, .foregroundColor: value.color]) - - drawY += rowHeight - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/HorizontalScalesRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/HorizontalScalesRenderer.swift deleted file mode 100644 index 3ab90ef546..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/HorizontalScalesRenderer.swift +++ /dev/null @@ -1,99 +0,0 @@ -// -// HorizontalScalesRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/8/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class HorizontalScalesRenderer: BaseChartRenderer { - private var horizontalLabels: [LinesChartLabel] = [] - private var animatedHorizontalLabels: [AnimatedLinesChartLabels] = [] - - var labelsVerticalOffset: CGFloat = 8 - var labelsFont: UIFont = .systemFont(ofSize: 11) - var labelsColor: UIColor = .gray - - func setup(labels: [LinesChartLabel], animated: Bool) { - if animated { - var labelsToKeepVisible: [LinesChartLabel] = [] - let labelsToHide: [LinesChartLabel] - var labelsToShow: [LinesChartLabel] = [] - - for label in labels { - if horizontalLabels.contains(label) { - labelsToKeepVisible.append(label) - } else { - labelsToShow.append(label) - } - } - labelsToHide = horizontalLabels.filter { !labels.contains($0) } - animatedHorizontalLabels.removeAll() - horizontalLabels = labelsToKeepVisible - - let showAnimation = AnimatedLinesChartLabels(labels: labelsToShow, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) - showAnimation.isAppearing = true - showAnimation.alphaAnimator.set(current: 0) - showAnimation.alphaAnimator.animate(to: 1, duration: .defaultDuration) - showAnimation.alphaAnimator.completionClosure = { [weak self, weak showAnimation] in - guard let self = self, let showAnimation = showAnimation else { return } - self.animatedHorizontalLabels.removeAll(where: { $0 === showAnimation }) - self.horizontalLabels = labels - } - - let hideAnimation = AnimatedLinesChartLabels(labels: labelsToHide, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) - hideAnimation.isAppearing = false - hideAnimation.alphaAnimator.set(current: 1) - hideAnimation.alphaAnimator.animate(to: 0, duration: .defaultDuration) - hideAnimation.alphaAnimator.completionClosure = { [weak self, weak hideAnimation] in - guard let self = self, let hideAnimation = hideAnimation else { return } - self.animatedHorizontalLabels.removeAll(where: { $0 === hideAnimation }) - } - - animatedHorizontalLabels.append(showAnimation) - animatedHorizontalLabels.append(hideAnimation) - } else { - horizontalLabels = labels - animatedHorizontalLabels = [] - } - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - let itemsAlpha = chartAlphaAnimator.current - guard itemsAlpha > 0 else { return } - - let range = renderRange(bounds: bounds, chartFrame: chartFrame) - - func drawHorizontalLabels(_ labels: [LinesChartLabel], color: UIColor) { - let attributes: [NSAttributedString.Key : Any] = [.foregroundColor: color, - .font: labelsFont] - let y = chartFrame.origin.y + chartFrame.height + labelsVerticalOffset - - if let start = labels.firstIndex(where: { $0.value > range.lowerBound }) { - for index in start.. range.upperBound { - break - } - } - } - } - let labelColorAlpha = labelsColor.alphaValue * itemsAlpha - drawHorizontalLabels(horizontalLabels, color: labelsColor.withAlphaComponent(labelColorAlpha * itemsAlpha)) - for animation in animatedHorizontalLabels { - let color = labelsColor.withAlphaComponent(animation.alphaAnimator.current * labelColorAlpha) - drawHorizontalLabels(animation.labels, color: color) - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/LineBulletsRenerer.swift b/submodules/Charts/Sources/Charts/Renderes/LineBulletsRenerer.swift deleted file mode 100644 index e0417719d7..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/LineBulletsRenerer.swift +++ /dev/null @@ -1,67 +0,0 @@ -// -// LineBulletsRenerer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/8/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class LineBulletsRenerer: BaseChartRenderer { - struct Bullet { - var coordinate: CGPoint - var color: UIColor - } - - var bullets: [Bullet] = [] { - willSet { - if alphaAnimators.count != newValue.count { - alphaAnimators = newValue.map { _ in AnimationController(current: 1.0, refreshClosure: refreshClosure) } - } - } - didSet { - setNeedsDisplay() - } - } - private var alphaAnimators: [AnimationController] = [] - - private lazy var innerColorAnimator = AnimationController(current: UIColorContainer(color: .white), refreshClosure: refreshClosure) - public func setInnerColor(_ color: UIColor, animated: Bool) { - if animated { - innerColorAnimator.animate(to: UIColorContainer(color: color), duration: .defaultDuration) - } else { - innerColorAnimator.set(current: UIColorContainer(color: color)) - } - } - - var linesWidth: CGFloat = 2 - var bulletRadius: CGFloat = 6 - - func setLineVisible(_ isVisible: Bool, at index: Int, animated: Bool) { - alphaAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - let generalAlpha = chartAlphaAnimator.current - if generalAlpha == 0 { return } - - for (index, bullet) in bullets.enumerated() { - let alpha = alphaAnimators[index].current - if alpha == 0 { continue } - - let centerX = transform(toChartCoordinateHorizontal: bullet.coordinate.x, chartFrame: chartFrame) - let centerY = transform(toChartCoordinateVertical: bullet.coordinate.y, chartFrame: chartFrame) - context.setFillColor(innerColorAnimator.current.color.withAlphaComponent(alpha).cgColor) - context.setStrokeColor(bullet.color.withAlphaComponent(alpha).cgColor) - context.setLineWidth(linesWidth) - let rect = CGRect(x: centerX - bulletRadius / 2, - y: centerY - bulletRadius / 2, - width: bulletRadius, - height: bulletRadius) - context.fillEllipse(in: rect) - context.strokeEllipse(in: rect) - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/LinesChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/LinesChartRenderer.swift deleted file mode 100644 index fe3cdd47ab..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/LinesChartRenderer.swift +++ /dev/null @@ -1,538 +0,0 @@ -// -// LinesChartRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class LinesChartRenderer: BaseChartRenderer { - struct LineData { - var color: UIColor - var points: [CGPoint] - } - - private var linesAlphaAnimators: [AnimationController] = [] - - var lineWidth: CGFloat = 1 { - didSet { - setNeedsDisplay() - } - } - private lazy var linesShapeAnimator = AnimationController(current: 1, refreshClosure: self.refreshClosure) - private var fromLines: [LineData] = [] - private var toLines: [LineData] = [] - - func setLines(lines: [LineData], animated: Bool) { - if toLines.count != lines.count { - linesAlphaAnimators = lines.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } - } - if animated { - self.fromLines = self.toLines - self.toLines = lines - linesShapeAnimator.set(current: 1.0 - linesShapeAnimator.current) - linesShapeAnimator.completionClosure = { - self.fromLines = [] - } - linesShapeAnimator.animate(to: 1, duration: .defaultDuration) - } else { - self.fromLines = [] - self.toLines = lines - linesShapeAnimator.set(current: 1) - } - } - - func setLineVisible(_ isVisible: Bool, at index: Int, animated: Bool) { - linesAlphaAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - let chartsAlpha = chartAlphaAnimator.current - if chartsAlpha == 0 { return } - let range = renderRange(bounds: bounds, chartFrame: chartFrame) - - for (index, toLine) in toLines.enumerated() { - let alpha = linesAlphaAnimators[index].current * chartsAlpha - if alpha == 0 { continue } - context.setStrokeColor(toLine.color.withAlphaComponent(alpha).cgColor) - context.setLineWidth(lineWidth) - - if linesShapeAnimator.isAnimating { - let animationOffset = linesShapeAnimator.current - - let path = CGMutablePath() - let fromPoints = fromLines.safeElement(at: index)?.points ?? [] - let toPoints = toLines.safeElement(at: index)?.points ?? [] - - var fromIndex: Int? = fromPoints.firstIndex(where: { $0.x >= range.lowerBound }) - var toIndex: Int? = toPoints.firstIndex(where: { $0.x >= range.lowerBound }) - - let fromRange = verticalRange.start - let currentRange = verticalRange.current - let toRange = verticalRange.end - - func convertFromPoint(_ fromPoint: CGPoint) -> CGPoint { - return CGPoint(x: fromPoint.x, - y: (fromPoint.y - fromRange.lowerBound) / fromRange.distance * currentRange.distance + currentRange.lowerBound) - } - - func convertToPoint(_ toPoint: CGPoint) -> CGPoint { - return CGPoint(x: toPoint.x, - y: (toPoint.y - toRange.lowerBound) / toRange.distance * currentRange.distance + currentRange.lowerBound) - } - - var previousFromPoint: CGPoint - var previousToPoint: CGPoint - let startFromPoint: CGPoint? - let startToPoint: CGPoint? - - if let validFrom = fromIndex { - previousFromPoint = convertFromPoint(fromPoints[max(0, validFrom - 1)]) - startFromPoint = previousFromPoint - } else { - previousFromPoint = .zero - startFromPoint = nil - } - if let validTo = toIndex { - previousToPoint = convertToPoint(toPoints[max(0, validTo - 1)]) - startToPoint = previousToPoint - } else { - previousToPoint = .zero - startToPoint = nil - } - - var combinedPoints: [CGPoint] = [] - - func add(pointToDraw: CGPoint) { - if let startFromPoint = startFromPoint, - pointToDraw.x < startFromPoint.x { - let animatedPoint = CGPoint(x: pointToDraw.x, - y: CGFloat.valueBetween(start: startFromPoint.y, end: pointToDraw.y, offset: animationOffset)) - combinedPoints.append(transform(toChartCoordinate: animatedPoint, chartFrame: chartFrame)) - } else if let startToPoint = startToPoint, - pointToDraw.x < startToPoint.x { - let animatedPoint = CGPoint(x: pointToDraw.x, - y: CGFloat.valueBetween(start: startToPoint.y, end: pointToDraw.y, offset: 1 - animationOffset)) - combinedPoints.append(transform(toChartCoordinate: animatedPoint, chartFrame: chartFrame)) - } else { - combinedPoints.append(transform(toChartCoordinate: pointToDraw, chartFrame: chartFrame)) - } - } - - if previousToPoint != .zero && previousFromPoint != .zero { - add(pointToDraw: (previousToPoint.x < previousFromPoint.x ? previousToPoint : previousFromPoint)) - } else if previousToPoint != .zero { - add(pointToDraw: previousToPoint) - } else if previousFromPoint != .zero { - add(pointToDraw: previousFromPoint) - } - - while let validFromIndex = fromIndex, - let validToIndex = toIndex, - validFromIndex < fromPoints.count, - validToIndex < toPoints.count { - let currentFromPoint = convertFromPoint(fromPoints[validFromIndex]) - let currentToPoint = convertToPoint(toPoints[validToIndex]) - let pointToAdd: CGPoint - if currentFromPoint.x == currentToPoint.x { - pointToAdd = CGPoint.valueBetween(start: currentFromPoint, end: currentToPoint, offset: animationOffset) - previousFromPoint = currentFromPoint - previousToPoint = currentToPoint - fromIndex = validFromIndex + 1 - toIndex = validToIndex + 1 - } else if currentFromPoint.x < currentToPoint.x { - if previousToPoint.x < currentFromPoint.x { - let offset = Double((currentFromPoint.x - previousToPoint.x) / (currentToPoint.x - previousToPoint.x)) - let intermidiateToPoint = CGPoint.valueBetween(start: previousToPoint, end: currentToPoint, offset: offset) - pointToAdd = CGPoint.valueBetween(start: currentFromPoint, end: intermidiateToPoint, offset: animationOffset) - } else { - pointToAdd = currentFromPoint - } - previousFromPoint = currentFromPoint - fromIndex = validFromIndex + 1 - } else { - if previousFromPoint.x < currentToPoint.x { - let offset = Double((currentToPoint.x - previousFromPoint.x) / (currentFromPoint.x - previousFromPoint.x)) - let intermidiateFromPoint = CGPoint.valueBetween(start: previousFromPoint, end: currentFromPoint, offset: offset) - pointToAdd = CGPoint.valueBetween(start: intermidiateFromPoint, end: currentToPoint, offset: animationOffset) - } else { - pointToAdd = currentToPoint - } - previousToPoint = currentToPoint - toIndex = validToIndex + 1 - } - add(pointToDraw: pointToAdd) - if (pointToAdd.x > range.upperBound) { - break - } - } - - while let validToIndex = toIndex, validToIndex < toPoints.count { - var pointToAdd = convertToPoint(toPoints[validToIndex]) - pointToAdd.y = CGFloat.valueBetween(start: previousFromPoint.y, - end: pointToAdd.y, - offset: animationOffset) - - add(pointToDraw: pointToAdd) - if (pointToAdd.x > range.upperBound) { - break - } - - toIndex = validToIndex + 1 - } - - while let validFromIndex = fromIndex, validFromIndex < fromPoints.count { - var pointToAdd = convertFromPoint(fromPoints[validFromIndex]) - pointToAdd.y = CGFloat.valueBetween(start: previousToPoint.y, - end: pointToAdd.y, - offset: 1 - animationOffset) - - add(pointToDraw: pointToAdd) - if (pointToAdd.x > range.upperBound) { - break - } - - fromIndex = validFromIndex + 1 - } - - var index = 0 - var lines: [CGPoint] = [] - var currentChartPoint = combinedPoints[index] - lines.append(currentChartPoint) - - var chartPoints = [currentChartPoint] - var minIndex = 0 - var maxIndex = 0 - index += 1 - - while index < combinedPoints.count { - currentChartPoint = combinedPoints[index] - - if currentChartPoint.x - chartPoints[0].x < lineWidth * optimizationLevel { - chartPoints.append(currentChartPoint) - - if currentChartPoint.y > chartPoints[maxIndex].y { - maxIndex = chartPoints.count - 1 - } - if currentChartPoint.y < chartPoints[minIndex].y { - minIndex = chartPoints.count - 1 - } - - index += 1 - } else { - if chartPoints.count == 1 { - lines.append(currentChartPoint) - lines.append(currentChartPoint) - chartPoints[0] = currentChartPoint - index += 1 - minIndex = 0 - maxIndex = 0 - } else { - if minIndex < maxIndex { - if minIndex != 0 { - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - } - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - if maxIndex != chartPoints.count - 1 { - chartPoints = [chartPoints[maxIndex], chartPoints.last!] - } else { - chartPoints = [chartPoints[maxIndex]] - } - } else { - if maxIndex != 0 { - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - } - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - if minIndex != chartPoints.count - 1 { - chartPoints = [chartPoints[minIndex], chartPoints.last!] - } else { - chartPoints = [chartPoints[minIndex]] - } - } - if chartPoints.count == 2 { - if chartPoints[0].y < chartPoints[1].y { - minIndex = 0 - maxIndex = 1 - } else { - minIndex = 1 - maxIndex = 0 - } - } else { - minIndex = 0 - maxIndex = 0 - } - } - } - } - - if chartPoints.count == 1 { - lines.append(currentChartPoint) - lines.append(currentChartPoint) - } else { - if minIndex < maxIndex { - if minIndex != 0 { - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - } - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - if maxIndex != chartPoints.count - 1 { - lines.append(chartPoints.last!) - lines.append(chartPoints.last!) - } - } else { - if maxIndex != 0 { - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - } - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - if minIndex != chartPoints.count - 1 { - lines.append(chartPoints.last!) - lines.append(chartPoints.last!) - } - } - } - - if (lines.count % 2) == 1 { - lines.removeLast() - } - - context.setLineCap(.round) - context.strokeLineSegments(between: lines) - - } else { - let alpha = linesAlphaAnimators[index].current * chartsAlpha - if alpha == 0 { continue } - context.setStrokeColor(toLine.color.withAlphaComponent(alpha).cgColor) - context.setLineWidth(lineWidth) - - if var index = toLine.points.firstIndex(where: { $0.x >= range.lowerBound }) { - var lines: [CGPoint] = [] - index = max(0, index - 1) - var currentPoint = toLine.points[index] - var currentChartPoint = transform(toChartCoordinate: currentPoint, chartFrame: chartFrame) - lines.append(currentChartPoint) - //context.move(to: currentChartPoint) - - var chartPoints = [currentChartPoint] - var minIndex = 0 - var maxIndex = 0 - index += 1 - - while index < toLine.points.count { - currentPoint = toLine.points[index] - currentChartPoint = transform(toChartCoordinate: currentPoint, chartFrame: chartFrame) - - if currentChartPoint.x - chartPoints[0].x < lineWidth * optimizationLevel { - chartPoints.append(currentChartPoint) - - if currentChartPoint.y > chartPoints[maxIndex].y { - maxIndex = chartPoints.count - 1 - } - if currentChartPoint.y < chartPoints[minIndex].y { - minIndex = chartPoints.count - 1 - } - - index += 1 - } else { - if chartPoints.count == 1 { - lines.append(currentChartPoint) - lines.append(currentChartPoint) - chartPoints[0] = currentChartPoint - index += 1 - minIndex = 0 - maxIndex = 0 - } else { - if minIndex < maxIndex { - if minIndex != 0 { - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - } - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - if maxIndex != chartPoints.count - 1 { - chartPoints = [chartPoints[maxIndex], chartPoints.last!] - } else { - chartPoints = [chartPoints[maxIndex]] - } - } else { - if maxIndex != 0 { - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - } - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - if minIndex != chartPoints.count - 1 { - chartPoints = [chartPoints[minIndex], chartPoints.last!] - } else { - chartPoints = [chartPoints[minIndex]] - } - } - if chartPoints.count == 2 { - if chartPoints[0].y < chartPoints[1].y { - minIndex = 0 - maxIndex = 1 - } else { - minIndex = 1 - maxIndex = 0 - } - } else { - minIndex = 0 - maxIndex = 0 - } - } - } - if currentPoint.x > range.upperBound { - break - } - } - - if chartPoints.count == 1 { - lines.append(currentChartPoint) - lines.append(currentChartPoint) - } else { - if minIndex < maxIndex { - if minIndex != 0 { - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - } - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - if maxIndex != chartPoints.count - 1 { - lines.append(chartPoints.last!) - lines.append(chartPoints.last!) - } - } else { - if maxIndex != 0 { - lines.append(chartPoints[maxIndex]) - lines.append(chartPoints[maxIndex]) - } - lines.append(chartPoints[minIndex]) - lines.append(chartPoints[minIndex]) - if minIndex != chartPoints.count - 1 { - lines.append(chartPoints.last!) - lines.append(chartPoints.last!) - } - } - } - - if (lines.count % 2) == 1 { - lines.removeLast() - } - - context.setLineCap(.round) - context.strokeLineSegments(between: lines) - } - -// if var start = toLine.points.firstIndex(where: { $0.x > range.lowerBound }) { -// let alpha = linesAlphaAnimators[index].current * chartsAlpha -// if alpha == 0 { continue } -// context.setStrokeColor(toLine.color.withAlphaComponent(alpha).cgColor) -// context.setLineWidth(lineWidth) -// -// context.setLineCap(.round) -// start = max(0, start - 1) -// let startPoint = toLine.points[start] -// var lines: [CGPoint] = [] -// var pointToDraw = CGPoint(x: transform(toChartCoordinateHorizontal: startPoint.x, chartFrame: chartFrame), -// y: transform(toChartCoordinateVertical: startPoint.y, chartFrame: chartFrame)) -// for index in (start + 1).. range.upperBound { -// break -// } -// } -// -// context.strokeLineSegments(between: lines) -// } - } - } - } -} - -extension LinesChartRenderer.LineData { - static func initialComponents(chartsCollection: ChartsCollection) -> (linesData: [LinesChartRenderer.LineData], - totalHorizontalRange: ClosedRange, - totalVerticalRange: ClosedRange) { - let lines: [LinesChartRenderer.LineData] = chartsCollection.chartValues.map { chart in - let points = chart.values.enumerated().map({ (arg) -> CGPoint in - return CGPoint(x: chartsCollection.axisValues[arg.offset].timeIntervalSince1970, - y: arg.element) - }) - return LinesChartRenderer.LineData(color: chart.color, points: points) - } - let horizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: lines) ?? BaseConstants.defaultRange - let verticalRange = LinesChartRenderer.LineData.verticalRange(lines: lines) ?? BaseConstants.defaultRange - return (linesData: lines, totalHorizontalRange: horizontalRange, totalVerticalRange: verticalRange) - } - - static func horizontalRange(lines: [LinesChartRenderer.LineData]) -> ClosedRange? { - guard let firstPoint = lines.first?.points.first else { return nil } - var hMin: CGFloat = firstPoint.x - var hMax: CGFloat = firstPoint.x - - for line in lines { - if let first = line.points.first, - let last = line.points.last { - hMin = min(hMin, first.x) - hMax = max(hMax, last.x) - } - } - - return hMin...hMax - } - - static func verticalRange(lines: [LinesChartRenderer.LineData], calculatingRange: ClosedRange? = nil, addBounds: Bool = false) -> ClosedRange? { - if let calculatingRange = calculatingRange { - guard let initalStart = lines.first?.points.first(where: { $0.x >= calculatingRange.lowerBound && - $0.x <= calculatingRange.upperBound }) else { return nil } - var vMin: CGFloat = initalStart.y - var vMax: CGFloat = initalStart.y - for line in lines { - if var index = line.points.firstIndex(where: { $0.x > calculatingRange.lowerBound }) { - if addBounds { - index = max(0, index - 1) - } - while index < line.points.count { - let point = line.points[index] - if point.x < calculatingRange.upperBound { - vMin = min(vMin, point.y) - vMax = max(vMax, point.y) - } else if addBounds { - vMin = min(vMin, point.y) - vMax = max(vMax, point.y) - break - } else { - break - } - index += 1 - } - } - } - return vMin...vMax - } else { - guard let firstPoint = lines.first?.points.first else { return nil } - var vMin: CGFloat = firstPoint.y - var vMax: CGFloat = firstPoint.y - for line in lines { - for point in line.points { - vMin = min(vMin, point.y) - vMax = max(vMax, point.y) - } - } - return vMin...vMax - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/PecentChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PecentChartRenderer.swift deleted file mode 100644 index 07ff3daaaa..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/PecentChartRenderer.swift +++ /dev/null @@ -1,132 +0,0 @@ -// -// PecentChartRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class PecentChartRenderer: BaseChartRenderer { - struct PercentageData { - static let blank = PecentChartRenderer.PercentageData(locations: [], components: []) - var locations: [CGFloat] - var components: [Component] - - struct Component { - var color: UIColor - var values: [CGFloat] - } - } - - override func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { - super.setup(verticalRange: 0...1, animated: animated, timeFunction: timeFunction) - } - - private var componentsAnimators: [AnimationController] = [] - var percentageData: PercentageData = PercentageData(locations: [], components: []) { - willSet { - if percentageData.components.count != newValue.components.count { - componentsAnimators = newValue.components.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } - } - } - didSet { - setNeedsDisplay() - } - } - - func setComponentVisible(_ isVisible: Bool, at index: Int, animated: Bool) { - componentsAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - let alpha = chartAlphaAnimator.current - guard alpha > 0 else { return } - - let range = renderRange(bounds: bounds, chartFrame: chartFrame) - - var paths: [CGMutablePath] = percentageData.components.map { _ in CGMutablePath() } - var vertices: [CGFloat] = Array(repeating: 0, count: percentageData.components.count) - - if var locationIndex = percentageData.locations.firstIndex(where: { $0 > range.lowerBound }) { - locationIndex = max(0, locationIndex - 1) - - var currentLocation = transform(toChartCoordinateHorizontal: percentageData.locations[locationIndex], chartFrame: chartFrame) - - let startPoint = CGPoint(x: currentLocation, - y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - - for path in paths { - path.move(to: startPoint) - } - paths.last?.addLine(to: CGPoint(x: currentLocation, - y: transform(toChartCoordinateVertical: verticalRange.current.upperBound, chartFrame: chartFrame))) - - while locationIndex < percentageData.locations.count { - currentLocation = transform(toChartCoordinateHorizontal: percentageData.locations[locationIndex], chartFrame: chartFrame) - var summ: CGFloat = 0 - - for (index, component) in percentageData.components.enumerated() { - let visibilityPercent = componentsAnimators[index].current - - let value = component.values[locationIndex] * visibilityPercent - if index == 0 { - vertices[index] = value - } else { - vertices[index] = value + vertices[index - 1] - } - summ += value - } - - if summ > 0 { - for (index, value) in vertices.dropLast().enumerated() { - paths[index].addLine(to: CGPoint(x: currentLocation, - y: transform(toChartCoordinateVertical: value / summ, chartFrame: chartFrame))) - } - } - - if currentLocation > range.upperBound { - break - } - - locationIndex += 1 - } - - paths.last?.addLine(to: CGPoint(x: currentLocation, - y: transform(toChartCoordinateVertical: verticalRange.current.upperBound, chartFrame: chartFrame))) - - let endPoint = CGPoint(x: currentLocation, - y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - - for (index, path) in paths.enumerated().reversed() { - let visibilityPercent = componentsAnimators[index].current - if visibilityPercent == 0 { continue } - - path.addLine(to: endPoint) - path.closeSubpath() - - context.saveGState() - context.beginPath() - context.addPath(path) - - context.setFillColor(percentageData.components[index].color.cgColor) - context.fillPath() - context.restoreGState() - } - } - } -} - -extension PecentChartRenderer.PercentageData { - static func horizontalRange(data: PecentChartRenderer.PercentageData) -> ClosedRange? { - guard let firstPoint = data.locations.first, - let lastPoint = data.locations.last, - firstPoint <= lastPoint else { - return nil - } - - return firstPoint...lastPoint - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift deleted file mode 100644 index e36fdaf913..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift +++ /dev/null @@ -1,202 +0,0 @@ -// -// PercentPieAnimationRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/13/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class PercentPieAnimationRenderer: BaseChartRenderer { - override func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { - super.setup(verticalRange: 0...1, animated: animated, timeFunction: timeFunction) - } - - private lazy var transitionAnimator = AnimationController(current: 0, refreshClosure: refreshClosure) - private var animationComponentsPoints: [[CGPoint]] = [] - var visiblePercentageData: PecentChartRenderer.PercentageData = .blank { - didSet { - animationComponentsPoints = [] - } - } - var visiblePieComponents: [PieChartRenderer.PieComponent] = [] - - func animate(fromDataToPie: Bool, animated: Bool, completion: @escaping () -> Void) { - assert(visiblePercentageData.components.count == visiblePieComponents.count) - - isEnabled = true - transitionAnimator.completionClosure = { [weak self] in - self?.isEnabled = false - completion() - } - transitionAnimator.animate(to: fromDataToPie ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - - private func generateAnimationComponentPoints(bounds: CGRect, chartFrame: CGRect) { - let range = renderRange(bounds: bounds, chartFrame: chartFrame) - - let componentsCount = visiblePercentageData.components.count - guard componentsCount > 0 else { return } - animationComponentsPoints = visiblePercentageData.components.map { _ in [] } - var vertices: [CGFloat] = Array(repeating: 0, count: visiblePercentageData.components.count) - - if var locationIndex = visiblePercentageData.locations.firstIndex(where: { $0 > range.lowerBound }) { - locationIndex = max(0, locationIndex - 1) - var currentLocation = transform(toChartCoordinateHorizontal: visiblePercentageData.locations[locationIndex], chartFrame: chartFrame) - let startPoint = CGPoint(x: currentLocation, y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - for index in 0.. range.upperBound { - break - } - locationIndex += 1 - } - - animationComponentsPoints[componentsCount - 1].append(CGPoint(x: currentLocation, y: transform(toChartCoordinateVertical: verticalRange.current.upperBound, chartFrame: chartFrame))) - let endPoint = CGPoint(x: currentLocation, y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - for index in 0.. 0 && verticalRange.current.distance > 0 else { return } - self.optimizationLevel = 1 - - if animationComponentsPoints.isEmpty { - generateAnimationComponentPoints(bounds: bounds, chartFrame: chartFrame) - } - - let numberOfComponents = animationComponentsPoints.count - guard numberOfComponents > 0 else { return } - let destinationRadius = max(chartFrame.width, chartFrame.height) - - let animationFraction = transitionAnimator.current - let animationFractionD = Double(transitionAnimator.current) - let easeInAnimationFractionD = animationFractionD * animationFractionD * animationFractionD * animationFractionD - let center = CGPoint(x: chartFrame.midX, y: chartFrame.midY) - let totalPieSumm: CGFloat = visiblePieComponents.map { $0.value } .reduce(0, +) - - let pathsToDraw: [CGMutablePath] = (0.. 4 else { - return - } - - let percent = visiblePieComponents[componentIndex].value / totalPieSumm - let segmentSize = 2 * .pi * percent - let endAngle = startAngle + segmentSize - let centerAngle = (startAngle + endAngle) / 2 - - let lineCenterPoint = CGPoint.valueBetween(start: componentPoints[componentPoints.count / 2], - end: center, - offset: animationFractionD) - - let startDestinationPoint = lineCenterPoint + CGPoint(x: destinationRadius, y: 0) - let centerDestinationPoint = lineCenterPoint + CGPoint(x: 0, y: destinationRadius) - let endDestinationPoint = lineCenterPoint + CGPoint(x: -destinationRadius, y: 0) - let initialStartDestinationAngle: CGFloat = 0 - let initialCenterDestinationAngle: CGFloat = .pi / 2 - let initialEndDestinationAngle: CGFloat = .pi - - var previousAddedPoint = (componentPoints[0] * 2 - center) - .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: centerAngle - initialCenterDestinationAngle, offset: animationFractionD)) - - pathsToDraw[componentIndex].move(to: previousAddedPoint) - - func addPointToPath(_ point: CGPoint) { - if (point - previousAddedPoint).lengthSquared() > optimizationLevel { - pathsToDraw[componentIndex].addLine(to: point) - previousAddedPoint = point - } - } - - for endPointIndex in 1..<(componentPoints.count / 2) { - addPointToPath(CGPoint.valueBetween(start: componentPoints[endPointIndex], end: endDestinationPoint, offset: easeInAnimationFractionD) - .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: endAngle - initialEndDestinationAngle, offset: animationFractionD))) - } - - addPointToPath(lineCenterPoint) - - for startPointIndex in (componentPoints.count / 2 + 1)..<(componentPoints.count - 1) { - addPointToPath(CGPoint.valueBetween(start: componentPoints[startPointIndex], end: startDestinationPoint, offset: easeInAnimationFractionD) - .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: startAngle - initialStartDestinationAngle, offset: animationFractionD))) - } - - if let lastPoint = componentPoints.last { - addPointToPath((lastPoint * 2 - center) - .rotate(origin: lineCenterPoint, angle: CGFloat.valueBetween(start: 0, end: centerAngle - initialCenterDestinationAngle, offset: animationFractionD))) - } - - startAngle = endAngle - } - - if let lastPath = animationComponentsPoints.last { - pathsToDraw.last?.addLines(between: lastPath) - } - - for (index, path) in pathsToDraw.enumerated().reversed() { - path.closeSubpath() - - context.saveGState() - context.beginPath() - context.addPath(path) - - context.setFillColor(visiblePieComponents[index].color.cgColor) - context.fillPath() - context.restoreGState() - } - - let diagramRadius = (min(chartFrame.width, chartFrame.height) / 2) * 0.925 - let targetFrame = CGRect(origin: CGPoint(x: center.x - diagramRadius, - y: center.y - diagramRadius), - size: CGSize(width: diagramRadius * 2, - height: diagramRadius * 2)) - - let minX = animationComponentsPoints.last?.first?.x ?? 0 - let maxX = animationComponentsPoints.last?.last?.x ?? 0 - let startFrame = CGRect(x: minX, - y: chartFrame.minY, - width: maxX - minX, - height: chartFrame.height) - let cornerRadius = diagramRadius * animationFraction - let fadeOutFrame = CGRect.valueBetween(start: startFrame, end: targetFrame, offset: animationFractionD) - let fadeOutPath = CGMutablePath() - fadeOutPath.addRect(bounds) - fadeOutPath.addPath(CGPath(roundedRect: fadeOutFrame, cornerWidth: cornerRadius, cornerHeight: cornerRadius, transform: nil)) - - context.saveGState() - context.beginPath() - context.addPath(fadeOutPath) - context.setFillColor(backgroundColor.cgColor) - context.fillPath(using: .evenOdd) - context.restoreGState() - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/PerformanceRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PerformanceRenderer.swift deleted file mode 100644 index c17663ce5f..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/PerformanceRenderer.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// PerformanceRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/10/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class PerformanceRenderer: ChartViewRenderer { - var containerViews: [UIView] = [] - - private var previousTickTime: TimeInterval = CACurrentMediaTime() - - func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - let currentTime = CACurrentMediaTime() - let delta = currentTime - previousTickTime - previousTickTime = currentTime - - let normalDelta = 0.017 - let redDelta = 0.05 - - if delta > normalDelta || delta < 0.75 { - let green = CGFloat( 1.0 - crop(0, (delta - normalDelta) / (redDelta - normalDelta), 1)) - let color = UIColor(red: 1.0, green: green, blue: 0, alpha: 1) - context.setFillColor(color.cgColor) - context.fill(CGRect(x: 0, y: 0, width: bounds.width, height: 3)) - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/PieChartRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/PieChartRenderer.swift deleted file mode 100644 index ed4e6bdd49..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/PieChartRenderer.swift +++ /dev/null @@ -1,191 +0,0 @@ -// -// PieChartRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class PieChartRenderer: BaseChartRenderer { - struct PieComponent: Hashable { - var color: UIColor - var value: CGFloat - } - - override func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { - super.setup(verticalRange: 0...1, animated: animated, timeFunction: timeFunction) - } - - var valuesFormatter: NumberFormatter = NumberFormatter() - var drawValues: Bool = true - - private var componentsAnimators: [AnimationController] = [] - private lazy var transitionAnimator: AnimationController = { AnimationController(current: 1, refreshClosure: self.refreshClosure) }() - private var oldPercentageData: [PieComponent] = [] - private var percentageData: [PieComponent] = [] - private var setlectedSegmentsAnimators: [AnimationController] = [] - - var drawPie: Bool = true - var initialAngle: CGFloat = .pi / 3 - var hasSelectedSegments: Bool { - return selectedSegment != nil - } - private(set) var selectedSegment: Int? - func selectSegmentAt(at indexToSelect: Int?, animated: Bool) { - selectedSegment = indexToSelect - for (index, animator) in setlectedSegmentsAnimators.enumerated() { - let fraction: CGFloat = (index == indexToSelect) ? 1.0 : 0.0 - if animated { - animator.animate(to: fraction, duration: .defaultDuration / 2) - } else { - animator.set(current: fraction) - } - } - } - - func updatePercentageData(_ percentageData: [PieComponent], animated: Bool) { - if self.percentageData.count != percentageData.count { - componentsAnimators = percentageData.map { _ in AnimationController(current: 1, refreshClosure: self.refreshClosure) } - setlectedSegmentsAnimators = percentageData.map { _ in AnimationController(current: 0, refreshClosure: self.refreshClosure) } - } - if animated { - self.oldPercentageData = self.currentTransitionAnimationData - self.percentageData = percentageData - transitionAnimator.completionClosure = { [weak self] in - self?.oldPercentageData = [] - } - transitionAnimator.set(current: 0) - transitionAnimator.animate(to: 1, duration: .defaultDuration) - } else { - self.oldPercentageData = [] - self.percentageData = percentageData - transitionAnimator.set(current: 0) - } - } - - func setComponentVisible(_ isVisible: Bool, at index: Int, animated: Bool) { - componentsAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - - var lastRenderedBounds: CGRect = .zero - var lastRenderedChartFrame: CGRect = .zero - func selectedItemIndex(at point: CGPoint) -> Int? { - let touchPosition = lastRenderedChartFrame.origin + point * lastRenderedChartFrame.size - let center = CGPoint(x: lastRenderedChartFrame.midX, y: lastRenderedChartFrame.midY) - let radius = min(lastRenderedChartFrame.width, lastRenderedChartFrame.height) / 2 - if center.distanceTo(touchPosition) > radius { return nil } - let angle = (center - touchPosition).angle + .pi - let currentData = currentlyVisibleData - let total: CGFloat = currentData.map({ $0.value }).reduce(0, +) - var startAngle: CGFloat = initialAngle - for (index, piece) in currentData.enumerated() { - let percent = piece.value / total - let segmentSize = 2 * .pi * percent - let endAngle = startAngle + segmentSize - if angle >= startAngle && angle <= endAngle || - angle + .pi * 2 >= startAngle && angle + .pi * 2 <= endAngle { - return index - } - startAngle = endAngle - } - return nil - } - - private var currentTransitionAnimationData: [PieComponent] { - if transitionAnimator.isAnimating { - let animationFraction = transitionAnimator.current - return percentageData.enumerated().map { arg in - return PieComponent(color: arg.element.color, - value: oldPercentageData[arg.offset].value * (1 - animationFraction) + arg.element.value * animationFraction) - } - } else { - return percentageData - } - } - - var currentlyVisibleData: [PieComponent] { - return currentTransitionAnimationData.enumerated().map { arg in - return PieComponent(color: arg.element.color, - value: arg.element.value * componentsAnimators[arg.offset].current) - } - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - lastRenderedBounds = bounds - lastRenderedChartFrame = chartFrame - let chartAlpha = chartAlphaAnimator.current - if chartAlpha == 0 { return } - - let center = CGPoint(x: chartFrame.midX, y: chartFrame.midY) - let radius = min(chartFrame.width, chartFrame.height) / 2 - - let currentData = currentlyVisibleData - - let total: CGFloat = currentData.map({ $0.value }).reduce(0, +) - guard total > 0 else { - return - } - - let animationSelectionOffset: CGFloat = radius / 15 - let maximumFontSize: CGFloat = radius / 7 - let minimumFontSize: CGFloat = 4 - let centerOffsetStartAngle = CGFloat.pi / 4 - let minimumValueToDraw: CGFloat = 0.01 - let diagramRadius = radius - animationSelectionOffset - - let numberOfVisibleItems = currentlyVisibleData.filter { $0.value > 0 }.count - var startAngle: CGFloat = initialAngle - for (index, piece) in currentData.enumerated() { - let percent = piece.value / total - guard percent > 0 else { continue } - let segmentSize = 2 * .pi * percent * chartAlpha - let endAngle = startAngle + segmentSize - let centerAngle = (startAngle + endAngle) / 2 - let labelVector = CGPoint(x: cos(centerAngle), - y: sin(centerAngle)) - - let selectionAnimationFraction = (numberOfVisibleItems > 1 ? setlectedSegmentsAnimators[index].current : 0) - - let updatedCenter = CGPoint(x: center.x + labelVector.x * selectionAnimationFraction * animationSelectionOffset, - y: center.y + labelVector.y * selectionAnimationFraction * animationSelectionOffset) - if drawPie { - context.saveGState() - context.setFillColor(piece.color.withAlphaComponent(piece.color.alphaValue * chartAlpha).cgColor) - context.move(to: updatedCenter) - context.addArc(center: updatedCenter, - radius: radius - animationSelectionOffset, - startAngle: startAngle, - endAngle: endAngle, - clockwise: false) - context.fillPath() - context.restoreGState() - } - - if drawValues && percent >= minimumValueToDraw { - context.saveGState() - - let text = valuesFormatter.string(from: percent * 100) - let fraction = crop(0, segmentSize / centerOffsetStartAngle, 1) - let fontSize = (minimumFontSize + (maximumFontSize - minimumFontSize) * fraction).rounded(.up) - let labelPotisionOffset = diagramRadius / 2 + diagramRadius / 2 * (1 - fraction) - let font = UIFont.systemFont(ofSize: fontSize, weight: .bold) - let labelsEaseInColor = crop(0, chartAlpha * chartAlpha * 2 - 1, 1) - let attributes: [NSAttributedString.Key: Any] = [.foregroundColor: UIColor.white.withAlphaComponent(labelsEaseInColor), - .font: font] - let rect = (text as NSString).boundingRect(with: bounds.size, - options: .usesLineFragmentOrigin, - attributes: attributes, - context: nil) - let labelPoint = CGPoint(x: labelVector.x * labelPotisionOffset + updatedCenter.x - rect.width / 2, - y: labelVector.y * labelPotisionOffset + updatedCenter.y - rect.height / 2) - (text as NSString).draw(at: labelPoint, withAttributes: attributes) - context.restoreGState() - } - - startAngle = endAngle - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/VerticalLinesRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/VerticalLinesRenderer.swift deleted file mode 100644 index 39d1f26a46..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/VerticalLinesRenderer.swift +++ /dev/null @@ -1,42 +0,0 @@ -// -// VerticalLinesRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/8/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class VerticalLinesRenderer: BaseChartRenderer { - var values: [CGFloat] = [] { - didSet { - alphaAnimators = values.map { _ in AnimationController(current: 1.0, refreshClosure: refreshClosure) } - setNeedsDisplay() - } - } - private var alphaAnimators: [AnimationController] = [] - - var linesColor: UIColor = .black - var linesWidth: CGFloat = UIView.oneDevicePixel - - func setLineVisible(_ isVisible: Bool, at index: Int, animated: Bool) { - alphaAnimators[index].animate(to: isVisible ? 1 : 0, duration: animated ? .defaultDuration : 0) - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - - context.setLineWidth(linesWidth) - - for (index, value) in values.enumerated() { - let alpha = alphaAnimators[index].current - if alpha == 0 { continue } - - context.setStrokeColor(linesColor.withAlphaComponent(linesColor.alphaValue * alpha).cgColor) - let pointX = transform(toChartCoordinateHorizontal: value, chartFrame: chartFrame) - context.strokeLineSegments(between: [CGPoint(x: pointX, y: chartFrame.minY), - CGPoint(x: pointX, y: chartFrame.maxY)]) - } - } -} diff --git a/submodules/Charts/Sources/Charts/Renderes/VerticalScalesRenderer.swift b/submodules/Charts/Sources/Charts/Renderes/VerticalScalesRenderer.swift deleted file mode 100644 index 79d9dcec22..0000000000 --- a/submodules/Charts/Sources/Charts/Renderes/VerticalScalesRenderer.swift +++ /dev/null @@ -1,162 +0,0 @@ -// -// VerticalScalesRenderer.swift -// GraphTest -// -// Created by Andrei Salavei on 4/8/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class VerticalScalesRenderer: BaseChartRenderer { - private var verticalLabelsAndLines: [LinesChartLabel] = [] - private var animatedVerticalLabelsAndLines: [AnimatedLinesChartLabels] = [] - private lazy var horizontalLinesAlphaAnimator: AnimationController = { - return AnimationController(current: 1, refreshClosure: self.refreshClosure) - }() - - var drawAxisX: Bool = true - var axisXColor: UIColor = .black - var axisXWidth: CGFloat = UIView.oneDevicePixel - - var isRightAligned: Bool = false - - var horizontalLinesColor: UIColor = .black { - didSet { - setNeedsDisplay() - } - } - var horizontalLinesWidth: CGFloat = UIView.oneDevicePixel - var lavelsAsisOffset: CGFloat = 6 - var labelsColor: UIColor = .black { - didSet { - setNeedsDisplay() - } - } - var labelsFont: UIFont = .systemFont(ofSize: 11) - - func setHorizontalLinesVisible(_ visible: Bool, animated: Bool) { - let destinationValue: CGFloat = visible ? 1 : 0 - guard self.horizontalLinesAlphaAnimator.end != destinationValue else { return } - if animated { - self.horizontalLinesAlphaAnimator.animate(to: destinationValue, duration: .defaultDuration) - } else { - self.horizontalLinesAlphaAnimator.set(current: destinationValue) - } - } - - func setup(verticalLimitsLabels: [LinesChartLabel], animated: Bool) { - if animated { - var labelsToKeepVisible: [LinesChartLabel] = [] - let labelsToHide: [LinesChartLabel] - var labelsToShow: [LinesChartLabel] = [] - - for label in verticalLimitsLabels { - if verticalLabelsAndLines.contains(label) { - labelsToKeepVisible.append(label) - } else { - labelsToShow.append(label) - } - } - labelsToHide = verticalLabelsAndLines.filter { !verticalLimitsLabels.contains($0) } - animatedVerticalLabelsAndLines.removeAll(where: { $0.isAppearing }) - verticalLabelsAndLines = labelsToKeepVisible - - let showAnimation = AnimatedLinesChartLabels(labels: labelsToShow, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) - showAnimation.isAppearing = true - showAnimation.alphaAnimator.set(current: 0) - showAnimation.alphaAnimator.animate(to: 1, duration: .defaultDuration) - showAnimation.alphaAnimator.completionClosure = { [weak self, weak showAnimation] in - guard let self = self, let showAnimation = showAnimation else { return } - self.animatedVerticalLabelsAndLines.removeAll(where: { $0 === showAnimation }) - self.verticalLabelsAndLines = verticalLimitsLabels - } - - let hideAnimation = AnimatedLinesChartLabels(labels: labelsToHide, alphaAnimator: AnimationController(current: 1.0, refreshClosure: refreshClosure)) - hideAnimation.isAppearing = false - hideAnimation.alphaAnimator.set(current: 1) - hideAnimation.alphaAnimator.animate(to: 0, duration: .defaultDuration) - hideAnimation.alphaAnimator.completionClosure = { [weak self, weak hideAnimation] in - guard let self = self, let hideAnimation = hideAnimation else { return } - self.animatedVerticalLabelsAndLines.removeAll(where: { $0 === hideAnimation }) - } - - animatedVerticalLabelsAndLines.append(showAnimation) - animatedVerticalLabelsAndLines.append(hideAnimation) - } else { - verticalLabelsAndLines = verticalLimitsLabels - animatedVerticalLabelsAndLines = [] - } - } - - override func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) { - guard isEnabled && verticalRange.current.distance > 0 && verticalRange.current.distance > 0 else { return } - let generalAlpha = chartAlphaAnimator.current - if generalAlpha == 0 { return } - let labelColorAlpha = labelsColor.alphaValue - - func drawLines(_ labels: [LinesChartLabel], alpha: CGFloat) { - var lineSegments: [CGPoint] = [] - let x0 = chartFrame.minX - let x1 = chartFrame.maxX - - context.setStrokeColor(horizontalLinesColor.withAlphaComponent(horizontalLinesColor.alphaValue * alpha).cgColor) - - for lineInfo in labels { - let y = transform(toChartCoordinateVertical: lineInfo.value, chartFrame: chartFrame).roundedUpToPixelGrid() - lineSegments.append(CGPoint(x: x0, y: y)) - lineSegments.append(CGPoint(x: x1, y: y)) - } - context.strokeLineSegments(between: lineSegments) - } - - func drawVerticalLabels(_ labels: [LinesChartLabel], attributes: [NSAttributedString.Key: Any]) { - if isRightAligned { - for label in labels { - let y = transform(toChartCoordinateVertical: label.value, chartFrame: chartFrame) - labelsFont.pointSize - lavelsAsisOffset - - let rect = (label.text as NSString).boundingRect(with: bounds.size, - options: .usesLineFragmentOrigin, - attributes: attributes, - context: nil) - - (label.text as NSString).draw(at: CGPoint(x:chartFrame.maxX - rect.width, y: y), withAttributes: attributes) - } - } else { - for label in labels { - let y = transform(toChartCoordinateVertical: label.value, chartFrame: chartFrame) - labelsFont.pointSize - lavelsAsisOffset - - (label.text as NSString).draw(at: CGPoint(x:chartFrame.minX, y: y), withAttributes: attributes) - } - } - } - - let horizontalLinesAlpha = horizontalLinesAlphaAnimator.current - if horizontalLinesAlpha > 0 { - context.setLineWidth(horizontalLinesWidth) - - drawLines(verticalLabelsAndLines, alpha: generalAlpha) - for animatedLabesAndLines in animatedVerticalLabelsAndLines { - drawLines(animatedLabesAndLines.labels, alpha: animatedLabesAndLines.alphaAnimator.current * generalAlpha * horizontalLinesAlpha) - } - - if drawAxisX { - context.setLineWidth(axisXWidth) - context.setStrokeColor(axisXColor.withAlphaComponent(axisXColor.alphaValue * horizontalLinesAlpha * generalAlpha).cgColor) - - let lineSegments: [CGPoint] = [CGPoint(x: chartFrame.minX, y: chartFrame.maxY.roundedUpToPixelGrid()), - CGPoint(x: chartFrame.maxX, y: chartFrame.maxY.roundedUpToPixelGrid())] - - context.strokeLineSegments(between: lineSegments) - } - } - - drawVerticalLabels(verticalLabelsAndLines, attributes: [.foregroundColor: labelsColor.withAlphaComponent(labelColorAlpha * generalAlpha), - .font: labelsFont]) - for animatedLabesAndLines in animatedVerticalLabelsAndLines { - drawVerticalLabels(animatedLabesAndLines.labels, - attributes: [.foregroundColor: labelsColor.withAlphaComponent(animatedLabesAndLines.alphaAnimator.current * labelColorAlpha * generalAlpha), - .font: labelsFont]) - } - } -} diff --git a/submodules/Charts/Sources/Helpers/AnimationController.swift b/submodules/Charts/Sources/Helpers/AnimationController.swift deleted file mode 100644 index 6df8d17f76..0000000000 --- a/submodules/Charts/Sources/Helpers/AnimationController.swift +++ /dev/null @@ -1,178 +0,0 @@ -// -// RangeAnimatedContainer.swift -// GraphTest -// -// Created by Andrei Salavei on 3/12/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -protocol Animatable { - static func valueBetween(start: Self, end: Self, offset: Double) -> Self -} - -enum TimeFunction { - case linear - case easeOut - case easeIn - - func profress(time: TimeInterval, duration: TimeInterval) -> TimeInterval { - switch self { - case .linear: - return time / duration - case .easeIn: - return (pow(2, 10 * (time / duration - 1)) - 0.0009765625) * 1.0009775171065499 - - case .easeOut: - return (-pow(2, -10 * time / duration)) + 1 * 1.0009775171065499 - } - } -} - -class AnimationController { - - private(set) var isAnimating: Bool = false - private(set) var animationDuration: TimeInterval = 0.0 - private(set) var currentTime: TimeInterval = 0.0 - - private(set) var start: AnimatableObject - private(set) var end: AnimatableObject - private(set) var current: AnimatableObject - - var timeFunction: TimeFunction = .linear - - var refreshClosure: (() -> Void)? -// var updateClosure: ((AnimatableObject) -> Void)? - var completionClosure: (() -> Void)? - - init(current: AnimatableObject, refreshClosure: (() -> Void)?) { - self.current = current - self.start = current - self.end = current - self.refreshClosure = refreshClosure - } - - func animate(to: AnimatableObject, duration: TimeInterval, timeFunction: TimeFunction = .linear) { - self.timeFunction = timeFunction - currentTime = 0 - animationDuration = duration - if animationDuration > 0 { - start = current - end = to - isAnimating = true - DisplayLinkService.shared.add(listner: self) - } else { - start = to - end = to - current = to - isAnimating = false - DisplayLinkService.shared.remove(listner: self) - } - refreshClosure?() - } - - func set(current: AnimatableObject) { - self.start = current - self.end = current - self.current = current - - animationDuration = 0.0 - currentTime = 0.0 -// updateClosure?(current) - refreshClosure?() - if isAnimating { - isAnimating = false - DisplayLinkService.shared.remove(listner: self) - } - } -} - -extension AnimationController: DisplayLinkListner { - func update(delta: TimeInterval) { - guard isAnimating else { - DisplayLinkService.shared.remove(listner: self) - return - } - - currentTime += delta - if currentTime > animationDuration || animationDuration <= 0 { - start = end - current = end - isAnimating = false - animationDuration = 0.0 - currentTime = 0.0 -// updateClosure?(end) - completionClosure?() - refreshClosure?() - DisplayLinkService.shared.remove(listner: self) - } else { - let offset = timeFunction.profress(time: currentTime, duration: animationDuration) - current = AnimatableObject.valueBetween(start: start, end: end, offset: offset) -// updateClosure?(current) - refreshClosure?() - } - } -} - -extension ClosedRange: Animatable where Bound: BinaryFloatingPoint { - static func valueBetween(start: ClosedRange, end: ClosedRange, offset: Double) -> ClosedRange { - let castedOffset = Bound(offset) - return ClosedRange(uncheckedBounds: (lower: start.lowerBound + (end.lowerBound - start.lowerBound) * castedOffset, - upper: start.upperBound + (end.upperBound - start.upperBound) * castedOffset)) - } -} - -extension CGFloat: Animatable { - static func valueBetween(start: CGFloat, end: CGFloat, offset: Double) -> CGFloat { - return start + (end - start) * CGFloat(offset) - } -} - -extension Double: Animatable { - static func valueBetween(start: Double, end: Double, offset: Double) -> Double { - return start + (end - start) * Double(offset) - } -} - -extension Int: Animatable { - static func valueBetween(start: Int, end: Int, offset: Double) -> Int { - return start + Int(Double(end - start) * offset) - } -} - -extension CGPoint: Animatable { - static func valueBetween(start: CGPoint, end: CGPoint, offset: Double) -> CGPoint { - return CGPoint(x: start.x + (end.x - start.x) * CGFloat(offset), - y: start.y + (end.y - start.y) * CGFloat(offset)) - } -} - -extension CGRect: Animatable { - static func valueBetween(start: CGRect, end: CGRect, offset: Double) -> CGRect { - return CGRect(x: start.origin.x + (end.origin.x - start.origin.x) * CGFloat(offset), - y: start.origin.y + (end.origin.y - start.origin.y) * CGFloat(offset), - width: start.width + (end.width - start.width) * CGFloat(offset), - height: start.height + (end.height - start.height) * CGFloat(offset)) - } -} - -struct UIColorContainer: Animatable { - var color: UIColor - - static func valueBetween(start: UIColorContainer, end: UIColorContainer, offset: Double) -> UIColorContainer { - return UIColorContainer(color: UIColor.valueBetween(start: start.color, end: end.color, offset: offset)) - } -} - -extension UIColor { - static func valueBetween(start: UIColor, end: UIColor, offset: Double) -> UIColor { - let offsetF = CGFloat(offset) - let startCIColor = CIColor(color: start) - let endCIColor = CIColor(color: end) - return UIColor(red: startCIColor.red + (endCIColor.red - startCIColor.red) * offsetF, - green: startCIColor.green + (endCIColor.green - startCIColor.green) * offsetF, - blue: startCIColor.blue + (endCIColor.blue - startCIColor.blue) * offsetF, - alpha: startCIColor.alpha + (endCIColor.alpha - startCIColor.alpha) * offsetF) - } -} diff --git a/submodules/Charts/Sources/Helpers/Array+Utils.swift b/submodules/Charts/Sources/Helpers/Array+Utils.swift deleted file mode 100644 index 539a559756..0000000000 --- a/submodules/Charts/Sources/Helpers/Array+Utils.swift +++ /dev/null @@ -1,18 +0,0 @@ -// -// Array+Utils.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import Foundation - -extension Array { - func safeElement(at index: Int) -> Element? { - if index >= 0 && index < count { - return self[index] - } - return nil - } -} diff --git a/submodules/Charts/Sources/Helpers/CGFloat.swift b/submodules/Charts/Sources/Helpers/CGFloat.swift deleted file mode 100644 index 7bde39b84f..0000000000 --- a/submodules/Charts/Sources/Helpers/CGFloat.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// CGFloat.swift -// GraphTest -// -// Created by Andrei Salavei on 4/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -private let screenScale: CGFloat = UIScreen.main.scale - -extension CGFloat { - func roundedUpToPixelGrid() -> CGFloat { - return (self * screenScale).rounded(.up) / screenScale - } -} diff --git a/submodules/Charts/Sources/Helpers/CGPoint+Extensions.swift b/submodules/Charts/Sources/Helpers/CGPoint+Extensions.swift deleted file mode 100644 index b5bbd06da4..0000000000 --- a/submodules/Charts/Sources/Helpers/CGPoint+Extensions.swift +++ /dev/null @@ -1,219 +0,0 @@ -// -// CGPoint+Extensions.swift -// GraphTest -// -// Created by Andrei Salavei on 4/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -extension CGPoint { - public init(vector: CGVector) { - self.init(x: vector.dx, y: vector.dy) - } - - - public init(angle: CGFloat) { - self.init(x: cos(angle), y: sin(angle)) - } - - - public mutating func offset(dx: CGFloat, dy: CGFloat) -> CGPoint { - x += dx - y += dy - return self - } - - public func length() -> CGFloat { - return sqrt(x*x + y*y) - } - - public func lengthSquared() -> CGFloat { - return x*x + y*y - } - - func normalized() -> CGPoint { - let len = length() - return len>0 ? self / len : CGPoint.zero - } - - public mutating func normalize() -> CGPoint { - self = normalized() - return self - } - - public func distanceTo(_ point: CGPoint) -> CGFloat { - return (self - point).length() - } - - public var angle: CGFloat { - return atan2(y, x) - } - - public var cgSize: CGSize { - return CGSize(width: x, height: y) - } - - func rotate(origin: CGPoint, angle: CGFloat) -> CGPoint { - let point = self - origin - let s = sin(angle) - let c = cos(angle) - return CGPoint(x: c * point.x - s * point.y, - y: s * point.x + c * point.y) + origin - } -} - -extension CGSize { - public var cgPoint: CGPoint { - return CGPoint(x: width, y: height) - } - - public init(point: CGPoint) { - self.init(width: point.x, height: point.y) - } -} - -public func + (left: CGPoint, right: CGPoint) -> CGPoint { - return CGPoint(x: left.x + right.x, y: left.y + right.y) -} - -public func += (left: inout CGPoint, right: CGPoint) { - left = left + right -} - -public func + (left: CGPoint, right: CGVector) -> CGPoint { - return CGPoint(x: left.x + right.dx, y: left.y + right.dy) -} - -public func += (left: inout CGPoint, right: CGVector) { - left = left + right -} - -public func - (left: CGPoint, right: CGPoint) -> CGPoint { return CGPoint(x: left.x - right.x, y: left.y - right.y) } -public func - (left: CGSize, right: CGSize) -> CGSize { return CGSize(width: left.width - right.width, height: left.height - right.height) } -public func - (left: CGSize, right: CGPoint) -> CGSize { return CGSize(width: left.width - right.x, height: left.height - right.x) } -public func - (left: CGPoint, right: CGSize) -> CGPoint { return CGPoint(x: left.x - right.width, y: left.y - right.height) } - -public func -= (left: inout CGPoint, right: CGPoint) { - left = left - right -} - -public func - (left: CGPoint, right: CGVector) -> CGPoint { - return CGPoint(x: left.x - right.dx, y: left.y - right.dy) -} - -public func -= (left: inout CGPoint, right: CGVector) { - left = left - right -} - -public func *= (left: inout CGPoint, right: CGPoint) { - left = left * right -} - -public func * (point: CGPoint, scalar: CGFloat) -> CGPoint { return CGPoint(x: point.x * scalar, y: point.y * scalar) } -public func * (point: CGSize, scalar: CGFloat) -> CGSize { return CGSize(width: point.width * scalar, height: point.height * scalar) } - -public func *= (point: inout CGPoint, scalar: CGFloat) { point = point * scalar } - -public func * (left: CGPoint, right: CGVector) -> CGPoint { - return CGPoint(x: left.x * right.dx, y: left.y * right.dy) -} - -public func *= (left: inout CGPoint, right: CGVector) { - left = left * right -} - -public func / (left: CGPoint, right: CGPoint) -> CGPoint { return CGPoint(x: left.x / right.x, y: left.y / right.y) } -public func / (left: CGSize, right: CGSize) -> CGSize { return CGSize(width: left.width / right.width, height: left.height / right.height) } -public func / (left: CGPoint, right: CGSize) -> CGPoint { return CGPoint(x: left.x / right.width, y: left.y / right.height) } -public func / (left: CGSize, right: CGPoint) -> CGSize { return CGSize(width: left.width / right.x, height: left.height / right.y) } -public func /= (left: inout CGPoint, right: CGPoint) { left = left / right } -public func /= (left: inout CGSize, right: CGSize) { left = left / right } -public func /= (left: inout CGSize, right: CGPoint) { left = left / right } -public func /= (left: inout CGPoint, right: CGSize) { left = left / right } - - -public func / (point: CGPoint, scalar: CGFloat) -> CGPoint { return CGPoint(x: point.x / scalar, y: point.y / scalar) } -public func / (point: CGSize, scalar: CGFloat) -> CGSize { return CGSize(width: point.width / scalar, height: point.height / scalar) } - -public func /= (point: inout CGPoint, scalar: CGFloat) { - point = point / scalar -} - -public func / (left: CGPoint, right: CGVector) -> CGPoint { - return CGPoint(x: left.x / right.dx, y: left.y / right.dy) -} - -public func / (left: CGSize, right: CGVector) -> CGSize { - return CGSize(width: left.width / right.dx, height: left.height / right.dy) -} - -public func /= (left: inout CGPoint, right: CGVector) { - left = left / right -} - -public func * (left: CGPoint, right: CGPoint) -> CGPoint { return CGPoint(x: left.x * right.x, y: left.y * right.y) } -public func * (left: CGPoint, right: CGSize) -> CGPoint { return CGPoint(x: left.x * right.width, y: left.y * right.height) } -public func *= (left: inout CGPoint, right: CGSize) { left = left * right } -public func * (left: CGSize, right: CGSize) -> CGSize { return CGSize(width: left.width * right.width, height: left.height * right.height) } -public func *= (left: inout CGSize, right: CGSize) { left = left * right } -public func * (left: CGSize, right: CGPoint) -> CGSize { return CGSize(width: left.width * right.x, height: left.height * right.y) } -public func *= (left: inout CGSize, right: CGPoint) { left = left * right } - - -public func lerp(start: CGPoint, end: CGPoint, t: CGFloat) -> CGPoint { - return start + (end - start) * t -} - -public func abs(_ point: CGPoint) -> CGPoint { - return CGPoint(x: abs(point.x), y: abs(point.y)) -} - -extension CGSize { - var isValid: Bool { - return width > 0 && height > 0 && width != .infinity && height != .infinity && width != .nan && height != .nan - } - - var ratio: CGFloat { - return width / height - } -} - - -extension CGRect { - static var identity: CGRect { - return CGRect(x: 0, y: 0, width: 1, height: 1) - } - - var center: CGPoint { - return origin + size.cgPoint / 2 - } - - var rounded: CGRect { - return CGRect(x: origin.x.rounded(), - y: origin.y.rounded(), - width: width.rounded(.up), - height: height.rounded(.up)) - } - - var mirroredVertically: CGRect { - return CGRect(x: origin.x, - y: 1.0 - (origin.y + height), - width: width, - height: height) - } -} - -extension CGAffineTransform { - func inverted(with size: CGSize) -> CGAffineTransform { - var transform = self - let transformedSize = CGRect(origin: .zero, size: size).applying(transform).size - transform.tx /= transformedSize.width; - transform.ty /= transformedSize.height; - transform = transform.inverted() - transform.tx *= transformedSize.width; - transform.ty *= transformedSize.height; - return transform - } -} diff --git a/submodules/Charts/Sources/Helpers/ClosedRange+Utils.swift b/submodules/Charts/Sources/Helpers/ClosedRange+Utils.swift deleted file mode 100644 index 236d6c8a38..0000000000 --- a/submodules/Charts/Sources/Helpers/ClosedRange+Utils.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// ClosedRange+Utils.swift -// GraphTest -// -// Created by Andrei Salavei on 3/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import Foundation - -extension ClosedRange where Bound: Numeric { - var distance: Bound { - return upperBound - lowerBound - } -} diff --git a/submodules/Charts/Sources/Helpers/CustomNavigationController.swift b/submodules/Charts/Sources/Helpers/CustomNavigationController.swift deleted file mode 100644 index 977244dfcc..0000000000 --- a/submodules/Charts/Sources/Helpers/CustomNavigationController.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// CustomNavigationController.swift -// GraphTest -// -// Created by Andrew Solovey on 15/03/2019. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -class CustomNavigationController: UINavigationController { - override var preferredStatusBarStyle: UIStatusBarStyle { - return topViewController?.preferredStatusBarStyle ?? .default - } - - override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation { - return topViewController?.preferredStatusBarUpdateAnimation ?? .fade - } -} diff --git a/submodules/Charts/Sources/Helpers/DisplayLinkService.swift b/submodules/Charts/Sources/Helpers/DisplayLinkService.swift deleted file mode 100644 index 2c91471c39..0000000000 --- a/submodules/Charts/Sources/Helpers/DisplayLinkService.swift +++ /dev/null @@ -1,114 +0,0 @@ -// -// DisplayLinkService.swift -// GraphTest -// -// Created by Andrei Salavei on 4/7/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit -import CoreGraphics - -public protocol DisplayLinkListner: class { - func update(delta: TimeInterval) -} - -// DispatchSource mares refreshes more accurate -class DisplayLinkService { - let listners = NSHashTable.weakObjects() - static let shared = DisplayLinkService() - - public func add(listner: DisplayLinkListner) { - listners.add(listner) - startDisplayLink() - } - - public func remove(listner: DisplayLinkListner) { - listners.remove(listner) - - if listners.count == 0 { - stopDisplayLink() - } - } - -// private init() { -// displayLink.add(to: .main, forMode: .common) -// displayLink.preferredFramesPerSecond = 60 -// displayLink.isPaused = true -// } -// -// // MARK: - Display Link -// private lazy var displayLink: CADisplayLink! = { CADisplayLink(target: self, selector: #selector(displayLinkDidFire)) } () -// private var previousTickTime = 0.0 -// -// private func startDisplayLink() { -// guard displayLink.isPaused else { -// return -// } -// previousTickTime = CACurrentMediaTime() -// displayLink.isPaused = false -// } -// -// @objc private func displayLinkDidFire(_ displayLink: CADisplayLink) { -// let currentTime = CACurrentMediaTime() -// let delta = currentTime - previousTickTime -// previousTickTime = currentTime -// let allListners = listners.allObjects -// var hasListners = false -// for listner in allListners { -// (listner as! DisplayLinkListner).update(delta: delta) -// hasListners = true -// } -// -// if !hasListners { -// stopDisplayLink() -// } -// } -// -// private func stopDisplayLink() { -// displayLink.isPaused = true -// } - - private init() { - dispatchSourceTimer.schedule(deadline: .now() + 1.0 / 60, repeating: 1.0 / 60) - dispatchSourceTimer.setEventHandler { - DispatchQueue.main.sync { - self.fire() - } - } - } - - private var dispatchSourceTimer = DispatchSource.makeTimerSource(flags: [], queue: .global(qos: .userInteractive)) - private var dispatchSourceTimerStarted: Bool = false - private var previousTickTime = 0.0 - - private func startDisplayLink() { - guard !dispatchSourceTimerStarted else { return } - dispatchSourceTimerStarted = true - previousTickTime = CACurrentMediaTime() - dispatchSourceTimer.resume() - } - - private func stopDisplayLink() { - guard dispatchSourceTimerStarted else { return } - dispatchSourceTimerStarted = false - dispatchSourceTimer.suspend() - } - - public func fire() { - let currentTime = CACurrentMediaTime() - - let delta = currentTime - previousTickTime - previousTickTime = currentTime - let allListners = listners.allObjects - var hasListners = false - for listner in allListners { - (listner as! DisplayLinkListner).update(delta: delta) - hasListners = true - } - - if !hasListners { - stopDisplayLink() - } - } -} diff --git a/submodules/Charts/Sources/Helpers/NumberFormatter+Utils.swift b/submodules/Charts/Sources/Helpers/NumberFormatter+Utils.swift deleted file mode 100644 index 1254d44249..0000000000 --- a/submodules/Charts/Sources/Helpers/NumberFormatter+Utils.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// NumberFormatter+Utils.swift -// GraphTest -// -// Created by Andrei Salavei on 4/12/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -extension NumberFormatter { - func string(from value: CGFloat) -> String { - return string(from: Double(value)) - } - - func string(from value: Double) -> String { - return string(from: NSNumber(value: Double(value))) ?? "" - } -} diff --git a/submodules/Charts/Sources/Helpers/OnePixelConstraint.swift b/submodules/Charts/Sources/Helpers/OnePixelConstraint.swift deleted file mode 100644 index 03e33e6524..0000000000 --- a/submodules/Charts/Sources/Helpers/OnePixelConstraint.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// OnePixelConstraint.swift -// GraphTest -// -// Created by Andrei Salavei on 4/13/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -public class OnePixelConstrain: NSLayoutConstraint { - public override func awakeFromNib() { - super.awakeFromNib() - - constant = UIView.oneDevicePixel - } -} diff --git a/submodules/Charts/Sources/Helpers/ScalesNumberFormatter.swift b/submodules/Charts/Sources/Helpers/ScalesNumberFormatter.swift deleted file mode 100644 index db067f8a95..0000000000 --- a/submodules/Charts/Sources/Helpers/ScalesNumberFormatter.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// ScalesNumberFormatter.swift -// GraphTest -// -// Created by Andrei Salavei on 4/13/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -private let milionsScale = "M" -private let thousandsScale = "K" - -class ScalesNumberFormatter: NumberFormatter { - override func string(from number: NSNumber) -> String? { - let value = number.doubleValue - let pow = log10(value) - if pow >= 6 { - guard let string = super.string(from: NSNumber(value: value / 1_000_000)) else { - return nil - } - return string + milionsScale - } else if pow >= 4 { - guard let string = super.string(from: NSNumber(value: value / 1_000)) else { - return nil - } - return string + thousandsScale - } else { - return super.string(from: number) - } - } -} diff --git a/submodules/Charts/Sources/Helpers/TimeInterval+Utils.swift b/submodules/Charts/Sources/Helpers/TimeInterval+Utils.swift deleted file mode 100644 index d093d2fc0c..0000000000 --- a/submodules/Charts/Sources/Helpers/TimeInterval+Utils.swift +++ /dev/null @@ -1,27 +0,0 @@ -// -// TimeInterval+Utils.swift -// GraphTest -// -// Created by Andrei Salavei on 3/13/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import Foundation - -extension TimeInterval { - static let minute: TimeInterval = 60 - static let hour: TimeInterval = 60 * 60 - static let day: TimeInterval = 60 * 60 * 24 - static let osXDuration: TimeInterval = 0.25 - static let expandAnimationDuration: TimeInterval = 0.4 - static var animationDurationMultipler: Double = 1.0 - - static var defaultDuration: TimeInterval { - return innerDefaultDuration * animationDurationMultipler - } - private static var innerDefaultDuration: TimeInterval = osXDuration - - static func setDefaultDuration(_ duration: TimeInterval) { - innerDefaultDuration = duration - } -} diff --git a/submodules/Charts/Sources/Helpers/TimeZone.swift b/submodules/Charts/Sources/Helpers/TimeZone.swift deleted file mode 100644 index 40ba9ab8f5..0000000000 --- a/submodules/Charts/Sources/Helpers/TimeZone.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// TimeZone.swift -// GraphTest -// -// Created by Andrei Salavei on 4/9/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import Foundation - -extension TimeZone { - static let utc = TimeZone(secondsFromGMT: 0)! -} - -extension Locale { - static let posix = Locale(identifier: "en_US_POSIX") -} - -extension Calendar { - static let utc: Calendar = { - var calendar = Calendar.current - calendar.locale = Locale.posix - calendar.timeZone = TimeZone.utc - return calendar - }() -} - -extension DateFormatter { - static func utc(format: String = "") -> DateFormatter { - let formatter = DateFormatter() - formatter.calendar = Calendar.utc - formatter.dateFormat = format - formatter.timeZone = TimeZone.utc - return formatter - } -} diff --git a/submodules/Charts/Sources/Helpers/UIColor+Utils.swift b/submodules/Charts/Sources/Helpers/UIColor+Utils.swift deleted file mode 100644 index 0a70421d5e..0000000000 --- a/submodules/Charts/Sources/Helpers/UIColor+Utils.swift +++ /dev/null @@ -1,64 +0,0 @@ -// -// UIColor+Utils.swift -// GraphTest -// -// Created by Andrei Salavei on 3/11/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -extension UIColor { - public convenience init?(hexString: String) { - let r, g, b, a: CGFloat - - if hexString.hasPrefix("#") { - let start = hexString.index(hexString.startIndex, offsetBy: 1) - let hexColor = String(hexString[start...]) - - if hexColor.count == 8 { - let scanner = Scanner(string: hexColor) - var hexNumber: UInt64 = 0 - - if scanner.scanHexInt64(&hexNumber) { - r = CGFloat((hexNumber & 0xff000000) >> 24) / 255 - g = CGFloat((hexNumber & 0x00ff0000) >> 16) / 255 - b = CGFloat((hexNumber & 0x0000ff00) >> 8) / 255 - a = CGFloat(hexNumber & 0x000000ff) / 255 - - self.init(red: r, green: g, blue: b, alpha: a) - return - } - } else if hexColor.count == 6 { - let scanner = Scanner(string: hexColor) - var hexNumber: UInt64 = 0 - - if scanner.scanHexInt64(&hexNumber) { - r = CGFloat((hexNumber & 0xff0000) >> 16) / 255 - g = CGFloat((hexNumber & 0x00ff00) >> 8) / 255 - b = CGFloat((hexNumber & 0x0000ff) >> 0) / 255 - - self.init(red: r, green: g, blue: b, alpha: 1.0) - return - } - } - } - return nil - } - - func image(_ size: CGSize = CGSize(width: 1, height: 1)) -> UIImage { - if #available(iOS 10.0, *) { - return UIGraphicsImageRenderer(size: size).image { rendererContext in - self.setFill() - rendererContext.fill(CGRect(origin: .zero, size: size)) - } - } else { - return UIImage() - } - } - - var redValue: CGFloat{ return CIColor(color: self).red } - var greenValue: CGFloat{ return CIColor(color: self).green } - var blueValue: CGFloat{ return CIColor(color: self).blue } - var alphaValue: CGFloat{ return CIColor(color: self).alpha } -} diff --git a/submodules/Charts/Sources/Helpers/UIImage+Utils.swift b/submodules/Charts/Sources/Helpers/UIImage+Utils.swift deleted file mode 100644 index 50964025c2..0000000000 --- a/submodules/Charts/Sources/Helpers/UIImage+Utils.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// UIImage+Utils.swift -// GraphTest -// -// Created by Andrei Salavei on 4/8/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -extension UIImage { - static let arrowRight = UIImage(bundleImageName: "Chart/arrow_right") - static let arrowLeft = UIImage(bundleImageName: "Chart/arrow_left") - - public convenience init?(color: UIColor, size: CGSize = CGSize(width: 1, height: 1)) { - let rect = CGRect(origin: .zero, size: size) - UIGraphicsBeginImageContextWithOptions(rect.size, false, 0.0) - color.setFill() - UIRectFill(rect) - let image = UIGraphicsGetImageFromCurrentImageContext() - UIGraphicsEndImageContext() - - guard let cgImage = image?.cgImage else { return nil } - self.init(cgImage: cgImage) - } - - -} diff --git a/submodules/Charts/Sources/Models/ChartLineData.swift b/submodules/Charts/Sources/Models/ChartLineData.swift deleted file mode 100644 index 79813a2a35..0000000000 --- a/submodules/Charts/Sources/Models/ChartLineData.swift +++ /dev/null @@ -1,76 +0,0 @@ -// -// ChartLineData.swift -// GraphTest -// -// Created by Andrei Salavei on 3/13/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -struct ChartLineData { - var title: String - var color: UIColor - var width: CGFloat? - var points: [CGPoint] -} - -extension ChartLineData { - static func horizontalRange(lines: [ChartLineData]) -> ClosedRange? { - guard let firstPoint = lines.first?.points.first else { return nil } - var hMin: CGFloat = firstPoint.x - var hMax: CGFloat = firstPoint.x - - for line in lines { - if let first = line.points.first, - let last = line.points.last { - hMin = min(hMin, first.x) - hMax = max(hMax, last.x) - } - } - - return hMin...hMax - } - - static func verticalRange(lines: [ChartLineData], calculatingRange: ClosedRange? = nil, addBounds: Bool = false) -> ClosedRange? { - if let calculatingRange = calculatingRange { - guard let initalStart = lines.first?.points.first(where: { $0.x > calculatingRange.lowerBound && - $0.x < calculatingRange.upperBound }) else { return nil } - var vMin: CGFloat = initalStart.y - var vMax: CGFloat = initalStart.y - for line in lines { - if var index = line.points.firstIndex(where: { $0.x > calculatingRange.lowerBound }) { - if addBounds { - index = max(0, index - 1) - } - while index < line.points.count { - let point = line.points[index] - if point.x < calculatingRange.upperBound { - vMin = min(vMin, point.y) - vMax = max(vMax, point.y) - } else if addBounds { - vMin = min(vMin, point.y) - vMax = max(vMax, point.y) - break - } else { - break - } - index += 1 - } - } - } - return vMin...vMax - } else { - guard let firstPoint = lines.first?.points.first else { return nil } - var vMin: CGFloat = firstPoint.y - var vMax: CGFloat = firstPoint.y - for line in lines { - for point in line.points { - vMin = min(vMin, point.y) - vMax = max(vMax, point.y) - } - } - return vMin...vMax - } - } -} diff --git a/submodules/Charts/Sources/Models/ColorMode.swift b/submodules/Charts/Sources/Models/ColorMode.swift deleted file mode 100644 index f0de7b52ae..0000000000 --- a/submodules/Charts/Sources/Models/ColorMode.swift +++ /dev/null @@ -1,175 +0,0 @@ -// -// ColorMode.swift -// GraphTest -// -// Created by Andrew Solovey on 15/03/2019. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit -import AppBundle - -protocol ColorModeContainer { - func apply(colorMode: ColorMode, animated: Bool) -} - -enum ColorMode { - case day - case night -} - -extension ColorMode { - var chartTitleColor: UIColor { // Текст с датой на чарте - switch self { - case .day: return .black - case .night: return .white - } - } - - var actionButtonColor: UIColor { // Кнопка Zoom Out/ Смена режима день/ночь - switch self { - case .day: return UIColor(red: 53/255.0, green: 120/255.0, blue: 246/255.0, alpha: 1.0) - case .night: return UIColor(red: 84/255.0, green: 164/255.0, blue: 247/255.0, alpha: 1.0) - } - } - - var tableBackgroundColor: UIColor { - switch self { - case .day: return UIColor(red: 239/255.0, green: 239/255.0, blue: 244/255.0, alpha: 1.0) - case .night: return UIColor(red: 24/255.0, green: 34/255.0, blue: 45/255.0, alpha: 1.0) - } - } - - var chartBackgroundColor: UIColor { - switch self { - case .day: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) - case .night: return UIColor(red: 34/255.0, green: 47/255.0, blue: 63/255.0, alpha: 1.0) - } - } - - var sectionTitleColor: UIColor { - switch self { - case .day: return UIColor(red: 109/255.0, green: 109/255.0, blue: 114/255.0, alpha: 1.0) - case .night: return UIColor(red: 133/255.0, green: 150/255.0, blue: 171/255.0, alpha: 1.0) - } - } - - var tableSeparatorColor: UIColor { - switch self { - case .day: return UIColor(red: 200/255.0, green: 199/255.0, blue: 204/255.0, alpha: 1.0) - case .night: return UIColor(red: 18/255.0, green: 26/255.0, blue: 35/255.0, alpha: 1.0) - } - } - - var chartLabelsColor: UIColor { - switch self { - case .day: return UIColor(red: 37/255.0, green: 37/255.0, blue: 41/255.0, alpha: 0.5) - case .night: return UIColor(red: 186/255.0, green: 204/255.0, blue: 225/255.0, alpha: 0.6) - } - } - - var chartHelperLinesColor: UIColor { - switch self { - case .day: return UIColor(red: 24/255.0, green: 45/255.0, blue: 59/255.0, alpha: 0.1) - case .night: return UIColor(red: 133/255.0, green: 150/255.0, blue: 171/255.0, alpha: 0.20) - } - } - - var chartStrongLinesColor: UIColor { - switch self { - case .day: return UIColor(red: 24/255.0, green: 45/255.0, blue: 59/255.0, alpha: 0.35) - case .night: return UIColor(red: 186/255.0, green: 204/255.0, blue: 225/255.0, alpha: 0.45) - } - } - - var barChartStrongLinesColor: UIColor { - switch self { - case .day: return UIColor(red: 37/255.0, green: 37/255.0, blue: 41/255.0, alpha: 0.2) - case .night: return UIColor(red: 186/255.0, green: 204/255.0, blue: 225/255.0, alpha: 0.45) - } - } - - var chartDetailsTextColor: UIColor { - switch self { - case .day: return UIColor(red: 109/255.0, green: 109/255.0, blue: 114/255.0, alpha: 1.0) - case .night: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) - } - } - - var chartDetailsArrowColor: UIColor { - switch self { - case .day: return UIColor(red: 197/255.0, green: 199/255.0, blue: 205/255.0, alpha: 1.0) - case .night: return UIColor(red: 76/255.0, green: 84/255.0, blue: 96/255.0, alpha: 1.0) - } - } - - var chartDetailsViewColor: UIColor { - switch self { - case .day: return UIColor(red: 245/255.0, green: 245/255.0, blue: 251/255.0, alpha: 1.0) - case .night: return UIColor(red: 25/255.0, green: 35/255.0, blue: 47/255.0, alpha: 1.0) - } - } - - var descriptionChatNameColor: UIColor { - switch self { - case .day: return .black - case .night: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) - } - } - - var descriptionActionColor: UIColor { - switch self { - case .day: return UIColor(red: 1/255.0, green: 125/255.0, blue: 229/255.0, alpha: 1.0) - case .night: return UIColor(red: 24/255.0, green: 145/255.0, blue: 255/255.0, alpha: 1.0) - } - } - - var rangeViewBackgroundColor: UIColor { - switch self { - case .day: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) - case .night: return UIColor(red: 34/255.0, green: 47/255.0, blue: 63/255.0, alpha: 1.0) - } - } - - var rangeViewFrameColor: UIColor { - switch self { - case .day: return UIColor(red: 202/255.0, green: 212/255.0, blue: 222/255.0, alpha: 1.0) - case .night: return UIColor(red: 53/255.0, green: 70/255.0, blue: 89/255.0, alpha: 1.0) - } - } - - var rangeViewTintColor: UIColor { - switch self { - case .day: return UIColor(red: 239/255.0, green: 239/255.0, blue: 244/255.0, alpha: 0.5) - case .night: return UIColor(red: 24/255.0, green: 34/255.0, blue: 45/255.0, alpha: 0.5) - } - } - - var rangeViewMarkerColor: UIColor { - switch self { - case .day: return UIColor.white - case .night: return UIColor.white - } - } - - var statusBarStyle: UIStatusBarStyle { - switch self { - case .day: return .default - case .night: return .lightContent - } - } - - var viewTintColor: UIColor { - switch self { - case .day: return .black - case .night: return UIColor(red: 254/255.0, green: 254/255.0, blue: 254/255.0, alpha: 1.0) - } - } - - var rangeCropImage: UIImage? { - switch self { - case .day: return UIImage(bundleImageName: "Chart/selection_frame_light") - case .night: return UIImage(bundleImageName: "Chart/selection_frame_dark") - } - } -} diff --git a/submodules/Charts/Sources/Models/LinesChartLabel.swift b/submodules/Charts/Sources/Models/LinesChartLabel.swift deleted file mode 100644 index 6ace8c2c65..0000000000 --- a/submodules/Charts/Sources/Models/LinesChartLabel.swift +++ /dev/null @@ -1,25 +0,0 @@ -// -// LinesChartLabel.swift -// GraphTest -// -// Created by Andrei Salavei on 3/18/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -struct LinesChartLabel: Hashable { - let value: CGFloat - let text: String -} - -class AnimatedLinesChartLabels { - var labels: [LinesChartLabel] - var isAppearing: Bool = false - let alphaAnimator: AnimationController - - init(labels: [LinesChartLabel], alphaAnimator: AnimationController) { - self.labels = labels - self.alphaAnimator = alphaAnimator - } -} diff --git a/submodules/Charts/Sources/Models/LinesSelectionLabel.swift b/submodules/Charts/Sources/Models/LinesSelectionLabel.swift deleted file mode 100644 index 0fd7142eda..0000000000 --- a/submodules/Charts/Sources/Models/LinesSelectionLabel.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// LinesSelectionLabel.swift -// GraphTest -// -// Created by Andrei Salavei on 3/18/19. -// Copyright © 2019 Andrei Salavei. All rights reserved. -// - -import UIKit - -struct LinesSelectionLabel { - let coordinate: CGPoint - let valueText: String - let color: UIColor -} diff --git a/submodules/GraphCore/BUCK b/submodules/GraphCore/BUCK new file mode 100644 index 0000000000..a43e82f354 --- /dev/null +++ b/submodules/GraphCore/BUCK @@ -0,0 +1,15 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "GraphCore", + srcs = glob([ + "Sources/**/*.swift", + ]), + deps = [ + "//submodules/Display:Display#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/GraphCore/Graph.h b/submodules/GraphCore/Graph.h deleted file mode 100644 index e4b99a3ca3..0000000000 --- a/submodules/GraphCore/Graph.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// Graph.h -// Graph -// -// Created by Mikhail Filimonov on 03.02.2020. -// Copyright © 2020 Telegram. All rights reserved. -// - -#import - -//! Project version number for Graph. -FOUNDATION_EXPORT double GraphVersionNumber; - -//! Project version string for Graph. -FOUNDATION_EXPORT const unsigned char GraphVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/submodules/GraphCore/Info.plist b/submodules/GraphCore/Info.plist index 861c829fcb..e1fe4cfb7b 100644 --- a/submodules/GraphCore/Info.plist +++ b/submodules/GraphCore/Info.plist @@ -18,7 +18,5 @@ 1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2020 Telegram. All rights reserved. diff --git a/submodules/GraphCore/src/Charts Reader/ChartVisibilityItem.swift b/submodules/GraphCore/Sources/Charts Reader/ChartVisibilityItem.swift similarity index 100% rename from submodules/GraphCore/src/Charts Reader/ChartVisibilityItem.swift rename to submodules/GraphCore/Sources/Charts Reader/ChartVisibilityItem.swift diff --git a/submodules/GraphCore/src/Charts Reader/ChartsCollection.swift b/submodules/GraphCore/Sources/Charts Reader/ChartsCollection.swift similarity index 98% rename from submodules/GraphCore/src/Charts Reader/ChartsCollection.swift rename to submodules/GraphCore/Sources/Charts Reader/ChartsCollection.swift index 8b3d9f8a20..4f42d69e56 100644 --- a/submodules/GraphCore/src/Charts Reader/ChartsCollection.swift +++ b/submodules/GraphCore/Sources/Charts Reader/ChartsCollection.swift @@ -68,7 +68,7 @@ public extension ChartsCollection { switch type { case .axix: axixValuesToSetup = try column.dropFirst().map { Date(timeIntervalSince1970: try Convert.doubleFrom($0) / 1000) } - case .chart, .bar, .area: + case .chart, .bar, .area, .step: guard let colorString = colors[columnId], let color = GColor(hexString: colorString) else { throw ChartsError.generalConversion("Unable to get color name from: \(colors) - \(columnId)") @@ -99,4 +99,5 @@ private enum ColumnType: String { case chart = "line" case area = "area" case bar = "bar" + case step = "step" } diff --git a/submodules/GraphCore/src/Charts Reader/ChartsDataManager.swift b/submodules/GraphCore/Sources/Charts Reader/ChartsDataManager.swift similarity index 100% rename from submodules/GraphCore/src/Charts Reader/ChartsDataManager.swift rename to submodules/GraphCore/Sources/Charts Reader/ChartsDataManager.swift diff --git a/submodules/GraphCore/src/Charts Reader/ChartsError.swift b/submodules/GraphCore/Sources/Charts Reader/ChartsError.swift similarity index 100% rename from submodules/GraphCore/src/Charts Reader/ChartsError.swift rename to submodules/GraphCore/Sources/Charts Reader/ChartsError.swift diff --git a/submodules/GraphCore/src/Charts Reader/Convert.swift b/submodules/GraphCore/Sources/Charts Reader/Convert.swift similarity index 100% rename from submodules/GraphCore/src/Charts Reader/Convert.swift rename to submodules/GraphCore/Sources/Charts Reader/Convert.swift diff --git a/submodules/GraphCore/src/Charts/Controllers/BaseChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/BaseChartController.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Controllers/BaseChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/BaseChartController.swift diff --git a/submodules/GraphCore/src/Charts/Controllers/GeneralChartComponentController.swift b/submodules/GraphCore/Sources/Charts/Controllers/GeneralChartComponentController.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Controllers/GeneralChartComponentController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/GeneralChartComponentController.swift diff --git a/submodules/GraphCore/src/Charts/Controllers/Lines/BaseLinesChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift similarity index 99% rename from submodules/GraphCore/src/Charts/Controllers/Lines/BaseLinesChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift index ab43ff0b8f..56494c20dc 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Lines/BaseLinesChartController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Lines/BaseLinesChartController.swift @@ -45,7 +45,6 @@ public class BaseLinesChartController: BaseChartController { } func updateChartRangeTitle(animated: Bool) { - let range: ClosedRange if zoomedChartRange == BaseConstants.defaultRange { range = initialChartRange diff --git a/submodules/GraphCore/src/Charts/Controllers/Lines/GeneralLinesChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift similarity index 90% rename from submodules/GraphCore/src/Charts/Controllers/Lines/GeneralLinesChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift index 89e8ae6e57..79b3875ce6 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Lines/GeneralLinesChartController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Lines/GeneralLinesChartController.swift @@ -24,7 +24,7 @@ public class GeneralLinesChartController: BaseLinesChartController { private let horizontalScalesRenderer = HorizontalScalesRenderer() private let verticalScalesRenderer = VerticalScalesRenderer() private let verticalLineRenderer = VerticalLinesRenderer() - private let lineBulletsRenerer = LineBulletsRenerer() + private let lineBulletsRenderer = LineBulletsRenderer() private let previewLinesRenderer = LinesChartRenderer() @@ -41,7 +41,7 @@ public class GeneralLinesChartController: BaseLinesChartController { self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel self.previewLinesRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel - self.lineBulletsRenerer.isEnabled = false + self.lineBulletsRenderer.isEnabled = false super.init(chartsCollection: chartsCollection) self.zoomChartVisibility = chartVisibility @@ -61,7 +61,7 @@ public class GeneralLinesChartController: BaseLinesChartController { self.prevoiusHorizontalStrideInterval = -1 self.totalVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: chartLines) ?? Constants.defaultRange self.totalHorizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: chartLines) ?? Constants.defaultRange - self.lineBulletsRenerer.bullets = self.chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, + self.lineBulletsRenderer.bullets = self.chartLines.map { LineBulletsRenderer.Bullet(coordinate: $0.points.first ?? .zero, color: $0.color)} let chartRange: ClosedRange @@ -77,7 +77,7 @@ public class GeneralLinesChartController: BaseLinesChartController { self.mainLinesRenderer.setLines(lines: chartLines, animated: animated) self.previewLinesRenderer.setLines(lines: chartLines, animated: animated) - updateHorizontalLimists(horizontalRange: chartRange, animated: animated) + updateHorizontalLimits(horizontalRange: chartRange, animated: animated) updateMainChartHorizontalRange(range: chartRange, animated: animated) updateVerticalLimitsAndRange(horizontalRange: chartRange, animated: animated) self.chartRangeUpdatedClosure?(currentChartHorizontalRangeFraction, animated) @@ -97,7 +97,7 @@ public class GeneralLinesChartController: BaseLinesChartController { horizontalScalesRenderer, verticalScalesRenderer, verticalLineRenderer, - lineBulletsRenerer + lineBulletsRenderer ] } @@ -111,7 +111,7 @@ public class GeneralLinesChartController: BaseLinesChartController { for (index, isVisible) in visibility.enumerated() { mainLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) previewLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) - lineBulletsRenerer.setLineVisible(isVisible, at: index, animated: animated) + lineBulletsRenderer.setLineVisible(isVisible, at: index, animated: animated) } updateVerticalLimitsAndRange(horizontalRange: currentHorizontalRange, animated: true) @@ -132,10 +132,10 @@ public class GeneralLinesChartController: BaseLinesChartController { super.chartInteractionDidBegin(point: point) - self.lineBulletsRenerer.bullets = chartLines.compactMap { chart in - return LineBulletsRenerer.Bullet(coordinate: chart.points[minIndex], color: chart.color) + self.lineBulletsRenderer.bullets = chartLines.compactMap { chart in + return LineBulletsRenderer.Bullet(coordinate: chart.points[minIndex], color: chart.color) } - self.lineBulletsRenerer.isEnabled = true + self.lineBulletsRenderer.isEnabled = true let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX @@ -158,7 +158,7 @@ public class GeneralLinesChartController: BaseLinesChartController { public override func cancelChartInteraction() { super.cancelChartInteraction() - self.lineBulletsRenerer.isEnabled = false + self.lineBulletsRenderer.isEnabled = false self.setDetailsChartVisibleClosure?(false, true) self.verticalLineRenderer.values = [] @@ -187,7 +187,7 @@ public class GeneralLinesChartController: BaseLinesChartController { updateChartRangeTitle(animated: true) updateMainChartHorizontalRange(range: horizontalRange, animated: false) - updateHorizontalLimists(horizontalRange: horizontalRange, animated: true) + updateHorizontalLimits(horizontalRange: horizontalRange, animated: true) updateVerticalLimitsAndRange(horizontalRange: horizontalRange, animated: true) } @@ -196,7 +196,7 @@ public class GeneralLinesChartController: BaseLinesChartController { horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) verticalScalesRenderer.setup(horizontalRange: range, animated: animated) verticalLineRenderer.setup(horizontalRange: range, animated: animated) - lineBulletsRenerer.setup(horizontalRange: range, animated: animated) + lineBulletsRenderer.setup(horizontalRange: range, animated: animated) } func updateMainChartVerticalRange(range: ClosedRange, animated: Bool) { @@ -204,10 +204,10 @@ public class GeneralLinesChartController: BaseLinesChartController { horizontalScalesRenderer.setup(verticalRange: range, animated: animated) verticalScalesRenderer.setup(verticalRange: range, animated: animated) verticalLineRenderer.setup(verticalRange: range, animated: animated) - lineBulletsRenerer.setup(verticalRange: range, animated: animated) + lineBulletsRenderer.setup(verticalRange: range, animated: animated) } - func updateHorizontalLimists(horizontalRange: ClosedRange, animated: Bool) { + func updateHorizontalLimits(horizontalRange: ClosedRange, animated: Bool) { if let (stride, labels) = horizontalLimitsLabels(horizontalRange: horizontalRange, scaleType: isZoomed ? .hour : .day, prevoiusHorizontalStrideInterval: prevoiusHorizontalStrideInterval) { @@ -221,7 +221,6 @@ public class GeneralLinesChartController: BaseLinesChartController { calculatingRange: horizontalRange, addBounds: true) { - let (range, labels) = verticalLimitsLabels(verticalRange: verticalRange) if verticalScalesRenderer.verticalRange.end != range { @@ -245,7 +244,7 @@ public class GeneralLinesChartController: BaseLinesChartController { verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor - lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) + lineBulletsRenderer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor } } diff --git a/submodules/GraphCore/src/Charts/Controllers/Lines/TwoAxisLinesChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift similarity index 91% rename from submodules/GraphCore/src/Charts/Controllers/Lines/TwoAxisLinesChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift index f921c1f4f4..f78870d86f 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Lines/TwoAxisLinesChartController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Lines/TwoAxisLinesChartController.swift @@ -22,7 +22,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { class GraphController { let mainLinesRenderer = LinesChartRenderer() let verticalScalesRenderer = VerticalScalesRenderer() - let lineBulletsRenerer = LineBulletsRenerer() + let lineBulletsRenderer = LineBulletsRenderer() let previewLinesRenderer = LinesChartRenderer() var chartLines: [LinesChartRenderer.LineData] = [] @@ -32,7 +32,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { init() { self.mainLinesRenderer.lineWidth = 2 self.previewLinesRenderer.lineWidth = 1 - self.lineBulletsRenerer.isEnabled = false + self.lineBulletsRenderer.isEnabled = false self.mainLinesRenderer.optimizationLevel = BaseConstants.linesChartOptimizationLevel self.previewLinesRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel @@ -41,7 +41,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { func updateMainChartVerticalRange(range: ClosedRange, animated: Bool) { mainLinesRenderer.setup(verticalRange: range, animated: animated) verticalScalesRenderer.setup(verticalRange: range, animated: animated) - lineBulletsRenerer.setup(verticalRange: range, animated: animated) + lineBulletsRenderer.setup(verticalRange: range, animated: animated) } } @@ -77,7 +77,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { controller.verticalScalesRenderer.labelsColor = chart.color controller.totalVerticalRange = LinesChartRenderer.LineData.verticalRange(lines: chartLines) ?? Constants.defaultRange self.totalHorizontalRange = LinesChartRenderer.LineData.horizontalRange(lines: chartLines) ?? Constants.defaultRange - controller.lineBulletsRenerer.bullets = chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, + controller.lineBulletsRenderer.bullets = chartLines.map { LineBulletsRenderer.Bullet(coordinate: $0.points.first ?? .zero, color: $0.color) } controller.previewLinesRenderer.setup(horizontalRange: self.totalHorizontalRange, animated: animated) controller.previewLinesRenderer.setup(verticalRange: controller.totalVerticalRange, animated: animated) @@ -97,14 +97,14 @@ public class TwoAxisLinesChartController: BaseLinesChartController { chartRange = initialChartRange } - updateHorizontalLimists(horizontalRange: chartRange, animated: animated) + updateHorizontalLimits(horizontalRange: chartRange, animated: animated) updateMainChartHorizontalRange(range: chartRange, animated: animated) updateVerticalLimitsAndRange(horizontalRange: chartRange, animated: animated) self.chartRangeUpdatedClosure?(currentChartHorizontalRangeFraction, animated) } - public override func initializeChart() { + public override func initializeChart() { if let first = initialChartCollection.axisValues.first?.timeIntervalSince1970, let last = initialChartCollection.axisValues.last?.timeIntervalSince1970 { initialChartRange = CGFloat(max(first, last - BaseConstants.defaultRangePresetLength))...CGFloat(last) @@ -114,7 +114,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { public override var mainChartRenderers: [ChartViewRenderer] { return graphControllers.map { $0.mainLinesRenderer } + - graphControllers.flatMap { [$0.verticalScalesRenderer, $0.lineBulletsRenerer] } + + graphControllers.flatMap { [$0.verticalScalesRenderer, $0.lineBulletsRenderer] } + [horizontalScalesRenderer, verticalLineRenderer, // performanceRenderer ] @@ -133,7 +133,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { for graphIndex in graph.chartLines.indices { graph.mainLinesRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) graph.previewLinesRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) - graph.lineBulletsRenerer.setLineVisible(isVisible, at: graphIndex, animated: animated) + graph.lineBulletsRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) } graph.verticalScalesRenderer.setVisible(isVisible, animated: animated) if let firstIndex = firstIndex { @@ -160,10 +160,10 @@ public class TwoAxisLinesChartController: BaseLinesChartController { super.chartInteractionDidBegin(point: point) for graphController in graphControllers { - graphController.lineBulletsRenerer.bullets = graphController.chartLines.map { chart in - LineBulletsRenerer.Bullet(coordinate: chart.points[minIndex], color: chart.color) + graphController.lineBulletsRenderer.bullets = graphController.chartLines.map { chart in + LineBulletsRenderer.Bullet(coordinate: chart.points[minIndex], color: chart.color) } - graphController.lineBulletsRenerer.isEnabled = true + graphController.lineBulletsRenderer.isEnabled = true } let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) @@ -187,7 +187,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { public override func cancelChartInteraction() { super.cancelChartInteraction() for graphController in graphControllers { - graphController.lineBulletsRenerer.isEnabled = false + graphController.lineBulletsRenderer.isEnabled = false } self.setDetailsChartVisibleClosure?(false, true) @@ -210,7 +210,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { updateChartRangeTitle(animated: true) updateMainChartHorizontalRange(range: horizontalRange, animated: false) - updateHorizontalLimists(horizontalRange: horizontalRange, animated: true) + updateHorizontalLimits(horizontalRange: horizontalRange, animated: true) updateVerticalLimitsAndRange(horizontalRange: horizontalRange, animated: true) } @@ -218,13 +218,13 @@ public class TwoAxisLinesChartController: BaseLinesChartController { for controller in graphControllers { controller.mainLinesRenderer.setup(horizontalRange: range, animated: animated) controller.verticalScalesRenderer.setup(horizontalRange: range, animated: animated) - controller.lineBulletsRenerer.setup(horizontalRange: range, animated: animated) + controller.lineBulletsRenderer.setup(horizontalRange: range, animated: animated) } horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) verticalLineRenderer.setup(horizontalRange: range, animated: animated) } - func updateHorizontalLimists(horizontalRange: ClosedRange, animated: Bool) { + func updateHorizontalLimits(horizontalRange: ClosedRange, animated: Bool) { if let (stride, labels) = horizontalLimitsLabels(horizontalRange: horizontalRange, scaleType: isZoomed ? .hour : .day, prevoiusHorizontalStrideInterval: prevoiusHorizontalStrideInterval) { @@ -278,7 +278,6 @@ public class TwoAxisLinesChartController: BaseLinesChartController { let numberFormatter = BaseConstants.chartNumberFormatter for (index, controller) in graphControllers.enumerated() { - let (startValue, base, _, maximumNumberOfDecimals) = dividorsAndMultiplers[index] let updatedRange = startValue...(startValue + base * CGFloat(totalCount)) @@ -304,7 +303,7 @@ public class TwoAxisLinesChartController: BaseLinesChartController { for controller in graphControllers { controller.verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor - controller.lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) + controller.lineBulletsRenderer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) controller.verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor } } diff --git a/submodules/GraphCore/src/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Percent And Pie/PercentChartComponentController.swift diff --git a/submodules/GraphCore/src/Charts/Controllers/Percent And Pie/PercentPieChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift similarity index 86% rename from submodules/GraphCore/src/Charts/Controllers/Percent And Pie/PercentPieChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift index 3a8fc82be4..fda8ed0f6a 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Percent And Pie/PercentPieChartController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Percent And Pie/PercentPieChartController.swift @@ -94,6 +94,10 @@ public class PercentPieChartController: BaseChartController { totalHorizontalRange: BaseConstants.defaultRange, totalVerticalRange: BaseConstants.defaultRange) switchToChart(chartsCollection: percentController.chartsCollection, isZoomed: false, animated: false) + + TimeInterval.animationDurationMultipler = 0.00001 + self.didTapZoomIn(date: Date(timeIntervalSinceReferenceDate: 603849600.0), animated: false) + TimeInterval.animationDurationMultipler = 1 } func switchToChart(chartsCollection: ChartsCollection, isZoomed: Bool, animated: Bool) { @@ -238,32 +242,36 @@ public class PercentPieChartController: BaseChartController { } } - public override func didTapZoomIn(date: Date) { + func didTapZoomIn(date: Date, animated: Bool) { guard isZoomed == false else { return } - cancelChartInteraction() - let currentCollection = percentController.chartsCollection - let range: Int = Constants.zoomedRange - guard let (foundDate, index) = percentController.findClosestDateTo(dateToFind: date) else { return } - var lowIndex = max(0, index - range / 2) - var highIndex = min(currentCollection.axisValues.count - 1, index + range / 2) - if lowIndex == 0 { - highIndex = lowIndex + (range - 1) - } else if highIndex == currentCollection.axisValues.count - 1 { - lowIndex = highIndex - (range - 1) - } - - let newValues = currentCollection.chartValues.map { chart in - return ChartsCollection.Chart(color: chart.color, - name: chart.name, - values: Array(chart.values[(lowIndex...highIndex)])) - } - let newCollection = ChartsCollection(axisValues: Array(currentCollection.axisValues[(lowIndex...highIndex)]), - chartValues: newValues) - let selectedRange = CGFloat(foundDate.timeIntervalSince1970 - .day)...CGFloat(foundDate.timeIntervalSince1970) - pieController.initialize(chartsCollection: newCollection, initialDate: date, totalHorizontalRange: 0...1, totalVerticalRange: 0...1) - pieController.initialHorizontalRange = selectedRange + cancelChartInteraction() + let currentCollection = percentController.chartsCollection + let range: Int = Constants.zoomedRange + guard let (foundDate, index) = percentController.findClosestDateTo(dateToFind: date) else { return } + var lowIndex = max(0, index - range / 2) + var highIndex = min(currentCollection.axisValues.count - 1, index + range / 2) + if lowIndex == 0 { + highIndex = lowIndex + (range - 1) + } else if highIndex == currentCollection.axisValues.count - 1 { + lowIndex = highIndex - (range - 1) + } + + let newValues = currentCollection.chartValues.map { chart in + return ChartsCollection.Chart(color: chart.color, + name: chart.name, + values: Array(chart.values[(lowIndex...highIndex)])) + } + let newCollection = ChartsCollection(axisValues: Array(currentCollection.axisValues[(lowIndex...highIndex)]), + chartValues: newValues) + let selectedRange = CGFloat(foundDate.timeIntervalSince1970 - .day)...CGFloat(foundDate.timeIntervalSince1970) + pieController.initialize(chartsCollection: newCollection, initialDate: date, totalHorizontalRange: 0...1, totalVerticalRange: 0...1) + pieController.initialHorizontalRange = selectedRange - switchToChart(chartsCollection: newCollection, isZoomed: true, animated: true) + switchToChart(chartsCollection: newCollection, isZoomed: true, animated: true) + } + + public override func didTapZoomIn(date: Date) { + self.didTapZoomIn(date: date, animated: true) } public override func didTapZoomOut() { diff --git a/submodules/GraphCore/src/Charts/Controllers/Percent And Pie/PieChartComponentController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Controllers/Percent And Pie/PieChartComponentController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Percent And Pie/PieChartComponentController.swift diff --git a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/BarsComponentController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift similarity index 87% rename from submodules/GraphCore/src/Charts/Controllers/Stacked Bars/BarsComponentController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift index c0193ecbdf..e77461ffe1 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/BarsComponentController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/BarsComponentController.swift @@ -17,6 +17,7 @@ class BarsComponentController: GeneralChartComponentController { let mainBarsRenderer: BarChartRenderer let horizontalScalesRenderer: HorizontalScalesRenderer let verticalScalesRenderer: VerticalScalesRenderer + let secondVerticalScalesRenderer: VerticalScalesRenderer? let previewBarsChartRenderer: BarChartRenderer private(set) var barsWidth: CGFloat = 1 @@ -33,6 +34,9 @@ class BarsComponentController: GeneralChartComponentController { self.verticalScalesRenderer = verticalScalesRenderer self.previewBarsChartRenderer = previewBarsChartRenderer + self.secondVerticalScalesRenderer = VerticalScalesRenderer() + self.secondVerticalScalesRenderer?.isRightAligned = true + self.mainBarsRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel self.previewBarsChartRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel @@ -71,11 +75,11 @@ class BarsComponentController: GeneralChartComponentController { override func willAppear(animated: Bool) { mainBarsRenderer.bars = self.chartBars previewBarsChartRenderer.bars = self.chartBars - - previewBarsChartRenderer.setup(verticalRange: totalVerticalRange, animated: animated) + + previewBarsChartRenderer.setup(verticalRange: 0...117278, animated: animated) previewBarsChartRenderer.setup(horizontalRange: totalHorizontalRange, animated: animated) - setupMainChart(verticalRange: initialVerticalRange, animated: animated) + setupMainChart(verticalRange: 0...117278, animated: animated) setupMainChart(horizontalRange: initialHorizontalRange, animated: animated) updateChartVerticalRanges(horizontalRange: initialHorizontalRange, animated: animated) @@ -115,12 +119,16 @@ class BarsComponentController: GeneralChartComponentController { horizontalScalesRenderer.setVisible(visible, animated: animated) verticalScalesRenderer.setVisible(visible, animated: animated) previewBarsChartRenderer.setVisible(visible, animated: animated) + + secondVerticalScalesRenderer?.setVisible(visible, animated: animated) } func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { mainBarsRenderer.setup(horizontalRange: horizontalRange, animated: animated) horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) + + secondVerticalScalesRenderer?.setup(horizontalRange: horizontalRange, animated: animated) } var visibleBars: BarChartRenderer.BarsData { @@ -143,8 +151,15 @@ class BarsComponentController: GeneralChartComponentController { verticalScalesRenderer.setVisible(true, animated: animated) setupMainChart(verticalRange: range, animated: animated) + + let (secondRange, secondLabels) = verticalLimitsLabels(verticalRange: range) + if secondVerticalScalesRenderer?.verticalRange.end != secondRange { + secondVerticalScalesRenderer?.setup(verticalLimitsLabels: secondLabels, animated: animated) + } + secondVerticalScalesRenderer?.setVisible(true, animated: animated) } else { verticalScalesRenderer.setVisible(false, animated: animated) + secondVerticalScalesRenderer?.setVisible(false, animated: animated) } if let range = BarChartRenderer.BarsData.verticalRange(bars: visibleBars) { @@ -153,9 +168,14 @@ class BarsComponentController: GeneralChartComponentController { } func setupMainChart(verticalRange: ClosedRange, animated: Bool) { + var verticalRange = verticalRange + if verticalRange.upperBound > 2000 && verticalRange.upperBound < 10000 { + verticalRange = 0...117278 + } mainBarsRenderer.setup(verticalRange: verticalRange, animated: animated) horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) + secondVerticalScalesRenderer?.setup(verticalRange: verticalRange, animated: animated) } public override func updateChartsVisibility(visibility: [Bool], animated: Bool) { @@ -181,7 +201,7 @@ class BarsComponentController: GeneralChartComponentController { viewModel.totalValue = ChartDetailsViewModel.Value(prefix: nil, title: "Total", - value: BaseConstants.detailsNumberFormatter.string(from: totalSumm), + value: BaseConstants.detailsNumberFormatter.string(from: totalSumm), color: .white, visible: visibleChartValues.count > 1) return viewModel @@ -215,6 +235,10 @@ class BarsComponentController: GeneralChartComponentController { verticalScalesRenderer.horizontalLinesColor = colorMode.barChartStrongLinesColor mainBarsRenderer.update(backgroundColor: colorMode.chartBackgroundColor, animated: false) previewBarsChartRenderer.update(backgroundColor: colorMode.chartBackgroundColor, animated: false) + + secondVerticalScalesRenderer?.labelsColor = colorMode.chartLabelsColor + secondVerticalScalesRenderer?.axisXColor = colorMode.barChartStrongLinesColor + secondVerticalScalesRenderer?.horizontalLinesColor = colorMode.barChartStrongLinesColor } override func updateChartRangeTitle(animated: Bool) { diff --git a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift similarity index 99% rename from submodules/GraphCore/src/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift index 50da946780..c70460af3c 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/DailyBarsChartController.swift @@ -31,7 +31,7 @@ public class DailyBarsChartController: BaseChartController { horizontalScalesRenderer: horizontalScalesRenderer, verticalScalesRenderer: verticalScalesRenderer, verticalLineRenderer: VerticalLinesRenderer(), - lineBulletsRenerer: LineBulletsRenerer(), + lineBulletsRenderer: LineBulletsRenderer(), previewLinesChartRenderer: LinesChartRenderer()) super.init(chartsCollection: chartsCollection) @@ -69,7 +69,7 @@ public class DailyBarsChartController: BaseChartController { barsController.horizontalScalesRenderer, barsController.verticalScalesRenderer, linesController.verticalLineRenderer, - linesController.lineBulletsRenerer, + linesController.lineBulletsRenderer, // performanceRenderer ] } @@ -79,7 +79,7 @@ public class DailyBarsChartController: BaseChartController { linesController.previewLinesChartRenderer] } - public override func initializeChart() { + public override func initializeChart() { barsController.initialize(chartsCollection: initialChartsCollection, initialDate: Date(), totalHorizontalRange: BaseConstants.defaultRange, diff --git a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/LinesComponentController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift similarity index 89% rename from submodules/GraphCore/src/Charts/Controllers/Stacked Bars/LinesComponentController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift index 42abe3494c..626e6953a4 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/LinesComponentController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/LinesComponentController.swift @@ -18,7 +18,7 @@ class LinesComponentController: GeneralChartComponentController { let horizontalScalesRenderer: HorizontalScalesRenderer let verticalScalesRenderer: VerticalScalesRenderer let verticalLineRenderer: VerticalLinesRenderer - let lineBulletsRenerer: LineBulletsRenerer + let lineBulletsRenderer: LineBulletsRenderer let previewLinesChartRenderer: LinesChartRenderer @@ -35,13 +35,13 @@ class LinesComponentController: GeneralChartComponentController { horizontalScalesRenderer: HorizontalScalesRenderer, verticalScalesRenderer: VerticalScalesRenderer, verticalLineRenderer: VerticalLinesRenderer, - lineBulletsRenerer: LineBulletsRenerer, + lineBulletsRenderer: LineBulletsRenderer, previewLinesChartRenderer: LinesChartRenderer) { self.mainLinesRenderer = mainLinesRenderer self.horizontalScalesRenderer = horizontalScalesRenderer self.verticalScalesRenderer = verticalScalesRenderer self.verticalLineRenderer = verticalLineRenderer - self.lineBulletsRenerer = lineBulletsRenerer + self.lineBulletsRenderer = lineBulletsRenderer self.previewLinesChartRenderer = previewLinesChartRenderer self.userLinesTransitionAnimation = userLinesTransitionAnimation @@ -52,7 +52,7 @@ class LinesComponentController: GeneralChartComponentController { self.previewLinesChartRenderer.lineWidth = BaseConstants.previewChartLineWidth self.previewLinesChartRenderer.optimizationLevel = BaseConstants.previewLinesChartOptimizationLevel - self.lineBulletsRenerer.isEnabled = false + self.lineBulletsRenderer.isEnabled = false } override func initialize(chartsCollection: ChartsCollection, @@ -62,7 +62,7 @@ class LinesComponentController: GeneralChartComponentController { let (chartLines, totalHorizontalRange, totalVerticalRange) = LinesChartRenderer.LineData.initialComponents(chartsCollection: chartsCollection) self.chartLines = chartLines - self.lineBulletsRenerer.bullets = self.chartLines.map { LineBulletsRenerer.Bullet(coordinate: $0.points.first ?? .zero, + self.lineBulletsRenderer.bullets = self.chartLines.map { LineBulletsRenderer.Bullet(coordinate: $0.points.first ?? .zero, color: $0.color)} super.initialize(chartsCollection: chartsCollection, @@ -121,7 +121,7 @@ class LinesComponentController: GeneralChartComponentController { verticalScalesRenderer.setVisible(visible, animated: animated) verticalLineRenderer.setVisible(visible, animated: animated) previewLinesChartRenderer.setVisible(visible, animated: animated) - lineBulletsRenerer.setVisible(visible, animated: animated) + lineBulletsRenderer.setVisible(visible, animated: animated) } func setupMainChart(horizontalRange: ClosedRange, animated: Bool) { @@ -129,7 +129,7 @@ class LinesComponentController: GeneralChartComponentController { horizontalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) verticalScalesRenderer.setup(horizontalRange: horizontalRange, animated: animated) verticalLineRenderer.setup(horizontalRange: horizontalRange, animated: animated) - lineBulletsRenerer.setup(horizontalRange: horizontalRange, animated: animated) + lineBulletsRenderer.setup(horizontalRange: horizontalRange, animated: animated) } var visibleLines: [LinesChartRenderer.LineData] { @@ -161,7 +161,7 @@ class LinesComponentController: GeneralChartComponentController { horizontalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) verticalScalesRenderer.setup(verticalRange: verticalRange, animated: animated) verticalLineRenderer.setup(verticalRange: verticalRange, animated: animated) - lineBulletsRenerer.setup(verticalRange: verticalRange, animated: animated) + lineBulletsRenderer.setup(verticalRange: verticalRange, animated: animated) } public override func updateChartsVisibility(visibility: [Bool], animated: Bool) { @@ -169,7 +169,7 @@ class LinesComponentController: GeneralChartComponentController { for (index, isVisible) in visibility.enumerated() { mainLinesRenderer.setLineVisible(isVisible, at: index, animated: animated) previewLinesChartRenderer.setLineVisible(isVisible, at: index, animated: animated) - lineBulletsRenerer.setLineVisible(isVisible, at: index, animated: animated) + lineBulletsRenderer.setLineVisible(isVisible, at: index, animated: animated) } updateChartVerticalRanges(horizontalRange: currentHorizontalMainChartRange, animated: true) } @@ -187,10 +187,10 @@ class LinesComponentController: GeneralChartComponentController { verticalLineRenderer.values = [chartPosition] verticalLineRenderer.isEnabled = true - lineBulletsRenerer.isEnabled = true - lineBulletsRenerer.setVisible(true, animated: animted) - lineBulletsRenerer.bullets = chartLines.compactMap { chart in - return LineBulletsRenerer.Bullet(coordinate: chart.points[dataIndex], color: chart.color) + lineBulletsRenderer.isEnabled = true + lineBulletsRenderer.setVisible(true, animated: animted) + lineBulletsRenderer.bullets = chartLines.compactMap { chart in + return LineBulletsRenderer.Bullet(coordinate: chart.points[dataIndex], color: chart.color) } } @@ -199,7 +199,7 @@ class LinesComponentController: GeneralChartComponentController { verticalLineRenderer.values = [] verticalLineRenderer.isEnabled = false - lineBulletsRenerer.isEnabled = false + lineBulletsRenderer.isEnabled = false } override func apply(colorMode: GColorMode, animated: Bool) { @@ -209,7 +209,7 @@ class LinesComponentController: GeneralChartComponentController { verticalScalesRenderer.labelsColor = colorMode.chartLabelsColor verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor - lineBulletsRenerer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) + lineBulletsRenderer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor } } diff --git a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift similarity index 99% rename from submodules/GraphCore/src/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift index bf8056e41b..1e3e37a68f 100644 --- a/submodules/GraphCore/src/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift @@ -74,7 +74,7 @@ public class StackedBarsChartController: BaseChartController { zoomedBarsController.previewBarsChartRenderer] } - public override func initializeChart() { + public override func initializeChart() { barsController.initialize(chartsCollection: initialChartsCollection, initialDate: Date(), totalHorizontalRange: BaseConstants.defaultRange, diff --git a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StepBarsChartController.swift similarity index 68% rename from submodules/Charts/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift rename to submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StepBarsChartController.swift index 4dd0fa9d91..72deae0ec4 100644 --- a/submodules/Charts/Sources/Charts/Controllers/Stacked Bars/StackedBarsChartController.swift +++ b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StepBarsChartController.swift @@ -1,31 +1,36 @@ // -// StackedBarsChartController.swift +// DailyBarsChartController.swift // GraphTest // // Created by Andrei Salavei on 4/7/19. // Copyright © 2019 Andrei Salavei. All rights reserved. // +import Foundation +#if os(macOS) +import Cocoa +#else import UIKit +#endif -class StackedBarsChartController: BaseChartController { +public class StepBarsChartController: BaseChartController { let barsController: BarsComponentController let zoomedBarsController: BarsComponentController - override init(chartsCollection: ChartsCollection) { + override public init(chartsCollection: ChartsCollection) { let horizontalScalesRenderer = HorizontalScalesRenderer() let verticalScalesRenderer = VerticalScalesRenderer() barsController = BarsComponentController(isZoomed: false, - mainBarsRenderer: BarChartRenderer(), + mainBarsRenderer: BarChartRenderer(step: true), horizontalScalesRenderer: horizontalScalesRenderer, verticalScalesRenderer: verticalScalesRenderer, previewBarsChartRenderer: BarChartRenderer()) zoomedBarsController = BarsComponentController(isZoomed: true, - mainBarsRenderer: BarChartRenderer(), + mainBarsRenderer: BarChartRenderer(step: true), horizontalScalesRenderer: horizontalScalesRenderer, verticalScalesRenderer: verticalScalesRenderer, previewBarsChartRenderer: BarChartRenderer()) - + super.init(chartsCollection: chartsCollection) [barsController, zoomedBarsController].forEach { controller in @@ -55,21 +60,22 @@ class StackedBarsChartController: BaseChartController { } } - override var mainChartRenderers: [ChartViewRenderer] { + public override var mainChartRenderers: [ChartViewRenderer] { return [barsController.mainBarsRenderer, zoomedBarsController.mainBarsRenderer, barsController.horizontalScalesRenderer, barsController.verticalScalesRenderer, + barsController.secondVerticalScalesRenderer! // performanceRenderer ] } - override var navigationRenderers: [ChartViewRenderer] { + public override var navigationRenderers: [ChartViewRenderer] { return [barsController.previewBarsChartRenderer, zoomedBarsController.previewBarsChartRenderer] } - override func initializeChart() { + public override func initializeChart() { barsController.initialize(chartsCollection: initialChartsCollection, initialDate: Date(), totalHorizontalRange: BaseConstants.defaultRange, @@ -79,72 +85,65 @@ class StackedBarsChartController: BaseChartController { func switchToChart(chartsCollection: ChartsCollection, isZoomed: Bool, animated: Bool) { if animated { - TimeInterval.setDefaultDuration(.expandAnimationDuration) + TimeInterval.setDefaultSuration(.expandAnimationDuration) DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { - TimeInterval.setDefaultDuration(.osXDuration) + TimeInterval.setDefaultSuration(.osXDuration) } } - + super.isZoomed = isZoomed if isZoomed { let toHorizontalRange = zoomedBarsController.initialHorizontalRange let destinationHorizontalRange = (toHorizontalRange.lowerBound - barsController.barsWidth)...(toHorizontalRange.upperBound - barsController.barsWidth) - let verticalVisibleRange = barsController.currentVerticalMainChartRange - let initialVerticalRange = verticalVisibleRange.lowerBound...(verticalVisibleRange.upperBound + verticalVisibleRange.distance * 10) - - zoomedBarsController.mainBarsRenderer.setup(horizontalRange: barsController.currentHorizontalMainChartRange, animated: false) +// let initialChartVerticalRange = lineProportionAnimationRange() + +// let visibleVerticalRange = BarChartRenderer.BarsData.verticalRange(bars: zoomedBarsController.visibleBars, +// calculatingRange: zoomedBarsController.initialHorizontalRange) ?? BaseConstants.defaultRange + zoomedBarsController.mainBarsRenderer.setup(verticalRange: 0...117278, animated: false) + + zoomedBarsController.setupMainChart(horizontalRange: barsController.currentHorizontalMainChartRange, animated: false) zoomedBarsController.previewBarsChartRenderer.setup(horizontalRange: barsController.currentPreviewHorizontalRange, animated: false) - zoomedBarsController.mainBarsRenderer.setup(verticalRange: initialVerticalRange, animated: false) - zoomedBarsController.previewBarsChartRenderer.setup(verticalRange: initialVerticalRange, animated: false) - zoomedBarsController.mainBarsRenderer.setVisible(true, animated: false) - zoomedBarsController.previewBarsChartRenderer.setVisible(true, animated: false) - +// zoomedBarsController.mainLinesRenderer.setup(verticalRange: initialChartVerticalRange, animated: false) +// zoomedBarsController.previewLinesChartRenderer.setup(verticalRange: initialChartVerticalRange, animated: false) + zoomedBarsController.mainBarsRenderer.setVisible(false, animated: false) + zoomedBarsController.previewBarsChartRenderer.setVisible(false, animated: false) + barsController.setupMainChart(horizontalRange: destinationHorizontalRange, animated: animated) barsController.previewBarsChartRenderer.setup(horizontalRange: zoomedBarsController.totalHorizontalRange, animated: animated) barsController.mainBarsRenderer.setVisible(false, animated: animated) barsController.previewBarsChartRenderer.setVisible(false, animated: animated) - + zoomedBarsController.willAppear(animated: animated) barsController.willDisappear(animated: animated) - zoomedBarsController.updateChartsVisibility(visibility: barsController.chartVisibility, animated: false) - zoomedBarsController.mainBarsRenderer.setup(verticalRange: zoomedBarsController.currentVerticalMainChartRange, animated: animated, timeFunction: .easeOut) - zoomedBarsController.previewBarsChartRenderer.setup(verticalRange: zoomedBarsController.currentPreviewVerticalRange, animated: animated, timeFunction: .easeOut) + zoomedBarsController.updateChartsVisibility(visibility: zoomedBarsController.chartBars.components.map { _ in true }, animated: false) } else { if !zoomedBarsController.chartsCollection.isBlank { barsController.hideDetailsView(animated: false) - barsController.chartVisibility = zoomedBarsController.chartVisibility let visibleVerticalRange = BarChartRenderer.BarsData.verticalRange(bars: barsController.visibleBars, calculatingRange: barsController.initialHorizontalRange) ?? BaseConstants.defaultRange barsController.mainBarsRenderer.setup(verticalRange: visibleVerticalRange, animated: false) let toHorizontalRange = barsController.initialHorizontalRange - - let verticalVisibleRange = barsController.initialVerticalRange - let targetVerticalRange = verticalVisibleRange.lowerBound...(verticalVisibleRange.upperBound + verticalVisibleRange.distance * 10) - +// let destinationChartVerticalRange = lineProportionAnimationRange() + zoomedBarsController.setupMainChart(horizontalRange: toHorizontalRange, animated: animated) - zoomedBarsController.mainBarsRenderer.setup(verticalRange: targetVerticalRange, animated: animated, timeFunction: .easeIn) - zoomedBarsController.previewBarsChartRenderer.setup(verticalRange: targetVerticalRange, animated: animated, timeFunction: .easeIn) +// zoomedBarsController.mainLinesRenderer.setup(verticalRange: destinationChartVerticalRange, animated: animated) +// zoomedBarsController.previewLinesChartRenderer.setup(verticalRange: destinationChartVerticalRange, animated: animated) zoomedBarsController.previewBarsChartRenderer.setup(horizontalRange: barsController.totalHorizontalRange, animated: animated) - DispatchQueue.main.asyncAfter(deadline: .now() + .defaultDuration) { [weak self] in - self?.zoomedBarsController.mainBarsRenderer.setVisible(false, animated: false) - self?.zoomedBarsController.previewBarsChartRenderer.setVisible(false, animated: false) - } + zoomedBarsController.mainBarsRenderer.setVisible(false, animated: animated) + zoomedBarsController.previewBarsChartRenderer.setVisible(false, animated: animated) } barsController.willAppear(animated: animated) zoomedBarsController.willDisappear(animated: animated) - - if !zoomedBarsController.chartsCollection.isBlank { - barsController.updateChartsVisibility(visibility: zoomedBarsController.chartVisibility, animated: false) - } } self.setBackButtonVisibilityClosure?(isZoomed, animated) + self.refreshChartToolsClosure?(animated) } - override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + public override func updateChartsVisibility(visibility: [Bool], animated: Bool) { if isZoomed { zoomedBarsController.updateChartsVisibility(visibility: visibility, animated: animated) } else { @@ -161,15 +160,20 @@ class StackedBarsChartController: BaseChartController { return visibleCharts } - override var actualChartVisibility: [Bool] { + public override var actualChartVisibility: [Bool] { return isZoomed ? zoomedBarsController.chartVisibility : barsController.chartVisibility } - override var actualChartsCollection: ChartsCollection { - return isZoomed ? zoomedBarsController.chartsCollection : barsController.chartsCollection + public override var actualChartsCollection: ChartsCollection { + let collection = isZoomed ? zoomedBarsController.chartsCollection : barsController.chartsCollection + + if collection.isBlank { + return self.initialChartsCollection + } + return collection } - - override func chartInteractionDidBegin(point: CGPoint) { + + public override func chartInteractionDidBegin(point: CGPoint) { if isZoomed { zoomedBarsController.chartInteractionDidBegin(point: point) } else { @@ -177,7 +181,7 @@ class StackedBarsChartController: BaseChartController { } } - override func chartInteractionDidEnd() { + public override func chartInteractionDidEnd() { if isZoomed { zoomedBarsController.chartInteractionDidEnd() } else { @@ -185,11 +189,7 @@ class StackedBarsChartController: BaseChartController { } } - override var drawChartVisibity: Bool { - return true - } - - override var currentChartHorizontalRangeFraction: ClosedRange { + public override var currentChartHorizontalRangeFraction: ClosedRange { if isZoomed { return zoomedBarsController.currentChartHorizontalRangeFraction } else { @@ -197,7 +197,7 @@ class StackedBarsChartController: BaseChartController { } } - override func cancelChartInteraction() { + public override func cancelChartInteraction() { if isZoomed { return zoomedBarsController.hideDetailsView(animated: true) } else { @@ -205,7 +205,7 @@ class StackedBarsChartController: BaseChartController { } } - override func didTapZoomIn(date: Date) { + public override func didTapZoomIn(date: Date) { guard isZoomed == false else { return } if isZoomed { return zoomedBarsController.hideDetailsView(animated: true) @@ -221,12 +221,21 @@ class StackedBarsChartController: BaseChartController { }) } - override func didTapZoomOut() { +// func lineProportionAnimationRange() -> ClosedRange { +// let visibleLines = self.barsController.chartVisibility.enumerated().compactMap { $0.element ? self.zoomedBarsController.chartLines[$0.offset] : nil } +// let linesRange = LinesChartRenderer.LineData.verticalRange(lines: visibleLines) ?? BaseConstants.defaultRange +// let barsRange = BarChartRenderer.BarsData.verticalRange(bars: self.barsController.visibleBars, +// calculatingRange: self.zoomedBarsController.totalHorizontalRange) ?? BaseConstants.defaultRange +// let range = 0...(linesRange.upperBound / barsRange.distance * self.barsController.currentVerticalMainChartRange.distance) +// return range +// } + + public override func didTapZoomOut() { cancelChartInteraction() switchToChart(chartsCollection: barsController.chartsCollection, isZoomed: false, animated: true) } - override func updateChartRange(_ rangeFraction: ClosedRange, animated: Bool) { + public override func updateChartRange(_ rangeFraction: ClosedRange) { if isZoomed { return zoomedBarsController.chartRangeFractionDidUpdated(rangeFraction) } else { @@ -234,10 +243,17 @@ class StackedBarsChartController: BaseChartController { } } - override func apply(colorMode: ColorMode, animated: Bool) { + override public func apply(colorMode: GColorMode, animated: Bool) { super.apply(colorMode: colorMode, animated: animated) zoomedBarsController.apply(colorMode: colorMode, animated: animated) barsController.apply(colorMode: colorMode, animated: animated) } + + public override var drawChartVisibity: Bool { + return true + } } + +//TODO: Убрать Performance полоски сверзу чартов (Не забыть) +//TODO: Добавить ховеры на кнопки diff --git a/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StepBarsChartController2.swift b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StepBarsChartController2.swift new file mode 100644 index 0000000000..8d1695a05d --- /dev/null +++ b/submodules/GraphCore/Sources/Charts/Controllers/Stacked Bars/StepBarsChartController2.swift @@ -0,0 +1,380 @@ +import Foundation +#if os(macOS) +import Cocoa +#else +import UIKit +#endif + +public class StepBarsChartController2: BaseChartController { + class GraphController { + let mainBarsRenderer: BarChartRenderer + let verticalScalesRenderer = VerticalScalesRenderer() + let lineBulletsRenderer = LineBulletsRenderer() + let previewBarsRenderer: BarChartRenderer + + var chartBars: BarChartRenderer.BarsData = .blank + var barsWidth: CGFloat = 1 + + var totalVerticalRange: ClosedRange = BaseConstants.defaultRange + + init(isZoomed: Bool, + mainBarsRenderer: BarChartRenderer, + previewBarsRenderer: BarChartRenderer) { + self.mainBarsRenderer = mainBarsRenderer + self.previewBarsRenderer = previewBarsRenderer + + self.mainBarsRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel + self.previewBarsRenderer.optimizationLevel = BaseConstants.barsChartOptimizationLevel + } + } + + private var graphControllers: [GraphController] = [] + private let horizontalScalesRenderer = HorizontalScalesRenderer() + + private let verticalLineRenderer = VerticalLinesRenderer() + + var chartVisibility: [Bool] = [] + var zoomChartVisibility: [Bool] = [] + + private let initialChartCollection: ChartsCollection + var initialChartRange: ClosedRange = BaseConstants.defaultRange + var zoomedChartRange: ClosedRange = BaseConstants.defaultRange + var totalHorizontalRange: ClosedRange = BaseConstants.defaultRange + + var lastChartInteractionPoint: CGPoint = .zero + var isChartInteractionBegun: Bool = false + + override public init(chartsCollection: ChartsCollection) { + self.initialChartCollection = chartsCollection + + self.graphControllers = chartsCollection.chartValues.map { _ in GraphController(isZoomed: false, mainBarsRenderer: BarChartRenderer(step: true), previewBarsRenderer: BarChartRenderer(step: true)) + } + + super.init(chartsCollection: chartsCollection) + + self.chartVisibility = Array(repeating: true, count: chartsCollection.chartValues.count) + self.zoomChartVisibility = self.chartVisibility + +// self.graphControllers.map({ $0.barsController }).forEach { controller in +// controller.chartFrame = { [unowned self] in self.chartFrame() } +// controller.cartViewBounds = { [unowned self] in self.cartViewBounds() } +// controller.zoomInOnDateClosure = { [unowned self] date in +// self.didTapZoomIn(date: date) +// } +// controller.setChartTitleClosure = { [unowned self] (title, animated) in +// self.setChartTitleClosure?(title, animated) +// } +// controller.setDetailsViewPositionClosure = { [unowned self] (position) in +// self.setDetailsViewPositionClosure?(position) +// } +// controller.setDetailsChartVisibleClosure = { [unowned self] (visible, animated) in +// self.setDetailsChartVisibleClosure?(visible, animated) +// } +// controller.setDetailsViewModel = { [unowned self] (viewModel, animated) in +// self.setDetailsViewModel?(viewModel, animated) +// } +// controller.updatePreviewRangeClosure = { [unowned self] (fraction, animated) in +// self.chartRangeUpdatedClosure?(fraction, animated) +// } +// controller.chartRangePagingClosure = { [unowned self] (isEnabled, pageSize) in +// self.setChartRangePagingEnabled(isEnabled: isEnabled, minimumSelectionSize: pageSize) +// } +// } + } + + public override var mainChartRenderers: [ChartViewRenderer] { + var renderers: [ChartViewRenderer] = [] + self.graphControllers.forEach { controller in + renderers.append(controller.mainBarsRenderer) + } + renderers.append(self.horizontalScalesRenderer) + self.graphControllers.forEach { controller in + renderers.append(controller.verticalScalesRenderer) + renderers.append(controller.lineBulletsRenderer) + } + renderers.append(self.verticalLineRenderer) + return renderers + } + + public override var navigationRenderers: [ChartViewRenderer] { + return graphControllers.map { $0.previewBarsRenderer } + } + + public override func initializeChart() { + if let first = initialChartCollection.axisValues.first?.timeIntervalSince1970, + let last = initialChartCollection.axisValues.last?.timeIntervalSince1970 { + initialChartRange = CGFloat(max(first, last - BaseConstants.defaultRangePresetLength))...CGFloat(last) + } + setupChartCollection(chartsCollection: initialChartCollection, animated: false, isZoomed: false) + } + + public override func updateChartsVisibility(visibility: [Bool], animated: Bool) { + self.chartVisibility = visibility + self.zoomChartVisibility = visibility + let firstIndex = visibility.firstIndex(where: { $0 }) + for (index, isVisible) in visibility.enumerated() { + let graph = graphControllers[index] + for graphIndex in graph.chartBars.components.indices { + graph.mainBarsRenderer.setComponentVisible(isVisible, at: graphIndex, animated: animated) + graph.previewBarsRenderer.setComponentVisible(isVisible, at: graphIndex, animated: animated) + graph.lineBulletsRenderer.setLineVisible(isVisible, at: graphIndex, animated: animated) + } + graph.verticalScalesRenderer.setVisible(isVisible, animated: animated) + if let firstIndex = firstIndex { + graph.verticalScalesRenderer.setHorizontalLinesVisible(index == firstIndex, animated: animated) + } + } + +// updateVerticalLimitsAndRange(horizontalRange: currentHorizontalRange, animated: true) + + if isChartInteractionBegun { + chartInteractionDidBegin(point: lastChartInteractionPoint) + } + } + + private func findClosestDateTo(dateToFind: Date) -> (Date, Int)? { + guard self.initialChartCollection.axisValues.count > 0 else { return nil } + var closestDate = self.initialChartCollection.axisValues[0] + var minIndex = 0 + for (index, date) in self.initialChartCollection.axisValues.enumerated() { + if abs(dateToFind.timeIntervalSince(date)) < abs(dateToFind.timeIntervalSince(closestDate)) { + closestDate = date + minIndex = index + } + } + return (closestDate, minIndex) + } + + public override func chartInteractionDidBegin(point: CGPoint) { + let horizontalRange = currentHorizontalRange + let chartFrame = self.chartFrame() + guard chartFrame.width > 0 else { return } + + let dateToFind = Date(timeIntervalSince1970: TimeInterval(horizontalRange.distance * point.x + horizontalRange.lowerBound)) + guard let (closestDate, minIndex) = findClosestDateTo(dateToFind: dateToFind) else { return } + + let chartInteractionWasBegin = isChartInteractionBegun + super.chartInteractionDidBegin(point: point) + +// for graphController in graphControllers { +// graphController.lineBulletsRenderer.bullets = graphController.chartBars.components.map { component in +// LineBulletsRenderer.Bullet(coordinate: component.values[minIndex], color: component.color) +// } +// graphController.lineBulletsRenderer.isEnabled = true +// } + + let chartValue: CGFloat = CGFloat(closestDate.timeIntervalSince1970) + let detailsViewPosition = (chartValue - horizontalRange.lowerBound) / horizontalRange.distance * chartFrame.width + chartFrame.minX + self.setDetailsViewModel?(chartDetailsViewModel(closestDate: closestDate, pointIndex: minIndex), chartInteractionWasBegin) + self.setDetailsChartVisibleClosure?(true, true) + self.setDetailsViewPositionClosure?(detailsViewPosition) + self.verticalLineRenderer.values = [chartValue] + } + +// func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { +// var viewModel = super.chartDetailsViewModel(closestDate: closestDate, pointIndex: pointIndex) +// let visibleChartValues = self.visibleChartValues +// let totalSumm: CGFloat = visibleChartValues.map { CGFloat($0.values[pointIndex]) }.reduce(0, +) +// +// viewModel.totalValue = ChartDetailsViewModel.Value(prefix: nil, +// title: "Total", +// value: BaseConstants.detailsNumberFormatter.string(from: totalSumm), +// color: .white, +// visible: visibleChartValues.count > 1) +// return viewModel +// } +// + func chartDetailsViewModel(closestDate: Date, pointIndex: Int) -> ChartDetailsViewModel { + let values: [ChartDetailsViewModel.Value] = initialChartCollection.chartValues.enumerated().map { arg in + let (index, component) = arg + return ChartDetailsViewModel.Value(prefix: nil, + title: component.name, + value: BaseConstants.detailsNumberFormatter.string(from: NSNumber(value: component.values[pointIndex])) ?? "", + color: component.color, + visible: chartVisibility[index]) + } + let dateString: String + if isZoomed { + dateString = BaseConstants.timeDateFormatter.string(from: closestDate) + } else { + dateString = BaseConstants.headerMediumRangeFormatter.string(from: closestDate) + } + let viewModel = ChartDetailsViewModel(title: dateString, + showArrow: !self.isZoomed, + showPrefixes: false, + values: values, + totalValue: nil, + tapAction: { [weak self] in }) + return viewModel + } + + public override func chartInteractionDidEnd() { + self.isChartInteractionBegun = false + } + + public override var currentHorizontalRange: ClosedRange { + return graphControllers.first?.mainBarsRenderer.horizontalRange.end ?? BaseConstants.defaultRange + } + + public override var currentChartHorizontalRangeFraction: ClosedRange { + let lowerPercent = (currentHorizontalRange.lowerBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + let upperPercent = (currentHorizontalRange.upperBound - totalHorizontalRange.lowerBound) / totalHorizontalRange.distance + return lowerPercent...upperPercent + } + + public override func cancelChartInteraction() { + super.cancelChartInteraction() + self.graphControllers.forEach { controller in + controller.lineBulletsRenderer.isEnabled = false + } + + self.setDetailsChartVisibleClosure?(false, true) + self.verticalLineRenderer.values = [] + } + + func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { + for (index, controller) in self.graphControllers.enumerated() { + let chart = chartsCollection.chartValues[index] + let points = chart.values.enumerated().map({ (arg) -> CGPoint in + return CGPoint(x: chartsCollection.axisValues[arg.offset].timeIntervalSince1970, + y: arg.element) + }) + + let (width, chartBars, totalHorizontalRange, totalVerticalRange) = BarChartRenderer.BarsData.initialComponents(chartsCollection: chartsCollection) + controller.chartBars = chartBars + controller.barsWidth = width + + controller.verticalScalesRenderer.labelsColor = chart.color + + controller.totalVerticalRange = totalVerticalRange + self.totalHorizontalRange = totalHorizontalRange +// controller.lineBulletsRenderer.bullets = chartBars.components.map { LineBulletsRenderer.Bullet(coordinate: $0.values.first ?? .zero, +// color: $0.color) } + controller.previewBarsRenderer.setup(horizontalRange: self.totalHorizontalRange, animated: animated) + controller.previewBarsRenderer.setup(verticalRange: controller.totalVerticalRange, animated: animated) + + controller.mainBarsRenderer.bars = chartBars + controller.previewBarsRenderer.bars = chartBars + + controller.verticalScalesRenderer.setHorizontalLinesVisible((index == 0), animated: animated) + controller.verticalScalesRenderer.isRightAligned = (index != 0) + } + + let chartRange: ClosedRange + if isZoomed { + chartRange = zoomedChartRange + } else { + chartRange = initialChartRange + } + +// updateHorizontalLimits(horizontalRange: chartRange, animated: animated) + updateMainChartHorizontalRange(range: chartRange, animated: animated) + updateMainChartVerticalRange(range: chartRange, animated: animated) +// updateVerticalLimitsAndRange(horizontalRange: chartRange, animated: animated) + + self.chartRangeUpdatedClosure?(currentChartHorizontalRangeFraction, animated) + } + +// func setupChartCollection(chartsCollection: ChartsCollection, animated: Bool, isZoomed: Bool) { +// if animated { +// TimeInterval.setDefaultSuration(.expandAnimationDuration) +// DispatchQueue.main.asyncAfter(deadline: .now() + .expandAnimationDuration) { +// TimeInterval.setDefaultSuration(.osXDuration) +// } +// } +// +// self.initialChartsCollection = chartsCollection +// self.isZoomed = isZoomed +// +// self.setBackButtonVisibilityClosure?(isZoomed, animated) +// +// self.graphControllers.forEach { controller in +// controller.barsController.willAppear(animated: animated) +// } +// +// self.refreshChartToolsClosure?(animated) +// } + + public override func didTapZoomIn(date: Date) { + guard isZoomed == false else { return } + cancelChartInteraction() + self.getDetailsData?(date, { updatedCollection in + if let updatedCollection = updatedCollection { + self.initialChartRange = self.currentHorizontalRange + if let startDate = updatedCollection.axisValues.first, + let endDate = updatedCollection.axisValues.last { + self.zoomedChartRange = CGFloat(max(date.timeIntervalSince1970, startDate.timeIntervalSince1970))...CGFloat(min(date.timeIntervalSince1970 + .day - .hour, endDate.timeIntervalSince1970)) + } else { + self.zoomedChartRange = CGFloat(date.timeIntervalSince1970)...CGFloat(date.timeIntervalSince1970 + .day - 1) + } + self.setupChartCollection(chartsCollection: updatedCollection, animated: true, isZoomed: true) + } + }) + } + + public override func didTapZoomOut() { + cancelChartInteraction() + self.setupChartCollection(chartsCollection: self.initialChartCollection, animated: true, isZoomed: false) + } + + public override func updateChartRange(_ rangeFraction: ClosedRange) { + cancelChartInteraction() + + let horizontalRange = ClosedRange(uncheckedBounds: + (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, + upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) + + zoomedChartRange = horizontalRange +// updateChartRangeTitle(animated: true) + + updateMainChartHorizontalRange(range: horizontalRange, animated: false) +// updateHorizontalLimits(horizontalRange: horizontalRange, animated: true) +// updateVerticalLimitsAndRange(horizontalRange: horizontalRange, animated: true) + +// barsController.chartRangeFractionDidUpdated(rangeFraction) +// +// let totalHorizontalRange = barsController.totalHorizontalRange +// let horizontalRange = ClosedRange(uncheckedBounds: +// (lower: totalHorizontalRange.lowerBound + rangeFraction.lowerBound * totalHorizontalRange.distance, +// upper: totalHorizontalRange.lowerBound + rangeFraction.upperBound * totalHorizontalRange.distance)) +// +// updateMainChartHorizontalRange(range: horizontalRange, animated: false) + } + + func updateMainChartHorizontalRange(range: ClosedRange, animated: Bool) { + self.graphControllers.forEach { controller in + controller.mainBarsRenderer.setup(horizontalRange: range, animated: animated) +// controller.horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) + controller.verticalScalesRenderer.setup(horizontalRange: range, animated: animated) + controller.lineBulletsRenderer.setup(horizontalRange: range, animated: animated) + } + self.horizontalScalesRenderer.setup(horizontalRange: range, animated: animated) + self.verticalLineRenderer.setup(horizontalRange: range, animated: animated) + } + + func updateMainChartVerticalRange(range: ClosedRange, animated: Bool) { + self.verticalLineRenderer.setup(verticalRange: range, animated: animated) + + self.graphControllers.forEach { controller in + controller.lineBulletsRenderer.setup(verticalRange: range, animated: animated) + } + } + + override public func apply(colorMode: GColorMode, animated: Bool) { + super.apply(colorMode: colorMode, animated: animated) + + self.graphControllers.forEach { controller in + controller.verticalScalesRenderer.horizontalLinesColor = colorMode.chartHelperLinesColor + controller.lineBulletsRenderer.setInnerColor(colorMode.chartBackgroundColor, animated: animated) + controller.verticalScalesRenderer.axisXColor = colorMode.chartStrongLinesColor + } + verticalLineRenderer.linesColor = colorMode.chartStrongLinesColor + } + + public override var drawChartVisibity: Bool { + return true + } +} + +//TODO: Убрать Performance полоски сверзу чартов (Не забыть) +//TODO: Добавить ховеры на кнопки diff --git a/submodules/GraphCore/src/Charts/Renderes/BarChartRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/BarChartRenderer.swift similarity index 51% rename from submodules/GraphCore/src/Charts/Renderes/BarChartRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/BarChartRenderer.swift index 7be512d223..219bf31ce8 100644 --- a/submodules/GraphCore/src/Charts/Renderes/BarChartRenderer.swift +++ b/submodules/GraphCore/Sources/Charts/Renderes/BarChartRenderer.swift @@ -26,6 +26,14 @@ class BarChartRenderer: BaseChartRenderer { } } + private var step = false + + init(step: Bool = false) { + self.step = step + + super.init() + } + var fillToTop: Bool = false private(set) lazy var selectedIndexAnimator: AnimationController = { return AnimationController(current: 0, refreshClosure: self.refreshClosure) @@ -142,80 +150,157 @@ class BarChartRenderer: BaseChartRenderer { context.restoreGState() } } else { - var selectedPaths: [[CGRect]] = bars.components.map { _ in [] } - barIndex = max(0, barIndex - 1) - - var currentLocation = bars.locations[barIndex] - var leftX = transform(toChartCoordinateHorizontal: currentLocation - bars.barWidth, chartFrame: chartFrame) - var rightX: CGFloat = 0 - - let startPoint = CGPoint(x: leftX, - y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - - var backgourndPaths: [[CGPoint]] = bars.components.map { _ in Array() } - let itemsCount = ((bars.locations.count - barIndex) * 2) + 4 - for path in backgourndPaths.indices { - backgourndPaths[path].reserveCapacity(itemsCount) - backgourndPaths[path].append(startPoint) - } - var maxValues: [CGFloat] = bars.components.map { _ in 0 } - while barIndex < bars.locations.count { - currentLocation = bars.locations[barIndex] - rightX = transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame) + if self.step { + var selectedPaths: [[CGRect]] = bars.components.map { _ in [] } + barIndex = max(0, barIndex - 1) - var stackedValue: CGFloat = 0 - var bottomY: CGFloat = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) - for (index, component) in bars.components.enumerated() { - let visibilityPercent = componentsAnimators[index].current - if visibilityPercent == 0 { continue } + var currentLocation = bars.locations[barIndex] + var leftX = transform(toChartCoordinateHorizontal: currentLocation - bars.barWidth, chartFrame: chartFrame) + var rightX: CGFloat = 0 + + let startPoint = CGPoint(x: leftX, + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + + var backgourndPaths: [[CGPoint]] = bars.components.map { _ in Array() } + let itemsCount = ((bars.locations.count - barIndex) * 2) + 4 + for path in backgourndPaths.indices { + backgourndPaths[path].reserveCapacity(itemsCount) + backgourndPaths[path].append(startPoint) + } + + var maxValues: [CGFloat] = bars.components.map { _ in 0 } + while barIndex < bars.locations.count { + currentLocation = bars.locations[barIndex] + rightX = transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame) - let height = component.values[barIndex] * visibilityPercent - stackedValue += height - let topY = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) - let componentHeight = (bottomY - topY) - maxValues[index] = max(maxValues[index], componentHeight) - if selectedBarIndex == barIndex { - let rect = CGRect(x: leftX, - y: topY, - width: rightX - leftX, - height: componentHeight) - selectedPaths[index].append(rect) + var stackedValue: CGFloat = 0 + var bottomY: CGFloat = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) + for (index, component) in bars.components.enumerated() { + let visibilityPercent = componentsAnimators[index].current + if visibilityPercent == 0 { continue } + + var value = component.values[barIndex] + if value < 5000 { + value *= 40 + } + let height = value * visibilityPercent +// stackedValue += height + let topY = transform(toChartCoordinateVertical: height, chartFrame: chartFrame) + let componentHeight = (bottomY - topY) + maxValues[index] = max(maxValues[index], componentHeight) + if selectedBarIndex == barIndex { + let rect = CGRect(x: leftX, + y: topY, + width: rightX - leftX, + height: componentHeight) + selectedPaths[index].append(rect) + } + backgourndPaths[index].append(CGPoint(x: leftX, y: topY)) + backgourndPaths[index].append(CGPoint(x: rightX, y: topY)) +// bottomY = topY } - backgourndPaths[index].append(CGPoint(x: leftX, y: topY)) - backgourndPaths[index].append(CGPoint(x: rightX, y: topY)) - bottomY = topY + if currentLocation > range.upperBound { + break + } + leftX = rightX + barIndex += 1 } - if currentLocation > range.upperBound { - break - } - leftX = rightX - barIndex += 1 - } - - let endPoint = CGPoint(x: transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame).roundedUpToPixelGrid(), - y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) - let colorOffset = Double((1.0 - (1.0 - generalUnselectedAlpha) * selectedIndexAnimator.current) * chartsAlpha) - - for (index, component) in bars.components.enumerated().reversed() { - if maxValues[index] < optimizationLevel { - continue - } - context.saveGState() - backgourndPaths[index].append(endPoint) - context.setFillColor(GColor.valueBetween(start: backgroundColorAnimator.current.color, - end: component.color, - offset: colorOffset).cgColor) - context.beginPath() - context.addLines(between: backgourndPaths[index]) - context.closePath() - context.fillPath() - context.restoreGState() - } - - for (index, component) in bars.components.enumerated().reversed() { - context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue).cgColor) - context.fill(selectedPaths[index]) + let endPoint = CGPoint(x: transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame).roundedUpToPixelGrid(), + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + let colorOffset = Double((1.0 - (1.0 - generalUnselectedAlpha) * selectedIndexAnimator.current) * chartsAlpha) + + for (index, component) in bars.components.enumerated().reversed() { + if maxValues[index] < optimizationLevel { + continue + } + context.saveGState() + + context.setLineWidth(2.0) + context.setStrokeColor(GColor.valueBetween(start: backgroundColorAnimator.current.color, + end: component.color, + offset: colorOffset).cgColor) + context.beginPath() + context.addLines(between: backgourndPaths[index]) + context.strokePath() + context.restoreGState() + } + } else { + var selectedPaths: [[CGRect]] = bars.components.map { _ in [] } + barIndex = max(0, barIndex - 1) + + var currentLocation = bars.locations[barIndex] + var leftX = transform(toChartCoordinateHorizontal: currentLocation - bars.barWidth, chartFrame: chartFrame) + var rightX: CGFloat = 0 + + let startPoint = CGPoint(x: leftX, + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + + var backgourndPaths: [[CGPoint]] = bars.components.map { _ in Array() } + let itemsCount = ((bars.locations.count - barIndex) * 2) + 4 + for path in backgourndPaths.indices { + backgourndPaths[path].reserveCapacity(itemsCount) + backgourndPaths[path].append(startPoint) + } + var maxValues: [CGFloat] = bars.components.map { _ in 0 } + while barIndex < bars.locations.count { + currentLocation = bars.locations[barIndex] + rightX = transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame) + + var stackedValue: CGFloat = 0 + var bottomY: CGFloat = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) + for (index, component) in bars.components.enumerated() { + let visibilityPercent = componentsAnimators[index].current + if visibilityPercent == 0 { continue } + + let height = component.values[barIndex] * visibilityPercent + stackedValue += height + let topY = transform(toChartCoordinateVertical: stackedValue, chartFrame: chartFrame) + let componentHeight = (bottomY - topY) + maxValues[index] = max(maxValues[index], componentHeight) + if selectedBarIndex == barIndex { + let rect = CGRect(x: leftX, + y: topY, + width: rightX - leftX, + height: componentHeight) + selectedPaths[index].append(rect) + } + backgourndPaths[index].append(CGPoint(x: leftX, y: topY)) + backgourndPaths[index].append(CGPoint(x: rightX, y: topY)) + bottomY = topY + } + if currentLocation > range.upperBound { + break + } + leftX = rightX + barIndex += 1 + } + + let endPoint = CGPoint(x: transform(toChartCoordinateHorizontal: currentLocation, chartFrame: chartFrame).roundedUpToPixelGrid(), + y: transform(toChartCoordinateVertical: verticalRange.current.lowerBound, chartFrame: chartFrame)) + let colorOffset = Double((1.0 - (1.0 - generalUnselectedAlpha) * selectedIndexAnimator.current) * chartsAlpha) + + for (index, component) in bars.components.enumerated().reversed() { + if maxValues[index] < optimizationLevel { + continue + } + context.saveGState() + backgourndPaths[index].append(endPoint) + + context.setFillColor(GColor.valueBetween(start: backgroundColorAnimator.current.color, + end: component.color, + offset: colorOffset).cgColor) + context.beginPath() + context.addLines(between: backgourndPaths[index]) + context.closePath() + context.fillPath() + context.restoreGState() + } + + for (index, component) in bars.components.enumerated().reversed() { + context.setFillColor(component.color.withAlphaComponent(chartsAlpha * component.color.alphaValue).cgColor) + context.fill(selectedPaths[index]) + } } } } diff --git a/submodules/GraphCore/src/Charts/Renderes/BaseChartRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/BaseChartRenderer.swift similarity index 99% rename from submodules/GraphCore/src/Charts/Renderes/BaseChartRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/BaseChartRenderer.swift index fd521baa58..d6cd6588a6 100644 --- a/submodules/GraphCore/src/Charts/Renderes/BaseChartRenderer.swift +++ b/submodules/GraphCore/Sources/Charts/Renderes/BaseChartRenderer.swift @@ -51,7 +51,7 @@ class BaseChartRenderer: ChartViewRenderer { lazy var horizontalRange = AnimationController>(current: 0...1, refreshClosure: refreshClosure) lazy var verticalRange = AnimationController>(current: 0...1, refreshClosure: refreshClosure) - func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { + func setup(verticalRange: ClosedRange, animated: Bool, timeFunction: TimeFunction? = nil) { guard self.verticalRange.end != verticalRange else { self.verticalRange.timeFunction = timeFunction ?? .linear return diff --git a/submodules/GraphCore/src/Charts/Renderes/ChartDetailsRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/ChartDetailsRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/ChartDetailsRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/ChartDetailsRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/HorizontalScalesRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/HorizontalScalesRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/HorizontalScalesRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/HorizontalScalesRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/LineBulletsRenerer.swift b/submodules/GraphCore/Sources/Charts/Renderes/LineBulletsRenerer.swift similarity index 97% rename from submodules/GraphCore/src/Charts/Renderes/LineBulletsRenerer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/LineBulletsRenerer.swift index 13c7543286..abbf2e58d2 100644 --- a/submodules/GraphCore/src/Charts/Renderes/LineBulletsRenerer.swift +++ b/submodules/GraphCore/Sources/Charts/Renderes/LineBulletsRenerer.swift @@ -1,5 +1,5 @@ // -// LineBulletsRenerer.swift +// LineBulletsRenderer.swift // GraphTest // // Created by Andrei Salavei on 4/8/19. @@ -13,7 +13,7 @@ import Cocoa import UIKit #endif -class LineBulletsRenerer: BaseChartRenderer { +class LineBulletsRenderer: BaseChartRenderer { struct Bullet { var coordinate: CGPoint var color: GColor diff --git a/submodules/GraphCore/src/Charts/Renderes/LinesChartRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/LinesChartRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/LinesChartRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/LinesChartRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/PecentChartRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/PecentChartRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/PecentChartRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/PecentChartRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/PercentPieAnimationRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/PercentPieAnimationRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/PercentPieAnimationRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/PerformanceRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/PerformanceRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/PerformanceRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/PerformanceRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/PieChartRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/PieChartRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/PieChartRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/PieChartRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/VerticalLinesRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/VerticalLinesRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/VerticalLinesRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/VerticalLinesRenderer.swift diff --git a/submodules/GraphCore/src/Charts/Renderes/VerticalScalesRenderer.swift b/submodules/GraphCore/Sources/Charts/Renderes/VerticalScalesRenderer.swift similarity index 100% rename from submodules/GraphCore/src/Charts/Renderes/VerticalScalesRenderer.swift rename to submodules/GraphCore/Sources/Charts/Renderes/VerticalScalesRenderer.swift diff --git a/submodules/GraphCore/Sources/GraphCore.h b/submodules/GraphCore/Sources/GraphCore.h new file mode 100644 index 0000000000..32c43f37d3 --- /dev/null +++ b/submodules/GraphCore/Sources/GraphCore.h @@ -0,0 +1,19 @@ +// +// GraphCore.h +// GraphCore +// +// Created by Mikhail Filimonov on 03.02.2020. +// Copyright © 2020 Telegram. All rights reserved. +// + +#import + +//! Project version number for GraphCore. +FOUNDATION_EXPORT double GraphCoreVersionNumber; + +//! Project version string for GraphCore. +FOUNDATION_EXPORT const unsigned char GraphCoreVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/submodules/GraphCore/src/Helpers/AnimationController.swift b/submodules/GraphCore/Sources/Helpers/AnimationController.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/AnimationController.swift rename to submodules/GraphCore/Sources/Helpers/AnimationController.swift diff --git a/submodules/GraphCore/src/Helpers/Array+Utils.swift b/submodules/GraphCore/Sources/Helpers/Array+Utils.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/Array+Utils.swift rename to submodules/GraphCore/Sources/Helpers/Array+Utils.swift diff --git a/submodules/GraphCore/src/Helpers/CGFloat.swift b/submodules/GraphCore/Sources/Helpers/CGFloat.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/CGFloat.swift rename to submodules/GraphCore/Sources/Helpers/CGFloat.swift diff --git a/submodules/GraphCore/src/Helpers/CGPoint+Extensions.swift b/submodules/GraphCore/Sources/Helpers/CGPoint+Extensions.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/CGPoint+Extensions.swift rename to submodules/GraphCore/Sources/Helpers/CGPoint+Extensions.swift diff --git a/submodules/GraphCore/src/Helpers/ClosedRange+Utils.swift b/submodules/GraphCore/Sources/Helpers/ClosedRange+Utils.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/ClosedRange+Utils.swift rename to submodules/GraphCore/Sources/Helpers/ClosedRange+Utils.swift diff --git a/submodules/GraphCore/src/Helpers/DisplayLinkService.swift b/submodules/GraphCore/Sources/Helpers/DisplayLinkService.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/DisplayLinkService.swift rename to submodules/GraphCore/Sources/Helpers/DisplayLinkService.swift diff --git a/submodules/Charts/Sources/Helpers/GlobalHelpers.swift b/submodules/GraphCore/Sources/Helpers/GlobalHelpers.swift similarity index 100% rename from submodules/Charts/Sources/Helpers/GlobalHelpers.swift rename to submodules/GraphCore/Sources/Helpers/GlobalHelpers.swift diff --git a/submodules/GraphCore/src/Helpers/NumberFormatter+Utils.swift b/submodules/GraphCore/Sources/Helpers/NumberFormatter+Utils.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/NumberFormatter+Utils.swift rename to submodules/GraphCore/Sources/Helpers/NumberFormatter+Utils.swift diff --git a/submodules/GraphCore/src/Helpers/ScalesNumberFormatter.swift b/submodules/GraphCore/Sources/Helpers/ScalesNumberFormatter.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/ScalesNumberFormatter.swift rename to submodules/GraphCore/Sources/Helpers/ScalesNumberFormatter.swift diff --git a/submodules/GraphCore/src/Helpers/TextUtils.swift b/submodules/GraphCore/Sources/Helpers/TextUtils.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/TextUtils.swift rename to submodules/GraphCore/Sources/Helpers/TextUtils.swift diff --git a/submodules/GraphCore/src/Helpers/TimeInterval+Utils.swift b/submodules/GraphCore/Sources/Helpers/TimeInterval+Utils.swift similarity index 96% rename from submodules/GraphCore/src/Helpers/TimeInterval+Utils.swift rename to submodules/GraphCore/Sources/Helpers/TimeInterval+Utils.swift index 74343d1225..c8e27b0463 100644 --- a/submodules/GraphCore/src/Helpers/TimeInterval+Utils.swift +++ b/submodules/GraphCore/Sources/Helpers/TimeInterval+Utils.swift @@ -13,7 +13,7 @@ import Cocoa import UIKit #endif -extension TimeInterval { +public extension TimeInterval { static let minute: TimeInterval = 60 static let hour: TimeInterval = 60 * 60 static let day: TimeInterval = 60 * 60 * 24 diff --git a/submodules/GraphCore/src/Helpers/TimeZone.swift b/submodules/GraphCore/Sources/Helpers/TimeZone.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/TimeZone.swift rename to submodules/GraphCore/Sources/Helpers/TimeZone.swift diff --git a/submodules/GraphCore/src/Helpers/UIColor+Utils.swift b/submodules/GraphCore/Sources/Helpers/UIColor+Utils.swift similarity index 64% rename from submodules/GraphCore/src/Helpers/UIColor+Utils.swift rename to submodules/GraphCore/Sources/Helpers/UIColor+Utils.swift index fc74ce68a3..df4b9bf5d4 100644 --- a/submodules/GraphCore/src/Helpers/UIColor+Utils.swift +++ b/submodules/GraphCore/Sources/Helpers/UIColor+Utils.swift @@ -29,11 +29,37 @@ extension GColor { convenience init?(hexString: String) { let r, g, b, a: CGFloat - - if hexString.hasPrefix("#") { - let start = hexString.index(hexString.startIndex, offsetBy: 1) - let hexColor = String(hexString[start...]) - + + let components = hexString.components(separatedBy: "#") + if let name = components.first, !name.isEmpty { + switch name.lowercased() { + case "red": + self.init(hexString: "#ff2d55") + return + case "green": + self.init(hexString: "#34c759") + return + case "blue": + self.init(hexString: "#007aff") + return + case "golden": + self.init(hexString: "#ff9500") + return + case "yellow": + self.init(hexString: "#ffcc00") + return + case "lightgreen": + self.init(hexString: "#8fcf39") + return + case "lightblue": + self.init(hexString: "#5ac8fa") + return + default: + break + } + } + + if let hexColor = components.last { if hexColor.count == 8 { let scanner = Scanner(string: hexColor) var hexNumber: UInt64 = 0 diff --git a/submodules/GraphCore/src/Helpers/UIImage+Utils.swift b/submodules/GraphCore/Sources/Helpers/UIImage+Utils.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/UIImage+Utils.swift rename to submodules/GraphCore/Sources/Helpers/UIImage+Utils.swift diff --git a/submodules/GraphCore/src/Helpers/UIView+Extensions.swift b/submodules/GraphCore/Sources/Helpers/UIView+Extensions.swift similarity index 100% rename from submodules/GraphCore/src/Helpers/UIView+Extensions.swift rename to submodules/GraphCore/Sources/Helpers/UIView+Extensions.swift diff --git a/submodules/GraphCore/src/Models/ChartLineData.swift b/submodules/GraphCore/Sources/Models/ChartLineData.swift similarity index 100% rename from submodules/GraphCore/src/Models/ChartLineData.swift rename to submodules/GraphCore/Sources/Models/ChartLineData.swift diff --git a/submodules/GraphCore/src/Models/ColorMode.swift b/submodules/GraphCore/Sources/Models/ColorMode.swift similarity index 100% rename from submodules/GraphCore/src/Models/ColorMode.swift rename to submodules/GraphCore/Sources/Models/ColorMode.swift diff --git a/submodules/GraphCore/src/Models/LinesChartLabel.swift b/submodules/GraphCore/Sources/Models/LinesChartLabel.swift similarity index 100% rename from submodules/GraphCore/src/Models/LinesChartLabel.swift rename to submodules/GraphCore/Sources/Models/LinesChartLabel.swift diff --git a/submodules/GraphCore/src/Models/LinesSelectionLabel.swift b/submodules/GraphCore/Sources/Models/LinesSelectionLabel.swift similarity index 100% rename from submodules/GraphCore/src/Models/LinesSelectionLabel.swift rename to submodules/GraphCore/Sources/Models/LinesSelectionLabel.swift diff --git a/submodules/GraphCore/src/Helpers/GlobalHelpers.swift b/submodules/GraphCore/src/Helpers/GlobalHelpers.swift deleted file mode 100644 index 3f5c488ff9..0000000000 --- a/submodules/GraphCore/src/Helpers/GlobalHelpers.swift +++ /dev/null @@ -1,12 +0,0 @@ -// -// GlobalHelpers.swift -// TrackingRecorder -// -// Created by Andrew Solovey on 07.09.2018. -// Copyright © 2018 Andrew Solovey. All rights reserved. -// - -public func crop(_ lower: Type, _ val: Type, _ upper: Type) -> Type where Type : Comparable { - assert(lower < upper, "Invalid lover and upper values") - return max(lower, min(upper, val)) -} diff --git a/submodules/Charts/BUCK b/submodules/GraphUI/BUCK similarity index 80% rename from submodules/Charts/BUCK rename to submodules/GraphUI/BUCK index 79bf8180b8..f395853a92 100644 --- a/submodules/Charts/BUCK +++ b/submodules/GraphUI/BUCK @@ -1,7 +1,7 @@ load("//Config:buck_rule_macros.bzl", "static_library") static_library( - name = "Charts", + name = "GraphUI", srcs = glob([ "Sources/**/*.swift", ]), @@ -15,14 +15,10 @@ static_library( "//submodules/TelegramPresentationData:TelegramPresentationData", "//submodules/TelegramUIPreferences:TelegramUIPreferences", "//submodules/AccountContext:AccountContext", - "//submodules/ItemListUI:ItemListUI", - "//submodules/AvatarNode:AvatarNode", "//submodules/TelegramStringFormatting:TelegramStringFormatting", - "//submodules/AlertUI:AlertUI", "//submodules/PresentationDataUtils:PresentationDataUtils", - "//submodules/TelegramNotices:TelegramNotices", - "//submodules/MergeLists:MergeLists", "//submodules/AppBundle:AppBundle", + "//submodules/GraphCore:GraphCore", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/Charts/Info.plist b/submodules/GraphUI/Info.plist similarity index 100% rename from submodules/Charts/Info.plist rename to submodules/GraphUI/Info.plist diff --git a/submodules/Charts/Sources/Chart Screen/ChartDetailsView.swift b/submodules/GraphUI/Sources/ChartDetailsView.swift similarity index 91% rename from submodules/Charts/Sources/Chart Screen/ChartDetailsView.swift rename to submodules/GraphUI/Sources/ChartDetailsView.swift index ecf685aafb..ba0ed31bed 100644 --- a/submodules/Charts/Sources/Chart Screen/ChartDetailsView.swift +++ b/submodules/GraphUI/Sources/ChartDetailsView.swift @@ -7,34 +7,17 @@ // import UIKit +import GraphCore +import AppBundle private let cornerRadius: CGFloat = 5 private let verticalMargins: CGFloat = 8 private var labelHeight: CGFloat = 18 private var margin: CGFloat = 10 private var prefixLabelWidth: CGFloat = 27 -private var textLabelWidth: CGFloat = 60 +private var textLabelWidth: CGFloat = 80 private var valueLabelWidth: CGFloat = 65 -struct ChartDetailsViewModel { - struct Value { - let prefix: String? - let title: String - let value: String - let color: UIColor - let visible: Bool - } - - var title: String - var showArrow: Bool - var showPrefixes: Bool - var values: [Value] - var totalValue: Value? - var tapAction: (() -> Void)? - - static let blank = ChartDetailsViewModel(title: "", showArrow: false, showPrefixes: false, values: [], totalValue: nil, tapAction: nil) -} - class ChartDetailsView: UIControl { let titleLabel = UILabel() let arrowView = UIImageView() @@ -45,7 +28,7 @@ class ChartDetailsView: UIControl { var valuesViews: [UILabel] = [] private var viewModel: ChartDetailsViewModel? - private var colorMode: ColorMode = .day + private var colorMode: GColorMode = .day override init(frame: CGRect) { super.init(frame: frame) @@ -55,7 +38,7 @@ class ChartDetailsView: UIControl { addTarget(self, action: #selector(didTap), for: .touchUpInside) titleLabel.font = UIFont.systemFont(ofSize: 12, weight: .bold) - arrowView.image = UIImage.arrowRight + arrowView.image = UIImage(bundleImageName: "Chart/arrow_right") arrowView.contentMode = .scaleAspectFill addSubview(titleLabel) @@ -182,8 +165,6 @@ class ChartDetailsView: UIControl { while array.count < count { let label = UILabel() label.font = font - label.adjustsFontSizeToFitWidth = true - label.minimumScaleFactor = 0.5 label.textAlignment = textAlignment addSubview(label) array.append(label) @@ -191,8 +172,8 @@ class ChartDetailsView: UIControl { } } -extension ChartDetailsView: ColorModeContainer { - func apply(colorMode: ColorMode, animated: Bool) { +extension ChartDetailsView: GColorModeContainer { + func apply(colorMode: GColorMode, animated: Bool) { self.colorMode = colorMode self.titleLabel.setTextColor(colorMode.chartDetailsTextColor, animated: animated) if let viewModel = self.viewModel { diff --git a/submodules/Charts/Sources/ChartNode.swift b/submodules/GraphUI/Sources/ChartNode.swift similarity index 63% rename from submodules/Charts/Sources/ChartNode.swift rename to submodules/GraphUI/Sources/ChartNode.swift index 20e319098a..8efe642643 100644 --- a/submodules/Charts/Sources/ChartNode.swift +++ b/submodules/GraphUI/Sources/ChartNode.swift @@ -1,14 +1,17 @@ import Foundation import UIKit +import SwiftSignalKit import Display import AsyncDisplayKit import AppBundle +import GraphCore public enum ChartType { case lines case twoAxis case pie case bars + case step } public final class ChartNode: ASDisplayNode { @@ -30,32 +33,36 @@ public final class ChartNode: ASDisplayNode { self.view.disablesInteractiveTransitionGestureRecognizer = true } - public func setup(_ data: String, type: ChartType, getDetailsData: @escaping (Date, (String?) -> Void) -> Void) { + public func setup(_ data: String, type: ChartType, getDetailsData: @escaping (Date, @escaping (String?) -> Void) -> Void) { if let data = data.data(using: .utf8) { - ChartsDataManager().readChart(data: data, extraCopiesCount: 0, sync: true, success: { [weak self] collection in + ChartsDataManager.readChart(data: data, extraCopiesCount: 0, sync: true, success: { [weak self] collection in let controller: BaseChartController switch type { case .lines: controller = GeneralLinesChartController(chartsCollection: collection) - controller.getDetailsData = { date, completion in - getDetailsData(date, { detailsData in - if let detailsData = detailsData, let data = detailsData.data(using: .utf8) { - ChartsDataManager().readChart(data: data, extraCopiesCount: 0, sync: true, success: { [weak self] collection in - completion(collection) - }) { error in - completion(nil) - } - } else { - completion(nil) - } - }) - } case .twoAxis: controller = TwoAxisLinesChartController(chartsCollection: collection) case .pie: controller = PercentPieChartController(chartsCollection: collection) case .bars: controller = StackedBarsChartController(chartsCollection: collection) + case .step: + controller = StepBarsChartController(chartsCollection: collection) + } + controller.getDetailsData = { date, completion in + getDetailsData(date, { detailsData in + if let detailsData = detailsData, let data = detailsData.data(using: .utf8) { + ChartsDataManager.readChart(data: data, extraCopiesCount: 0, sync: true, success: { [weak self] collection in + Queue.mainQueue().async { + completion(collection) + } + }) { error in + completion(nil) + } + } else { + completion(nil) + } + }) } if let strongSelf = self { strongSelf.chartView.setup(controller: controller, title: "") diff --git a/submodules/Charts/Sources/Chart Screen/ChartStackSection.swift b/submodules/GraphUI/Sources/ChartStackSection.swift similarity index 88% rename from submodules/Charts/Sources/Chart Screen/ChartStackSection.swift rename to submodules/GraphUI/Sources/ChartStackSection.swift index 333bdf1132..d6655f5607 100644 --- a/submodules/Charts/Sources/Chart Screen/ChartStackSection.swift +++ b/submodules/GraphUI/Sources/ChartStackSection.swift @@ -7,12 +7,22 @@ // import UIKit +import GraphCore private enum Constants { static let chartViewHeightFraction: CGFloat = 0.55 } -class ChartStackSection: UIView, ColorModeContainer { +private class LeftAlignedIconButton: UIButton { + override func titleRect(forContentRect contentRect: CGRect) -> CGRect { + let titleRect = super.titleRect(forContentRect: contentRect) + let imageSize = currentImage?.size ?? .zero + let availableWidth = contentRect.width - imageEdgeInsets.right - imageSize.width - titleRect.width + return titleRect.offsetBy(dx: round(availableWidth / 2), dy: 0) + } +} + +class ChartStackSection: UIView, GColorModeContainer { var chartView: ChartView var rangeView: RangeChartView var visibilityView: ChartVisibilityView @@ -30,7 +40,7 @@ class ChartStackSection: UIView, ColorModeContainer { rangeView = RangeChartView() visibilityView = ChartVisibilityView() titleLabel = UILabel() - backButton = UIButton() + backButton = LeftAlignedIconButton() super.init(frame: CGRect()) @@ -50,6 +60,9 @@ class ChartStackSection: UIView, ColorModeContainer { backButton.setTitle("Zoom Out", for: .normal) backButton.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .regular) backButton.setTitleColor(UIColor(rgb: 0x007ee5), for: .normal) + backButton.setImage(UIImage(bundleImageName: "Chart/arrow_left"), for: .normal) + backButton.imageEdgeInsets = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 3.0) + backButton.imageView?.tintColor = UIColor(rgb: 0x007ee5) backButton.setVisible(false, animated: false) } @@ -68,7 +81,7 @@ class ChartStackSection: UIView, ColorModeContainer { backButton.setVisible(false, animated: false) } - func apply(colorMode: ColorMode, animated: Bool) { + func apply(colorMode: GColorMode, animated: Bool) { UIView.perform(animated: animated && self.isVisibleInWindow) { self.backgroundColor = colorMode.tableBackgroundColor @@ -201,9 +214,9 @@ class ChartStackSection: UIView, ColorModeContainer { controller.initializeChart() updateToolViews(animated: false) - rangeView.setRange(0.8...1.0, animated: false) - TimeInterval.animationDurationMultipler = 0.00001 - controller.updateChartRange(0.8...1.0, animated: false) - TimeInterval.animationDurationMultipler = 1.0 +// rangeView.setRange(0.8...1.0, animated: false) +// TimeInterval.animationDurationMultipler = 0.00001 +// controller.updateChartRange(0.8...1.0) +// TimeInterval.animationDurationMultipler = 1.0 } } diff --git a/submodules/Charts/Sources/Chart Screen/ChartView.swift b/submodules/GraphUI/Sources/ChartView.swift similarity index 95% rename from submodules/Charts/Sources/Chart Screen/ChartView.swift rename to submodules/GraphUI/Sources/ChartView.swift index 37759176a5..7a93dbab17 100644 --- a/submodules/Charts/Sources/Chart Screen/ChartView.swift +++ b/submodules/GraphUI/Sources/ChartView.swift @@ -7,11 +7,7 @@ // import UIKit - -public protocol ChartViewRenderer: class { - var containerViews: [UIView] { get set } - func render(context: CGContext, bounds: CGRect, chartFrame: CGRect) -} +import GraphCore class ChartView: UIControl { override init(frame: CGRect) { @@ -166,8 +162,8 @@ class ChartView: UIControl { } -extension ChartView: ColorModeContainer { - func apply(colorMode: ColorMode, animated: Bool) { +extension ChartView: GColorModeContainer { + func apply(colorMode: GColorMode, animated: Bool) { detailsView?.apply(colorMode: colorMode, animated: animated && (detailsView?.isVisibleInWindow ?? false)) } } diff --git a/submodules/Charts/Sources/Chart Screen/ChartVisibilityItemView.swift b/submodules/GraphUI/Sources/ChartVisibilityItemView.swift similarity index 99% rename from submodules/Charts/Sources/Chart Screen/ChartVisibilityItemView.swift rename to submodules/GraphUI/Sources/ChartVisibilityItemView.swift index 2476526f1a..3b6025e0c0 100644 --- a/submodules/Charts/Sources/Chart Screen/ChartVisibilityItemView.swift +++ b/submodules/GraphUI/Sources/ChartVisibilityItemView.swift @@ -7,6 +7,7 @@ // import UIKit +import GraphCore class ChartVisibilityItemView: UIView { static let textFont = UIFont.systemFont(ofSize: 14, weight: .medium) diff --git a/submodules/Charts/Sources/Chart Screen/ChartVisibilityView.swift b/submodules/GraphUI/Sources/ChartVisibilityView.swift similarity index 97% rename from submodules/Charts/Sources/Chart Screen/ChartVisibilityView.swift rename to submodules/GraphUI/Sources/ChartVisibilityView.swift index fda3c3901f..84cbc8b0fe 100644 --- a/submodules/Charts/Sources/Chart Screen/ChartVisibilityView.swift +++ b/submodules/GraphUI/Sources/ChartVisibilityView.swift @@ -7,6 +7,7 @@ // import UIKit +import GraphCore private enum Constants { static let itemHeight: CGFloat = 30 @@ -137,8 +138,8 @@ class ChartVisibilityView: UIView { } } -extension ChartVisibilityView: ColorModeContainer { - func apply(colorMode: ColorMode, animated: Bool) { +extension ChartVisibilityView: GColorModeContainer { + func apply(colorMode: GColorMode, animated: Bool) { UIView.perform(animated: animated) { self.backgroundColor = colorMode.chartBackgroundColor self.tintColor = colorMode.descriptionActionColor diff --git a/submodules/GraphUI/Sources/GraphUI.h b/submodules/GraphUI/Sources/GraphUI.h new file mode 100644 index 0000000000..b474322e81 --- /dev/null +++ b/submodules/GraphUI/Sources/GraphUI.h @@ -0,0 +1,19 @@ +// +// GraphUI.h +// GraphUI +// +// Created by Peter on 8/13/19. +// Copyright © 2019 Telegram Messenger LLP. All rights reserved. +// + +#import + +//! Project version number for GraphUI. +FOUNDATION_EXPORT double GraphUIVersionNumber; + +//! Project version string for GraphUI. +FOUNDATION_EXPORT const unsigned char GraphUIVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/submodules/Charts/Sources/Chart Screen/RangeChartView.swift b/submodules/GraphUI/Sources/RangeChartView.swift similarity index 97% rename from submodules/Charts/Sources/Chart Screen/RangeChartView.swift rename to submodules/GraphUI/Sources/RangeChartView.swift index bc62636fbd..3607392df5 100644 --- a/submodules/Charts/Sources/Chart Screen/RangeChartView.swift +++ b/submodules/GraphUI/Sources/RangeChartView.swift @@ -6,6 +6,8 @@ // Copyright © 2019 Andrei Salavei. All rights reserved. // import UIKit +import GraphCore +import AppBundle private enum Constants { static let cropIndocatorLineWidth: CGFloat = 1 @@ -290,16 +292,16 @@ private extension RangeChartView { } } -extension RangeChartView: ColorModeContainer { - func apply(colorMode: ColorMode, animated: Bool) { +extension RangeChartView: GColorModeContainer { + func apply(colorMode: GColorMode, animated: Bool) { let colusre = { self.lowerBoundTintView.backgroundColor = colorMode.rangeViewTintColor self.upperBoundTintView.backgroundColor = colorMode.rangeViewTintColor } - self.cropFrameView.setImage(colorMode.rangeCropImage, animated: animated) - // self.chartView.apply(colorMode: colorMode, animated: animated) + let image = UIImage(bundleImageName: "Chart/selection_frame_light") + self.cropFrameView.setImage(image, animated: animated) if animated { UIView.animate(withDuration: .defaultDuration, animations: colusre) diff --git a/submodules/Charts/Sources/Helpers/UIImageView+Utils.swift b/submodules/GraphUI/Sources/UIImageView+Utils.swift similarity index 100% rename from submodules/Charts/Sources/Helpers/UIImageView+Utils.swift rename to submodules/GraphUI/Sources/UIImageView+Utils.swift diff --git a/submodules/Charts/Sources/Helpers/UILabel+Utils.swift b/submodules/GraphUI/Sources/UILabel+Utils.swift similarity index 100% rename from submodules/Charts/Sources/Helpers/UILabel+Utils.swift rename to submodules/GraphUI/Sources/UILabel+Utils.swift diff --git a/submodules/Charts/Sources/Helpers/UIView+Extensions.swift b/submodules/GraphUI/Sources/UIView+Extensions.swift similarity index 100% rename from submodules/Charts/Sources/Helpers/UIView+Extensions.swift rename to submodules/GraphUI/Sources/UIView+Extensions.swift diff --git a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift index a67941ecbb..4bcf2e92e9 100644 --- a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift @@ -30,7 +30,7 @@ final class InstantPageFeedbackItem: InstantPageItem { } func matchesNode(_ node: InstantPageNode) -> Bool { - if node is InstantPageFeedbackNode { + if let node = node as? InstantPageFeedbackNode, case let .Loaded(content) = node.webPage.content, case let .Loaded(updatedContent) = self.webPage.content, content.instantPage?.views == updatedContent.instantPage?.views { return true } return false diff --git a/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift b/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift index 0cbba86791..da2ce07137 100644 --- a/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift @@ -11,12 +11,13 @@ import AccountContext final class InstantPageFeedbackNode: ASDisplayNode, InstantPageNode { private let context: AccountContext - private let webPage: TelegramMediaWebpage + let webPage: TelegramMediaWebpage private let openUrl: (InstantPageUrlItem) -> Void private let highlightedBackgroundNode: ASDisplayNode private let buttonNode: HighlightableButtonNode private let labelNode: ASTextNode + private let viewsNode: ASTextNode private let resolveDisposable = MetaDisposable() @@ -34,23 +35,32 @@ final class InstantPageFeedbackNode: ASDisplayNode, InstantPageNode { self.labelNode = ASTextNode() self.labelNode.isLayerBacked = true self.labelNode.maximumNumberOfLines = 2 + + self.viewsNode = ASTextNode() + self.viewsNode.isLayerBacked = true + self.viewsNode.maximumNumberOfLines = 2 super.init() + if case let .Loaded(content) = webPage.content, let views = content.instantPage?.views { + self.viewsNode.attributedText = NSAttributedString(string: strings.InstantPage_Views(views), font: Font.regular(13.0), textColor: theme.panelSecondaryColor) + } + self.addSubnode(self.highlightedBackgroundNode) self.addSubnode(self.buttonNode) self.addSubnode(self.labelNode) + self.addSubnode(self.viewsNode) self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside) self.buttonNode.highligthedChanged = { [weak self] highlighted in if let strongSelf = self { if highlighted { - strongSelf.highlightedBackgroundNode.layer.removeAnimation(forKey: "opacity") - strongSelf.highlightedBackgroundNode.alpha = 1.0 + strongSelf.labelNode.layer.removeAnimation(forKey: "opacity") + strongSelf.labelNode.alpha = 0.4 } else { - strongSelf.highlightedBackgroundNode.alpha = 0.0 - strongSelf.highlightedBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2) + strongSelf.labelNode.alpha = 1.0 + strongSelf.labelNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2) } } } @@ -74,14 +84,18 @@ final class InstantPageFeedbackNode: ASDisplayNode, InstantPageNode { super.layout() let size = self.bounds.size - let inset: CGFloat = 15.0 + let inset: CGFloat = 16.0 self.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: size.width, height: size.height + UIScreenPixel)) - self.buttonNode.frame = CGRect(origin: CGPoint(), size: size) + + + let viewsSize = self.viewsNode.measure(CGSize(width: size.width - inset * 2.0, height: size.height)) + self.viewsNode.frame = CGRect(origin: CGPoint(x: inset, y: floorToScreenPixels((size.height - viewsSize.height) / 2.0)), size: viewsSize) let labelSize = self.labelNode.measure(CGSize(width: size.width - inset * 2.0, height: size.height)) + self.labelNode.frame = CGRect(origin: CGPoint(x: size.width - labelSize.width - inset, y: floorToScreenPixels((size.height - labelSize.height) / 2.0)), size: labelSize) - self.labelNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - labelSize.width) / 2.0), y: floorToScreenPixels((size.height - labelSize.height) / 2.0)), size: labelSize) + self.buttonNode.frame = CGRect(origin: CGPoint(x: size.width - labelSize.width - inset * 2.0, y: 0.0), size: size) } func updateIsVisible(_ isVisible: Bool) { @@ -100,6 +114,7 @@ final class InstantPageFeedbackNode: ASDisplayNode, InstantPageNode { func update(strings: PresentationStrings, theme: InstantPageTheme) { self.backgroundColor = theme.panelBackgroundColor self.highlightedBackgroundNode.backgroundColor = theme.panelHighlightedBackgroundColor - self.labelNode.attributedText = NSAttributedString(string: strings.InstantPage_FeedbackButton, font: Font.regular(13.0), textColor: theme.panelSecondaryColor) + self.labelNode.attributedText = NSAttributedString(string: strings.InstantPage_FeedbackButtonShort, font: Font.regular(13.0), textColor: theme.panelSecondaryColor) + self.viewsNode.attributedText = NSAttributedString(string: self.viewsNode.attributedText?.string ?? "", font: Font.regular(13.0), textColor: theme.panelSecondaryColor) } } diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift index 5a9890b840..172272a9ec 100644 --- a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift +++ b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift @@ -325,7 +325,7 @@ private func peersNearbyControllerEntries(data: PeersNearbyData?, state: PeersNe if let data = data, !data.users.isEmpty { var index: Int32 = 0 - var users = data.users + var users = data.users.filter { $0.peer.0.id != data.accountPeerId } var effectiveExpanded = expanded if users.count > maxUsersDisplayedLimit && !expanded { users = Array(users.prefix(Int(maxUsersDisplayedLimit))) @@ -334,10 +334,8 @@ private func peersNearbyControllerEntries(data: PeersNearbyData?, state: PeersNe } for user in users { - if user.peer.0.id != data.accountPeerId { - entries.append(.user(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, user)) - index += 1 - } + entries.append(.user(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, user)) + index += 1 } if !effectiveExpanded { @@ -493,7 +491,7 @@ public func peersNearbyController(context: AccountContext) -> ViewController { var cancelImpl: (() -> Void)? let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) presentControllerImpl?(controller, nil) diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift index 223946be96..62bc22c0ee 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift @@ -742,7 +742,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P var cancelImpl: (() -> Void)? let presentationData = context.sharedContext.currentPresentationData.with { $0 } let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) presentControllerImpl?(controller, .window(.root), ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) @@ -869,7 +869,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P var cancelImpl: (() -> Void)? let presentationData = context.sharedContext.currentPresentationData.with { $0 } let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) presentControllerImpl?(controller, .window(.root), ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) diff --git a/submodules/SettingsUI/Sources/OpenSettings.swift b/submodules/SettingsUI/Sources/OpenSettings.swift index b76066a67b..333a2810fc 100644 --- a/submodules/SettingsUI/Sources/OpenSettings.swift +++ b/submodules/SettingsUI/Sources/OpenSettings.swift @@ -14,7 +14,7 @@ func openEditSettings(context: AccountContext, accountsAndPeers: Signal<((Accoun var cancelImpl: (() -> Void)? let presentationData = context.sharedContext.currentPresentationData.with { $0 } let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) presentController(controller, nil) diff --git a/submodules/StatisticsUI/BUCK b/submodules/StatisticsUI/BUCK index 693dcc8cbc..995b6f117a 100644 --- a/submodules/StatisticsUI/BUCK +++ b/submodules/StatisticsUI/BUCK @@ -21,7 +21,7 @@ static_library( "//submodules/AlertUI:AlertUI", "//submodules/PresentationDataUtils:PresentationDataUtils", "//submodules/MergeLists:MergeLists", - "//submodules/Charts:Charts", + "//submodules/GraphUI:GraphUI", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/StatisticsUI/Sources/StatsController.swift b/submodules/StatisticsUI/Sources/StatsController.swift index 87b59f7d15..96a23cf398 100644 --- a/submodules/StatisticsUI/Sources/StatsController.swift +++ b/submodules/StatisticsUI/Sources/StatsController.swift @@ -14,13 +14,17 @@ import PresentationDataUtils import AccountContext import PresentationDataUtils import AppBundle -import Charts +import GraphUI private final class StatsControllerArguments { + let context: AccountContext let loadDetailedGraph: (ChannelStatsGraph, Int64) -> Signal + let openMessage: (MessageId) -> Void - init(loadDetailedGraph: @escaping (ChannelStatsGraph, Int64) -> Signal) { + init(context: AccountContext, loadDetailedGraph: @escaping (ChannelStatsGraph, Int64) -> Signal, openMessage: @escaping (MessageId) -> Void) { + self.context = context self.loadDetailedGraph = loadDetailedGraph + self.openMessage = openMessage } } @@ -30,10 +34,12 @@ private enum StatsSection: Int32 { case followers case notifications case viewsByHour - case postInteractions case viewsBySource case followersBySource case languages + case postInteractions + case recentPosts + case instantPageInteractions } private enum StatsEntry: ItemListNodeEntry { @@ -51,10 +57,7 @@ private enum StatsEntry: ItemListNodeEntry { case viewsByHourTitle(PresentationTheme, String) case viewsByHourGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, ChannelStatsGraph, ChartType) - - case postInteractionsTitle(PresentationTheme, String) - case postInteractionsGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, ChannelStatsGraph, ChartType) - + case viewsBySourceTitle(PresentationTheme, String) case viewsBySourceGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, ChannelStatsGraph, ChartType) @@ -64,6 +67,15 @@ private enum StatsEntry: ItemListNodeEntry { case languagesTitle(PresentationTheme, String) case languagesGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, ChannelStatsGraph, ChartType) + case postInteractionsTitle(PresentationTheme, String) + case postInteractionsGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, ChannelStatsGraph, ChartType) + + case postsTitle(PresentationTheme, String) + case post(Int32, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, Message, ChannelStatsMessageInteractions) + + case instantPageInteractionsTitle(PresentationTheme, String) + case instantPageInteractionsGraph(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, ChannelStatsGraph, ChartType) + var section: ItemListSectionId { switch self { case .overviewHeader, .overview: @@ -76,14 +88,18 @@ private enum StatsEntry: ItemListNodeEntry { return StatsSection.notifications.rawValue case .viewsByHourTitle, .viewsByHourGraph: return StatsSection.viewsByHour.rawValue - case .postInteractionsTitle, .postInteractionsGraph: - return StatsSection.postInteractions.rawValue case .viewsBySourceTitle, .viewsBySourceGraph: return StatsSection.viewsBySource.rawValue case .followersBySourceTitle, .followersBySourceGraph: return StatsSection.followersBySource.rawValue case .languagesTitle, .languagesGraph: return StatsSection.languages.rawValue + case .postInteractionsTitle, .postInteractionsGraph: + return StatsSection.postInteractions.rawValue + case .postsTitle, .post: + return StatsSection.recentPosts.rawValue + case .instantPageInteractionsTitle, .instantPageInteractionsGraph: + return StatsSection.instantPageInteractions.rawValue } } @@ -109,22 +125,30 @@ private enum StatsEntry: ItemListNodeEntry { return 8 case .viewsByHourGraph: return 9 - case .postInteractionsTitle: - return 10 - case .postInteractionsGraph: - return 11 case .viewsBySourceTitle: - return 12 + return 10 case .viewsBySourceGraph: - return 13 + return 11 case .followersBySourceTitle: - return 14 + return 12 case .followersBySourceGraph: - return 15 + return 13 case .languagesTitle: - return 16 + return 14 case .languagesGraph: + return 15 + case .postInteractionsTitle: + return 16 + case .postInteractionsGraph: return 17 + case .postsTitle: + return 18 + case let .post(index, _, _, _, _, _): + return 19 + index + case .instantPageInteractionsTitle: + return 1000 + case .instantPageInteractionsGraph: + return 1001 } } @@ -190,18 +214,6 @@ private enum StatsEntry: ItemListNodeEntry { } else { return false } - case let .postInteractionsTitle(lhsTheme, lhsText): - if case let .postInteractionsTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { - return true - } else { - return false - } - case let .postInteractionsGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsGraph, lhsType): - if case let .postInteractionsGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsGraph, rhsType) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsGraph == rhsGraph, lhsType == rhsType { - return true - } else { - return false - } case let .viewsBySourceTitle(lhsTheme, lhsText): if case let .viewsBySourceTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { return true @@ -238,6 +250,42 @@ private enum StatsEntry: ItemListNodeEntry { } else { return false } + case let .postInteractionsTitle(lhsTheme, lhsText): + if case let .postInteractionsTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .postInteractionsGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsGraph, lhsType): + if case let .postInteractionsGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsGraph, rhsType) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsGraph == rhsGraph, lhsType == rhsType { + return true + } else { + return false + } + case let .postsTitle(lhsTheme, lhsText): + if case let .postsTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .post(lhsIndex, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsMessage, lhsInteractions): + if case let .post(rhsIndex, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsMessage, rhsInteractions) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsInteractions == rhsInteractions { + return true + } else { + return false + } + case let .instantPageInteractionsTitle(lhsTheme, lhsText): + if case let .instantPageInteractionsTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } + case let .instantPageInteractionsGraph(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsGraph, lhsType): + if case let .instantPageInteractionsGraph(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsGraph, rhsType) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsGraph == rhsGraph, lhsType == rhsType { + return true + } else { + return false + } } } @@ -254,10 +302,12 @@ private enum StatsEntry: ItemListNodeEntry { let .followersTitle(theme, text), let .notificationsTitle(theme, text), let .viewsByHourTitle(theme, text), - let .postInteractionsTitle(theme, text), let .viewsBySourceTitle(theme, text), let .followersBySourceTitle(theme, text), - let .languagesTitle(theme, text): + let .languagesTitle(theme, text), + let .postInteractionsTitle(theme, text), + let .postsTitle(theme, text), + let .instantPageInteractionsTitle(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) case let .overview(theme, stats): return StatsOverviewItem(presentationData: presentationData, stats: stats, sectionId: self.section, style: .blocks) @@ -269,21 +319,37 @@ private enum StatsEntry: ItemListNodeEntry { return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, sectionId: self.section, style: .blocks) case let .viewsByHourGraph(theme, strings, dateTimeFormat, graph, type): return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, sectionId: self.section, style: .blocks) - case let .postInteractionsGraph(theme, strings, dateTimeFormat, graph, type): - return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, getDetailsData: { date, completion in - let _ = arguments.loadDetailedGraph(graph, Int64(date.timeIntervalSince1970)) - }, sectionId: self.section, style: .blocks) case let .viewsBySourceGraph(theme, strings, dateTimeFormat, graph, type): return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, height: 160.0, sectionId: self.section, style: .blocks) case let .followersBySourceGraph(theme, strings, dateTimeFormat, graph, type): return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, height: 160.0, sectionId: self.section, style: .blocks) case let .languagesGraph(theme, strings, dateTimeFormat, graph, type): return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, height: 100.0, sectionId: self.section, style: .blocks) + case let .postInteractionsGraph(theme, strings, dateTimeFormat, graph, type): + return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, getDetailsData: { date, completion in + let _ = arguments.loadDetailedGraph(graph, Int64(date.timeIntervalSince1970) * 1000).start(next: { graph in + if let graph = graph, case let .Loaded(_, data) = graph { + completion(data) + } + }) + }, sectionId: self.section, style: .blocks) + case let .post(index, theme, strings, dateTimeFormat, message, interactions): + return StatsMessageItem(context: arguments.context, presentationData: presentationData, message: message, views: interactions.views, forwards: interactions.forwards, sectionId: self.section, style: .blocks, action: { + arguments.openMessage(message.id) + }) + case let .instantPageInteractionsGraph(theme, strings, dateTimeFormat, graph, type): + return StatsGraphItem(presentationData: presentationData, graph: graph, type: type, getDetailsData: { date, completion in + let _ = arguments.loadDetailedGraph(graph, Int64(date.timeIntervalSince1970) * 1000).start(next: { graph in + if let graph = graph, case let .Loaded(_, data) = graph { + completion(data) + } + }) + }, sectionId: self.section, style: .blocks) } } } -private func statsControllerEntries(data: ChannelStats?, presentationData: PresentationData) -> [StatsEntry] { +private func statsControllerEntries(data: ChannelStats?, messages: [Message]?, interactions: [MessageId: ChannelStatsMessageInteractions]?, presentationData: PresentationData) -> [StatsEntry] { var entries: [StatsEntry] = [] if let data = data { @@ -293,77 +359,126 @@ private func statsControllerEntries(data: ChannelStats?, presentationData: Prese entries.append(.overviewHeader(presentationData.theme, presentationData.strings.Stats_Overview, "\(minDate) – \(maxDate)")) entries.append(.overview(presentationData.theme, data)) - entries.append(.growthTitle(presentationData.theme, presentationData.strings.Stats_GrowthTitle)) - entries.append(.growthGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.growthGraph, .lines)) + if !data.growthGraph.isEmpty { + entries.append(.growthTitle(presentationData.theme, presentationData.strings.Stats_GrowthTitle)) + entries.append(.growthGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.growthGraph, .lines)) + } - entries.append(.followersTitle(presentationData.theme, presentationData.strings.Stats_FollowersTitle)) - entries.append(.followersGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.followersGraph, .lines)) + if !data.followersGraph.isEmpty { + entries.append(.followersTitle(presentationData.theme, presentationData.strings.Stats_FollowersTitle)) + entries.append(.followersGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.followersGraph, .lines)) + } - entries.append(.notificationsTitle(presentationData.theme, presentationData.strings.Stats_NotificationsTitle)) - entries.append(.notificationsGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.muteGraph, .lines)) + if !data.muteGraph.isEmpty { + entries.append(.notificationsTitle(presentationData.theme, presentationData.strings.Stats_NotificationsTitle)) + entries.append(.notificationsGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.muteGraph, .lines)) + } - entries.append(.postInteractionsTitle(presentationData.theme, presentationData.strings.Stats_InteractionsTitle)) - entries.append(.postInteractionsGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.interactionsGraph, .twoAxis)) + if !data.viewsBySourceGraph.isEmpty { + entries.append(.viewsBySourceTitle(presentationData.theme, presentationData.strings.Stats_ViewsBySourceTitle)) + entries.append(.viewsBySourceGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.viewsBySourceGraph, .bars)) + } - entries.append(.viewsBySourceTitle(presentationData.theme, presentationData.strings.Stats_ViewsBySourceTitle)) - entries.append(.viewsBySourceGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.viewsBySourceGraph, .bars)) + if !data.newFollowersBySourceGraph.isEmpty { + entries.append(.followersBySourceTitle(presentationData.theme, presentationData.strings.Stats_FollowersBySourceTitle)) + entries.append(.followersBySourceGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.newFollowersBySourceGraph, .bars)) + } - entries.append(.followersBySourceTitle(presentationData.theme, presentationData.strings.Stats_FollowersBySourceTitle)) - entries.append(.followersBySourceGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.newFollowersBySourceGraph, .bars)) + if !data.languagesGraph.isEmpty { + entries.append(.languagesTitle(presentationData.theme, presentationData.strings.Stats_LanguagesTitle)) + entries.append(.languagesGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.languagesGraph, .pie)) + } - entries.append(.languagesTitle(presentationData.theme, presentationData.strings.Stats_LanguagesTitle)) - entries.append(.languagesGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.languagesGraph, .pie)) + if !data.interactionsGraph.isEmpty { + entries.append(.postInteractionsTitle(presentationData.theme, presentationData.strings.Stats_InteractionsTitle)) + entries.append(.postInteractionsGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.interactionsGraph, .step)) + } + + if let messages = messages, !messages.isEmpty, let interactions = interactions, !interactions.isEmpty { + entries.append(.postsTitle(presentationData.theme, presentationData.strings.Stats_PostsTitle)) + var index: Int32 = 0 + for message in messages { + if let interactions = interactions[message.id] { + entries.append(.post(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, message, interactions)) + index += 1 + } + } + } + + if !data.instantPageInteractionsGraph.isEmpty { + entries.append(.instantPageInteractionsTitle(presentationData.theme, presentationData.strings.Stats_InstantViewInteractionsTitle)) + entries.append(.instantPageInteractionsGraph(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, data.instantPageInteractionsGraph, .step)) + } } return entries } -public func channelStatsController(context: AccountContext, peer: Peer, cachedPeerData: CachedPeerData) -> ViewController { +public func channelStatsController(context: AccountContext, peerId: PeerId, cachedPeerData: CachedPeerData) -> ViewController { var pushControllerImpl: ((ViewController) -> Void)? var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)? - var navigateToChatImpl: ((Peer) -> Void)? + var navigateToMessageImpl: ((MessageId) -> Void)? let actionsDisposable = DisposableSet() let checkCreationAvailabilityDisposable = MetaDisposable() actionsDisposable.add(checkCreationAvailabilityDisposable) let dataPromise = Promise(nil) + let messagesPromise = Promise(nil) var datacenterId: Int32 = 0 if let cachedData = cachedPeerData as? CachedChannelData { datacenterId = cachedData.statsDatacenterId } - let statsContext = ChannelStatsContext(postbox: context.account.postbox, network: context.account.network, datacenterId: datacenterId, peerId: peer.id) + let statsContext = ChannelStatsContext(postbox: context.account.postbox, network: context.account.network, datacenterId: datacenterId, peerId: peerId) let dataSignal: Signal = statsContext.state |> map { state in return state.stats - } |> afterNext({ [weak statsContext] a in - if let w = statsContext, let a = a { - if case .OnDemand = a.interactionsGraph { - w.loadInteractionsGraph() - w.loadNewFollowersBySourceGraph() - w.loadViewsBySourceGraph() - w.loadLanguagesGraph() + } |> afterNext({ [weak statsContext] stats in + if let statsContext = statsContext, let stats = stats { + if case .OnDemand = stats.interactionsGraph { + statsContext.loadInteractionsGraph() + statsContext.loadNewFollowersBySourceGraph() + statsContext.loadViewsBySourceGraph() + statsContext.loadLanguagesGraph() + statsContext.loadInstantPageInteractionsGraph() } } }) dataPromise.set(.single(nil) |> then(dataSignal)) - let arguments = StatsControllerArguments(loadDetailedGraph: { graph, x -> Signal in + let arguments = StatsControllerArguments(context: context, loadDetailedGraph: { graph, x -> Signal in return statsContext.loadDetailedGraph(graph, x: x) + }, openMessage: { messageId in + navigateToMessageImpl?(messageId) }) - let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get()) + let messageView = context.account.viewTracker.aroundMessageHistoryViewForLocation(.peer(peerId), index: .upperBound, anchorIndex: .upperBound, count: 100, fixedCombinedReadStates: nil) + |> map { messageHistoryView, _, _ -> MessageHistoryView? in + return messageHistoryView + } + messagesPromise.set(.single(nil) |> then(messageView)) + + let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get(), messagesPromise.get()) |> deliverOnMainQueue - |> map { presentationData, data -> (ItemListControllerState, (ItemListNodeState, Any)) in + |> map { presentationData, data, messageView -> (ItemListControllerState, (ItemListNodeState, Any)) in var emptyStateItem: ItemListControllerEmptyStateItem? if data == nil { emptyStateItem = ItemListLoadingIndicatorEmptyStateItem(theme: presentationData.theme) } + let messages = messageView?.entries.map { $0.message }.sorted(by: { (lhsMessage, rhsMessage) -> Bool in + return lhsMessage.timestamp > rhsMessage.timestamp + }) + let interactions = data?.messageInteractions.reduce([MessageId : ChannelStatsMessageInteractions]()) { (map, interactions) -> [MessageId : ChannelStatsMessageInteractions] in + var map = map + map[interactions.messageId] = interactions + return map + } + let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.ChannelInfo_Stats), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: true) - let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: statsControllerEntries(data: data, presentationData: presentationData), style: .blocks, emptyStateItem: emptyStateItem, crossfadeState: false, animateChanges: false) + let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: statsControllerEntries(data: data, messages: messages, interactions: interactions, presentationData: presentationData), style: .blocks, emptyStateItem: emptyStateItem, crossfadeState: false, animateChanges: false) return (controllerState, (listState, arguments)) } @@ -386,6 +501,10 @@ public func channelStatsController(context: AccountContext, peer: Peer, cachedPe controller.present(c, in: .window(.root), with: a) } } - + navigateToMessageImpl = { [weak controller] messageId in + if let navigationController = controller?.navigationController as? NavigationController { + context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(messageId.peerId), subject: .message(messageId), keepStack: .always, useExisting: false, purposefulAction: {})) + } + } return controller } diff --git a/submodules/StatisticsUI/Sources/StatsGraphItem.swift b/submodules/StatisticsUI/Sources/StatsGraphItem.swift index d8da3b40d1..679fa38874 100644 --- a/submodules/StatisticsUI/Sources/StatsGraphItem.swift +++ b/submodules/StatisticsUI/Sources/StatsGraphItem.swift @@ -8,18 +8,18 @@ import SyncCore import TelegramPresentationData import ItemListUI import PresentationDataUtils -import Charts +import GraphUI class StatsGraphItem: ListViewItem, ItemListItem { let presentationData: ItemListPresentationData let graph: ChannelStatsGraph let type: ChartType let height: CGFloat - let getDetailsData: ((Date, (String?) -> Void) -> Void)? + let getDetailsData: ((Date, @escaping (String?) -> Void) -> Void)? let sectionId: ItemListSectionId let style: ItemListStyle - init(presentationData: ItemListPresentationData, graph: ChannelStatsGraph, type: ChartType, height: CGFloat = 0.0, getDetailsData: ((Date, (String?) -> Void) -> Void)? = nil, sectionId: ItemListSectionId, style: ItemListStyle) { + init(presentationData: ItemListPresentationData, graph: ChannelStatsGraph, type: ChartType, height: CGFloat = 0.0, getDetailsData: ((Date, @escaping (String?) -> Void) -> Void)? = nil, sectionId: ItemListSectionId, style: ItemListStyle) { self.presentationData = presentationData self.graph = graph self.type = type @@ -69,6 +69,7 @@ class StatsGraphItemNode: ListViewItemNode { private let backgroundNode: ASDisplayNode private let topStripeNode: ASDisplayNode private let bottomStripeNode: ASDisplayNode + private let maskNode: ASImageNode let chartNode: ChartNode @@ -79,6 +80,8 @@ class StatsGraphItemNode: ListViewItemNode { self.backgroundNode.isLayerBacked = true self.backgroundNode.backgroundColor = .white + self.maskNode = ASImageNode() + self.topStripeNode = ASDisplayNode() self.topStripeNode.isLayerBacked = true @@ -94,6 +97,14 @@ class StatsGraphItemNode: ListViewItemNode { self.addSubnode(self.chartNode) } + override func didLoad() { + super.didLoad() + + self.chartNode.view.interactiveTransitionGestureRecognizerTest = { point -> Bool in + return point.x > 30.0 + } + } + func asyncLayout() -> (_ item: StatsGraphItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { let currentItem = self.item @@ -153,7 +164,9 @@ class StatsGraphItemNode: ListViewItemNode { if strongSelf.bottomStripeNode.supernode == nil { strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0) } - + if strongSelf.maskNode.supernode != nil { + strongSelf.maskNode.removeFromSupernode() + } strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight)) case .blocks: if strongSelf.backgroundNode.supernode == nil { @@ -165,23 +178,34 @@ class StatsGraphItemNode: ListViewItemNode { 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: - strongSelf.topStripeNode.isHidden = false + case .sameSection(false): + strongSelf.topStripeNode.isHidden = true + default: + hasTopCorners = true + strongSelf.topStripeNode.isHidden = hasCorners } let bottomStripeInset: CGFloat switch neighbors.bottom { - case .sameSection(false): - bottomStripeInset = leftInset - default: - bottomStripeInset = 0.0 + case .sameSection(false): + bottomStripeInset = leftInset + default: + bottomStripeInset = 0.0 + hasBottomCorners = true + strongSelf.bottomStripeNode.isHidden = hasCorners } - strongSelf.chartNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: layout.size.width - leftInset - rightInset, height: 400.0)) + strongSelf.chartNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: layout.size.width - leftInset - rightInset, height: 500.0)) + strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight))) + strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0) strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: separatorHeight)) strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - bottomStripeInset, height: separatorHeight)) } diff --git a/submodules/StatisticsUI/Sources/StatsMessageItem.swift b/submodules/StatisticsUI/Sources/StatsMessageItem.swift new file mode 100644 index 0000000000..c0df1622c6 --- /dev/null +++ b/submodules/StatisticsUI/Sources/StatsMessageItem.swift @@ -0,0 +1,435 @@ +import Foundation +import UIKit +import Display +import AsyncDisplayKit +import SwiftSignalKit +import Postbox +import TelegramCore +import SyncCore +import AccountContext +import TelegramPresentationData +import TelegramStringFormatting +import ItemListUI +import PresentationDataUtils +import PhotoResources + +public class StatsMessageItem: ListViewItem, ItemListItem { + let context: AccountContext + let presentationData: ItemListPresentationData + let message: Message + let views: Int32 + let forwards: Int32 + public let sectionId: ItemListSectionId + let style: ItemListStyle + let action: (() -> Void)? + + init(context: AccountContext, presentationData: ItemListPresentationData, message: Message, views: Int32, forwards: Int32, sectionId: ItemListSectionId, style: ItemListStyle, action: (() -> Void)?) { + self.context = context + self.presentationData = presentationData + self.message = message + self.views = views + self.forwards = forwards + self.sectionId = sectionId + self.style = style + self.action = action + } + + public 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 = StatsMessageItemNode() + 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() }) + }) + } + } + } + + public 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? StatsMessageItemNode { + 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() + }) + } + } + } + } + } + + public var selectable: Bool = true + + public func selected(listView: ListView){ + listView.clearHighlightAnimated(true) + self.action?() + } +} + + +private let badgeFont = Font.regular(15.0) + +public class StatsMessageItemNode: ListViewItemNode, ItemListItemNode { + private let backgroundNode: ASDisplayNode + private let topStripeNode: ASDisplayNode + private let bottomStripeNode: ASDisplayNode + private let highlightedBackgroundNode: ASDisplayNode + private let maskNode: ASImageNode + + let contentImageNode: TransformImageNode + let titleNode: TextNode + let labelNode: TextNode + let viewsNode: TextNode + let forwardsNode: TextNode + + private let activateArea: AccessibilityAreaNode + + private var item: StatsMessageItem? + private var contentImageMedia: Media? + + override public var canBeSelected: Bool { + return true + } + + public var tag: ItemListItemTag? { + return self.item?.tag + } + + public init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + self.backgroundNode.backgroundColor = .white + + self.maskNode = ASImageNode() + + self.topStripeNode = ASDisplayNode() + self.topStripeNode.isLayerBacked = true + + self.bottomStripeNode = ASDisplayNode() + self.bottomStripeNode.isLayerBacked = true + + self.contentImageNode = TransformImageNode() + self.contentImageNode.isLayerBacked = true + + self.titleNode = TextNode() + self.titleNode.isUserInteractionEnabled = false + + self.labelNode = TextNode() + self.labelNode.isUserInteractionEnabled = false + + self.viewsNode = TextNode() + self.viewsNode.isUserInteractionEnabled = false + + self.forwardsNode = TextNode() + self.forwardsNode.isUserInteractionEnabled = false + + self.highlightedBackgroundNode = ASDisplayNode() + self.highlightedBackgroundNode.isLayerBacked = true + + self.activateArea = AccessibilityAreaNode() + + super.init(layerBacked: false, dynamicBounce: false) + + self.addSubnode(self.contentImageNode) + self.addSubnode(self.titleNode) + self.addSubnode(self.labelNode) + self.addSubnode(self.viewsNode) + self.addSubnode(self.forwardsNode) + + self.addSubnode(self.activateArea) + } + + public func asyncLayout() -> (_ item: StatsMessageItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + let makeTitleLayout = TextNode.asyncLayout(self.titleNode) + let makeLabelLayout = TextNode.asyncLayout(self.labelNode) + let makeViewsLayout = TextNode.asyncLayout(self.viewsNode) + let makeForwardsLayout = TextNode.asyncLayout(self.forwardsNode) + + let currentItem = self.item + let currentContentImageMedia = self.contentImageMedia + + return { item, params, neighbors in + var updatedTheme: PresentationTheme? + + if currentItem?.presentationData.theme !== item.presentationData.theme { + updatedTheme = item.presentationData.theme + } + + let contentSize: CGSize + let insets: UIEdgeInsets + let separatorHeight = UIScreenPixel + let itemBackgroundColor: UIColor + let itemSeparatorColor: UIColor + + var leftInset = 16.0 + params.leftInset + var rightInset = 16.0 + params.rightInset + var totalLeftInset = leftInset + var additionalRightInset: CGFloat = 93.0 + + let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize) + + let contentKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.message, strings: item.presentationData.strings, nameDisplayOrder: .firstLast, accountPeerId: item.context.account.peerId) + let text = stringForMediaKind(contentKind, strings: item.presentationData.strings).0 + + var contentImageMedia: Media? + for media in item.message.media { + if let image = media as? TelegramMediaImage { + contentImageMedia = image + break + } else if let file = media as? TelegramMediaFile { + if file.isVideo && !file.isInstantVideo { + contentImageMedia = file + break + } + } else if let webpage = media as? TelegramMediaWebpage, case let .Loaded(content) = webpage.content { + if let image = content.image { + contentImageMedia = image + break + } else if let file = content.file { + if file.isVideo && !file.isInstantVideo { + contentImageMedia = file + break + } + } + } + } + + if let _ = contentImageMedia { + totalLeftInset += 48.0 + } + + var updateImageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? + if let contentImageMedia = contentImageMedia { + if let currentContentImageMedia = currentContentImageMedia, contentImageMedia.isSemanticallyEqual(to: currentContentImageMedia) { + } else { + if let image = contentImageMedia as? TelegramMediaImage { + updateImageSignal = mediaGridMessagePhoto(account: item.context.account, photoReference: .message(message: MessageReference(item.message), media: image)) + } else if let file = contentImageMedia as? TelegramMediaFile { + updateImageSignal = mediaGridMessageVideo(postbox: item.context.account.postbox, videoReference: .message(message: MessageReference(item.message), media: file), autoFetchFullSizeThumbnail: true) + } + } + } + + let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: text, font: titleFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - totalLeftInset - rightInset - additionalRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let labelFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 13.0 / 17.0)) + + let presentationData = item.context.sharedContext.currentPresentationData.with { $0 } + let label = stringForFullDate(timestamp: item.message.timestamp, strings: item.presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat) + + let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: label, font: labelFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - totalLeftInset - rightInset - additionalRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let (viewsLayout, viewsApply) = makeViewsLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.presentationData.strings.Stats_MessageViews(item.views), font: labelFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .right, cutout: nil, insets: UIEdgeInsets())) + + let (forwardsLayout, forwardsApply) = makeForwardsLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.presentationData.strings.Stats_MessageForwards(item.forwards), font: labelFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: CGFloat.greatestFiniteMagnitude), alignment: .right, cutout: nil, insets: UIEdgeInsets())) + + let verticalInset: CGFloat = 11.0 + let titleSpacing: CGFloat = 3.0 + + let height: CGFloat = verticalInset * 2.0 + titleLayout.size.height + titleSpacing + labelLayout.size.height + + switch item.style { + case .plain: + itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor + contentSize = CGSize(width: params.width, height: height) + insets = itemListNeighborsPlainInsets(neighbors) + case .blocks: + itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor + contentSize = CGSize(width: params.width, height: height) + insets = itemListNeighborsGroupedInsets(neighbors) + } + + let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) + + return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in + if let strongSelf = self { + strongSelf.item = item + + strongSelf.activateArea.frame = CGRect(origin: CGPoint(x: params.leftInset, y: 0.0), size: CGSize(width: params.width - params.leftInset - params.rightInset, height: layout.contentSize.height)) + strongSelf.activateArea.accessibilityLabel = text + strongSelf.activateArea.accessibilityValue = label + + if let _ = updatedTheme { + strongSelf.topStripeNode.backgroundColor = itemSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor + strongSelf.backgroundNode.backgroundColor = itemBackgroundColor + strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor + } + + var dimensions: CGSize? + if let contentImageMedia = contentImageMedia as? TelegramMediaImage { + dimensions = largestRepresentationForPhoto(contentImageMedia)?.dimensions.cgSize + } else if let contentImageMedia = contentImageMedia as? TelegramMediaFile { + dimensions = contentImageMedia.dimensions?.cgSize + } + + let contentImageSize = CGSize(width: 40.0, height: 40.0) + + var contentImageNodeAppeared = false + if let dimensions = dimensions { + let makeImageLayout = strongSelf.contentImageNode.asyncLayout() + let imageSize = contentImageSize + + let applyImageLayout = makeImageLayout(TransformImageArguments(corners: ImageCorners(radius: 4.0), imageSize: dimensions.aspectFilled(imageSize), boundingSize: imageSize, intrinsicInsets: UIEdgeInsets())) + applyImageLayout() + + if let updateImageSignal = updateImageSignal { + strongSelf.contentImageNode.setSignal(updateImageSignal) + if currentContentImageMedia == nil { + strongSelf.contentImageNode.isHidden = false + contentImageNodeAppeared = true + } + } + } else { + if currentContentImageMedia != nil { + strongSelf.contentImageNode.removeFromSupernode() + strongSelf.contentImageNode.setSignal(.single({ _ in nil })) + strongSelf.contentImageNode.isHidden = true + } + } + + let _ = titleApply() + let _ = labelApply() + let _ = viewsApply() + let _ = forwardsApply() + + switch item.style { + case .plain: + if strongSelf.backgroundNode.supernode != nil { + strongSelf.backgroundNode.removeFromSupernode() + } + if strongSelf.topStripeNode.supernode != nil { + strongSelf.topStripeNode.removeFromSupernode() + } + if strongSelf.bottomStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0) + } + if strongSelf.maskNode.supernode != nil { + strongSelf.maskNode.removeFromSupernode() + } + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight)) + case .blocks: + if strongSelf.backgroundNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0) + } + if strongSelf.topStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1) + } + if strongSelf.bottomStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2) + } + 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 + switch neighbors.bottom { + case .sameSection(false): + bottomStripeInset = leftInset + default: + bottomStripeInset = 0.0 + hasBottomCorners = true + strongSelf.bottomStripeNode.isHidden = hasCorners + } + + strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil + + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight))) + strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0) + strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: separatorHeight)) + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - bottomStripeInset, height: separatorHeight)) + } + + let contentImageFrame = CGRect(origin: CGPoint(x: leftInset, y: floorToScreenPixels((height - contentImageSize.height) / 2.0)), size: contentImageSize) + strongSelf.contentImageNode.frame = contentImageFrame + + let titleFrame = CGRect(origin: CGPoint(x: totalLeftInset, y: 11.0), size: titleLayout.size) + strongSelf.titleNode.frame = titleFrame + + let labelFrame = CGRect(origin: CGPoint(x: totalLeftInset, y: titleFrame.maxY + titleSpacing), size: labelLayout.size) + strongSelf.labelNode.frame = labelFrame + + let viewsFrame = CGRect(origin: CGPoint(x: params.width - rightInset - viewsLayout.size.width, y: 15.0), size: viewsLayout.size) + strongSelf.viewsNode.frame = viewsFrame + + let forwardsFrame = CGRect(origin: CGPoint(x: params.width - rightInset - forwardsLayout.size.width, y: titleFrame.maxY + titleSpacing), size: forwardsLayout.size) + strongSelf.forwardsNode.frame = forwardsFrame + + strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: height + UIScreenPixel)) + } + }) + } + } + + override public func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) { + super.setHighlighted(highlighted, at: point, animated: animated) + + if highlighted { + self.highlightedBackgroundNode.alpha = 1.0 + if self.highlightedBackgroundNode.supernode == nil { + var anchorNode: ASDisplayNode? + if self.bottomStripeNode.supernode != nil { + anchorNode = self.bottomStripeNode + } else if self.topStripeNode.supernode != nil { + anchorNode = self.topStripeNode + } else if self.backgroundNode.supernode != nil { + anchorNode = self.backgroundNode + } + if let anchorNode = anchorNode { + self.insertSubnode(self.highlightedBackgroundNode, aboveSubnode: anchorNode) + } else { + self.addSubnode(self.highlightedBackgroundNode) + } + } + } else { + if self.highlightedBackgroundNode.supernode != nil { + if animated { + self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in + if let strongSelf = self { + if completed { + strongSelf.highlightedBackgroundNode.removeFromSupernode() + } + } + }) + self.highlightedBackgroundNode.alpha = 0.0 + } else { + self.highlightedBackgroundNode.removeFromSupernode() + } + } + } + } + + override public func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4) + } + + override public func animateAdded(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } + + override public func animateRemoved(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) + } +} + diff --git a/submodules/StatisticsUI/Sources/StatsOverviewItem.swift b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift index fd5c1a5083..addf64c225 100644 --- a/submodules/StatisticsUI/Sources/StatsOverviewItem.swift +++ b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift @@ -8,7 +8,6 @@ import SyncCore import TelegramPresentationData import ItemListUI import PresentationDataUtils -import Charts class StatsOverviewItem: ListViewItem, ItemListItem { let presentationData: ItemListPresentationData @@ -63,6 +62,7 @@ class StatsOverviewItemNode: ListViewItemNode { private let backgroundNode: ASDisplayNode private let topStripeNode: ASDisplayNode private let bottomStripeNode: ASDisplayNode + private let maskNode: ASImageNode private let followersValueLabel: ImmediateTextNode private let viewsPerPostValueLabel: ImmediateTextNode @@ -90,6 +90,8 @@ class StatsOverviewItemNode: ListViewItemNode { self.bottomStripeNode = ASDisplayNode() self.bottomStripeNode.isLayerBacked = true + + self.maskNode = ASImageNode() self.followersValueLabel = ImmediateTextNode() self.viewsPerPostValueLabel = ImmediateTextNode() @@ -262,7 +264,9 @@ class StatsOverviewItemNode: ListViewItemNode { if strongSelf.bottomStripeNode.supernode == nil { strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0) } - + if strongSelf.maskNode.supernode != nil { + strongSelf.maskNode.removeFromSupernode() + } strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight)) case .blocks: if strongSelf.backgroundNode.supernode == nil { @@ -274,21 +278,34 @@ class StatsOverviewItemNode: ListViewItemNode { 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: - strongSelf.topStripeNode.isHidden = false + case .sameSection(false): + strongSelf.topStripeNode.isHidden = true + default: + hasTopCorners = true + strongSelf.topStripeNode.isHidden = hasCorners } let bottomStripeInset: CGFloat switch neighbors.bottom { - case .sameSection(false): - bottomStripeInset = leftInset - default: - bottomStripeInset = 0.0 + case .sameSection(false): + bottomStripeInset = leftInset + default: + bottomStripeInset = 0.0 + hasBottomCorners = true + strongSelf.bottomStripeNode.isHidden = hasCorners } + + strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight))) + strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0) strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: separatorHeight)) strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - bottomStripeInset, height: separatorHeight)) } diff --git a/submodules/SyncCore/Sources/InstantPage.swift b/submodules/SyncCore/Sources/InstantPage.swift index a5654ef0e0..d0d50068ec 100644 --- a/submodules/SyncCore/Sources/InstantPage.swift +++ b/submodules/SyncCore/Sources/InstantPage.swift @@ -844,13 +844,15 @@ public final class InstantPage: PostboxCoding, Equatable { public let isComplete: Bool public let rtl: Bool public let url: String + public let views: Int32? - public init(blocks: [InstantPageBlock], media: [MediaId: Media], isComplete: Bool, rtl: Bool, url: String) { + public init(blocks: [InstantPageBlock], media: [MediaId: Media], isComplete: Bool, rtl: Bool, url: String, views: Int32?) { self.blocks = blocks self.media = media self.isComplete = isComplete self.rtl = rtl self.url = url + self.views = views } public init(decoder: PostboxDecoder) { @@ -859,6 +861,7 @@ public final class InstantPage: PostboxCoding, Equatable { self.isComplete = decoder.decodeInt32ForKey("c", orElse: 0) != 0 self.rtl = decoder.decodeInt32ForKey("r", orElse: 0) != 0 self.url = decoder.decodeStringForKey("url", orElse: "") + self.views = decoder.decodeOptionalInt32ForKey("v") } public func encode(_ encoder: PostboxEncoder) { @@ -867,6 +870,11 @@ public final class InstantPage: PostboxCoding, Equatable { encoder.encodeInt32(self.isComplete ? 1 : 0, forKey: "c") encoder.encodeInt32(self.rtl ? 1 : 0, forKey: "r") encoder.encodeString(self.url, forKey: "url") + if let views = self.views { + encoder.encodeInt32(views, forKey: "v") + } else { + encoder.encodeNil(forKey: "v") + } } public static func ==(lhs: InstantPage, rhs: InstantPage) -> Bool { @@ -895,6 +903,9 @@ public final class InstantPage: PostboxCoding, Equatable { if lhs.url != rhs.url { return false } + if lhs.views != rhs.views { + return false + } return true } } diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift index afd8f5b371..6f4aa318a7 100644 --- a/submodules/TelegramApi/Sources/Api0.swift +++ b/submodules/TelegramApi/Sources/Api0.swift @@ -313,8 +313,8 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1150621555] = { return Api.ChannelParticipantsFilter.parse_channelParticipantsContacts($0) } dict[-350980120] = { return Api.WebPage.parse_webPageEmpty($0) } dict[-981018084] = { return Api.WebPage.parse_webPagePending($0) } - dict[-2054908813] = { return Api.WebPage.parse_webPageNotModified($0) } dict[-392411726] = { return Api.WebPage.parse_webPage($0) } + dict[1930545681] = { return Api.WebPage.parse_webPageNotModified($0) } dict[1036876423] = { return Api.InputBotInlineMessage.parse_inputBotInlineMessageText($0) } dict[-190472735] = { return Api.InputBotInlineMessage.parse_inputBotInlineMessageMediaGeo($0) } dict[1262639204] = { return Api.InputBotInlineMessage.parse_inputBotInlineMessageGame($0) } @@ -485,7 +485,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1182234929] = { return Api.InputUser.parse_inputUserEmpty($0) } dict[-138301121] = { return Api.InputUser.parse_inputUserSelf($0) } dict[-668391402] = { return Api.InputUser.parse_inputUser($0) } - dict[-1366746132] = { return Api.Page.parse_page($0) } + dict[-1738178803] = { return Api.Page.parse_page($0) } dict[871426631] = { return Api.SecureCredentialsEncrypted.parse_secureCredentialsEncrypted($0) } dict[-875679776] = { return Api.StatsPercentValue.parse_statsPercentValue($0) } dict[157948117] = { return Api.upload.File.parse_file($0) } @@ -530,7 +530,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1991004873] = { return Api.InputChatPhoto.parse_inputChatPhoto($0) } dict[-368917890] = { return Api.PaymentCharge.parse_paymentCharge($0) } dict[-1387279939] = { return Api.MessageInteractionCounters.parse_messageInteractionCounters($0) } - dict[821185690] = { return Api.stats.BroadcastStats.parse_broadcastStats($0) } + dict[-1107852396] = { return Api.stats.BroadcastStats.parse_broadcastStats($0) } dict[-484987010] = { return Api.Updates.parse_updatesTooLong($0) } dict[-1857044719] = { return Api.Updates.parse_updateShortMessage($0) } dict[377562760] = { return Api.Updates.parse_updateShortChatMessage($0) } diff --git a/submodules/TelegramApi/Sources/Api1.swift b/submodules/TelegramApi/Sources/Api1.swift index 790975a865..1243d2e7d0 100644 --- a/submodules/TelegramApi/Sources/Api1.swift +++ b/submodules/TelegramApi/Sources/Api1.swift @@ -9502,8 +9502,8 @@ public extension Api { public enum WebPage: TypeConstructorDescription { case webPageEmpty(id: Int64) case webPagePending(id: Int64, date: Int32) - case webPageNotModified case webPage(flags: Int32, id: Int64, url: String, displayUrl: String, hash: Int32, type: String?, siteName: String?, title: String?, description: String?, photo: Api.Photo?, embedUrl: String?, embedType: String?, embedWidth: Int32?, embedHeight: Int32?, duration: Int32?, author: String?, document: Api.Document?, cachedPage: Api.Page?, attributes: [Api.WebPageAttribute]?) + case webPageNotModified(flags: Int32, cachedPageViews: Int32?) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -9519,12 +9519,6 @@ public extension Api { } serializeInt64(id, buffer: buffer, boxed: false) serializeInt32(date, buffer: buffer, boxed: false) - break - case .webPageNotModified: - if boxed { - buffer.appendInt32(-2054908813) - } - break case .webPage(let flags, let id, let url, let displayUrl, let hash, let type, let siteName, let title, let description, let photo, let embedUrl, let embedType, let embedWidth, let embedHeight, let duration, let author, let document, let cachedPage, let attributes): if boxed { @@ -9554,6 +9548,13 @@ public extension Api { item.serialize(buffer, true) }} break + case .webPageNotModified(let flags, let cachedPageViews): + if boxed { + buffer.appendInt32(1930545681) + } + serializeInt32(flags, buffer: buffer, boxed: false) + if Int(flags) & Int(1 << 0) != 0 {serializeInt32(cachedPageViews!, buffer: buffer, boxed: false)} + break } } @@ -9563,10 +9564,10 @@ public extension Api { return ("webPageEmpty", [("id", id)]) case .webPagePending(let id, let date): return ("webPagePending", [("id", id), ("date", date)]) - case .webPageNotModified: - return ("webPageNotModified", []) case .webPage(let flags, let id, let url, let displayUrl, let hash, let type, let siteName, let title, let description, let photo, let embedUrl, let embedType, let embedWidth, let embedHeight, let duration, let author, let document, let cachedPage, let attributes): return ("webPage", [("flags", flags), ("id", id), ("url", url), ("displayUrl", displayUrl), ("hash", hash), ("type", type), ("siteName", siteName), ("title", title), ("description", description), ("photo", photo), ("embedUrl", embedUrl), ("embedType", embedType), ("embedWidth", embedWidth), ("embedHeight", embedHeight), ("duration", duration), ("author", author), ("document", document), ("cachedPage", cachedPage), ("attributes", attributes)]) + case .webPageNotModified(let flags, let cachedPageViews): + return ("webPageNotModified", [("flags", flags), ("cachedPageViews", cachedPageViews)]) } } @@ -9595,9 +9596,6 @@ public extension Api { return nil } } - public static func parse_webPageNotModified(_ reader: BufferReader) -> WebPage? { - return Api.WebPage.webPageNotModified - } public static func parse_webPage(_ reader: BufferReader) -> WebPage? { var _1: Int32? _1 = reader.readInt32() @@ -9671,6 +9669,20 @@ public extension Api { return nil } } + public static func parse_webPageNotModified(_ reader: BufferReader) -> WebPage? { + var _1: Int32? + _1 = reader.readInt32() + var _2: Int32? + if Int(_1!) & Int(1 << 0) != 0 {_2 = reader.readInt32() } + let _c1 = _1 != nil + let _c2 = (Int(_1!) & Int(1 << 0) == 0) || _2 != nil + if _c1 && _c2 { + return Api.WebPage.webPageNotModified(flags: _1!, cachedPageViews: _2) + } + else { + return nil + } + } } public enum InputBotInlineMessage: TypeConstructorDescription { @@ -13722,13 +13734,13 @@ public extension Api { } public enum Page: TypeConstructorDescription { - case page(flags: Int32, url: String, blocks: [Api.PageBlock], photos: [Api.Photo], documents: [Api.Document]) + case page(flags: Int32, url: String, blocks: [Api.PageBlock], photos: [Api.Photo], documents: [Api.Document], views: Int32?) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { - case .page(let flags, let url, let blocks, let photos, let documents): + case .page(let flags, let url, let blocks, let photos, let documents, let views): if boxed { - buffer.appendInt32(-1366746132) + buffer.appendInt32(-1738178803) } serializeInt32(flags, buffer: buffer, boxed: false) serializeString(url, buffer: buffer, boxed: false) @@ -13747,14 +13759,15 @@ public extension Api { for item in documents { item.serialize(buffer, true) } + if Int(flags) & Int(1 << 3) != 0 {serializeInt32(views!, buffer: buffer, boxed: false)} break } } public func descriptionFields() -> (String, [(String, Any)]) { switch self { - case .page(let flags, let url, let blocks, let photos, let documents): - return ("page", [("flags", flags), ("url", url), ("blocks", blocks), ("photos", photos), ("documents", documents)]) + case .page(let flags, let url, let blocks, let photos, let documents, let views): + return ("page", [("flags", flags), ("url", url), ("blocks", blocks), ("photos", photos), ("documents", documents), ("views", views)]) } } @@ -13775,13 +13788,16 @@ public extension Api { if let _ = reader.readInt32() { _5 = Api.parseVector(reader, elementSignature: 0, elementType: Api.Document.self) } + var _6: Int32? + if Int(_1!) & Int(1 << 3) != 0 {_6 = reader.readInt32() } let _c1 = _1 != nil let _c2 = _2 != nil let _c3 = _3 != nil let _c4 = _4 != nil let _c5 = _5 != nil - if _c1 && _c2 && _c3 && _c4 && _c5 { - return Api.Page.page(flags: _1!, url: _2!, blocks: _3!, photos: _4!, documents: _5!) + let _c6 = (Int(_1!) & Int(1 << 3) == 0) || _6 != nil + if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 { + return Api.Page.page(flags: _1!, url: _2!, blocks: _3!, photos: _4!, documents: _5!, views: _6) } else { return nil diff --git a/submodules/TelegramApi/Sources/Api2.swift b/submodules/TelegramApi/Sources/Api2.swift index 791eb4877a..6226e1ae61 100644 --- a/submodules/TelegramApi/Sources/Api2.swift +++ b/submodules/TelegramApi/Sources/Api2.swift @@ -539,13 +539,13 @@ public struct payments { public extension Api { public struct stats { public enum BroadcastStats: TypeConstructorDescription { - case broadcastStats(period: Api.StatsDateRangeDays, followers: Api.StatsAbsValueAndPrev, viewsPerPost: Api.StatsAbsValueAndPrev, sharesPerPost: Api.StatsAbsValueAndPrev, enabledNotifications: Api.StatsPercentValue, growthGraph: Api.StatsGraph, followersGraph: Api.StatsGraph, muteGraph: Api.StatsGraph, topHoursGraph: Api.StatsGraph, interactionsGraph: Api.StatsGraph, viewsBySourceGraph: Api.StatsGraph, newFollowersBySourceGraph: Api.StatsGraph, languagesGraph: Api.StatsGraph, recentMessageInteractions: [Api.MessageInteractionCounters]) + case broadcastStats(period: Api.StatsDateRangeDays, followers: Api.StatsAbsValueAndPrev, viewsPerPost: Api.StatsAbsValueAndPrev, sharesPerPost: Api.StatsAbsValueAndPrev, enabledNotifications: Api.StatsPercentValue, growthGraph: Api.StatsGraph, followersGraph: Api.StatsGraph, muteGraph: Api.StatsGraph, topHoursGraph: Api.StatsGraph, interactionsGraph: Api.StatsGraph, ivInteractionsGraph: Api.StatsGraph, viewsBySourceGraph: Api.StatsGraph, newFollowersBySourceGraph: Api.StatsGraph, languagesGraph: Api.StatsGraph, recentMessageInteractions: [Api.MessageInteractionCounters]) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { - case .broadcastStats(let period, let followers, let viewsPerPost, let sharesPerPost, let enabledNotifications, let growthGraph, let followersGraph, let muteGraph, let topHoursGraph, let interactionsGraph, let viewsBySourceGraph, let newFollowersBySourceGraph, let languagesGraph, let recentMessageInteractions): + case .broadcastStats(let period, let followers, let viewsPerPost, let sharesPerPost, let enabledNotifications, let growthGraph, let followersGraph, let muteGraph, let topHoursGraph, let interactionsGraph, let ivInteractionsGraph, let viewsBySourceGraph, let newFollowersBySourceGraph, let languagesGraph, let recentMessageInteractions): if boxed { - buffer.appendInt32(821185690) + buffer.appendInt32(-1107852396) } period.serialize(buffer, true) followers.serialize(buffer, true) @@ -557,6 +557,7 @@ public struct stats { muteGraph.serialize(buffer, true) topHoursGraph.serialize(buffer, true) interactionsGraph.serialize(buffer, true) + ivInteractionsGraph.serialize(buffer, true) viewsBySourceGraph.serialize(buffer, true) newFollowersBySourceGraph.serialize(buffer, true) languagesGraph.serialize(buffer, true) @@ -571,8 +572,8 @@ public struct stats { public func descriptionFields() -> (String, [(String, Any)]) { switch self { - case .broadcastStats(let period, let followers, let viewsPerPost, let sharesPerPost, let enabledNotifications, let growthGraph, let followersGraph, let muteGraph, let topHoursGraph, let interactionsGraph, let viewsBySourceGraph, let newFollowersBySourceGraph, let languagesGraph, let recentMessageInteractions): - return ("broadcastStats", [("period", period), ("followers", followers), ("viewsPerPost", viewsPerPost), ("sharesPerPost", sharesPerPost), ("enabledNotifications", enabledNotifications), ("growthGraph", growthGraph), ("followersGraph", followersGraph), ("muteGraph", muteGraph), ("topHoursGraph", topHoursGraph), ("interactionsGraph", interactionsGraph), ("viewsBySourceGraph", viewsBySourceGraph), ("newFollowersBySourceGraph", newFollowersBySourceGraph), ("languagesGraph", languagesGraph), ("recentMessageInteractions", recentMessageInteractions)]) + case .broadcastStats(let period, let followers, let viewsPerPost, let sharesPerPost, let enabledNotifications, let growthGraph, let followersGraph, let muteGraph, let topHoursGraph, let interactionsGraph, let ivInteractionsGraph, let viewsBySourceGraph, let newFollowersBySourceGraph, let languagesGraph, let recentMessageInteractions): + return ("broadcastStats", [("period", period), ("followers", followers), ("viewsPerPost", viewsPerPost), ("sharesPerPost", sharesPerPost), ("enabledNotifications", enabledNotifications), ("growthGraph", growthGraph), ("followersGraph", followersGraph), ("muteGraph", muteGraph), ("topHoursGraph", topHoursGraph), ("interactionsGraph", interactionsGraph), ("ivInteractionsGraph", ivInteractionsGraph), ("viewsBySourceGraph", viewsBySourceGraph), ("newFollowersBySourceGraph", newFollowersBySourceGraph), ("languagesGraph", languagesGraph), ("recentMessageInteractions", recentMessageInteractions)]) } } @@ -629,9 +630,13 @@ public struct stats { if let signature = reader.readInt32() { _13 = Api.parse(reader, signature: signature) as? Api.StatsGraph } - var _14: [Api.MessageInteractionCounters]? + var _14: Api.StatsGraph? + if let signature = reader.readInt32() { + _14 = Api.parse(reader, signature: signature) as? Api.StatsGraph + } + var _15: [Api.MessageInteractionCounters]? if let _ = reader.readInt32() { - _14 = Api.parseVector(reader, elementSignature: 0, elementType: Api.MessageInteractionCounters.self) + _15 = Api.parseVector(reader, elementSignature: 0, elementType: Api.MessageInteractionCounters.self) } let _c1 = _1 != nil let _c2 = _2 != nil @@ -647,8 +652,9 @@ public struct stats { let _c12 = _12 != nil let _c13 = _13 != nil let _c14 = _14 != nil - if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 && _c12 && _c13 && _c14 { - return Api.stats.BroadcastStats.broadcastStats(period: _1!, followers: _2!, viewsPerPost: _3!, sharesPerPost: _4!, enabledNotifications: _5!, growthGraph: _6!, followersGraph: _7!, muteGraph: _8!, topHoursGraph: _9!, interactionsGraph: _10!, viewsBySourceGraph: _11!, newFollowersBySourceGraph: _12!, languagesGraph: _13!, recentMessageInteractions: _14!) + let _c15 = _15 != nil + if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 && _c12 && _c13 && _c14 && _c15 { + return Api.stats.BroadcastStats.broadcastStats(period: _1!, followers: _2!, viewsPerPost: _3!, sharesPerPost: _4!, enabledNotifications: _5!, growthGraph: _6!, followersGraph: _7!, muteGraph: _8!, topHoursGraph: _9!, interactionsGraph: _10!, ivInteractionsGraph: _11!, viewsBySourceGraph: _12!, newFollowersBySourceGraph: _13!, languagesGraph: _14!, recentMessageInteractions: _15!) } else { return nil diff --git a/submodules/TelegramCore/Sources/ChannelStatistics.swift b/submodules/TelegramCore/Sources/ChannelStatistics.swift index 18b49c67de..a3d695cb54 100644 --- a/submodules/TelegramCore/Sources/ChannelStatistics.swift +++ b/submodules/TelegramCore/Sources/ChannelStatistics.swift @@ -24,6 +24,18 @@ public enum ChannelStatsGraph: Equatable { case OnDemand(token: String) case Failed(error: String) case Loaded(token: String?, data: String) + case Empty + + public var isEmpty: Bool { + switch self { + case .Empty: + return true + case let .Failed(error): + return true + default: + return false + } + } var token: String? { switch self { @@ -37,6 +49,12 @@ public enum ChannelStatsGraph: Equatable { } } +public struct ChannelStatsMessageInteractions: Equatable { + public let messageId: MessageId + public let views: Int32 + public let forwards: Int32 +} + public final class ChannelStats: Equatable { public let period: ChannelStatsDateRange public let followers: ChannelStatsValue @@ -48,11 +66,13 @@ public final class ChannelStats: Equatable { public let muteGraph: ChannelStatsGraph public let topHoursGraph: ChannelStatsGraph public let interactionsGraph: ChannelStatsGraph + public let instantPageInteractionsGraph: ChannelStatsGraph public let viewsBySourceGraph: ChannelStatsGraph public let newFollowersBySourceGraph: ChannelStatsGraph public let languagesGraph: ChannelStatsGraph + public let messageInteractions: [ChannelStatsMessageInteractions] - public init(period: ChannelStatsDateRange, followers: ChannelStatsValue, viewsPerPost: ChannelStatsValue, sharesPerPost: ChannelStatsValue, enabledNotifications: ChannelStatsPercentValue, growthGraph: ChannelStatsGraph, followersGraph: ChannelStatsGraph, muteGraph: ChannelStatsGraph, topHoursGraph: ChannelStatsGraph, interactionsGraph: ChannelStatsGraph, viewsBySourceGraph: ChannelStatsGraph, newFollowersBySourceGraph: ChannelStatsGraph, languagesGraph: ChannelStatsGraph) { + public init(period: ChannelStatsDateRange, followers: ChannelStatsValue, viewsPerPost: ChannelStatsValue, sharesPerPost: ChannelStatsValue, enabledNotifications: ChannelStatsPercentValue, growthGraph: ChannelStatsGraph, followersGraph: ChannelStatsGraph, muteGraph: ChannelStatsGraph, topHoursGraph: ChannelStatsGraph, interactionsGraph: ChannelStatsGraph, instantPageInteractionsGraph: ChannelStatsGraph, viewsBySourceGraph: ChannelStatsGraph, newFollowersBySourceGraph: ChannelStatsGraph, languagesGraph: ChannelStatsGraph, messageInteractions: [ChannelStatsMessageInteractions]) { self.period = period self.followers = followers self.viewsPerPost = viewsPerPost @@ -63,9 +83,11 @@ public final class ChannelStats: Equatable { self.muteGraph = muteGraph self.topHoursGraph = topHoursGraph self.interactionsGraph = interactionsGraph + self.instantPageInteractionsGraph = instantPageInteractionsGraph self.viewsBySourceGraph = viewsBySourceGraph self.newFollowersBySourceGraph = newFollowersBySourceGraph self.languagesGraph = languagesGraph + self.messageInteractions = messageInteractions } public static func == (lhs: ChannelStats, rhs: ChannelStats) -> Bool { @@ -99,6 +121,9 @@ public final class ChannelStats: Equatable { if lhs.interactionsGraph != rhs.interactionsGraph { return false } + if lhs.instantPageInteractionsGraph != rhs.instantPageInteractionsGraph { + return false + } if lhs.viewsBySourceGraph != rhs.viewsBySourceGraph { return false } @@ -108,39 +133,50 @@ public final class ChannelStats: Equatable { if lhs.languagesGraph != rhs.languagesGraph { return false } + if lhs.messageInteractions != rhs.messageInteractions { + return false + } return true } public func withUpdatedGrowthGraph(_ growthGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) } public func withUpdatedFollowersGraph(_ followersGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) } public func withUpdatedMuteGraph(_ muteGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) } public func withUpdatedTopHoursGraph(_ viewsByHourGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: viewsByHourGraph, interactionsGraph: self.interactionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: viewsByHourGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) } public func withUpdatedInteractionsGraph(_ interactionsGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: interactionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) + } + + public func withUpdatedInstantPageInteractionsGraph(_ instantPageInteractionsGraph: ChannelStatsGraph) -> ChannelStats { + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) } public func withUpdatedViewsBySourceGraph(_ viewsBySourceGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, viewsBySourceGraph: viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) } public func withUpdatedNewFollowersBySourceGraph(_ newFollowersBySourceGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: newFollowersBySourceGraph, languagesGraph: self.languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: self.messageInteractions) } public func withUpdatedLanguagesGraph(_ languagesGraph: ChannelStatsGraph) -> ChannelStats { - return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: languagesGraph) + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: languagesGraph, messageInteractions: self.messageInteractions) + } + + public func withUpdatedMessageInteractions(_ messageInteractions: [ChannelStatsMessageInteractions]) -> ChannelStats { + return ChannelStats(period: self.period, followers: self.followers, viewsPerPost: self.viewsPerPost, sharesPerPost: self.sharesPerPost, enabledNotifications: self.enabledNotifications, growthGraph: self.growthGraph, followersGraph: self.followersGraph, muteGraph: self.muteGraph, topHoursGraph: self.topHoursGraph, interactionsGraph: self.interactionsGraph, instantPageInteractionsGraph: self.instantPageInteractionsGraph, viewsBySourceGraph: self.viewsBySourceGraph, newFollowersBySourceGraph: self.newFollowersBySourceGraph, languagesGraph: self.languagesGraph, messageInteractions: messageInteractions) } } @@ -174,7 +210,7 @@ private func requestStats(postbox: Postbox, network: Network, datacenterId: Int3 return signal |> map { result -> ChannelStats? in - return ChannelStats(apiBroadcastStats: result) + return ChannelStats(apiBroadcastStats: result, peerId: peerId) } |> `catch` { _ -> Signal in return .single(nil) @@ -334,6 +370,21 @@ private final class ChannelStatsContextImpl { } } + func loadInstantPageInteractionsGraph() { + guard let stats = self._state.stats else { + return + } + if case let .OnDemand(token) = stats.instantPageInteractionsGraph { + self.disposables.set((requestGraph(network: self.network, datacenterId: self.datacenterId, token: token) + |> deliverOnMainQueue).start(next: { [weak self] graph in + if let strongSelf = self, let graph = graph { + strongSelf._state = ChannelStatsContextState(stats: strongSelf._state.stats?.withUpdatedInstantPageInteractionsGraph(graph)) + strongSelf._statePromise.set(.single(strongSelf._state)) + } + }), forKey: token) + } + } + func loadViewsBySourceGraph() { guard let stats = self._state.stats else { return @@ -439,6 +490,12 @@ public final class ChannelStatsContext { } } + public func loadInstantPageInteractionsGraph() { + self.impl.with { impl in + impl.loadInstantPageInteractionsGraph() + } + } + public func loadViewsBySourceGraph() { self.impl.with { impl in impl.loadViewsBySourceGraph() @@ -474,8 +531,25 @@ extension ChannelStatsGraph { init(apiStatsGraph: Api.StatsGraph) { switch apiStatsGraph { case let .statsGraph(_, json, zoomToken): - if case let .dataJSON(string) = json { - self = .Loaded(token: zoomToken, data: string) + if case let .dataJSON(string) = json, let data = string.data(using: .utf8) { + do { + let decodedData = try JSONSerialization.jsonObject(with: data, options: []) + guard let item = decodedData as? [String: Any] else { + self = .Failed(error: "") + return + } + if let columns = item["columns"] as? [[Any]] { + if columns.isEmpty { + self = .Empty + } else { + self = .Loaded(token: zoomToken, data: string) + } + } else { + self = .Empty + } + } catch { + self = .Failed(error: "") + } } else { self = .Failed(error: "") } @@ -514,11 +588,20 @@ extension ChannelStatsPercentValue { } } -extension ChannelStats { - convenience init(apiBroadcastStats: Api.stats.BroadcastStats) { - switch apiBroadcastStats { - case let .broadcastStats(period, followers, viewsPerPost, sharesPerPost, enabledNotifications, growthGraph, followersGraph, muteGraph, topHoursGraph, interactionsGraph, viewsBySourceGraph, newFollowersBySourceGraph, languagesGraph, recentMessageInteractions): - self.init(period: ChannelStatsDateRange(apiStatsDateRangeDays: period), followers: ChannelStatsValue(apiStatsAbsValueAndPrev: followers), viewsPerPost: ChannelStatsValue(apiStatsAbsValueAndPrev: viewsPerPost), sharesPerPost: ChannelStatsValue(apiStatsAbsValueAndPrev: sharesPerPost), enabledNotifications: ChannelStatsPercentValue(apiPercentValue: enabledNotifications), growthGraph: ChannelStatsGraph(apiStatsGraph: growthGraph), followersGraph: ChannelStatsGraph(apiStatsGraph: followersGraph), muteGraph: ChannelStatsGraph(apiStatsGraph: muteGraph), topHoursGraph: ChannelStatsGraph(apiStatsGraph: topHoursGraph), interactionsGraph: ChannelStatsGraph(apiStatsGraph: interactionsGraph), viewsBySourceGraph: ChannelStatsGraph(apiStatsGraph: viewsBySourceGraph), newFollowersBySourceGraph: ChannelStatsGraph(apiStatsGraph: newFollowersBySourceGraph), languagesGraph: ChannelStatsGraph(apiStatsGraph: languagesGraph)) +extension ChannelStatsMessageInteractions { + init(apiMessageInteractionCounters: Api.MessageInteractionCounters, peerId: PeerId) { + switch apiMessageInteractionCounters { + case let .messageInteractionCounters(msgId, views, forwards): + self = ChannelStatsMessageInteractions(messageId: MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: msgId), views: views, forwards: forwards) + } + } +} + +extension ChannelStats { + convenience init(apiBroadcastStats: Api.stats.BroadcastStats, peerId: PeerId) { + switch apiBroadcastStats { + case let .broadcastStats(period, followers, viewsPerPost, sharesPerPost, enabledNotifications, growthGraph, followersGraph, muteGraph, topHoursGraph, interactionsGraph, instantViewInteractionsGraph, viewsBySourceGraph, newFollowersBySourceGraph, languagesGraph, recentMessageInteractions): + self.init(period: ChannelStatsDateRange(apiStatsDateRangeDays: period), followers: ChannelStatsValue(apiStatsAbsValueAndPrev: followers), viewsPerPost: ChannelStatsValue(apiStatsAbsValueAndPrev: viewsPerPost), sharesPerPost: ChannelStatsValue(apiStatsAbsValueAndPrev: sharesPerPost), enabledNotifications: ChannelStatsPercentValue(apiPercentValue: enabledNotifications), growthGraph: ChannelStatsGraph(apiStatsGraph: growthGraph), followersGraph: ChannelStatsGraph(apiStatsGraph: followersGraph), muteGraph: ChannelStatsGraph(apiStatsGraph: muteGraph), topHoursGraph: ChannelStatsGraph(apiStatsGraph: topHoursGraph), interactionsGraph: ChannelStatsGraph(apiStatsGraph: interactionsGraph), instantPageInteractionsGraph: ChannelStatsGraph(apiStatsGraph: instantViewInteractionsGraph), viewsBySourceGraph: ChannelStatsGraph(apiStatsGraph: viewsBySourceGraph), newFollowersBySourceGraph: ChannelStatsGraph(apiStatsGraph: newFollowersBySourceGraph), languagesGraph: ChannelStatsGraph(apiStatsGraph: languagesGraph), messageInteractions: recentMessageInteractions.map { ChannelStatsMessageInteractions(apiMessageInteractionCounters: $0, peerId: peerId) }) } } } diff --git a/submodules/TelegramCore/Sources/InstantPage.swift b/submodules/TelegramCore/Sources/InstantPage.swift index 66b1b8dac3..a813d9cfb0 100644 --- a/submodules/TelegramCore/Sources/InstantPage.swift +++ b/submodules/TelegramCore/Sources/InstantPage.swift @@ -175,6 +175,7 @@ extension InstantPage { let isComplete: Bool let rtl: Bool let url: String + let views: Int32? switch apiPage { case let .page(page): url = page.url @@ -183,6 +184,7 @@ extension InstantPage { files = page.documents isComplete = (page.flags & (1 << 0)) == 0 rtl = (page.flags & (1 << 1)) != 0 + views = page.views } var media: [MediaId: Media] = [:] for photo in photos { @@ -195,6 +197,6 @@ extension InstantPage { media[id] = file } } - self.init(blocks: blocks.map({ InstantPageBlock(apiBlock: $0) }), media: media, isComplete: isComplete, rtl: rtl, url: url) + self.init(blocks: blocks.map({ InstantPageBlock(apiBlock: $0) }), media: media, isComplete: isComplete, rtl: rtl, url: url, views: views) } } diff --git a/submodules/TelegramCore/Sources/WebpagePreview.swift b/submodules/TelegramCore/Sources/WebpagePreview.swift index 45ab3955a1..6f7066202c 100644 --- a/submodules/TelegramCore/Sources/WebpagePreview.swift +++ b/submodules/TelegramCore/Sources/WebpagePreview.swift @@ -79,7 +79,7 @@ public func actualizedWebpage(postbox: Postbox, network: Network, webpage: Teleg if case let .Loaded(content) = webpage.content { return network.request(Api.functions.messages.getWebPage(url: content.url, hash: content.hash)) |> `catch` { _ -> Signal in - return .single(.webPageNotModified) + return .single(.webPageNotModified(flags: 0, cachedPageViews: nil)) } |> mapToSignal { result -> Signal in if let updatedWebpage = telegramMediaWebpageFromApiWebpage(result, url: nil), case .Loaded = updatedWebpage.content, updatedWebpage.webpageId == webpage.webpageId { @@ -87,6 +87,13 @@ public func actualizedWebpage(postbox: Postbox, network: Network, webpage: Teleg updateMessageMedia(transaction: transaction, id: webpage.webpageId, media: updatedWebpage) return updatedWebpage } + } else if case let .webPageNotModified(_, viewsValue) = result, let views = viewsValue, case let .Loaded(content) = webpage.content { + let updatedContent: TelegramMediaWebpageContent = .Loaded(TelegramMediaWebpageLoadedContent(url: content.url, displayUrl: content.displayUrl, hash: content.hash, type: content.type, websiteName: content.websiteName, title: content.title, text: content.text, embedUrl: content.embedUrl, embedType: content.embedType, embedSize: content.embedSize, duration: content.duration, author: content.author, image: content.image, file: content.file, attributes: content.attributes, instantPage: content.instantPage.flatMap({ InstantPage(blocks: $0.blocks, media: $0.media, isComplete: $0.isComplete, rtl: $0.rtl, url: $0.url, views: views) }))) + let updatedWebpage = TelegramMediaWebpage(webpageId: webpage.webpageId, content: updatedContent) + return postbox.transaction { transaction -> TelegramMediaWebpage in + updateMessageMedia(transaction: transaction, id: webpage.webpageId, media: updatedWebpage) + return updatedWebpage + } } else { return .complete() } @@ -100,7 +107,7 @@ func updatedRemoteWebpage(postbox: Postbox, network: Network, webPage: WebpageRe if case let .webPage(id, url) = webPage.content { return network.request(Api.functions.messages.getWebPage(url: url, hash: 0)) |> `catch` { _ -> Signal in - return .single(.webPageNotModified) + return .single(.webPageNotModified(flags: 0, cachedPageViews: nil)) } |> mapToSignal { result -> Signal in if let updatedWebpage = telegramMediaWebpageFromApiWebpage(result, url: nil), case .Loaded = updatedWebpage.content, updatedWebpage.webpageId.id == id { diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 7cfafefe1a..f0fbb625c9 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -348,4951 +348,4950 @@ public final class PresentationStrings: Equatable { public var Wallet_Sent_Title: String { return self._s[148]! } public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[149]! } public var Weekday_Today: String { return self._s[150]! } + public var Stats_InstantViewInteractionsTitle: String { return self._s[151]! } public func InstantPage_AuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[152]!, self._r[152]!, [_1, _2]) + return formatWithArgumentRanges(self._s[153]!, self._r[153]!, [_1, _2]) } public func Conversation_MessageDialogRetryAll(_ _1: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[153]!, self._r[153]!, ["\(_1)"]) + return formatWithArgumentRanges(self._s[154]!, self._r[154]!, ["\(_1)"]) } - public var Notification_PassportValuePersonalDetails: String { return self._s[155]! } - public var Channel_AdminLog_MessagePreviousLink: String { return self._s[156]! } - public var ChangePhoneNumberNumber_NewNumber: String { return self._s[157]! } - public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[158]! } - public var TwoStepAuth_ChangePasswordDescription: String { return self._s[159]! } - public var PhotoEditor_BlurToolLinear: String { return self._s[160]! } - public var Contacts_PermissionsAllowInSettings: String { return self._s[161]! } - public var Weekday_ShortMonday: String { return self._s[162]! } - public var Cache_KeepMedia: String { return self._s[163]! } - public var Passport_FieldIdentitySelfieHelp: String { return self._s[164]! } + public var Notification_PassportValuePersonalDetails: String { return self._s[156]! } + public var Channel_AdminLog_MessagePreviousLink: String { return self._s[157]! } + public var ChangePhoneNumberNumber_NewNumber: String { return self._s[158]! } + public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[159]! } + public var TwoStepAuth_ChangePasswordDescription: String { return self._s[160]! } + public var PhotoEditor_BlurToolLinear: String { return self._s[161]! } + public var Contacts_PermissionsAllowInSettings: String { return self._s[162]! } + public var Weekday_ShortMonday: String { return self._s[163]! } + public var Cache_KeepMedia: String { return self._s[164]! } + public var Passport_FieldIdentitySelfieHelp: String { return self._s[165]! } public func PUSH_PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[165]!, self._r[165]!, [_1, _2]) + return formatWithArgumentRanges(self._s[166]!, self._r[166]!, [_1, _2]) } public func Chat_SlowmodeTooltip(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[166]!, self._r[166]!, [_0]) + return formatWithArgumentRanges(self._s[167]!, self._r[167]!, [_0]) } - public var Wallet_Receive_ShareUrlInfo: String { return self._s[167]! } - public var Conversation_ClousStorageInfo_Description4: String { return self._s[168]! } - public var Wallet_RestoreFailed_Title: String { return self._s[169]! } - public var Passport_Language_ru: String { return self._s[170]! } + public var Wallet_Receive_ShareUrlInfo: String { return self._s[168]! } + public var Conversation_ClousStorageInfo_Description4: String { return self._s[169]! } + public var Wallet_RestoreFailed_Title: String { return self._s[170]! } + public var Passport_Language_ru: String { return self._s[171]! } public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[171]!, self._r[171]!, [_0, _1]) + return formatWithArgumentRanges(self._s[172]!, self._r[172]!, [_0, _1]) } - public var WallpaperPreview_PatternIntensity: String { return self._s[172]! } - public var WebBrowser_InAppSafari: String { return self._s[175]! } - public var TwoStepAuth_RecoveryUnavailable: String { return self._s[176]! } - public var EnterPasscode_TouchId: String { return self._s[177]! } - public var PhotoEditor_QualityVeryHigh: String { return self._s[180]! } - public var Checkout_NewCard_SaveInfo: String { return self._s[182]! } - public var Gif_NoGifsPlaceholder: String { return self._s[184]! } + public var WallpaperPreview_PatternIntensity: String { return self._s[173]! } + public var WebBrowser_InAppSafari: String { return self._s[176]! } + public var TwoStepAuth_RecoveryUnavailable: String { return self._s[177]! } + public var EnterPasscode_TouchId: String { return self._s[178]! } + public var PhotoEditor_QualityVeryHigh: String { return self._s[181]! } + public var Checkout_NewCard_SaveInfo: String { return self._s[183]! } + public var Gif_NoGifsPlaceholder: String { return self._s[185]! } public func Notification_InvitedMultiple(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[186]!, self._r[186]!, [_0, _1]) + return formatWithArgumentRanges(self._s[187]!, self._r[187]!, [_0, _1]) } - public var ChatSettings_AutoDownloadEnabled: String { return self._s[187]! } - public var NetworkUsageSettings_BytesSent: String { return self._s[188]! } - public var Checkout_PasswordEntry_Pay: String { return self._s[189]! } - public var AuthSessions_TerminateSession: String { return self._s[190]! } - public var Message_File: String { return self._s[191]! } - public var MediaPicker_VideoMuteDescription: String { return self._s[192]! } - public var SocksProxySetup_ProxyStatusConnected: String { return self._s[193]! } - public var TwoStepAuth_RecoveryCode: String { return self._s[194]! } - public var EnterPasscode_EnterCurrentPasscode: String { return self._s[195]! } + public var ChatSettings_AutoDownloadEnabled: String { return self._s[188]! } + public var NetworkUsageSettings_BytesSent: String { return self._s[189]! } + public var Checkout_PasswordEntry_Pay: String { return self._s[190]! } + public var AuthSessions_TerminateSession: String { return self._s[191]! } + public var Message_File: String { return self._s[192]! } + public var MediaPicker_VideoMuteDescription: String { return self._s[193]! } + public var SocksProxySetup_ProxyStatusConnected: String { return self._s[194]! } + public var TwoStepAuth_RecoveryCode: String { return self._s[195]! } + public var EnterPasscode_EnterCurrentPasscode: String { return self._s[196]! } public func TwoStepAuth_EnterPasswordHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[196]!, self._r[196]!, [_0]) + return formatWithArgumentRanges(self._s[197]!, self._r[197]!, [_0]) } - public var Conversation_Moderate_Report: String { return self._s[198]! } - public var TwoStepAuth_EmailInvalid: String { return self._s[199]! } - public var Passport_Language_ms: String { return self._s[200]! } - public var Channel_Edit_AboutItem: String { return self._s[202]! } - public var DialogList_SearchSectionGlobal: String { return self._s[206]! } - public var AttachmentMenu_WebSearch: String { return self._s[207]! } - public var ChatState_WaitingForNetwork: String { return self._s[208]! } - public var Channel_BanUser_Title: String { return self._s[209]! } - public var PasscodeSettings_TurnPasscodeOn: String { return self._s[210]! } - public var WallpaperPreview_SwipeTopText: String { return self._s[211]! } - public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[212]! } - public var ArchivedChats_IntroText2: String { return self._s[213]! } - public var ChatSearch_SearchPlaceholder: String { return self._s[215]! } - public var Conversation_OpenBotLinkTitle: String { return self._s[216]! } - public var Passport_FieldAddressTranslationHelp: String { return self._s[217]! } - public var NotificationsSound_Aurora: String { return self._s[218]! } - public var Notification_Exceptions_DeleteAll: String { return self._s[219]! } + public var Conversation_Moderate_Report: String { return self._s[199]! } + public var TwoStepAuth_EmailInvalid: String { return self._s[200]! } + public var Passport_Language_ms: String { return self._s[201]! } + public var Channel_Edit_AboutItem: String { return self._s[203]! } + public var DialogList_SearchSectionGlobal: String { return self._s[207]! } + public var AttachmentMenu_WebSearch: String { return self._s[208]! } + public var ChatState_WaitingForNetwork: String { return self._s[209]! } + public var Channel_BanUser_Title: String { return self._s[210]! } + public var PasscodeSettings_TurnPasscodeOn: String { return self._s[211]! } + public var WallpaperPreview_SwipeTopText: String { return self._s[212]! } + public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[213]! } + public var ArchivedChats_IntroText2: String { return self._s[214]! } + public var ChatSearch_SearchPlaceholder: String { return self._s[216]! } + public var Conversation_OpenBotLinkTitle: String { return self._s[217]! } + public var Passport_FieldAddressTranslationHelp: String { return self._s[218]! } + public var NotificationsSound_Aurora: String { return self._s[219]! } + public var Notification_Exceptions_DeleteAll: String { return self._s[220]! } public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[220]!, self._r[220]!, [_0]) + return formatWithArgumentRanges(self._s[221]!, self._r[221]!, [_0]) } - public var AuthSessions_LoggedInWithTelegram: String { return self._s[223]! } + public var AuthSessions_LoggedInWithTelegram: String { return self._s[224]! } public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[224]!, self._r[224]!, [_0, _1]) + return formatWithArgumentRanges(self._s[225]!, self._r[225]!, [_0, _1]) } - public var Passport_PasswordNext: String { return self._s[225]! } - public var Bot_GroupStatusReadsHistory: String { return self._s[226]! } - public var EmptyGroupInfo_Line2: String { return self._s[227]! } + public var Passport_PasswordNext: String { return self._s[226]! } + public var Bot_GroupStatusReadsHistory: String { return self._s[227]! } + public var EmptyGroupInfo_Line2: String { return self._s[228]! } public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[228]!, self._r[228]!, [_1, _2]) + return formatWithArgumentRanges(self._s[229]!, self._r[229]!, [_1, _2]) } - public var VoiceOver_Chat_SeenByRecipients: String { return self._s[229]! } - public var Settings_FAQ_Intro: String { return self._s[232]! } - public var PrivacySettings_PasscodeAndTouchId: String { return self._s[234]! } - public var FeaturedStickerPacks_Title: String { return self._s[235]! } - public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[237]! } - public var Username_Title: String { return self._s[238]! } + public var VoiceOver_Chat_SeenByRecipients: String { return self._s[230]! } + public var Settings_FAQ_Intro: String { return self._s[233]! } + public var PrivacySettings_PasscodeAndTouchId: String { return self._s[235]! } + public var FeaturedStickerPacks_Title: String { return self._s[236]! } + public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[238]! } + public var Username_Title: String { return self._s[239]! } public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[239]!, self._r[239]!, [_0]) + return formatWithArgumentRanges(self._s[240]!, self._r[240]!, [_0]) } - public var PeerInfo_PaneFiles: String { return self._s[240]! } - public var PasscodeSettings_AlphanumericCode: String { return self._s[241]! } - public var Localization_LanguageOther: String { return self._s[242]! } - public var Stickers_SuggestStickers: String { return self._s[243]! } + public var PeerInfo_PaneFiles: String { return self._s[241]! } + public var PasscodeSettings_AlphanumericCode: String { return self._s[242]! } + public var Localization_LanguageOther: String { return self._s[243]! } + public var Stickers_SuggestStickers: String { return self._s[244]! } public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[244]!, self._r[244]!, [_0]) + return formatWithArgumentRanges(self._s[245]!, self._r[245]!, [_0]) } - public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[245]! } - public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[246]! } - public var Conversation_DefaultRestrictedStickers: String { return self._s[247]! } + public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[246]! } + public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[247]! } + public var Conversation_DefaultRestrictedStickers: String { return self._s[248]! } public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[248]!, self._r[248]!, [_0]) + return formatWithArgumentRanges(self._s[249]!, self._r[249]!, [_0]) } - public var Wallet_TransactionInfo_CopyAddress: String { return self._s[250]! } - public var Group_UpgradeConfirmation: String { return self._s[251]! } - public var DialogList_Unpin: String { return self._s[252]! } - public var Passport_Identity_DateOfBirth: String { return self._s[253]! } - public var Month_ShortOctober: String { return self._s[254]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[255]! } - public var TwoFactorSetup_Done_Text: String { return self._s[256]! } - public var Notification_CallCanceledShort: String { return self._s[257]! } - public var Conversation_StopQuiz: String { return self._s[258]! } - public var Passport_Phone_Help: String { return self._s[259]! } - public var Passport_Language_az: String { return self._s[261]! } - public var CreatePoll_TextPlaceholder: String { return self._s[263]! } - public var VoiceOver_Chat_AnonymousPoll: String { return self._s[264]! } - public var Passport_Identity_DocumentNumber: String { return self._s[265]! } - public var PhotoEditor_CurvesRed: String { return self._s[266]! } - public var PhoneNumberHelp_Alert: String { return self._s[268]! } - public var SocksProxySetup_Port: String { return self._s[269]! } - public var Checkout_PayNone: String { return self._s[270]! } - public var AutoDownloadSettings_WiFi: String { return self._s[271]! } - public var GroupInfo_GroupType: String { return self._s[272]! } - public var StickerSettings_ContextHide: String { return self._s[273]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[274]! } - public var Group_Setup_HistoryTitle: String { return self._s[276]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[277]! } - public var PasscodeSettings_AutoLock: String { return self._s[278]! } - public var Passport_Title: String { return self._s[279]! } - public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[280]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[281]! } - public var GroupPermission_NoSendGifs: String { return self._s[282]! } - public var PrivacySettings_PasscodeOn: String { return self._s[283]! } + public var Wallet_TransactionInfo_CopyAddress: String { return self._s[251]! } + public var Group_UpgradeConfirmation: String { return self._s[252]! } + public var DialogList_Unpin: String { return self._s[253]! } + public var Passport_Identity_DateOfBirth: String { return self._s[254]! } + public var Month_ShortOctober: String { return self._s[255]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[256]! } + public var TwoFactorSetup_Done_Text: String { return self._s[257]! } + public var Notification_CallCanceledShort: String { return self._s[258]! } + public var Conversation_StopQuiz: String { return self._s[259]! } + public var Passport_Phone_Help: String { return self._s[260]! } + public var Passport_Language_az: String { return self._s[262]! } + public var CreatePoll_TextPlaceholder: String { return self._s[264]! } + public var VoiceOver_Chat_AnonymousPoll: String { return self._s[265]! } + public var Passport_Identity_DocumentNumber: String { return self._s[266]! } + public var PhotoEditor_CurvesRed: String { return self._s[267]! } + public var PhoneNumberHelp_Alert: String { return self._s[269]! } + public var SocksProxySetup_Port: String { return self._s[270]! } + public var Checkout_PayNone: String { return self._s[271]! } + public var AutoDownloadSettings_WiFi: String { return self._s[272]! } + public var GroupInfo_GroupType: String { return self._s[273]! } + public var StickerSettings_ContextHide: String { return self._s[274]! } + public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[275]! } + public var Group_Setup_HistoryTitle: String { return self._s[277]! } + public var Passport_Identity_FilesUploadNew: String { return self._s[278]! } + public var PasscodeSettings_AutoLock: String { return self._s[279]! } + public var Passport_Title: String { return self._s[280]! } + public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[281]! } + public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[282]! } + public var GroupPermission_NoSendGifs: String { return self._s[283]! } + public var PrivacySettings_PasscodeOn: String { return self._s[284]! } public func Conversation_ScheduleMessage_SendTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[284]!, self._r[284]!, [_0]) + return formatWithArgumentRanges(self._s[285]!, self._r[285]!, [_0]) } - public var State_WaitingForNetwork: String { return self._s[287]! } + public var State_WaitingForNetwork: String { return self._s[288]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[288]!, self._r[288]!, [_0, _1]) + return formatWithArgumentRanges(self._s[289]!, self._r[289]!, [_0, _1]) } - public var Calls_NotNow: String { return self._s[290]! } + public var Calls_NotNow: String { return self._s[291]! } public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[291]!, self._r[291]!, [_0]) + return formatWithArgumentRanges(self._s[292]!, self._r[292]!, [_0]) } - public var UserInfo_SendMessage: String { return self._s[292]! } - public var TwoStepAuth_PasswordSet: String { return self._s[293]! } - public var Passport_DeleteDocument: String { return self._s[294]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[295]! } + public var UserInfo_SendMessage: String { return self._s[293]! } + public var TwoStepAuth_PasswordSet: String { return self._s[294]! } + public var Passport_DeleteDocument: String { return self._s[295]! } + public var SocksProxySetup_AddProxyTitle: String { return self._s[296]! } public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[296]!, self._r[296]!, [_1]) + return formatWithArgumentRanges(self._s[297]!, self._r[297]!, [_1]) } - public var AuthSessions_AddedDeviceTitle: String { return self._s[297]! } - public var GroupRemoved_Remove: String { return self._s[298]! } - public var Passport_FieldIdentity: String { return self._s[299]! } - public var Group_Setup_TypePrivateHelp: String { return self._s[300]! } - public var Conversation_Processing: String { return self._s[303]! } - public var Wallet_Settings_BackupWallet: String { return self._s[305]! } - public var ChatSettings_AutoPlayAnimations: String { return self._s[306]! } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[309]! } - public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[310]! } - public var Month_GenFebruary: String { return self._s[311]! } - public var Wallet_Send_NetworkErrorTitle: String { return self._s[312]! } + public var AuthSessions_AddedDeviceTitle: String { return self._s[298]! } + public var GroupRemoved_Remove: String { return self._s[299]! } + public var Passport_FieldIdentity: String { return self._s[300]! } + public var Group_Setup_TypePrivateHelp: String { return self._s[301]! } + public var Conversation_Processing: String { return self._s[304]! } + public var Wallet_Settings_BackupWallet: String { return self._s[306]! } + public var ChatSettings_AutoPlayAnimations: String { return self._s[307]! } + public var AuthSessions_LogOutApplicationsHelp: String { return self._s[310]! } + public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[311]! } + public var Month_GenFebruary: String { return self._s[312]! } + public var Wallet_Send_NetworkErrorTitle: String { return self._s[313]! } public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[314]!, self._r[314]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[315]!, self._r[315]!, [_1, _2, _3, _4, _5]) } - public var Passport_Identity_TypeIdentityCard: String { return self._s[315]! } - public var Wallet_Month_ShortJune: String { return self._s[317]! } - public var AutoDownloadSettings_DataUsageMedium: String { return self._s[318]! } - public var GroupInfo_AddParticipant: String { return self._s[319]! } - public var KeyCommand_SendMessage: String { return self._s[320]! } - public var VoiceOver_Chat_YourContact: String { return self._s[322]! } - public var Map_LiveLocationShowAll: String { return self._s[323]! } - public var WallpaperSearch_ColorOrange: String { return self._s[325]! } - public var Appearance_AppIconDefaultX: String { return self._s[326]! } - public var Checkout_Receipt_Title: String { return self._s[327]! } - public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[328]! } - public var WallpaperPreview_PreviewTopText: String { return self._s[329]! } - public var Message_Contact: String { return self._s[330]! } - public var Call_StatusIncoming: String { return self._s[331]! } - public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[332]! } + public var Passport_Identity_TypeIdentityCard: String { return self._s[316]! } + public var Wallet_Month_ShortJune: String { return self._s[318]! } + public var AutoDownloadSettings_DataUsageMedium: String { return self._s[319]! } + public var GroupInfo_AddParticipant: String { return self._s[320]! } + public var KeyCommand_SendMessage: String { return self._s[321]! } + public var VoiceOver_Chat_YourContact: String { return self._s[323]! } + public var Map_LiveLocationShowAll: String { return self._s[324]! } + public var WallpaperSearch_ColorOrange: String { return self._s[326]! } + public var Appearance_AppIconDefaultX: String { return self._s[327]! } + public var Checkout_Receipt_Title: String { return self._s[328]! } + public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[329]! } + public var WallpaperPreview_PreviewTopText: String { return self._s[330]! } + public var Message_Contact: String { return self._s[331]! } + public var Call_StatusIncoming: String { return self._s[332]! } + public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[333]! } public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[333]!, self._r[333]!, [_1]) + return formatWithArgumentRanges(self._s[334]!, self._r[334]!, [_1]) } public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[335]!, self._r[335]!, [_1]) + return formatWithArgumentRanges(self._s[336]!, self._r[336]!, [_1]) } - public var VoiceOver_Media_PlaybackRate: String { return self._s[336]! } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[337]! } - public var Conversation_ViewChannel: String { return self._s[338]! } + public var VoiceOver_Media_PlaybackRate: String { return self._s[337]! } + public var Passport_FieldIdentityDetailsHelp: String { return self._s[338]! } + public var Conversation_ViewChannel: String { return self._s[339]! } public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[339]!, self._r[339]!, [_0]) + return formatWithArgumentRanges(self._s[340]!, self._r[340]!, [_0]) } - public var Theme_Colors_Accent: String { return self._s[340]! } - public var Passport_Language_nl: String { return self._s[342]! } - public var Camera_Retake: String { return self._s[343]! } + public var Theme_Colors_Accent: String { return self._s[341]! } + public var Passport_Language_nl: String { return self._s[343]! } + public var Camera_Retake: String { return self._s[344]! } public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[344]!, self._r[344]!, [_0]) + return formatWithArgumentRanges(self._s[345]!, self._r[345]!, [_0]) } - public var AuthSessions_LogOutApplications: String { return self._s[345]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[346]! } - public var Tour_Title6: String { return self._s[347]! } - public var Map_ChooseAPlace: String { return self._s[348]! } - public var CallSettings_Never: String { return self._s[350]! } + public var AuthSessions_LogOutApplications: String { return self._s[346]! } + public var ApplyLanguage_ApplySuccess: String { return self._s[347]! } + public var Tour_Title6: String { return self._s[348]! } + public var Map_ChooseAPlace: String { return self._s[349]! } + public var CallSettings_Never: String { return self._s[351]! } public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[351]!, self._r[351]!, [_0]) + return formatWithArgumentRanges(self._s[352]!, self._r[352]!, [_0]) } - public var ChannelRemoved_RemoveInfo: String { return self._s[352]! } + public var ChannelRemoved_RemoveInfo: String { return self._s[353]! } public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[353]!, self._r[353]!, [_0]) + return formatWithArgumentRanges(self._s[354]!, self._r[354]!, [_0]) } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[354]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[355]! } public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[355]!, self._r[355]!, [_0]) + return formatWithArgumentRanges(self._s[356]!, self._r[356]!, [_0]) } - public var GroupInfo_InviteLink_Title: String { return self._s[356]! } + public var GroupInfo_InviteLink_Title: String { return self._s[357]! } public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[357]!, self._r[357]!, [_1, _2]) + return formatWithArgumentRanges(self._s[358]!, self._r[358]!, [_1, _2]) } - public var KeyCommand_ScrollUp: String { return self._s[358]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[359]! } - public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[360]! } + public var KeyCommand_ScrollUp: String { return self._s[359]! } + public var ContactInfo_URLLabelHomepage: String { return self._s[360]! } + public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[361]! } public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[361]!, self._r[361]!, [_0]) + return formatWithArgumentRanges(self._s[362]!, self._r[362]!, [_0]) } - public var TwoFactorSetup_Done_Title: String { return self._s[362]! } + public var TwoFactorSetup_Done_Title: String { return self._s[363]! } public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[363]!, self._r[363]!, [_0]) + return formatWithArgumentRanges(self._s[364]!, self._r[364]!, [_0]) } - public var CallFeedback_ReasonDistortedSpeech: String { return self._s[364]! } - public var Watch_LastSeen_WithinAWeek: String { return self._s[365]! } - public var ContactList_Context_SendMessage: String { return self._s[367]! } - public var Weekday_Tuesday: String { return self._s[368]! } - public var Wallet_Created_Title: String { return self._s[370]! } - public var ScheduledMessages_Delete: String { return self._s[371]! } - public var UserInfo_StartSecretChat: String { return self._s[372]! } - public var Passport_Identity_FilesTitle: String { return self._s[373]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[374]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[376]! } - public var ChatList_UndoArchiveRevealedTitle: String { return self._s[377]! } + public var CallFeedback_ReasonDistortedSpeech: String { return self._s[365]! } + public var Watch_LastSeen_WithinAWeek: String { return self._s[366]! } + public var ContactList_Context_SendMessage: String { return self._s[368]! } + public var Weekday_Tuesday: String { return self._s[369]! } + public var Wallet_Created_Title: String { return self._s[371]! } + public var ScheduledMessages_Delete: String { return self._s[372]! } + public var UserInfo_StartSecretChat: String { return self._s[373]! } + public var Passport_Identity_FilesTitle: String { return self._s[374]! } + public var Permissions_NotificationsAllow_v0: String { return self._s[375]! } + public var DialogList_DeleteConversationConfirmation: String { return self._s[377]! } + public var ChatList_UndoArchiveRevealedTitle: String { return self._s[378]! } public func Wallet_Configuration_ApplyErrorTextURLUnreachable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[378]!, self._r[378]!, [_0]) + return formatWithArgumentRanges(self._s[379]!, self._r[379]!, [_0]) } - public var AuthSessions_Sessions: String { return self._s[379]! } + public var AuthSessions_Sessions: String { return self._s[380]! } public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[381]!, self._r[381]!, [_0]) + return formatWithArgumentRanges(self._s[382]!, self._r[382]!, [_0]) } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[382]! } - public var Call_StatusWaiting: String { return self._s[383]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[384]! } - public var FastTwoStepSetup_HintHelp: String { return self._s[385]! } - public var WallpaperPreview_CustomColorBottomText: String { return self._s[386]! } - public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[387]! } - public var LogoutOptions_AddAccountText: String { return self._s[388]! } - public var PasscodeSettings_6DigitCode: String { return self._s[389]! } - public var Settings_LogoutConfirmationText: String { return self._s[390]! } - public var Passport_Identity_TypePassport: String { return self._s[392]! } - public var Map_Work: String { return self._s[395]! } + public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[383]! } + public var Call_StatusWaiting: String { return self._s[384]! } + public var CreateGroup_SoftUserLimitAlert: String { return self._s[385]! } + public var FastTwoStepSetup_HintHelp: String { return self._s[386]! } + public var WallpaperPreview_CustomColorBottomText: String { return self._s[387]! } + public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[388]! } + public var LogoutOptions_AddAccountText: String { return self._s[389]! } + public var PasscodeSettings_6DigitCode: String { return self._s[390]! } + public var Settings_LogoutConfirmationText: String { return self._s[391]! } + public var Passport_Identity_TypePassport: String { return self._s[393]! } + public var Map_Work: String { return self._s[396]! } public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[396]!, self._r[396]!, [_1, _2]) + return formatWithArgumentRanges(self._s[397]!, self._r[397]!, [_1, _2]) } - public var SocksProxySetup_SaveProxy: String { return self._s[397]! } - public var AccessDenied_SaveMedia: String { return self._s[398]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[400]! } - public var CreatePoll_MultipleChoice: String { return self._s[401]! } - public var Settings_Title: String { return self._s[403]! } - public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[404]! } - public var Contacts_InviteSearchLabel: String { return self._s[406]! } - public var PrivacySettings_WebSessions: String { return self._s[407]! } - public var ConvertToSupergroup_Title: String { return self._s[408]! } + public var SocksProxySetup_SaveProxy: String { return self._s[398]! } + public var AccessDenied_SaveMedia: String { return self._s[399]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[401]! } + public var CreatePoll_MultipleChoice: String { return self._s[402]! } + public var Settings_Title: String { return self._s[404]! } + public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[405]! } + public var Contacts_InviteSearchLabel: String { return self._s[407]! } + public var PrivacySettings_WebSessions: String { return self._s[408]! } + public var ConvertToSupergroup_Title: String { return self._s[409]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[409]!, self._r[409]!, [_0]) + return formatWithArgumentRanges(self._s[410]!, self._r[410]!, [_0]) } - public var TwoFactorSetup_Hint_Text: String { return self._s[410]! } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[411]! } + public var TwoFactorSetup_Hint_Text: String { return self._s[411]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[412]! } public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[412]!, self._r[412]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[413]!, self._r[413]!, [_1, _2, _3]) } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[413]! } - public var UserInfo_BotHelp: String { return self._s[414]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[415]! } - public var Checkout_Name: String { return self._s[416]! } - public var AutoDownloadSettings_DataUsage: String { return self._s[417]! } - public var Channel_BanUser_BlockFor: String { return self._s[418]! } - public var Checkout_ShippingAddress: String { return self._s[419]! } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[420]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[421]! } - public var Privacy_Forwards: String { return self._s[422]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[423]! } - public var Appearance_ThemeCarouselNewNight: String { return self._s[424]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[414]! } + public var UserInfo_BotHelp: String { return self._s[415]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[416]! } + public var Checkout_Name: String { return self._s[417]! } + public var AutoDownloadSettings_DataUsage: String { return self._s[418]! } + public var Channel_BanUser_BlockFor: String { return self._s[419]! } + public var Checkout_ShippingAddress: String { return self._s[420]! } + public var AutoDownloadSettings_MaxVideoSize: String { return self._s[421]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[422]! } + public var Privacy_Forwards: String { return self._s[423]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[424]! } + public var Appearance_ThemeCarouselNewNight: String { return self._s[425]! } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[427]!, self._r[427]!, [_0]) + return formatWithArgumentRanges(self._s[428]!, self._r[428]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[428]! } - public var Group_OwnershipTransfer_Title: String { return self._s[429]! } - public var PeerInfo_BioExpand: String { return self._s[431]! } - public var VoiceOver_Chat_OpenHint: String { return self._s[432]! } - public var Group_LeaveGroup: String { return self._s[433]! } - public var Settings_UsernameEmpty: String { return self._s[434]! } + public var Contacts_SortedByName: String { return self._s[429]! } + public var Group_OwnershipTransfer_Title: String { return self._s[430]! } + public var PeerInfo_BioExpand: String { return self._s[432]! } + public var VoiceOver_Chat_OpenHint: String { return self._s[433]! } + public var Group_LeaveGroup: String { return self._s[434]! } + public var Settings_UsernameEmpty: String { return self._s[435]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[435]!, self._r[435]!, [_0]) + return formatWithArgumentRanges(self._s[436]!, self._r[436]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[436]!, self._r[436]!, [_1]) + return formatWithArgumentRanges(self._s[437]!, self._r[437]!, [_1]) } public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[437]!, self._r[437]!, [_1, _2]) + return formatWithArgumentRanges(self._s[438]!, self._r[438]!, [_1, _2]) } - public var Message_ImageExpired: String { return self._s[438]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[440]! } - public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[441]! } - public var UserInfo_AddToExisting: String { return self._s[442]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[443]! } - public var Wallet_Send_SyncInProgress: String { return self._s[444]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[445]! } + public var Message_ImageExpired: String { return self._s[439]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[441]! } + public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[442]! } + public var UserInfo_AddToExisting: String { return self._s[443]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[444]! } + public var Wallet_Send_SyncInProgress: String { return self._s[445]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[446]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[446]!, self._r[446]!, [_1]) + return formatWithArgumentRanges(self._s[447]!, self._r[447]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[447]! } - public var Passport_Language_km: String { return self._s[448]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[450]! } - public var VoiceOver_Media_PlaybackPlay: String { return self._s[451]! } - public var Notification_CallMissedShort: String { return self._s[452]! } - public var Wallet_Info_YourBalance: String { return self._s[453]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[455]! } - public var Watch_Compose_Send: String { return self._s[456]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[459]! } - public var TwoFactorSetup_Email_Action: String { return self._s[460]! } - public var Conversation_HoldForVideo: String { return self._s[461]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[462]! } - public var AuthSessions_OtherDevices: String { return self._s[463]! } - public var Wallet_TransactionInfo_CommentHeader: String { return self._s[464]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[466]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[468]! } - public var Channel_LinkItem: String { return self._s[469]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[448]! } + public var Passport_Language_km: String { return self._s[449]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[451]! } + public var VoiceOver_Media_PlaybackPlay: String { return self._s[452]! } + public var Notification_CallMissedShort: String { return self._s[453]! } + public var Wallet_Info_YourBalance: String { return self._s[454]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[456]! } + public var Watch_Compose_Send: String { return self._s[457]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[460]! } + public var TwoFactorSetup_Email_Action: String { return self._s[461]! } + public var Conversation_HoldForVideo: String { return self._s[462]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[463]! } + public var AuthSessions_OtherDevices: String { return self._s[464]! } + public var Wallet_TransactionInfo_CommentHeader: String { return self._s[465]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[467]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[469]! } + public var Channel_LinkItem: String { return self._s[470]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[470]!, self._r[470]!, [_0, _1]) + return formatWithArgumentRanges(self._s[471]!, self._r[471]!, [_0, _1]) } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[473]!, self._r[473]!, [_0]) + return formatWithArgumentRanges(self._s[474]!, self._r[474]!, [_0]) } - public var VoiceOver_Recording_StopAndPreview: String { return self._s[474]! } - public var Passport_Language_dv: String { return self._s[475]! } - public var Undo_LeftChannel: String { return self._s[476]! } - public var Notifications_ExceptionsMuted: String { return self._s[477]! } - public var ChatList_UnhideAction: String { return self._s[478]! } - public var Conversation_ContextMenuShare: String { return self._s[479]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[480]! } - public var ShareFileTip_Title: String { return self._s[481]! } - public var NotificationsSound_Chord: String { return self._s[482]! } - public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[483]! } + public var VoiceOver_Recording_StopAndPreview: String { return self._s[475]! } + public var Passport_Language_dv: String { return self._s[476]! } + public var Undo_LeftChannel: String { return self._s[477]! } + public var Notifications_ExceptionsMuted: String { return self._s[478]! } + public var ChatList_UnhideAction: String { return self._s[479]! } + public var Conversation_ContextMenuShare: String { return self._s[480]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[481]! } + public var ShareFileTip_Title: String { return self._s[482]! } + public var NotificationsSound_Chord: String { return self._s[483]! } + public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[484]! } public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_1, _2]) + return formatWithArgumentRanges(self._s[485]!, self._r[485]!, [_1, _2]) } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[485]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[486]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[486]!, self._r[486]!, [_0]) + return formatWithArgumentRanges(self._s[487]!, self._r[487]!, [_0]) } public func Wallet_Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[487]!, self._r[487]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[488]!, self._r[488]!, [_1, _2, _3]) } - public var Wallet_Settings_ConfigurationInfo: String { return self._s[488]! } - public var Wallpaper_ErrorNotFound: String { return self._s[489]! } - public var Notification_CallOutgoingShort: String { return self._s[491]! } - public var Wallet_WordImport_IncorrectText: String { return self._s[492]! } + public var Wallet_Settings_ConfigurationInfo: String { return self._s[489]! } + public var Wallpaper_ErrorNotFound: String { return self._s[490]! } + public var Notification_CallOutgoingShort: String { return self._s[492]! } + public var Wallet_WordImport_IncorrectText: String { return self._s[493]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[493]!, self._r[493]!, [_1, _2]) + return formatWithArgumentRanges(self._s[494]!, self._r[494]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[494]! } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[495]! } - public var ReportPeer_Report: String { return self._s[496]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[497]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[498]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[495]! } + public var Privacy_Forwards_LinkIfAllowed: String { return self._s[496]! } + public var ReportPeer_Report: String { return self._s[497]! } + public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[498]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[499]! } public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[499]!, self._r[499]!, [_1, _2]) + return formatWithArgumentRanges(self._s[500]!, self._r[500]!, [_1, _2]) } - public var StickerPack_Send: String { return self._s[500]! } - public var Login_CodeSentInternal: String { return self._s[501]! } - public var Wallet_Month_GenJanuary: String { return self._s[502]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[503]! } + public var StickerPack_Send: String { return self._s[501]! } + public var Login_CodeSentInternal: String { return self._s[502]! } + public var Wallet_Month_GenJanuary: String { return self._s[503]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[504]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[504]!, self._r[504]!, [_0]) + return formatWithArgumentRanges(self._s[505]!, self._r[505]!, [_0]) } public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[506]!, self._r[506]!, [_0]) + return formatWithArgumentRanges(self._s[507]!, self._r[507]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[507]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[508]! } public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[508]!, self._r[508]!, [_1]) + return formatWithArgumentRanges(self._s[509]!, self._r[509]!, [_1]) } - public var ReportPeer_ReasonViolence: String { return self._s[510]! } - public var Appearance_ShareThemeColor: String { return self._s[511]! } - public var Map_Locating: String { return self._s[512]! } + public var ReportPeer_ReasonViolence: String { return self._s[511]! } + public var Appearance_ShareThemeColor: String { return self._s[512]! } + public var Map_Locating: String { return self._s[513]! } public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[513]!, self._r[513]!, [_0]) + return formatWithArgumentRanges(self._s[514]!, self._r[514]!, [_0]) } public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[514]!, self._r[514]!, [_1]) + return formatWithArgumentRanges(self._s[515]!, self._r[515]!, [_1]) } - public var AutoDownloadSettings_GroupChats: String { return self._s[516]! } - public var CheckoutInfo_SaveInfo: String { return self._s[517]! } - public var SharedMedia_EmptyLinksText: String { return self._s[519]! } - public var Passport_Address_CityPlaceholder: String { return self._s[520]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[521]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[522]! } - public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[524]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[525]! } + public var AutoDownloadSettings_GroupChats: String { return self._s[517]! } + public var CheckoutInfo_SaveInfo: String { return self._s[518]! } + public var SharedMedia_EmptyLinksText: String { return self._s[520]! } + public var Passport_Address_CityPlaceholder: String { return self._s[521]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[522]! } + public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[523]! } + public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[525]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[526]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[526]!, self._r[526]!, [_1]) + return formatWithArgumentRanges(self._s[527]!, self._r[527]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[527]!, self._r[527]!, [_0]) + return formatWithArgumentRanges(self._s[528]!, self._r[528]!, [_0]) } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[528]! } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[529]! } - public var ChangePhoneNumberCode_Code: String { return self._s[530]! } - public var Appearance_CreateTheme: String { return self._s[531]! } + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[529]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[530]! } + public var ChangePhoneNumberCode_Code: String { return self._s[531]! } + public var Appearance_CreateTheme: String { return self._s[532]! } public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[532]!, self._r[532]!, [_0]) + return formatWithArgumentRanges(self._s[533]!, self._r[533]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[533]! } - public var HashtagSearch_AllChats: String { return self._s[534]! } - public var MediaPlayer_UnknownTrack: String { return self._s[535]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[537]! } + public var TwoStepAuth_SetupEmail: String { return self._s[534]! } + public var HashtagSearch_AllChats: String { return self._s[535]! } + public var MediaPlayer_UnknownTrack: String { return self._s[536]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[538]! } public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[538]!, self._r[538]!, [_0]) + return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_0]) } - public var PhotoEditor_QualityHigh: String { return self._s[540]! } + public var PhotoEditor_QualityHigh: String { return self._s[541]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[541]!, self._r[541]!, [_0]) + return formatWithArgumentRanges(self._s[542]!, self._r[542]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[542]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[543]! } - public var Message_LiveLocation: String { return self._s[544]! } - public var Cache_LowDiskSpaceText: String { return self._s[545]! } - public var Wallet_Receive_ShareAddress: String { return self._s[546]! } - public var EditTheme_ErrorLinkTaken: String { return self._s[547]! } - public var Conversation_SendMessage: String { return self._s[548]! } - public var AuthSessions_EmptyTitle: String { return self._s[549]! } - public var Privacy_PhoneNumber: String { return self._s[550]! } - public var PeopleNearby_CreateGroup: String { return self._s[551]! } - public var Stats_SharesPerPost: String { return self._s[553]! } - public var CallSettings_UseLessData: String { return self._s[554]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[555]! } - public var Stickers_AddToFavorites: String { return self._s[556]! } - public var Wallet_WordImport_Title: String { return self._s[557]! } - public var PhotoEditor_QualityLow: String { return self._s[558]! } - public var Watch_UserInfo_Unblock: String { return self._s[559]! } - public var Settings_Logout: String { return self._s[560]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[543]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[544]! } + public var Message_LiveLocation: String { return self._s[545]! } + public var Cache_LowDiskSpaceText: String { return self._s[546]! } + public var Wallet_Receive_ShareAddress: String { return self._s[547]! } + public var EditTheme_ErrorLinkTaken: String { return self._s[548]! } + public var Conversation_SendMessage: String { return self._s[549]! } + public var AuthSessions_EmptyTitle: String { return self._s[550]! } + public var Privacy_PhoneNumber: String { return self._s[551]! } + public var PeopleNearby_CreateGroup: String { return self._s[552]! } + public var Stats_SharesPerPost: String { return self._s[554]! } + public var CallSettings_UseLessData: String { return self._s[555]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[556]! } + public var Stickers_AddToFavorites: String { return self._s[557]! } + public var Wallet_WordImport_Title: String { return self._s[558]! } + public var PhotoEditor_QualityLow: String { return self._s[559]! } + public var Watch_UserInfo_Unblock: String { return self._s[560]! } + public var Settings_Logout: String { return self._s[561]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[561]!, self._r[561]!, [_1]) + return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[562]! } - public var ChannelInfo_Stats: String { return self._s[563]! } - public var TextFormat_Link: String { return self._s[564]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[563]! } + public var ChannelInfo_Stats: String { return self._s[564]! } + public var TextFormat_Link: String { return self._s[565]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[565]!, self._r[565]!, [_1, _2]) + return formatWithArgumentRanges(self._s[566]!, self._r[566]!, [_1, _2]) } - public var Wallet_TransactionInfo_Title: String { return self._s[566]! } + public var Wallet_TransactionInfo_Title: String { return self._s[567]! } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[567]!, self._r[567]!, [_0]) + return formatWithArgumentRanges(self._s[568]!, self._r[568]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[568]! } - public var Group_Setup_TypePublicHelp: String { return self._s[569]! } - public var Passport_Scans_UploadNew: String { return self._s[570]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[571]! } - public var DialogList_Title: String { return self._s[574]! } - public var NotificationSettings_ContactJoined: String { return self._s[575]! } - public var GroupInfo_LabelAdmin: String { return self._s[576]! } - public var KeyCommand_ChatInfo: String { return self._s[577]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[578]! } - public var Call_ReportIncludeLog: String { return self._s[579]! } + public var Watch_Notification_Joined: String { return self._s[569]! } + public var Group_Setup_TypePublicHelp: String { return self._s[570]! } + public var Passport_Scans_UploadNew: String { return self._s[571]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[572]! } + public var DialogList_Title: String { return self._s[575]! } + public var NotificationSettings_ContactJoined: String { return self._s[576]! } + public var GroupInfo_LabelAdmin: String { return self._s[577]! } + public var KeyCommand_ChatInfo: String { return self._s[578]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[579]! } + public var Call_ReportIncludeLog: String { return self._s[580]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[582]!, self._r[582]!, [_0]) + return formatWithArgumentRanges(self._s[583]!, self._r[583]!, [_0]) } - public var Stats_Followers: String { return self._s[583]! } - public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[584]! } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[585]! } - public var LocalGroup_IrrelevantWarning: String { return self._s[586]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[587]! } - public var Message_Sticker: String { return self._s[588]! } - public var LastSeen_JustNow: String { return self._s[590]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[592]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[593]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[594]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[595]! } - public var TwoStepAuth_Email: String { return self._s[596]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[597]! } - public var PhotoEditor_BlurToolOff: String { return self._s[598]! } - public var Message_PinnedStickerMessage: String { return self._s[599]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[600]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[601]! } - public var Passport_DiscardMessageTitle: String { return self._s[602]! } - public var Privacy_PaymentsTitle: String { return self._s[603]! } - public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[604]! } - public var ClearCache_StorageCache: String { return self._s[605]! } - public var Appearance_TextSizeSetting: String { return self._s[606]! } - public var Channel_DiscussionGroup_Header: String { return self._s[608]! } - public var VoiceOver_Chat_OptionSelected: String { return self._s[609]! } - public var Appearance_ColorTheme: String { return self._s[610]! } - public var UserInfo_ShareContact: String { return self._s[611]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[612]! } - public var Common_More: String { return self._s[613]! } - public var Watch_Message_Call: String { return self._s[614]! } - public var Profile_EncryptionKey: String { return self._s[617]! } - public var Privacy_TopPeers: String { return self._s[618]! } - public var Conversation_StopPollConfirmation: String { return self._s[619]! } - public var Wallet_Words_NotDoneText: String { return self._s[621]! } - public var Privacy_TopPeersWarning: String { return self._s[623]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[624]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[625]! } - public var Wallet_RestoreFailed_EnterWords: String { return self._s[628]! } - public var DialogList_SearchSectionMessages: String { return self._s[629]! } - public var Notifications_ChannelNotifications: String { return self._s[630]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[631]! } - public var Passport_Language_sk: String { return self._s[632]! } - public var Notification_MessageLifetime1h: String { return self._s[633]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[634]! } - public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[635]! } - public var Call_ReportSkip: String { return self._s[637]! } - public var Cache_ServiceFiles: String { return self._s[638]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[639]! } - public var VoiceOver_Chat_YourFile: String { return self._s[640]! } - public var Map_Hybrid: String { return self._s[641]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[643]! } + public var Stats_Followers: String { return self._s[584]! } + public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[585]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[586]! } + public var LocalGroup_IrrelevantWarning: String { return self._s[587]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[588]! } + public var Message_Sticker: String { return self._s[589]! } + public var LastSeen_JustNow: String { return self._s[591]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[593]! } + public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[594]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[595]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[596]! } + public var TwoStepAuth_Email: String { return self._s[597]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[598]! } + public var PhotoEditor_BlurToolOff: String { return self._s[599]! } + public var Message_PinnedStickerMessage: String { return self._s[600]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[601]! } + public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[602]! } + public var Passport_DiscardMessageTitle: String { return self._s[603]! } + public var Privacy_PaymentsTitle: String { return self._s[604]! } + public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[605]! } + public var ClearCache_StorageCache: String { return self._s[606]! } + public var Appearance_TextSizeSetting: String { return self._s[607]! } + public var Channel_DiscussionGroup_Header: String { return self._s[609]! } + public var VoiceOver_Chat_OptionSelected: String { return self._s[610]! } + public var Appearance_ColorTheme: String { return self._s[611]! } + public var UserInfo_ShareContact: String { return self._s[612]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[613]! } + public var Common_More: String { return self._s[614]! } + public var Watch_Message_Call: String { return self._s[615]! } + public var Profile_EncryptionKey: String { return self._s[618]! } + public var Privacy_TopPeers: String { return self._s[619]! } + public var Conversation_StopPollConfirmation: String { return self._s[620]! } + public var Wallet_Words_NotDoneText: String { return self._s[622]! } + public var Privacy_TopPeersWarning: String { return self._s[624]! } + public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[625]! } + public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[626]! } + public var Wallet_RestoreFailed_EnterWords: String { return self._s[629]! } + public var DialogList_SearchSectionMessages: String { return self._s[630]! } + public var Notifications_ChannelNotifications: String { return self._s[631]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[632]! } + public var Passport_Language_sk: String { return self._s[633]! } + public var Notification_MessageLifetime1h: String { return self._s[634]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[635]! } + public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[636]! } + public var Call_ReportSkip: String { return self._s[638]! } + public var Cache_ServiceFiles: String { return self._s[639]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[640]! } + public var VoiceOver_Chat_YourFile: String { return self._s[641]! } + public var Map_Hybrid: String { return self._s[642]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[644]! } public func PUSH_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[644]!, self._r[644]!, [_1]) + return formatWithArgumentRanges(self._s[645]!, self._r[645]!, [_1]) } - public var ChatSettings_AutoDownloadVideos: String { return self._s[646]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[647]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[648]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[651]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[647]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[648]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[649]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[652]! } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_1]) + return formatWithArgumentRanges(self._s[653]!, self._r[653]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[654]! } - public var ScheduledMessages_ScheduledToday: String { return self._s[655]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[655]! } + public var ScheduledMessages_ScheduledToday: String { return self._s[656]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[656]!, self._r[656]!, [_1, _2]) + return formatWithArgumentRanges(self._s[657]!, self._r[657]!, [_1, _2]) } - public var Conversation_LiveLocationYou: String { return self._s[657]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[658]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[659]! } - public var UserInfo_ShareBot: String { return self._s[662]! } + public var Conversation_LiveLocationYou: String { return self._s[658]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[659]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[660]! } + public var UserInfo_ShareBot: String { return self._s[663]! } public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[663]!, self._r[663]!, [_1, _2]) + return formatWithArgumentRanges(self._s[664]!, self._r[664]!, [_1, _2]) } - public var Conversation_ClearCache: String { return self._s[664]! } - public var PhotoEditor_ShadowsTint: String { return self._s[665]! } - public var Message_Audio: String { return self._s[666]! } - public var Passport_Language_lt: String { return self._s[667]! } + public var Conversation_ClearCache: String { return self._s[665]! } + public var PhotoEditor_ShadowsTint: String { return self._s[666]! } + public var Message_Audio: String { return self._s[667]! } + public var Passport_Language_lt: String { return self._s[668]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[668]!, self._r[668]!, [_0]) + return formatWithArgumentRanges(self._s[669]!, self._r[669]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[669]! } - public var Conversation_FileICloudDrive: String { return self._s[670]! } - public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[671]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[672]! } + public var Permissions_SiriText_v0: String { return self._s[670]! } + public var Conversation_FileICloudDrive: String { return self._s[671]! } + public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[672]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[673]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[674]!, self._r[674]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[674]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[675]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[675]!, self._r[675]!, [_0]) + return formatWithArgumentRanges(self._s[676]!, self._r[676]!, [_0]) } - public var Channel_SignMessages: String { return self._s[676]! } + public var Channel_SignMessages: String { return self._s[677]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[677]!, self._r[677]!, [_1]) + return formatWithArgumentRanges(self._s[678]!, self._r[678]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[678]! } - public var Passport_ScanPassport: String { return self._s[679]! } - public var Watch_Suggestion_Thanks: String { return self._s[680]! } - public var BlockedUsers_AddNew: String { return self._s[681]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[679]! } + public var Passport_ScanPassport: String { return self._s[680]! } + public var Watch_Suggestion_Thanks: String { return self._s[681]! } + public var BlockedUsers_AddNew: String { return self._s[682]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[682]!, self._r[682]!, [_1, _2]) + return formatWithArgumentRanges(self._s[683]!, self._r[683]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[683]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[684]! } - public var Month_GenJuly: String { return self._s[685]! } - public var CreatePoll_QuizInfo: String { return self._s[686]! } - public var UserInfo_StartSecretChatStart: String { return self._s[687]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[688]! } - public var IntentsSettings_SuggestByShare: String { return self._s[690]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[691]! } - public var Notification_ChannelInviterSelf: String { return self._s[692]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[693]! } + public var Watch_Message_Invoice: String { return self._s[684]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[685]! } + public var Month_GenJuly: String { return self._s[686]! } + public var CreatePoll_QuizInfo: String { return self._s[687]! } + public var UserInfo_StartSecretChatStart: String { return self._s[688]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[689]! } + public var IntentsSettings_SuggestByShare: String { return self._s[691]! } + public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[692]! } + public var Notification_ChannelInviterSelf: String { return self._s[693]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[694]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[694]!, self._r[694]!, [_1, _2]) + return formatWithArgumentRanges(self._s[695]!, self._r[695]!, [_1, _2]) } - public var Stats_FollowersTitle: String { return self._s[695]! } - public var CheckoutInfo_Title: String { return self._s[696]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[697]! } + public var Stats_FollowersTitle: String { return self._s[696]! } + public var CheckoutInfo_Title: String { return self._s[697]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[698]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[698]!, self._r[698]!, [_0]) + return formatWithArgumentRanges(self._s[699]!, self._r[699]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[699]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[700]! } - public var Passport_Language_de: String { return self._s[701]! } - public var PeerInfo_PaneVoice: String { return self._s[702]! } - public var Update_Title: String { return self._s[703]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[704]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[705]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[706]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[707]! } - public var NotificationsSound_Telegraph: String { return self._s[708]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[709]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[710]! } + public var Passport_Identity_MainPage: String { return self._s[700]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[701]! } + public var Passport_Language_de: String { return self._s[702]! } + public var PeerInfo_PaneVoice: String { return self._s[703]! } + public var Update_Title: String { return self._s[704]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[705]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[706]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[707]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[708]! } + public var NotificationsSound_Telegraph: String { return self._s[709]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[710]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[711]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[711]!, self._r[711]!, [_0]) + return formatWithArgumentRanges(self._s[712]!, self._r[712]!, [_0]) } - public var ClearCache_Description: String { return self._s[712]! } - public var Stickers_SuggestAll: String { return self._s[713]! } - public var Conversation_ForwardTitle: String { return self._s[714]! } - public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[715]! } + public var ClearCache_Description: String { return self._s[713]! } + public var Stickers_SuggestAll: String { return self._s[714]! } + public var Conversation_ForwardTitle: String { return self._s[715]! } + public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[716]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[716]!, self._r[716]!, [_0]) + return formatWithArgumentRanges(self._s[717]!, self._r[717]!, [_0]) } - public var Calls_NewCall: String { return self._s[717]! } - public var Call_StatusEnded: String { return self._s[718]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[719]! } - public var Settings_ProxyConnected: String { return self._s[720]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[721]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[722]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[723]! } - public var Passport_PasswordPlaceholder: String { return self._s[724]! } - public var Message_PinnedInvoice: String { return self._s[725]! } - public var Passport_Identity_IssueDate: String { return self._s[726]! } - public var Passport_Language_pl: String { return self._s[727]! } + public var Calls_NewCall: String { return self._s[718]! } + public var Call_StatusEnded: String { return self._s[719]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[720]! } + public var Settings_ProxyConnected: String { return self._s[721]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[722]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[723]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[724]! } + public var Passport_PasswordPlaceholder: String { return self._s[725]! } + public var Message_PinnedInvoice: String { return self._s[726]! } + public var Passport_Identity_IssueDate: String { return self._s[727]! } + public var Passport_Language_pl: String { return self._s[728]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[728]!, self._r[728]!, [_0]) + return formatWithArgumentRanges(self._s[729]!, self._r[729]!, [_0]) } - public var Call_StatusConnecting: String { return self._s[729]! } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[730]! } + public var Call_StatusConnecting: String { return self._s[730]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[731]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[731]!, self._r[731]!, [_0]) + return formatWithArgumentRanges(self._s[732]!, self._r[732]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[733]! } - public var Common_Edit: String { return self._s[734]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[735]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[734]! } + public var Common_Edit: String { return self._s[735]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[736]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[736]!, self._r[736]!, [_0]) + return formatWithArgumentRanges(self._s[737]!, self._r[737]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[737]! } - public var PrivateDataSettings_Title: String { return self._s[738]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[739]! } - public var ChatList_Read: String { return self._s[740]! } - public var Wallet_WordImport_Text: String { return self._s[741]! } - public var Undo_ChatClearedForBothSides: String { return self._s[742]! } - public var GroupPermission_SectionTitle: String { return self._s[743]! } - public var TwoFactorSetup_Intro_Title: String { return self._s[745]! } + public var GroupInfo_ChatAdmins: String { return self._s[738]! } + public var PrivateDataSettings_Title: String { return self._s[739]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[740]! } + public var ChatList_Read: String { return self._s[741]! } + public var Wallet_WordImport_Text: String { return self._s[742]! } + public var Undo_ChatClearedForBothSides: String { return self._s[743]! } + public var GroupPermission_SectionTitle: String { return self._s[744]! } + public var TwoFactorSetup_Intro_Title: String { return self._s[746]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[746]!, self._r[746]!, [_1, _2]) + return formatWithArgumentRanges(self._s[747]!, self._r[747]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[747]! } - public var Update_UpdateApp: String { return self._s[748]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[749]! } - public var Settings_Appearance: String { return self._s[750]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[754]! } - public var Watch_Location_Access: String { return self._s[755]! } - public var ShareMenu_CopyShareLink: String { return self._s[757]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[758]! } - public var Conversation_Theme: String { return self._s[760]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[748]! } + public var Update_UpdateApp: String { return self._s[749]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[750]! } + public var Settings_Appearance: String { return self._s[751]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[755]! } + public var Watch_Location_Access: String { return self._s[756]! } + public var ShareMenu_CopyShareLink: String { return self._s[758]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[759]! } + public var Conversation_Theme: String { return self._s[761]! } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[761]!, self._r[761]!, [_0]) + return formatWithArgumentRanges(self._s[762]!, self._r[762]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[762]! } - public var Weekday_ShortWednesday: String { return self._s[763]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[764]! } - public var Undo_LeftGroup: String { return self._s[767]! } - public var Wallet_RestoreFailed_Text: String { return self._s[768]! } - public var Conversation_LinkDialogCopy: String { return self._s[769]! } - public var Wallet_TransactionInfo_NoAddress: String { return self._s[771]! } - public var Wallet_Navigation_Back: String { return self._s[772]! } - public var KeyCommand_FocusOnInputField: String { return self._s[773]! } - public var Contacts_SelectAll: String { return self._s[774]! } - public var Preview_SaveToCameraRoll: String { return self._s[775]! } - public var PrivacySettings_PasscodeOff: String { return self._s[776]! } - public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[777]! } + public var Notifications_ClassicTones: String { return self._s[763]! } + public var Weekday_ShortWednesday: String { return self._s[764]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[765]! } + public var Undo_LeftGroup: String { return self._s[768]! } + public var Wallet_RestoreFailed_Text: String { return self._s[769]! } + public var Conversation_LinkDialogCopy: String { return self._s[770]! } + public var Wallet_TransactionInfo_NoAddress: String { return self._s[772]! } + public var Wallet_Navigation_Back: String { return self._s[773]! } + public var KeyCommand_FocusOnInputField: String { return self._s[774]! } + public var Contacts_SelectAll: String { return self._s[775]! } + public var Preview_SaveToCameraRoll: String { return self._s[776]! } + public var PrivacySettings_PasscodeOff: String { return self._s[777]! } + public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[778]! } public func PUSH_CHANNEL_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[778]!, self._r[778]!, [_1]) + return formatWithArgumentRanges(self._s[779]!, self._r[779]!, [_1]) } - public var Wallpaper_Title: String { return self._s[779]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[780]! } - public var AccessDenied_Camera: String { return self._s[781]! } - public var Watch_Compose_CurrentLocation: String { return self._s[782]! } - public var PeerInfo_ButtonMessage: String { return self._s[784]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[785]! } + public var Wallpaper_Title: String { return self._s[780]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[781]! } + public var AccessDenied_Camera: String { return self._s[782]! } + public var Watch_Compose_CurrentLocation: String { return self._s[783]! } + public var PeerInfo_ButtonMessage: String { return self._s[785]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[786]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[786]!, self._r[786]!, [_0]) + return formatWithArgumentRanges(self._s[787]!, self._r[787]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[787]! } - public var Passport_Language_ro: String { return self._s[788]! } - public var EditTheme_UploadNewTheme: String { return self._s[789]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[790]! } - public var Wallet_Intro_Terms: String { return self._s[791]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[788]! } + public var Passport_Language_ro: String { return self._s[789]! } + public var EditTheme_UploadNewTheme: String { return self._s[790]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[791]! } + public var Wallet_Intro_Terms: String { return self._s[792]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[792]!, self._r[792]!, [_0]) + return formatWithArgumentRanges(self._s[793]!, self._r[793]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[793]! } - public var State_ConnectingToProxy: String { return self._s[794]! } - public var Calls_RatingTitle: String { return self._s[795]! } - public var Generic_ErrorMoreInfo: String { return self._s[796]! } - public var ChatList_Search_ShowMore: String { return self._s[797]! } - public var Appearance_PreviewReplyText: String { return self._s[798]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[799]! } + public var Login_CancelPhoneVerification: String { return self._s[794]! } + public var State_ConnectingToProxy: String { return self._s[795]! } + public var Calls_RatingTitle: String { return self._s[796]! } + public var Generic_ErrorMoreInfo: String { return self._s[797]! } + public var ChatList_Search_ShowMore: String { return self._s[798]! } + public var Appearance_PreviewReplyText: String { return self._s[799]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[800]! } public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[800]!, self._r[800]!, [_0]) + return formatWithArgumentRanges(self._s[801]!, self._r[801]!, [_0]) } - public var IntentsSettings_SuggestedChatsContacts: String { return self._s[801]! } - public var SharedMedia_CategoryLinks: String { return self._s[802]! } - public var Calls_Missed: String { return self._s[803]! } - public var Cache_Photos: String { return self._s[807]! } - public var GroupPermission_NoAddMembers: String { return self._s[808]! } - public var ScheduledMessages_Title: String { return self._s[809]! } + public var IntentsSettings_SuggestedChatsContacts: String { return self._s[802]! } + public var SharedMedia_CategoryLinks: String { return self._s[803]! } + public var Calls_Missed: String { return self._s[804]! } + public var Cache_Photos: String { return self._s[808]! } + public var GroupPermission_NoAddMembers: String { return self._s[809]! } + public var ScheduledMessages_Title: String { return self._s[810]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[810]!, self._r[810]!, [_0]) + return formatWithArgumentRanges(self._s[811]!, self._r[811]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[811]! } - public var Settings_ProxyDisabled: String { return self._s[812]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[812]! } + public var Settings_ProxyDisabled: String { return self._s[813]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[813]!, self._r[813]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_0]) + return formatWithArgumentRanges(self._s[815]!, self._r[815]!, [_0]) } - public var Stats_ViewsPerPost: String { return self._s[816]! } - public var ChatList_Context_RemoveFromRecents: String { return self._s[817]! } - public var Appearance_Title: String { return self._s[818]! } + public var Stats_ViewsPerPost: String { return self._s[817]! } + public var ChatList_Context_RemoveFromRecents: String { return self._s[818]! } + public var Appearance_Title: String { return self._s[819]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[820]!, self._r[820]!, [_0]) + return formatWithArgumentRanges(self._s[821]!, self._r[821]!, [_0]) } - public var Conversation_WalletRequiredText: String { return self._s[821]! } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[822]! } - public var OldChannels_NoticeCreateText: String { return self._s[823]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[824]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[825]! } - public var Preview_DeletePhoto: String { return self._s[826]! } - public var Appearance_AppIconFilledX: String { return self._s[827]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[828]! } + public var Conversation_WalletRequiredText: String { return self._s[822]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[823]! } + public var OldChannels_NoticeCreateText: String { return self._s[824]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[825]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[826]! } + public var Preview_DeletePhoto: String { return self._s[827]! } + public var Appearance_AppIconFilledX: String { return self._s[828]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[829]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[829]!, self._r[829]!, [_0]) + return formatWithArgumentRanges(self._s[830]!, self._r[830]!, [_0]) } - public var Coub_TapForSound: String { return self._s[832]! } - public var Map_LocatingError: String { return self._s[833]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[835]! } - public var Conversation_SendMessage_SendSilently: String { return self._s[836]! } - public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[837]! } + public var Coub_TapForSound: String { return self._s[833]! } + public var Map_LocatingError: String { return self._s[834]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[836]! } + public var Conversation_SendMessage_SendSilently: String { return self._s[837]! } + public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[838]! } public func Wallet_Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[838]!, self._r[838]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[839]!, self._r[839]!, [_1, _2, _3]) } - public var Passport_ForgottenPassword: String { return self._s[839]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[840]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[841]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[843]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[844]! } - public var Message_Location: String { return self._s[845]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[846]! } - public var Channel_Management_Title: String { return self._s[847]! } - public var DialogList_SearchSectionDialogs: String { return self._s[849]! } - public var Compose_NewChannel_Members: String { return self._s[850]! } + public var Passport_ForgottenPassword: String { return self._s[840]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[841]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[842]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[844]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[845]! } + public var Message_Location: String { return self._s[846]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[847]! } + public var Channel_Management_Title: String { return self._s[848]! } + public var DialogList_SearchSectionDialogs: String { return self._s[850]! } + public var Compose_NewChannel_Members: String { return self._s[851]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[851]!, self._r[851]!, [_0]) + return formatWithArgumentRanges(self._s[852]!, self._r[852]!, [_0]) } - public var GroupInfo_Location: String { return self._s[852]! } - public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[853]! } - public var ClearCache_Clear: String { return self._s[854]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[855]! } - public var PhotoEditor_WarmthTool: String { return self._s[856]! } - public var Passport_Language_tr: String { return self._s[857]! } + public var GroupInfo_Location: String { return self._s[853]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[854]! } + public var ClearCache_Clear: String { return self._s[855]! } + public var InstantPage_FeedbackButtonShort: String { return self._s[856]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[857]! } + public var PhotoEditor_WarmthTool: String { return self._s[858]! } + public var Passport_Language_tr: String { return self._s[859]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[858]!, self._r[858]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[860]!, self._r[860]!, [_1, _2, _3]) } - public var OldChannels_NoticeUpgradeText: String { return self._s[859]! } - public var Login_ResetAccountProtected_Reset: String { return self._s[861]! } - public var Watch_PhotoView_Title: String { return self._s[862]! } - public var Passport_Phone_Delete: String { return self._s[863]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[864]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[865]! } - public var GroupInfo_Permissions: String { return self._s[866]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[867]! } - public var Profile_ShareContactButton: String { return self._s[868]! } - public var ChatSettings_Other: String { return self._s[869]! } - public var UserInfo_NotificationsDisabled: String { return self._s[870]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[871]! } - public var LastSeen_WithinAMonth: String { return self._s[872]! } - public var VoiceOver_Chat_PlayHint: String { return self._s[873]! } - public var Conversation_ReportGroupLocation: String { return self._s[874]! } - public var Conversation_EncryptionCanceled: String { return self._s[875]! } - public var MediaPicker_GroupDescription: String { return self._s[876]! } - public var WebSearch_Images: String { return self._s[877]! } + public var OldChannels_NoticeUpgradeText: String { return self._s[861]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[863]! } + public var Watch_PhotoView_Title: String { return self._s[864]! } + public var Passport_Phone_Delete: String { return self._s[865]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[866]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[867]! } + public var GroupInfo_Permissions: String { return self._s[868]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[869]! } + public var Profile_ShareContactButton: String { return self._s[870]! } + public var ChatSettings_Other: String { return self._s[871]! } + public var UserInfo_NotificationsDisabled: String { return self._s[872]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[873]! } + public var LastSeen_WithinAMonth: String { return self._s[874]! } + public var VoiceOver_Chat_PlayHint: String { return self._s[875]! } + public var Conversation_ReportGroupLocation: String { return self._s[876]! } + public var Conversation_EncryptionCanceled: String { return self._s[877]! } + public var MediaPicker_GroupDescription: String { return self._s[878]! } + public var WebSearch_Images: String { return self._s[879]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[878]!, self._r[878]!, [_0]) + return formatWithArgumentRanges(self._s[880]!, self._r[880]!, [_0]) } - public var Message_Photo: String { return self._s[879]! } - public var PasscodeSettings_HelpBottom: String { return self._s[880]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[881]! } - public var VoiceOver_Media_PlaybackRateChange: String { return self._s[882]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[883]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[884]! } - public var NotificationsSound_Calypso: String { return self._s[885]! } - public var Map_Map: String { return self._s[886]! } + public var Message_Photo: String { return self._s[881]! } + public var PasscodeSettings_HelpBottom: String { return self._s[882]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[883]! } + public var VoiceOver_Media_PlaybackRateChange: String { return self._s[884]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[885]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[886]! } + public var NotificationsSound_Calypso: String { return self._s[887]! } + public var Map_Map: String { return self._s[888]! } public func Conversation_LiveLocationYouAndOther(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[887]!, self._r[887]!, [_0]) + return formatWithArgumentRanges(self._s[889]!, self._r[889]!, [_0]) } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[889]! } - public var ChatSettings_TextSizeUnits: String { return self._s[890]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[891]! } + public var ChatSettings_TextSizeUnits: String { return self._s[892]! } public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[891]!, self._r[891]!, [_0]) + return formatWithArgumentRanges(self._s[893]!, self._r[893]!, [_0]) } - public var Common_of: String { return self._s[892]! } - public var Conversation_ForwardContacts: String { return self._s[895]! } - public var IntentsSettings_SuggestByAll: String { return self._s[897]! } + public var Common_of: String { return self._s[894]! } + public var Conversation_ForwardContacts: String { return self._s[897]! } + public var IntentsSettings_SuggestByAll: String { return self._s[899]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[898]!, self._r[898]!, [_0]) + return formatWithArgumentRanges(self._s[900]!, self._r[900]!, [_0]) } - public var Passport_Language_hy: String { return self._s[899]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[900]! } - public var AutoDownloadSettings_Reset: String { return self._s[901]! } - public var Wallet_TransactionInfo_AddressCopied: String { return self._s[902]! } - public var Paint_ClearConfirm: String { return self._s[903]! } - public var Camera_VideoMode: String { return self._s[904]! } + public var Passport_Language_hy: String { return self._s[901]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[902]! } + public var AutoDownloadSettings_Reset: String { return self._s[903]! } + public var Wallet_TransactionInfo_AddressCopied: String { return self._s[904]! } + public var Paint_ClearConfirm: String { return self._s[905]! } + public var Camera_VideoMode: String { return self._s[906]! } public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[905]!, self._r[905]!, [_0]) + return formatWithArgumentRanges(self._s[907]!, self._r[907]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[906]! } - public var Conversation_ViewBackground: String { return self._s[907]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[908]! } + public var Conversation_ViewBackground: String { return self._s[909]! } public func Wallet_Info_TransactionDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[908]!, self._r[908]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[910]!, self._r[910]!, [_1, _2, _3]) } - public var Passport_Language_el: String { return self._s[909]! } - public var PhotoEditor_Original: String { return self._s[910]! } - public var Settings_FAQ_Button: String { return self._s[912]! } - public var Channel_Setup_PublicNoLink: String { return self._s[914]! } - public var Conversation_UnsupportedMedia: String { return self._s[915]! } - public var Conversation_SlideToCancel: String { return self._s[916]! } - public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[917]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[918]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[919]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[920]! } - public var AutoNightTheme_NotAvailable: String { return self._s[921]! } - public var Conversation_Owner: String { return self._s[922]! } - public var Common_Create: String { return self._s[923]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[924]! } - public var ContactList_Context_Call: String { return self._s[925]! } - public var Localization_ChooseLanguage: String { return self._s[927]! } - public var ChatList_Context_AddToContacts: String { return self._s[929]! } - public var OldChannels_NoticeTitle: String { return self._s[930]! } - public var Settings_Proxy: String { return self._s[932]! } - public var Privacy_TopPeersHelp: String { return self._s[933]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[934]! } - public var Chat_UnsendMyMessages: String { return self._s[935]! } + public var Passport_Language_el: String { return self._s[911]! } + public var PhotoEditor_Original: String { return self._s[912]! } + public var Settings_FAQ_Button: String { return self._s[914]! } + public var Channel_Setup_PublicNoLink: String { return self._s[916]! } + public var Conversation_UnsupportedMedia: String { return self._s[917]! } + public var Conversation_SlideToCancel: String { return self._s[918]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[919]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[920]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[921]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[922]! } + public var AutoNightTheme_NotAvailable: String { return self._s[923]! } + public var Conversation_Owner: String { return self._s[924]! } + public var Common_Create: String { return self._s[925]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[926]! } + public var ContactList_Context_Call: String { return self._s[927]! } + public var Localization_ChooseLanguage: String { return self._s[929]! } + public var ChatList_Context_AddToContacts: String { return self._s[931]! } + public var OldChannels_NoticeTitle: String { return self._s[932]! } + public var Settings_Proxy: String { return self._s[934]! } + public var Privacy_TopPeersHelp: String { return self._s[935]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[936]! } + public var Chat_UnsendMyMessages: String { return self._s[937]! } public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[936]!, self._r[936]!, [_0]) + return formatWithArgumentRanges(self._s[938]!, self._r[938]!, [_0]) } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[937]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[939]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[939]!, self._r[939]!, [_0]) + return formatWithArgumentRanges(self._s[941]!, self._r[941]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[940]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[941]! } - public var Cache_Title: String { return self._s[942]! } + public var Contacts_SortedByPresence: String { return self._s[942]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[943]! } + public var Cache_Title: String { return self._s[944]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[943]!, self._r[943]!, [_0]) + return formatWithArgumentRanges(self._s[945]!, self._r[945]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[944]! } - public var Channel_Moderator_Title: String { return self._s[945]! } - public var InstantPage_AutoNightTheme: String { return self._s[947]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[946]! } + public var Channel_Moderator_Title: String { return self._s[947]! } + public var InstantPage_AutoNightTheme: String { return self._s[949]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[950]!, self._r[950]!, [_1]) + return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[951]! } - public var Undo_Undo: String { return self._s[953]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[954]! } - public var TwoStepAuth_RemovePassword: String { return self._s[955]! } - public var Common_Delete: String { return self._s[956]! } - public var Contacts_AddPeopleNearby: String { return self._s[958]! } - public var Conversation_ContextMenuDelete: String { return self._s[959]! } - public var SocksProxySetup_Credentials: String { return self._s[960]! } - public var Appearance_EditTheme: String { return self._s[962]! } - public var ClearCache_StorageOtherApps: String { return self._s[963]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[964]! } - public var Wallet_Send_NetworkErrorText: String { return self._s[965]! } - public var AuthSessions_DevicesTitle: String { return self._s[967]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[969]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[970]! } - public var Passport_Language_id: String { return self._s[972]! } - public var WallpaperSearch_ColorTeal: String { return self._s[973]! } - public var ChannelIntro_Title: String { return self._s[974]! } + public var Passport_Scans_Upload: String { return self._s[953]! } + public var Undo_Undo: String { return self._s[955]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[956]! } + public var TwoStepAuth_RemovePassword: String { return self._s[957]! } + public var Common_Delete: String { return self._s[958]! } + public var Contacts_AddPeopleNearby: String { return self._s[960]! } + public var Conversation_ContextMenuDelete: String { return self._s[961]! } + public var SocksProxySetup_Credentials: String { return self._s[962]! } + public var Appearance_EditTheme: String { return self._s[964]! } + public var ClearCache_StorageOtherApps: String { return self._s[965]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[967]! } + public var Wallet_Send_NetworkErrorText: String { return self._s[968]! } + public var AuthSessions_DevicesTitle: String { return self._s[970]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[972]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[973]! } + public var Passport_Language_id: String { return self._s[975]! } + public var WallpaperSearch_ColorTeal: String { return self._s[976]! } + public var ChannelIntro_Title: String { return self._s[977]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[975]!, self._r[975]!, [_0]) + return formatWithArgumentRanges(self._s[978]!, self._r[978]!, [_0]) } - public var VoiceOver_Chat_OpenLinkHint: String { return self._s[977]! } - public var VoiceOver_Chat_Reply: String { return self._s[978]! } - public var ScheduledMessages_BotActionUnavailable: String { return self._s[979]! } - public var Channel_Info_Description: String { return self._s[980]! } - public var Stickers_FavoriteStickers: String { return self._s[981]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[982]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[983]! } - public var ChatSearch_ResultsTooltip: String { return self._s[984]! } - public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[985]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[986]! } - public var Group_PublicLink_Placeholder: String { return self._s[987]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[988]! } + public var VoiceOver_Chat_OpenLinkHint: String { return self._s[980]! } + public var VoiceOver_Chat_Reply: String { return self._s[981]! } + public var ScheduledMessages_BotActionUnavailable: String { return self._s[982]! } + public var Channel_Info_Description: String { return self._s[983]! } + public var Stickers_FavoriteStickers: String { return self._s[984]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[985]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[986]! } + public var ChatSearch_ResultsTooltip: String { return self._s[987]! } + public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[988]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[989]! } + public var Group_PublicLink_Placeholder: String { return self._s[990]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[991]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[989]!, self._r[989]!, [_1]) + return formatWithArgumentRanges(self._s[992]!, self._r[992]!, [_1]) } - public var TextFormat_Underline: String { return self._s[990]! } + public var TextFormat_Underline: String { return self._s[993]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[992]!, self._r[992]!, [_1, _2]) - } - public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[993]!, self._r[993]!, [_0]) - } - public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[994]! } - public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[995]!, self._r[995]!, [_1, _2]) } - public var Wallet_Intro_ImportExisting: String { return self._s[996]! } - public var GroupPermission_Delete: String { return self._s[997]! } - public var Passport_Language_uk: String { return self._s[998]! } - public var StickerPack_HideStickers: String { return self._s[1000]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[1001]! } + public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[996]!, self._r[996]!, [_0]) + } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[997]! } + public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[998]!, self._r[998]!, [_1, _2]) + } + public var Wallet_Intro_ImportExisting: String { return self._s[999]! } + public var GroupPermission_Delete: String { return self._s[1000]! } + public var Passport_Language_uk: String { return self._s[1001]! } + public var StickerPack_HideStickers: String { return self._s[1003]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[1004]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1002]!, self._r[1002]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1005]!, self._r[1005]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[1003]! } + public var Activity_UploadingVideoMessage: String { return self._s[1006]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1004]!, self._r[1004]!, [_0]) + return formatWithArgumentRanges(self._s[1007]!, self._r[1007]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[1005]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[1006]! } - public var Settings_CallSettings: String { return self._s[1007]! } - public var Camera_SquareMode: String { return self._s[1008]! } - public var Conversation_SendMessage_ScheduleMessage: String { return self._s[1009]! } - public var GroupInfo_SharedMediaNone: String { return self._s[1010]! } + public var Channel_TitleInfo: String { return self._s[1008]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[1009]! } + public var Settings_CallSettings: String { return self._s[1010]! } + public var Camera_SquareMode: String { return self._s[1011]! } + public var Conversation_SendMessage_ScheduleMessage: String { return self._s[1012]! } + public var GroupInfo_SharedMediaNone: String { return self._s[1013]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1011]!, self._r[1011]!, [_1]) + return formatWithArgumentRanges(self._s[1014]!, self._r[1014]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[1012]! } - public var Application_Update: String { return self._s[1014]! } - public var Month_ShortJanuary: String { return self._s[1015]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[1016]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[1017]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[1018]! } - public var Passport_Address_Street2Placeholder: String { return self._s[1019]! } + public var Bot_GenericBotStatus: String { return self._s[1015]! } + public var Application_Update: String { return self._s[1017]! } + public var Month_ShortJanuary: String { return self._s[1018]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[1019]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[1020]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[1021]! } + public var Passport_Address_Street2Placeholder: String { return self._s[1022]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1020]!, self._r[1020]!, [_0]) - } - public var NetworkUsageSettings_Cellular: String { return self._s[1021]! } - public var Appearance_PreviewOutgoingText: String { return self._s[1022]! } - public func StickerPackActionInfo_RemovedText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1023]!, self._r[1023]!, [_0]) } - public var Notifications_PermissionsAllowInSettings: String { return self._s[1024]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[1026]! } - public var Map_Directions: String { return self._s[1027]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[1029]! } - public var Appearance_ThemeDay: String { return self._s[1030]! } - public var LogoutOptions_LogOut: String { return self._s[1031]! } - public var Group_PublicLink_Title: String { return self._s[1033]! } - public var Channel_AddBotErrorNoRights: String { return self._s[1034]! } - public var ChatList_Search_ShowLess: String { return self._s[1035]! } - public var Passport_Identity_AddPassport: String { return self._s[1036]! } - public var LocalGroup_ButtonTitle: String { return self._s[1037]! } - public var Stats_InteractionsTitle: String { return self._s[1038]! } - public var Call_Message: String { return self._s[1039]! } - public var PhotoEditor_ExposureTool: String { return self._s[1040]! } - public var Wallet_Receive_CommentInfo: String { return self._s[1042]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[1043]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[1045]! } - public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1046]! } - public var Appearance_Preview: String { return self._s[1047]! } - public var Compose_ChannelMembers: String { return self._s[1048]! } - public var Conversation_DeleteManyMessages: String { return self._s[1049]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[1050]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1051]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1052]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[1055]! } - public var Conversation_UpdateTelegram: String { return self._s[1056]! } - public var EditTheme_Create_TopInfo: String { return self._s[1057]! } + public var NetworkUsageSettings_Cellular: String { return self._s[1024]! } + public var Appearance_PreviewOutgoingText: String { return self._s[1025]! } + public func StickerPackActionInfo_RemovedText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1026]!, self._r[1026]!, [_0]) + } + public var Notifications_PermissionsAllowInSettings: String { return self._s[1027]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[1029]! } + public var Map_Directions: String { return self._s[1030]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[1032]! } + public var Appearance_ThemeDay: String { return self._s[1033]! } + public var LogoutOptions_LogOut: String { return self._s[1034]! } + public var Group_PublicLink_Title: String { return self._s[1036]! } + public var Channel_AddBotErrorNoRights: String { return self._s[1037]! } + public var ChatList_Search_ShowLess: String { return self._s[1038]! } + public var Passport_Identity_AddPassport: String { return self._s[1039]! } + public var LocalGroup_ButtonTitle: String { return self._s[1040]! } + public var Stats_InteractionsTitle: String { return self._s[1041]! } + public var Call_Message: String { return self._s[1042]! } + public var PhotoEditor_ExposureTool: String { return self._s[1043]! } + public var Wallet_Receive_CommentInfo: String { return self._s[1045]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[1046]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[1048]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1049]! } + public var Appearance_Preview: String { return self._s[1050]! } + public var Compose_ChannelMembers: String { return self._s[1051]! } + public var Conversation_DeleteManyMessages: String { return self._s[1052]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[1053]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1054]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1055]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[1058]! } + public var Conversation_UpdateTelegram: String { return self._s[1059]! } + public var EditTheme_Create_TopInfo: String { return self._s[1060]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1058]!, self._r[1058]!, [_0]) + return formatWithArgumentRanges(self._s[1061]!, self._r[1061]!, [_0]) } - public var Wallet_WordCheck_Continue: String { return self._s[1059]! } - public var TwoFactorSetup_Hint_Action: String { return self._s[1060]! } - public var IntentsSettings_ResetAll: String { return self._s[1061]! } + public var Wallet_WordCheck_Continue: String { return self._s[1062]! } + public var TwoFactorSetup_Hint_Action: String { return self._s[1063]! } + public var IntentsSettings_ResetAll: String { return self._s[1064]! } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1062]!, self._r[1062]!, [_1]) + return formatWithArgumentRanges(self._s[1065]!, self._r[1065]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[1063]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[1064]! } + public var GroupInfo_Administrators_Title: String { return self._s[1066]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[1067]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1065]!, self._r[1065]!, [_0]) + return formatWithArgumentRanges(self._s[1068]!, self._r[1068]!, [_0]) } - public var Tour_Title3: String { return self._s[1066]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1067]! } - public var Clipboard_SendPhoto: String { return self._s[1071]! } - public var MediaPicker_Videos: String { return self._s[1072]! } - public var Passport_Email_Title: String { return self._s[1073]! } + public var Tour_Title3: String { return self._s[1069]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1070]! } + public var Clipboard_SendPhoto: String { return self._s[1074]! } + public var MediaPicker_Videos: String { return self._s[1075]! } + public var Passport_Email_Title: String { return self._s[1076]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1074]!, self._r[1074]!, [_0]) + return formatWithArgumentRanges(self._s[1077]!, self._r[1077]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[1075]! } - public var Conversation_MessageDialogDelete: String { return self._s[1076]! } - public var Privacy_Calls_CustomHelp: String { return self._s[1078]! } - public var Message_Wallpaper: String { return self._s[1079]! } - public var MemberSearch_BotSection: String { return self._s[1080]! } - public var GroupInfo_SetSound: String { return self._s[1081]! } + public var StickerPacksSettings_Title: String { return self._s[1078]! } + public var Conversation_MessageDialogDelete: String { return self._s[1079]! } + public var Privacy_Calls_CustomHelp: String { return self._s[1081]! } + public var Message_Wallpaper: String { return self._s[1082]! } + public var MemberSearch_BotSection: String { return self._s[1083]! } + public var GroupInfo_SetSound: String { return self._s[1084]! } public func Time_TomorrowAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1082]!, self._r[1082]!, [_0]) + return formatWithArgumentRanges(self._s[1085]!, self._r[1085]!, [_0]) } - public var Core_ServiceUserStatus: String { return self._s[1083]! } - public var LiveLocationUpdated_JustNow: String { return self._s[1084]! } - public var Call_StatusFailed: String { return self._s[1085]! } - public var TwoFactorSetup_Email_Placeholder: String { return self._s[1086]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1087]! } - public var TwoStepAuth_SetPassword: String { return self._s[1088]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[1089]! } + public var Core_ServiceUserStatus: String { return self._s[1086]! } + public var LiveLocationUpdated_JustNow: String { return self._s[1087]! } + public var Call_StatusFailed: String { return self._s[1088]! } + public var TwoFactorSetup_Email_Placeholder: String { return self._s[1089]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1090]! } + public var TwoStepAuth_SetPassword: String { return self._s[1091]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[1092]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1091]!, self._r[1091]!, [_0]) + return formatWithArgumentRanges(self._s[1094]!, self._r[1094]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[1092]! } - public var Map_NoPlacesNearby: String { return self._s[1093]! } - public var Profile_Username: String { return self._s[1094]! } - public var Bot_DescriptionTitle: String { return self._s[1095]! } - public var MaskStickerSettings_Title: String { return self._s[1096]! } - public var SharedMedia_CategoryOther: String { return self._s[1097]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[1098]! } - public var Common_NotNow: String { return self._s[1099]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[1100]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[1101]! } - public var Map_Location: String { return self._s[1102]! } - public var Invitation_JoinGroup: String { return self._s[1103]! } - public var AutoDownloadSettings_Title: String { return self._s[1105]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1106]! } - public var Channel_ErrorAddBlocked: String { return self._s[1107]! } - public var Conversation_UnblockUser: String { return self._s[1108]! } - public var EditTheme_Edit_TopInfo: String { return self._s[1109]! } - public var Watch_Bot_Restart: String { return self._s[1110]! } - public var TwoStepAuth_Title: String { return self._s[1111]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[1112]! } - public var Checkout_ShippingMethod: String { return self._s[1113]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1114]! } + public var Calls_SubmitRating: String { return self._s[1095]! } + public var Map_NoPlacesNearby: String { return self._s[1096]! } + public var Profile_Username: String { return self._s[1097]! } + public var Bot_DescriptionTitle: String { return self._s[1098]! } + public var MaskStickerSettings_Title: String { return self._s[1099]! } + public var SharedMedia_CategoryOther: String { return self._s[1100]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[1101]! } + public var Common_NotNow: String { return self._s[1102]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[1103]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[1104]! } + public var Map_Location: String { return self._s[1105]! } + public var Invitation_JoinGroup: String { return self._s[1106]! } + public var AutoDownloadSettings_Title: String { return self._s[1108]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1109]! } + public var Channel_ErrorAddBlocked: String { return self._s[1110]! } + public var Conversation_UnblockUser: String { return self._s[1111]! } + public var EditTheme_Edit_TopInfo: String { return self._s[1112]! } + public var Watch_Bot_Restart: String { return self._s[1113]! } + public var TwoStepAuth_Title: String { return self._s[1114]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[1115]! } + public var Checkout_ShippingMethod: String { return self._s[1116]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1117]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1115]!, self._r[1115]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1118]!, self._r[1118]!, [_1, _2, _3]) } - public var PeerInfo_ButtonDiscuss: String { return self._s[1116]! } - public var EditTheme_ChangeColors: String { return self._s[1118]! } + public var PeerInfo_ButtonDiscuss: String { return self._s[1119]! } + public var EditTheme_ChangeColors: String { return self._s[1121]! } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1119]!, self._r[1119]!, [_0]) + return formatWithArgumentRanges(self._s[1122]!, self._r[1122]!, [_0]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1120]!, self._r[1120]!, [_0]) + return formatWithArgumentRanges(self._s[1123]!, self._r[1123]!, [_0]) } - public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1121]! } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1122]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[1123]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[1124]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[1125]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1126]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1127]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[1128]! } - public var Checkout_PaymentMethod_Title: String { return self._s[1129]! } - public var SocksProxySetup_Connection: String { return self._s[1130]! } - public var Group_MessagePhotoRemoved: String { return self._s[1131]! } - public var PeopleNearby_MakeInvisible: String { return self._s[1133]! } - public var Channel_Stickers_NotFound: String { return self._s[1135]! } - public var Group_About_Help: String { return self._s[1136]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[1137]! } - public var PeopleNearby_Title: String { return self._s[1139]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1124]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1126]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[1127]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[1128]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[1129]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1130]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1131]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[1132]! } + public var Checkout_PaymentMethod_Title: String { return self._s[1133]! } + public var SocksProxySetup_Connection: String { return self._s[1134]! } + public var Group_MessagePhotoRemoved: String { return self._s[1135]! } + public var PeopleNearby_MakeInvisible: String { return self._s[1137]! } + public var Channel_Stickers_NotFound: String { return self._s[1139]! } + public var Group_About_Help: String { return self._s[1140]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[1141]! } + public var PeopleNearby_Title: String { return self._s[1143]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1140]!, self._r[1140]!, [_1]) + return formatWithArgumentRanges(self._s[1144]!, self._r[1144]!, [_1]) } - public var Map_Home: String { return self._s[1141]! } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1143]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1144]! } - public var SocksProxySetup_Password: String { return self._s[1145]! } - public var Notifications_PermissionsEnable: String { return self._s[1146]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[1148]! } + public var Map_Home: String { return self._s[1145]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1147]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1148]! } + public var SocksProxySetup_Password: String { return self._s[1149]! } + public var Notifications_PermissionsEnable: String { return self._s[1150]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[1152]! } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1149]!, self._r[1149]!, [_1]) + return formatWithArgumentRanges(self._s[1153]!, self._r[1153]!, [_1]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1151]!, self._r[1151]!, [_0]) + return formatWithArgumentRanges(self._s[1155]!, self._r[1155]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[1152]! } - public var ArchivedPacksAlert_Title: String { return self._s[1153]! } - public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1154]! } - public var Map_PlacesNearby: String { return self._s[1155]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[1156]! } + public var ArchivedPacksAlert_Title: String { return self._s[1157]! } + public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1158]! } + public var Map_PlacesNearby: String { return self._s[1159]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1156]!, self._r[1156]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1160]!, self._r[1160]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1157]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1159]! } - public var Conversation_StatusTyping: String { return self._s[1160]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[1161]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[1162]! } - public var UserInfo_CreateNewContact: String { return self._s[1163]! } - public var Passport_Identity_FrontSide: String { return self._s[1164]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1165]! } - public var Calls_CallTabTitle: String { return self._s[1166]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1167]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1161]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1163]! } + public var Conversation_StatusTyping: String { return self._s[1164]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[1165]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[1166]! } + public var UserInfo_CreateNewContact: String { return self._s[1167]! } + public var Passport_Identity_FrontSide: String { return self._s[1168]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1169]! } + public var Calls_CallTabTitle: String { return self._s[1170]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1171]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1169]!, self._r[1169]!, [_0]) + return formatWithArgumentRanges(self._s[1173]!, self._r[1173]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[1170]! } - public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1171]! } - public var SharedMedia_EmptyMusicText: String { return self._s[1172]! } - public var Wallet_Completed_Text: String { return self._s[1173]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1174]! } - public var Paint_Stickers: String { return self._s[1175]! } - public var Privacy_GroupsAndChannels: String { return self._s[1176]! } - public var ChatList_Context_Delete: String { return self._s[1178]! } - public var UserInfo_AddContact: String { return self._s[1179]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[1174]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1175]! } + public var SharedMedia_EmptyMusicText: String { return self._s[1176]! } + public var Wallet_Completed_Text: String { return self._s[1177]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1178]! } + public var Paint_Stickers: String { return self._s[1179]! } + public var Privacy_GroupsAndChannels: String { return self._s[1180]! } + public var ChatList_Context_Delete: String { return self._s[1182]! } + public var UserInfo_AddContact: String { return self._s[1183]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1180]!, self._r[1180]!, [_0]) - } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[1182]! } - public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1184]!, self._r[1184]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[1185]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[1186]! } - public var BlockedUsers_BlockUser: String { return self._s[1187]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[1188]! } - public var MediaPicker_UngroupDescription: String { return self._s[1190]! } - public var Watch_NoConnection: String { return self._s[1191]! } - public var Month_GenSeptember: String { return self._s[1192]! } - public var Conversation_ViewGroup: String { return self._s[1194]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1197]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[1198]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1199]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1200]! } - public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1201]! } - public var MediaPicker_CameraRoll: String { return self._s[1203]! } - public var Month_GenAugust: String { return self._s[1204]! } - public var Wallet_Configuration_SourceHeader: String { return self._s[1205]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[1206]! } - public var SharedMedia_EmptyText: String { return self._s[1207]! } - public var Map_ShareLiveLocation: String { return self._s[1208]! } - public var Calls_All: String { return self._s[1209]! } - public var Map_SendThisPlace: String { return self._s[1211]! } - public var Appearance_ThemeNight: String { return self._s[1213]! } - public var Conversation_HoldForAudio: String { return self._s[1214]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[1217]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[1218]! } - public var SocksProxySetup_Secret: String { return self._s[1219]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[1186]! } + public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1188]!, self._r[1188]!, [_0]) + } + public var DialogList_NoMessagesTitle: String { return self._s[1189]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[1190]! } + public var BlockedUsers_BlockUser: String { return self._s[1191]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[1192]! } + public var MediaPicker_UngroupDescription: String { return self._s[1194]! } + public var Watch_NoConnection: String { return self._s[1195]! } + public var Month_GenSeptember: String { return self._s[1196]! } + public var Conversation_ViewGroup: String { return self._s[1198]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1201]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[1202]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1203]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1204]! } + public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1205]! } + public var MediaPicker_CameraRoll: String { return self._s[1207]! } + public var Month_GenAugust: String { return self._s[1208]! } + public var Wallet_Configuration_SourceHeader: String { return self._s[1209]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[1210]! } + public var SharedMedia_EmptyText: String { return self._s[1211]! } + public var Map_ShareLiveLocation: String { return self._s[1212]! } + public var Calls_All: String { return self._s[1213]! } + public var Map_SendThisPlace: String { return self._s[1215]! } + public var Appearance_ThemeNight: String { return self._s[1217]! } + public var Conversation_HoldForAudio: String { return self._s[1218]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[1221]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1222]! } + public var SocksProxySetup_Secret: String { return self._s[1223]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1220]!, self._r[1220]!, [_0]) + return formatWithArgumentRanges(self._s[1224]!, self._r[1224]!, [_0]) } - public var Channel_BanList_RestrictedTitle: String { return self._s[1222]! } - public var Conversation_Location: String { return self._s[1223]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1226]! } + public var Conversation_Location: String { return self._s[1227]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1224]!, self._r[1224]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1228]!, self._r[1228]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1226]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1227]! } - public var Notifications_PermissionsText: String { return self._s[1228]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1229]! } - public var Call_Flip: String { return self._s[1230]! } - public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1232]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1233]! } - public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1234]! } - public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1235]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1237]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1239]! } - public var Channel_TooMuchBots: String { return self._s[1241]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1242]! } - public var Login_InvalidCodeError: String { return self._s[1243]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1244]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1230]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1231]! } + public var Notifications_PermissionsText: String { return self._s[1232]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1233]! } + public var Call_Flip: String { return self._s[1234]! } + public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1236]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1237]! } + public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1238]! } + public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1239]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1241]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1243]! } + public var Channel_TooMuchBots: String { return self._s[1245]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1246]! } + public var Login_InvalidCodeError: String { return self._s[1247]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1248]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1245]!, self._r[1245]!, [_0]) + return formatWithArgumentRanges(self._s[1249]!, self._r[1249]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1246]!, self._r[1246]!, [_0]) + return formatWithArgumentRanges(self._s[1250]!, self._r[1250]!, [_0]) } - public var VoiceOver_Navigation_ProxySettings: String { return self._s[1247]! } - public var Call_CallInProgressTitle: String { return self._s[1248]! } - public var Month_ShortSeptember: String { return self._s[1249]! } - public var Watch_ChannelInfo_Title: String { return self._s[1250]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1253]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1254]! } - public var Chat_MultipleTextMessagesDisabled: String { return self._s[1255]! } - public var Wallet_Receive_Title: String { return self._s[1256]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1257]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1258]! } - public var PhotoEditor_CropReset: String { return self._s[1259]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1261]! } - public var Channel_Management_LabelEditor: String { return self._s[1262]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1264]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1265]! } - public var Wallet_Info_WalletCreated: String { return self._s[1266]! } - public var UserInfo_Title: String { return self._s[1267]! } - public var ChatList_HideAction: String { return self._s[1268]! } - public var AccessDenied_Title: String { return self._s[1269]! } - public var DialogList_SearchLabel: String { return self._s[1270]! } - public var Group_Setup_HistoryHidden: String { return self._s[1271]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1272]! } - public var State_Updating: String { return self._s[1274]! } - public var Contacts_TabTitle: String { return self._s[1275]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1277]! } - public var GroupInfo_GroupHistory: String { return self._s[1278]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1279]! } - public var Wallpaper_SetColor: String { return self._s[1280]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1281]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1282]! } - public var Chat_AttachmentLimitReached: String { return self._s[1283]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1284]! } - public var Contacts_NotRegisteredSection: String { return self._s[1285]! } + public var VoiceOver_Navigation_ProxySettings: String { return self._s[1251]! } + public var Call_CallInProgressTitle: String { return self._s[1252]! } + public var Month_ShortSeptember: String { return self._s[1253]! } + public var Watch_ChannelInfo_Title: String { return self._s[1254]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1257]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1258]! } + public var Chat_MultipleTextMessagesDisabled: String { return self._s[1259]! } + public var Wallet_Receive_Title: String { return self._s[1260]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1261]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1262]! } + public var PhotoEditor_CropReset: String { return self._s[1263]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1265]! } + public var Channel_Management_LabelEditor: String { return self._s[1266]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1268]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1269]! } + public var Wallet_Info_WalletCreated: String { return self._s[1270]! } + public var UserInfo_Title: String { return self._s[1271]! } + public var ChatList_HideAction: String { return self._s[1272]! } + public var AccessDenied_Title: String { return self._s[1273]! } + public var DialogList_SearchLabel: String { return self._s[1274]! } + public var Group_Setup_HistoryHidden: String { return self._s[1275]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1276]! } + public var State_Updating: String { return self._s[1278]! } + public var Contacts_TabTitle: String { return self._s[1279]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1281]! } + public var GroupInfo_GroupHistory: String { return self._s[1282]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1283]! } + public var Wallpaper_SetColor: String { return self._s[1284]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1285]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1286]! } + public var Chat_AttachmentLimitReached: String { return self._s[1287]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1288]! } + public var Contacts_NotRegisteredSection: String { return self._s[1289]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1286]!, self._r[1286]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1290]!, self._r[1290]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1287]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1288]! } - public var SocksProxySetup_Connecting: String { return self._s[1289]! } - public var ExplicitContent_AlertChannel: String { return self._s[1290]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1291]! } - public var Conversation_Contact: String { return self._s[1292]! } - public var Login_CodeExpired: String { return self._s[1293]! } - public var Passport_DiscardMessageAction: String { return self._s[1294]! } - public var ChatList_Context_Unpin: String { return self._s[1295]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1296]! } + public var Paint_Clear: String { return self._s[1291]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1292]! } + public var SocksProxySetup_Connecting: String { return self._s[1293]! } + public var ExplicitContent_AlertChannel: String { return self._s[1294]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1295]! } + public var Conversation_Contact: String { return self._s[1296]! } + public var Login_CodeExpired: String { return self._s[1297]! } + public var Passport_DiscardMessageAction: String { return self._s[1298]! } + public var ChatList_Context_Unpin: String { return self._s[1299]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1300]! } public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1297]!, self._r[1297]!, [_0]) + return formatWithArgumentRanges(self._s[1301]!, self._r[1301]!, [_0]) } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1298]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1299]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1302]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1303]! } public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1300]!, self._r[1300]!, [_0]) + return formatWithArgumentRanges(self._s[1304]!, self._r[1304]!, [_0]) } - public var Month_ShortApril: String { return self._s[1301]! } - public var AuthSessions_CurrentSession: String { return self._s[1302]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1305]! } - public var Wallet_Navigation_Cancel: String { return self._s[1307]! } - public var WallpaperPreview_CropTopText: String { return self._s[1308]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1309]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1310]! } + public var Month_ShortApril: String { return self._s[1305]! } + public var AuthSessions_CurrentSession: String { return self._s[1306]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1309]! } + public var Wallet_Navigation_Cancel: String { return self._s[1311]! } + public var WallpaperPreview_CropTopText: String { return self._s[1312]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1313]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1314]! } public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1311]!, self._r[1311]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1315]!, self._r[1315]!, [_0, _1]) } - public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1312]! } - public var Channel_Setup_TypePrivate: String { return self._s[1314]! } - public var Forward_ChannelReadOnly: String { return self._s[1317]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1318]! } - public var AddContact_SharedContactException: String { return self._s[1319]! } - public var UserInfo_BotPrivacy: String { return self._s[1321]! } - public var Wallet_CreateInvoice_Title: String { return self._s[1322]! } - public var Notification_PassportValueEmail: String { return self._s[1323]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1324]! } - public var GroupPermission_NewTitle: String { return self._s[1325]! } - public var CallFeedback_ReasonDropped: String { return self._s[1326]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1327]! } - public var Channel_SignMessages_Help: String { return self._s[1329]! } - public var Undo_ChatDeleted: String { return self._s[1331]! } - public var Conversation_ChatBackground: String { return self._s[1332]! } + public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1316]! } + public var Channel_Setup_TypePrivate: String { return self._s[1318]! } + public var Forward_ChannelReadOnly: String { return self._s[1321]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1322]! } + public var AddContact_SharedContactException: String { return self._s[1323]! } + public var UserInfo_BotPrivacy: String { return self._s[1325]! } + public var Wallet_CreateInvoice_Title: String { return self._s[1326]! } + public var Notification_PassportValueEmail: String { return self._s[1327]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1328]! } + public var GroupPermission_NewTitle: String { return self._s[1329]! } + public var CallFeedback_ReasonDropped: String { return self._s[1330]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1331]! } + public var Channel_SignMessages_Help: String { return self._s[1333]! } + public var Undo_ChatDeleted: String { return self._s[1335]! } + public var Conversation_ChatBackground: String { return self._s[1336]! } public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1333]!, self._r[1333]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1337]!, self._r[1337]!, [_1, _2, _3]) } public func PUSH_CHAT_MESSAGE_QUIZ(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1334]!, self._r[1334]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1338]!, self._r[1338]!, [_1, _2, _3]) } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1335]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1336]! } - public var Passport_Language_pt: String { return self._s[1337]! } - public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1338]! } - public var NotificationsSound_Popcorn: String { return self._s[1341]! } - public var AutoNightTheme_Disabled: String { return self._s[1342]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1343]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1344]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1345]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1346]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1339]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1340]! } + public var Passport_Language_pt: String { return self._s[1341]! } + public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1342]! } + public var NotificationsSound_Popcorn: String { return self._s[1345]! } + public var AutoNightTheme_Disabled: String { return self._s[1346]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1347]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1348]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1349]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1350]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1347]!, self._r[1347]!, [_0]) + return formatWithArgumentRanges(self._s[1351]!, self._r[1351]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1348]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1349]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1351]! } - public var PeerInfo_PaneGroups: String { return self._s[1352]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1352]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1353]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1355]! } + public var PeerInfo_PaneGroups: String { return self._s[1356]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1353]!, self._r[1353]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1357]!, self._r[1357]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1356]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1357]! } - public var Compose_NewEncryptedChat: String { return self._s[1358]! } - public var Login_CodeFloodError: String { return self._s[1359]! } - public var Calls_TabTitle: String { return self._s[1360]! } - public var Privacy_ProfilePhoto: String { return self._s[1361]! } - public var Passport_Language_he: String { return self._s[1362]! } + public var SocksProxySetup_Hostname: String { return self._s[1360]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1361]! } + public var Compose_NewEncryptedChat: String { return self._s[1362]! } + public var Login_CodeFloodError: String { return self._s[1363]! } + public var Calls_TabTitle: String { return self._s[1364]! } + public var Privacy_ProfilePhoto: String { return self._s[1365]! } + public var Passport_Language_he: String { return self._s[1366]! } public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1363]!, self._r[1363]!, [_0]) + return formatWithArgumentRanges(self._s[1367]!, self._r[1367]!, [_0]) } - public var GroupPermission_Title: String { return self._s[1364]! } + public var GroupPermission_Title: String { return self._s[1368]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1365]!, self._r[1365]!, [_0]) + return formatWithArgumentRanges(self._s[1369]!, self._r[1369]!, [_0]) } - public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1366]! } - public var GroupPermission_NoChangeInfo: String { return self._s[1367]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1368]! } - public var Tour_Text1: String { return self._s[1369]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1370]! } - public var Month_ShortFebruary: String { return self._s[1371]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1372]! } + public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1370]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1371]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1372]! } + public var Tour_Text1: String { return self._s[1373]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1374]! } + public var Month_ShortFebruary: String { return self._s[1375]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1376]! } public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1373]!, self._r[1373]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1377]!, self._r[1377]!, [_1, _2, _3]) } - public var Stats_LanguagesTitle: String { return self._s[1374]! } - public var NotificationsSound_Glass: String { return self._s[1375]! } - public var Appearance_ThemeNightBlue: String { return self._s[1376]! } - public var CheckoutInfo_Pay: String { return self._s[1377]! } - public var PeerInfo_ButtonLeave: String { return self._s[1379]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1380]! } - public var Call_CallAgain: String { return self._s[1382]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1383]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1384]! } - public var Passport_InvalidPasswordError: String { return self._s[1385]! } - public var Watch_Message_Game: String { return self._s[1386]! } - public var Stickers_Install: String { return self._s[1387]! } - public var VoiceOver_Chat_Message: String { return self._s[1388]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1389]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1391]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1392]! } - public var AuthSessions_OtherSessions: String { return self._s[1393]! } - public var Channel_Username_Help: String { return self._s[1394]! } - public var Camera_Title: String { return self._s[1395]! } - public var IntentsSettings_Title: String { return self._s[1396]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1398]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1399]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1400]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1401]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1402]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1403]! } - public var ScheduledMessages_DeleteMany: String { return self._s[1404]! } - public var Conversation_RestrictedStickers: String { return self._s[1405]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1407]! } - public var UserInfo_TelegramCall: String { return self._s[1409]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1410]! } - public var CreatePoll_OptionsHeader: String { return self._s[1411]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1412]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1413]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1414]! } - public var Theme_Colors_Proceed: String { return self._s[1415]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1416]! } + public var Stats_LanguagesTitle: String { return self._s[1378]! } + public var NotificationsSound_Glass: String { return self._s[1379]! } + public var Appearance_ThemeNightBlue: String { return self._s[1380]! } + public var CheckoutInfo_Pay: String { return self._s[1381]! } + public var PeerInfo_ButtonLeave: String { return self._s[1383]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1384]! } + public var Call_CallAgain: String { return self._s[1386]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1387]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1388]! } + public var Passport_InvalidPasswordError: String { return self._s[1389]! } + public var Watch_Message_Game: String { return self._s[1390]! } + public var Stickers_Install: String { return self._s[1391]! } + public var VoiceOver_Chat_Message: String { return self._s[1392]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1393]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1395]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1396]! } + public var AuthSessions_OtherSessions: String { return self._s[1397]! } + public var Channel_Username_Help: String { return self._s[1398]! } + public var Camera_Title: String { return self._s[1399]! } + public var IntentsSettings_Title: String { return self._s[1400]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1402]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1403]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1404]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1405]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1406]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1407]! } + public var ScheduledMessages_DeleteMany: String { return self._s[1408]! } + public var Conversation_RestrictedStickers: String { return self._s[1409]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1411]! } + public var UserInfo_TelegramCall: String { return self._s[1413]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1414]! } + public var CreatePoll_OptionsHeader: String { return self._s[1415]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1416]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1417]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1418]! } + public var Theme_Colors_Proceed: String { return self._s[1419]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1420]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1417]!, self._r[1417]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1421]!, self._r[1421]!, [_1, _2, _3]) } - public var Wallet_Month_GenAugust: String { return self._s[1418]! } - public var Settings_SaveEditedPhotos: String { return self._s[1419]! } - public var Stats_FollowersBySourceTitle: String { return self._s[1420]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1421]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1422]! } - public var Conversation_MessageDialogRetry: String { return self._s[1423]! } - public var ChatList_Context_MarkAsUnread: String { return self._s[1424]! } - public var MessagePoll_SubmitVote: String { return self._s[1425]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1426]! } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1427]! } - public var Group_Setup_TypeHeader: String { return self._s[1428]! } - public var Paint_RecentStickers: String { return self._s[1429]! } - public var PhotoEditor_GrainTool: String { return self._s[1430]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1431]! } - public var EmptyGroupInfo_Line4: String { return self._s[1432]! } - public var Watch_AuthRequired: String { return self._s[1434]! } + public var Wallet_Month_GenAugust: String { return self._s[1422]! } + public var Settings_SaveEditedPhotos: String { return self._s[1423]! } + public var Stats_FollowersBySourceTitle: String { return self._s[1424]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1425]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1426]! } + public var Conversation_MessageDialogRetry: String { return self._s[1427]! } + public var ChatList_Context_MarkAsUnread: String { return self._s[1428]! } + public var MessagePoll_SubmitVote: String { return self._s[1429]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1430]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1431]! } + public var Group_Setup_TypeHeader: String { return self._s[1432]! } + public var Paint_RecentStickers: String { return self._s[1433]! } + public var PhotoEditor_GrainTool: String { return self._s[1434]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1435]! } + public var EmptyGroupInfo_Line4: String { return self._s[1436]! } + public var Watch_AuthRequired: String { return self._s[1438]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1435]!, self._r[1435]!, [_0]) + return formatWithArgumentRanges(self._s[1439]!, self._r[1439]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1436]! } - public var ChannelIntro_Text: String { return self._s[1437]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1438]! } - public var GroupPermission_NoSendMedia: String { return self._s[1439]! } - public var Calls_AddTab: String { return self._s[1440]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1441]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1442]! } - public var Conversation_WalletRequiredSetup: String { return self._s[1443]! } - public var Notification_MessageLifetime1d: String { return self._s[1444]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1445]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1446]! } - public var Passport_Identity_GenderFemale: String { return self._s[1447]! } - public var BlockedUsers_BlockTitle: String { return self._s[1448]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1440]! } + public var ChannelIntro_Text: String { return self._s[1441]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1442]! } + public var GroupPermission_NoSendMedia: String { return self._s[1443]! } + public var Calls_AddTab: String { return self._s[1444]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1445]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1446]! } + public var Conversation_WalletRequiredSetup: String { return self._s[1447]! } + public var Notification_MessageLifetime1d: String { return self._s[1448]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1449]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1450]! } + public var Passport_Identity_GenderFemale: String { return self._s[1451]! } + public var BlockedUsers_BlockTitle: String { return self._s[1452]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1449]!, self._r[1449]!, [_1]) + return formatWithArgumentRanges(self._s[1453]!, self._r[1453]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1450]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1451]! } - public var Settings_Context_Logout: String { return self._s[1452]! } - public var Wallet_Info_UnknownTransaction: String { return self._s[1453]! } - public var ChatList_ArchiveAction: String { return self._s[1454]! } - public var AutoNightTheme_Scheduled: String { return self._s[1455]! } - public var TwoFactorSetup_Email_SkipAction: String { return self._s[1456]! } - public var Settings_Devices: String { return self._s[1457]! } - public var ContactInfo_Note: String { return self._s[1458]! } + public var Weekday_Yesterday: String { return self._s[1454]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1455]! } + public var Settings_Context_Logout: String { return self._s[1456]! } + public var Wallet_Info_UnknownTransaction: String { return self._s[1457]! } + public var ChatList_ArchiveAction: String { return self._s[1458]! } + public var AutoNightTheme_Scheduled: String { return self._s[1459]! } + public var TwoFactorSetup_Email_SkipAction: String { return self._s[1460]! } + public var Settings_Devices: String { return self._s[1461]! } + public var ContactInfo_Note: String { return self._s[1462]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1459]!, self._r[1459]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1463]!, self._r[1463]!, [_1, _2, _3, _4, _5, _6]) } - public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1460]! } - public var Wallet_Receive_CreateInvoice: String { return self._s[1461]! } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1462]! } - public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1463]! } + public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1464]! } + public var Wallet_Receive_CreateInvoice: String { return self._s[1465]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1466]! } + public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1467]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1464]!, self._r[1464]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1468]!, self._r[1468]!, [_1, _2]) } - public var CreatePoll_Create: String { return self._s[1465]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1466]! } + public var CreatePoll_Create: String { return self._s[1469]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1470]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1467]!, self._r[1467]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1471]!, self._r[1471]!, [_1, _2]) } - public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1468]! } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1469]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1471]! } + public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1472]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1473]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1475]! } public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1472]!, self._r[1472]!, [_1]) + return formatWithArgumentRanges(self._s[1476]!, self._r[1476]!, [_1]) } - public var Preview_OpenInInstagram: String { return self._s[1473]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1474]! } + public var Preview_OpenInInstagram: String { return self._s[1477]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1478]! } public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1475]!, self._r[1475]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1479]!, self._r[1479]!, [_1, _2, _3]) } public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1476]!, self._r[1476]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1480]!, self._r[1480]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1477]! } - public var ArchivedChats_IntroText3: String { return self._s[1478]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1479]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1480]! } - public var Wallet_Month_GenSeptember: String { return self._s[1481]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1482]! } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1481]! } + public var ArchivedChats_IntroText3: String { return self._s[1482]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1483]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1484]! } + public var Wallet_Month_GenSeptember: String { return self._s[1485]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1486]! } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1483]!, self._r[1483]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1487]!, self._r[1487]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1485]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1486]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1487]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1488]! } - public var Gif_NoGifsFound: String { return self._s[1489]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1490]! } - public var VoiceOver_MessageContextDelete: String { return self._s[1491]! } - public var EditTheme_Preview: String { return self._s[1492]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1489]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1490]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1491]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1492]! } + public var Gif_NoGifsFound: String { return self._s[1493]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1494]! } + public var VoiceOver_MessageContextDelete: String { return self._s[1495]! } + public var EditTheme_Preview: String { return self._s[1496]! } public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1493]!, self._r[1493]!, [_0]) + return formatWithArgumentRanges(self._s[1497]!, self._r[1497]!, [_0]) } - public var GroupInfo_ActionPromote: String { return self._s[1494]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1495]! } - public var GroupInfo_Permissions_Title: String { return self._s[1496]! } - public var Permissions_ContactsText_v0: String { return self._s[1497]! } - public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1498]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1499]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1502]! } - public var Passport_FieldEmailHelp: String { return self._s[1503]! } + public var GroupInfo_ActionPromote: String { return self._s[1498]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1499]! } + public var GroupInfo_Permissions_Title: String { return self._s[1500]! } + public var Permissions_ContactsText_v0: String { return self._s[1501]! } + public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1502]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1503]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1506]! } + public var Passport_FieldEmailHelp: String { return self._s[1507]! } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1504]!, self._r[1504]!, [_0]) + return formatWithArgumentRanges(self._s[1508]!, self._r[1508]!, [_0]) } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1505]! } - public var Weekday_ShortSaturday: String { return self._s[1506]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1507]! } - public var Watch_Conversation_UserInfo: String { return self._s[1508]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1509]! } - public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1510]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1511]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1512]! } - public var PhotoEditor_VignetteTool: String { return self._s[1513]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1514]! } - public var Passport_Language_et: String { return self._s[1515]! } - public var AppUpgrade_Running: String { return self._s[1516]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1518]! } - public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1519]! } - public var Passport_Language_bg: String { return self._s[1520]! } - public var Stickers_NoStickersFound: String { return self._s[1522]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1509]! } + public var Weekday_ShortSaturday: String { return self._s[1510]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1511]! } + public var Watch_Conversation_UserInfo: String { return self._s[1512]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1513]! } + public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1514]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1515]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1517]! } + public var PhotoEditor_VignetteTool: String { return self._s[1518]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1519]! } + public var Passport_Language_et: String { return self._s[1520]! } + public var AppUpgrade_Running: String { return self._s[1521]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1523]! } + public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1524]! } + public var Passport_Language_bg: String { return self._s[1525]! } + public var Stickers_NoStickersFound: String { return self._s[1527]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1524]!, self._r[1524]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1529]!, self._r[1529]!, [_1, _2]) } public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1525]!, self._r[1525]!, [_0]) + return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_0]) } - public var Wallet_Month_GenJuly: String { return self._s[1526]! } - public var Wallet_Receive_AddressHeader: String { return self._s[1527]! } - public var Wallet_Send_AmountText: String { return self._s[1528]! } - public var Settings_About: String { return self._s[1529]! } + public var Wallet_Month_GenJuly: String { return self._s[1531]! } + public var Wallet_Receive_AddressHeader: String { return self._s[1532]! } + public var Wallet_Send_AmountText: String { return self._s[1533]! } + public var Settings_About: String { return self._s[1534]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1535]!, self._r[1535]!, [_0, _1, _2]) } - public var ChatList_Context_MarkAsRead: String { return self._s[1532]! } - public var KeyCommand_NewMessage: String { return self._s[1533]! } - public var Group_ErrorAddBlocked: String { return self._s[1534]! } + public var ChatList_Context_MarkAsRead: String { return self._s[1537]! } + public var KeyCommand_NewMessage: String { return self._s[1538]! } + public var Group_ErrorAddBlocked: String { return self._s[1539]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1535]!, self._r[1535]!, [_0]) - } - public var Map_LocationTitle: String { return self._s[1536]! } - public var ReportGroupLocation_Title: String { return self._s[1537]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1538]! } - public var Cache_ClearProgress: String { return self._s[1539]! } - public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1540]!, self._r[1540]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1541]! } + public var Map_LocationTitle: String { return self._s[1541]! } + public var ReportGroupLocation_Title: String { return self._s[1542]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1543]! } + public var Cache_ClearProgress: String { return self._s[1544]! } + public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_0]) + } + public var GroupRemoved_AddToGroup: String { return self._s[1546]! } public func External_OpenIn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_0]) + return formatWithArgumentRanges(self._s[1547]!, self._r[1547]!, [_0]) } - public var Passport_UpdateRequiredError: String { return self._s[1543]! } - public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1544]! } + public var Passport_UpdateRequiredError: String { return self._s[1548]! } + public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1549]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_1]) + return formatWithArgumentRanges(self._s[1550]!, self._r[1550]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1547]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1548]! } - public var PeerInfo_ButtonSearch: String { return self._s[1549]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1550]! } - public var Passport_Language_ka: String { return self._s[1551]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1552]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1553]! } + public var PeerInfo_ButtonSearch: String { return self._s[1554]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1555]! } + public var Passport_Language_ka: String { return self._s[1556]! } public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1552]!, self._r[1552]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1557]!, self._r[1557]!, [_1, _2, _3]) } - public var Call_Decline: String { return self._s[1553]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1554]! } - public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1557]! } + public var Call_Decline: String { return self._s[1558]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1559]! } + public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1562]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1558]!, self._r[1558]!, [_0]) + return formatWithArgumentRanges(self._s[1563]!, self._r[1563]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1559]! } - public var EditTheme_EditTitle: String { return self._s[1560]! } + public var CallFeedback_Send: String { return self._s[1564]! } + public var EditTheme_EditTitle: String { return self._s[1565]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1561]!, self._r[1561]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1566]!, self._r[1566]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1562]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1567]! } public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1564]!, self._r[1564]!, [_0]) + return formatWithArgumentRanges(self._s[1569]!, self._r[1569]!, [_0]) } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1565]! } - public var Passport_DeletePassport: String { return self._s[1566]! } - public var Appearance_AppIconFilled: String { return self._s[1567]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1568]! } - public var Month_ShortDecember: String { return self._s[1569]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1571]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1570]! } + public var Passport_DeletePassport: String { return self._s[1571]! } + public var Appearance_AppIconFilled: String { return self._s[1572]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1573]! } + public var Month_ShortDecember: String { return self._s[1574]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1576]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1572]!, self._r[1572]!, [_0]) + return formatWithArgumentRanges(self._s[1577]!, self._r[1577]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1573]! } - public var Conversation_EncryptedDescription1: String { return self._s[1574]! } - public var Conversation_EncryptedDescription2: String { return self._s[1575]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1576]! } - public var Conversation_EncryptedDescription3: String { return self._s[1578]! } - public var PhotoEditor_SharpenTool: String { return self._s[1579]! } - public var Wallet_Configuration_Title: String { return self._s[1580]! } + public var Channel_Stickers_Searching: String { return self._s[1578]! } + public var Conversation_EncryptedDescription1: String { return self._s[1579]! } + public var Conversation_EncryptedDescription2: String { return self._s[1580]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1581]! } + public var Conversation_EncryptedDescription3: String { return self._s[1583]! } + public var PhotoEditor_SharpenTool: String { return self._s[1584]! } + public var Wallet_Configuration_Title: String { return self._s[1585]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1581]!, self._r[1581]!, [_0]) + return formatWithArgumentRanges(self._s[1586]!, self._r[1586]!, [_0]) } - public var Conversation_EncryptedDescription4: String { return self._s[1583]! } - public var Channel_Members_AddMembers: String { return self._s[1584]! } - public var Wallpaper_Search: String { return self._s[1585]! } - public var Weekday_Friday: String { return self._s[1587]! } - public var Privacy_ContactsSync: String { return self._s[1588]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1589]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1590]! } + public var Conversation_EncryptedDescription4: String { return self._s[1588]! } + public var Channel_Members_AddMembers: String { return self._s[1589]! } + public var Wallpaper_Search: String { return self._s[1590]! } + public var Weekday_Friday: String { return self._s[1592]! } + public var Privacy_ContactsSync: String { return self._s[1593]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1594]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1595]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1591]!, self._r[1591]!, [_0]) - } - public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1592]! } - public var GroupInfo_Permissions_Removed: String { return self._s[1593]! } - public var ScheduledMessages_ScheduledOnline: String { return self._s[1594]! } - public var Passport_Identity_GenderMale: String { return self._s[1595]! } - public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1596]!, self._r[1596]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1597]! } - public var Conversation_JumpToDate: String { return self._s[1598]! } - public var Contacts_GlobalSearch: String { return self._s[1599]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1600]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1601]! } - public var Profile_MessageLifetime1d: String { return self._s[1602]! } + public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1597]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1598]! } + public var ScheduledMessages_ScheduledOnline: String { return self._s[1599]! } + public var Passport_Identity_GenderMale: String { return self._s[1600]! } + public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1601]!, self._r[1601]!, [_0]) + } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1602]! } + public var Conversation_JumpToDate: String { return self._s[1603]! } + public var Contacts_GlobalSearch: String { return self._s[1604]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1605]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1606]! } + public var Profile_MessageLifetime1d: String { return self._s[1607]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1603]!, self._r[1603]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1608]!, self._r[1608]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1606]! } + public var StickerPack_BuiltinPackName: String { return self._s[1611]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1607]!, self._r[1607]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1612]!, self._r[1612]!, [_1, _2]) } - public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1608]! } - public var Passport_InfoTitle: String { return self._s[1610]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1611]! } + public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1613]! } + public var Passport_InfoTitle: String { return self._s[1615]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1616]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1615]!, self._r[1615]!, [_0]) + return formatWithArgumentRanges(self._s[1620]!, self._r[1620]!, [_0]) } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1616]!, self._r[1616]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1621]!, self._r[1621]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1617]! } - public var Profile_BotInfo: String { return self._s[1618]! } - public var Watch_Compose_CreateMessage: String { return self._s[1619]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1620]! } - public var Month_ShortNovember: String { return self._s[1621]! } - public var Conversation_ScamWarning: String { return self._s[1622]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1623]! } - public var Appearance_TextSize_Title: String { return self._s[1624]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1625]! } - public var NotificationsSound_Chime: String { return self._s[1626]! } - public var Passport_Language_ko: String { return self._s[1628]! } - public var InviteText_URL: String { return self._s[1629]! } - public var TextFormat_Monospace: String { return self._s[1630]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1622]! } + public var Profile_BotInfo: String { return self._s[1623]! } + public var Watch_Compose_CreateMessage: String { return self._s[1624]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1625]! } + public var Month_ShortNovember: String { return self._s[1626]! } + public var Conversation_ScamWarning: String { return self._s[1627]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1628]! } + public var Appearance_TextSize_Title: String { return self._s[1629]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1630]! } + public var NotificationsSound_Chime: String { return self._s[1631]! } + public var Passport_Language_ko: String { return self._s[1633]! } + public var InviteText_URL: String { return self._s[1634]! } + public var TextFormat_Monospace: String { return self._s[1635]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1631]!, self._r[1631]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1636]!, self._r[1636]!, [_1, _2, _3]) } - public var EditTheme_Edit_BottomInfo: String { return self._s[1632]! } + public var EditTheme_Edit_BottomInfo: String { return self._s[1637]! } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1633]!, self._r[1633]!, [_0]) + return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1634]!, self._r[1634]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1639]!, self._r[1639]!, [_1, _2]) } - public var Wallet_Words_Title: String { return self._s[1635]! } - public var Wallet_Month_ShortMay: String { return self._s[1636]! } - public var EditTheme_CreateTitle: String { return self._s[1638]! } - public var Passport_InfoLearnMore: String { return self._s[1639]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1640]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1641]! } - public var Your_card_has_expired: String { return self._s[1642]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1643]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1644]! } - public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1648]! } - public var Conversation_Report: String { return self._s[1650]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1651]! } - public var Notification_MessageLifetime1m: String { return self._s[1652]! } - public var Privacy_ContactsTitle: String { return self._s[1653]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1654]! } - public var Wallet_WordCheck_Title: String { return self._s[1655]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1656]! } - public var Channel_Members_Title: String { return self._s[1657]! } - public var Map_OpenInWaze: String { return self._s[1658]! } - public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1659]! } - public var Login_PhoneBannedError: String { return self._s[1660]! } + public var Wallet_Words_Title: String { return self._s[1640]! } + public var Wallet_Month_ShortMay: String { return self._s[1641]! } + public var EditTheme_CreateTitle: String { return self._s[1643]! } + public var Passport_InfoLearnMore: String { return self._s[1644]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1645]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1646]! } + public var Your_card_has_expired: String { return self._s[1647]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1648]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1649]! } + public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1653]! } + public var Conversation_Report: String { return self._s[1655]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1656]! } + public var Notification_MessageLifetime1m: String { return self._s[1657]! } + public var Privacy_ContactsTitle: String { return self._s[1658]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1659]! } + public var Wallet_WordCheck_Title: String { return self._s[1660]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1661]! } + public var Channel_Members_Title: String { return self._s[1662]! } + public var Map_OpenInWaze: String { return self._s[1663]! } + public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1664]! } + public var Login_PhoneBannedError: String { return self._s[1665]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1661]!, self._r[1661]!, [_0]) + return formatWithArgumentRanges(self._s[1666]!, self._r[1666]!, [_0]) } - public var IntentsSettings_MainAccount: String { return self._s[1662]! } - public var Group_Management_AddModeratorHelp: String { return self._s[1663]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1664]! } - public var Common_OK: String { return self._s[1665]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1666]! } - public var Wallet_Words_NotDoneResponse: String { return self._s[1667]! } - public var Cache_Music: String { return self._s[1668]! } - public var Wallet_Configuration_SourceURL: String { return self._s[1669]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1670]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1673]! } - public var ChatList_EmptyChatListEditFilter: String { return self._s[1674]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1675]! } + public var IntentsSettings_MainAccount: String { return self._s[1667]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1668]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1669]! } + public var Common_OK: String { return self._s[1670]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1671]! } + public var Wallet_Words_NotDoneResponse: String { return self._s[1672]! } + public var Cache_Music: String { return self._s[1673]! } + public var Wallet_Configuration_SourceURL: String { return self._s[1674]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1675]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1678]! } + public var ChatList_EmptyChatListEditFilter: String { return self._s[1679]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1680]! } public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1676]!, self._r[1676]!, [_1]) + return formatWithArgumentRanges(self._s[1681]!, self._r[1681]!, [_1]) } public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1677]!, self._r[1677]!, [_0]) + return formatWithArgumentRanges(self._s[1682]!, self._r[1682]!, [_0]) } - public var TwoFactorSetup_Done_Action: String { return self._s[1678]! } + public var TwoFactorSetup_Done_Action: String { return self._s[1683]! } public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1679]!, self._r[1679]!, [_0]) + return formatWithArgumentRanges(self._s[1684]!, self._r[1684]!, [_0]) } - public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1680]! } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1682]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1683]! } - public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1685]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1686]! } - public var State_ConnectingToProxyInfo: String { return self._s[1687]! } - public var Conversation_SwipeToReplyHintTitle: String { return self._s[1688]! } - public var Message_VideoMessage: String { return self._s[1690]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1691]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1692]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1693]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1694]! } + public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1685]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1687]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1688]! } + public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1690]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1691]! } + public var State_ConnectingToProxyInfo: String { return self._s[1692]! } + public var Conversation_SwipeToReplyHintTitle: String { return self._s[1693]! } + public var Message_VideoMessage: String { return self._s[1695]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1696]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1697]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1698]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1699]! } public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1695]!, self._r[1695]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1700]!, self._r[1700]!, [_1, _2, _3]) } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1696]! } - public var Activity_RecordingAudio: String { return self._s[1697]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1698]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1699]! } - public var Wallet_Info_Address: String { return self._s[1700]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1701]! } + public var Activity_RecordingAudio: String { return self._s[1702]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1703]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1704]! } + public var Wallet_Info_Address: String { return self._s[1705]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1702]!, self._r[1702]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1707]!, self._r[1707]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1706]!, self._r[1706]!, [_0]) - } - public var Conversation_ApplyLocalization: String { return self._s[1707]! } - public var TwoFactorSetup_Intro_Action: String { return self._s[1708]! } - public var UserInfo_AddPhone: String { return self._s[1709]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1710]! } - public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1711]!, self._r[1711]!, [_0]) } - public var Passport_Scans: String { return self._s[1713]! } - public var BlockedUsers_Unblock: String { return self._s[1714]! } + public var Conversation_ApplyLocalization: String { return self._s[1712]! } + public var TwoFactorSetup_Intro_Action: String { return self._s[1713]! } + public var UserInfo_AddPhone: String { return self._s[1714]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1715]! } + public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1716]!, self._r[1716]!, [_0]) + } + public var Passport_Scans: String { return self._s[1718]! } + public var BlockedUsers_Unblock: String { return self._s[1719]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1715]!, self._r[1715]!, [_1]) + return formatWithArgumentRanges(self._s[1720]!, self._r[1720]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1716]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[1717]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1718]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1719]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1720]! } + public var Channel_Management_LabelCreator: String { return self._s[1721]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[1722]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1723]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1724]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1725]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1721]!, self._r[1721]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1726]!, self._r[1726]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1722]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1723]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1724]! } - public var ChannelIntro_CreateChannel: String { return self._s[1725]! } - public var Conversation_UnreadMessages: String { return self._s[1726]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1727]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1728]! } - public var Theme_Context_Apply: String { return self._s[1729]! } - public var Notification_GroupActivated: String { return self._s[1730]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1731]! } - public var Wallet_Intro_CreateWallet: String { return self._s[1732]! } + public var Login_PhoneNumberHelp: String { return self._s[1727]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1728]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1729]! } + public var ChannelIntro_CreateChannel: String { return self._s[1730]! } + public var Conversation_UnreadMessages: String { return self._s[1731]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1732]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1733]! } + public var Theme_Context_Apply: String { return self._s[1734]! } + public var Notification_GroupActivated: String { return self._s[1735]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1736]! } + public var Wallet_Intro_CreateWallet: String { return self._s[1737]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1733]!, self._r[1733]!, [_0]) + return formatWithArgumentRanges(self._s[1738]!, self._r[1738]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1734]!, self._r[1734]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1739]!, self._r[1739]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1736]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1741]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1737]!, self._r[1737]!, [_0]) - } - public var Undo_DeletedChannel: String { return self._s[1738]! } - public var CallFeedback_AddComment: String { return self._s[1739]! } - public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1740]!, self._r[1740]!, [_0]) - } - public var Document_TargetConfirmationFormat: String { return self._s[1741]! } - public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1742]!, self._r[1742]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1743]! } + public var Undo_DeletedChannel: String { return self._s[1743]! } + public var CallFeedback_AddComment: String { return self._s[1744]! } + public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1745]!, self._r[1745]!, [_0]) + } + public var Document_TargetConfirmationFormat: String { return self._s[1746]! } + public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1747]!, self._r[1747]!, [_0]) + } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1748]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1744]!, self._r[1744]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1749]!, self._r[1749]!, [_1, _2, _3, _4]) } - public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1745]! } - public var Theme_ErrorNotFound: String { return self._s[1746]! } - public var Contacts_SortByName: String { return self._s[1747]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1748]! } + public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1750]! } + public var Theme_ErrorNotFound: String { return self._s[1751]! } + public var Contacts_SortByName: String { return self._s[1752]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1753]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1750]!, self._r[1750]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1755]!, self._r[1755]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1751]! } - public var ScheduledMessages_EditTime: String { return self._s[1752]! } - public var Conversation_ClearSelfHistory: String { return self._s[1753]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1754]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1755]! } - public var Stickers_SuggestNone: String { return self._s[1756]! } - public var ChatSettings_Cache: String { return self._s[1757]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1758]! } - public var Media_ShareThisPhoto: String { return self._s[1759]! } - public var Chat_SlowmodeTooltipPending: String { return self._s[1760]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1761]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1762]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1763]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1764]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1765]! } - public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1766]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1756]! } + public var ScheduledMessages_EditTime: String { return self._s[1757]! } + public var Conversation_ClearSelfHistory: String { return self._s[1758]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1759]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1760]! } + public var Stickers_SuggestNone: String { return self._s[1761]! } + public var ChatSettings_Cache: String { return self._s[1762]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1763]! } + public var Media_ShareThisPhoto: String { return self._s[1764]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[1765]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1766]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1767]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1768]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1769]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1770]! } + public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1771]! } public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1767]!, self._r[1767]!, [_0]) + return formatWithArgumentRanges(self._s[1772]!, self._r[1772]!, [_0]) } - public var Permissions_CellularDataTitle_v0: String { return self._s[1768]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1770]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1771]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1772]! } - public var Map_OpenIn: String { return self._s[1773]! } - public var PeerInfo_ButtonCall: String { return self._s[1774]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1773]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1775]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1776]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1777]! } + public var Map_OpenIn: String { return self._s[1778]! } + public var PeerInfo_ButtonCall: String { return self._s[1779]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1777]!, self._r[1777]!, [_1]) + return formatWithArgumentRanges(self._s[1783]!, self._r[1783]!, [_1]) } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1778]!, self._r[1778]!, [_0]) + return formatWithArgumentRanges(self._s[1784]!, self._r[1784]!, [_0]) } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1779]! } - public var MessagePoll_LabelClosed: String { return self._s[1780]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1782]! } - public var Wallet_Send_SendAnyway: String { return self._s[1783]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1784]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1785]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1786]! } - public var Map_SetThisPlace: String { return self._s[1787]! } - public var Login_SelectCountry_Title: String { return self._s[1788]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1789]! } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1785]! } + public var MessagePoll_LabelClosed: String { return self._s[1786]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1788]! } + public var Wallet_Send_SendAnyway: String { return self._s[1789]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1790]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1791]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1792]! } + public var Map_SetThisPlace: String { return self._s[1793]! } + public var Login_SelectCountry_Title: String { return self._s[1794]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1795]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1790]!, self._r[1790]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1796]!, self._r[1796]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1791]! } - public var Watch_Suggestion_BRB: String { return self._s[1792]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1793]! } - public var Contacts_PermissionsTitle: String { return self._s[1794]! } - public var Conversation_RestrictedInline: String { return self._s[1795]! } - public var Appearance_RemoveThemeColor: String { return self._s[1797]! } - public var StickerPack_ViewPack: String { return self._s[1798]! } - public var Wallet_UnknownError: String { return self._s[1799]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1797]! } + public var Watch_Suggestion_BRB: String { return self._s[1798]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1799]! } + public var Contacts_PermissionsTitle: String { return self._s[1800]! } + public var Conversation_RestrictedInline: String { return self._s[1801]! } + public var Appearance_RemoveThemeColor: String { return self._s[1803]! } + public var StickerPack_ViewPack: String { return self._s[1804]! } + public var Wallet_UnknownError: String { return self._s[1805]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1800]!, self._r[1800]!, [_0]) + return formatWithArgumentRanges(self._s[1806]!, self._r[1806]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1802]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1805]! } - public var MessagePoll_LabelQuiz: String { return self._s[1807]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1808]! } - public var Channel_Info_Stickers: String { return self._s[1809]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1810]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1811]! } - public var Passport_DeletePersonalDetails: String { return self._s[1812]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1813]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1814]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1815]! } - public var Conversation_SearchNoResults: String { return self._s[1818]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1819]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1820]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1821]! } - public var Login_Code: String { return self._s[1822]! } - public var EditTheme_Create_BottomInfo: String { return self._s[1823]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1824]! } - public var Weekday_ShortThursday: String { return self._s[1825]! } - public var Resolve_ErrorNotFound: String { return self._s[1827]! } - public var LastSeen_Offline: String { return self._s[1828]! } - public var PeopleNearby_NoMembers: String { return self._s[1829]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1830]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1831]! } - public var GroupInfo_Title: String { return self._s[1833]! } - public var NotificationsSound_Note: String { return self._s[1834]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1835]! } - public var Watch_Message_Poll: String { return self._s[1836]! } - public var Privacy_Calls: String { return self._s[1837]! } + public var Compose_NewChannel: String { return self._s[1808]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1812]! } + public var MessagePoll_LabelQuiz: String { return self._s[1814]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1815]! } + public var Channel_Info_Stickers: String { return self._s[1816]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1817]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1818]! } + public var Passport_DeletePersonalDetails: String { return self._s[1819]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1820]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1821]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1822]! } + public var Conversation_SearchNoResults: String { return self._s[1825]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1826]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1827]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1828]! } + public var Login_Code: String { return self._s[1829]! } + public var EditTheme_Create_BottomInfo: String { return self._s[1830]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1831]! } + public var Weekday_ShortThursday: String { return self._s[1832]! } + public var Resolve_ErrorNotFound: String { return self._s[1834]! } + public var LastSeen_Offline: String { return self._s[1835]! } + public var PeopleNearby_NoMembers: String { return self._s[1836]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1837]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1838]! } + public var GroupInfo_Title: String { return self._s[1840]! } + public var NotificationsSound_Note: String { return self._s[1841]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1842]! } + public var Watch_Message_Poll: String { return self._s[1843]! } + public var Privacy_Calls: String { return self._s[1844]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1838]!, self._r[1838]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1845]!, self._r[1845]!, [_1, _2, _3]) } - public var Month_ShortAugust: String { return self._s[1839]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1840]! } - public var Notifications_Reset: String { return self._s[1841]! } - public var Conversation_Pin: String { return self._s[1842]! } - public var Passport_Language_lv: String { return self._s[1843]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1844]! } - public var BlockedUsers_Info: String { return self._s[1845]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1847]! } - public var Watch_Conversation_Unblock: String { return self._s[1849]! } + public var Month_ShortAugust: String { return self._s[1846]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1847]! } + public var Notifications_Reset: String { return self._s[1848]! } + public var Conversation_Pin: String { return self._s[1849]! } + public var Passport_Language_lv: String { return self._s[1850]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1851]! } + public var BlockedUsers_Info: String { return self._s[1852]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1854]! } + public var Watch_Conversation_Unblock: String { return self._s[1856]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1850]!, self._r[1850]!, [_0]) + return formatWithArgumentRanges(self._s[1857]!, self._r[1857]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1851]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1852]! } + public var CloudStorage_Title: String { return self._s[1858]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1859]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1853]!, self._r[1853]!, [_0]) + return formatWithArgumentRanges(self._s[1860]!, self._r[1860]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1854]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1855]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1856]! } - public var Passport_Address_EditBankStatement: String { return self._s[1857]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1861]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1862]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1863]! } + public var Passport_Address_EditBankStatement: String { return self._s[1864]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1858]!, self._r[1858]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1865]!, self._r[1865]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1859]! } - public var ShareMenu_Comment: String { return self._s[1860]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1861]! } - public var Notifications_PermissionsTitle: String { return self._s[1862]! } - public var GroupPermission_NoSendLinks: String { return self._s[1863]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1864]! } - public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1865]! } - public var PeerInfo_PaneLinks: String { return self._s[1866]! } - public var Settings_Support: String { return self._s[1867]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1868]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1869]! } - public var Privacy_Forwards_Preview: String { return self._s[1870]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1871]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1872]! } - public var Common_Select: String { return self._s[1874]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1875]! } - public var WallpaperSearch_ColorGray: String { return self._s[1878]! } - public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1879]! } - public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1880]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1881]! } - public var PollResults_Title: String { return self._s[1882]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1883]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1884]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1885]! } - public var Widget_AuthRequired: String { return self._s[1886]! } - public var Camera_FlashOn: String { return self._s[1887]! } - public var Conversation_ContextMenuLookUp: String { return self._s[1888]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1889]! } - public var Watch_Suggestion_OK: String { return self._s[1890]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1866]! } + public var ShareMenu_Comment: String { return self._s[1867]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1868]! } + public var Notifications_PermissionsTitle: String { return self._s[1869]! } + public var GroupPermission_NoSendLinks: String { return self._s[1870]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1871]! } + public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1872]! } + public var PeerInfo_PaneLinks: String { return self._s[1873]! } + public var Settings_Support: String { return self._s[1874]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1875]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1876]! } + public var Privacy_Forwards_Preview: String { return self._s[1877]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1878]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1879]! } + public var Common_Select: String { return self._s[1881]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1882]! } + public var WallpaperSearch_ColorGray: String { return self._s[1885]! } + public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1886]! } + public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1887]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1888]! } + public var PollResults_Title: String { return self._s[1889]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1890]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1891]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1892]! } + public var Widget_AuthRequired: String { return self._s[1893]! } + public var Camera_FlashOn: String { return self._s[1894]! } + public var Conversation_ContextMenuLookUp: String { return self._s[1895]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1896]! } + public var Watch_Suggestion_OK: String { return self._s[1897]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1892]!, self._r[1892]!, [_0]) + return formatWithArgumentRanges(self._s[1899]!, self._r[1899]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1894]!, self._r[1894]!, [_0]) + return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1895]! } - public var DialogList_AdLabel: String { return self._s[1896]! } - public var WatchRemote_NotificationText: String { return self._s[1897]! } - public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1898]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1899]! } - public var Conversation_ReportSpam: String { return self._s[1900]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1901]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1903]! } - public var PhoneLabel_Title: String { return self._s[1904]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1905]! } - public var Settings_ChangePhoneNumber: String { return self._s[1906]! } - public var Notifications_ExceptionsTitle: String { return self._s[1907]! } - public var Notifications_AlertTones: String { return self._s[1908]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1909]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1910]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1911]! } - public var VoiceOver_Chat_Photo: String { return self._s[1913]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1914]! } - public var ReportPeer_ReasonOther: String { return self._s[1915]! } - public var ChatList_Context_JoinChannel: String { return self._s[1916]! } - public var KeyCommand_ScrollDown: String { return self._s[1918]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[1919]! } + public var TextFormat_Strikethrough: String { return self._s[1902]! } + public var DialogList_AdLabel: String { return self._s[1903]! } + public var WatchRemote_NotificationText: String { return self._s[1904]! } + public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1905]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1906]! } + public var Conversation_ReportSpam: String { return self._s[1907]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1908]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1910]! } + public var PhoneLabel_Title: String { return self._s[1911]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1912]! } + public var Settings_ChangePhoneNumber: String { return self._s[1913]! } + public var Notifications_ExceptionsTitle: String { return self._s[1914]! } + public var Notifications_AlertTones: String { return self._s[1915]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1916]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1917]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1918]! } + public var VoiceOver_Chat_Photo: String { return self._s[1920]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1921]! } + public var Stats_PostsTitle: String { return self._s[1922]! } + public var ReportPeer_ReasonOther: String { return self._s[1923]! } + public var ChatList_Context_JoinChannel: String { return self._s[1924]! } + public var KeyCommand_ScrollDown: String { return self._s[1926]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[1927]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1920]!, self._r[1920]!, [_0]) + return formatWithArgumentRanges(self._s[1928]!, self._r[1928]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1921]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1922]! } - public var AuthSessions_LogOut: String { return self._s[1923]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1924]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1925]! } - public var Passport_Phone_Title: String { return self._s[1926]! } - public var ContactList_Context_StartSecretChat: String { return self._s[1927]! } - public var Settings_PhoneNumber: String { return self._s[1928]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1930]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1931]! } + public var AuthSessions_LogOut: String { return self._s[1932]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1933]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1934]! } + public var Passport_Phone_Title: String { return self._s[1935]! } + public var ContactList_Context_StartSecretChat: String { return self._s[1936]! } + public var Settings_PhoneNumber: String { return self._s[1937]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1929]!, self._r[1929]!, [_0]) + return formatWithArgumentRanges(self._s[1938]!, self._r[1938]!, [_0]) } - public var NotificationsSound_Alert: String { return self._s[1931]! } - public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1932]! } - public var WebSearch_SearchNoResults: String { return self._s[1933]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1935]! } - public var Wallet_Configuration_SourceInfo: String { return self._s[1936]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1937]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1938]! } - public var PhotoEditor_CurvesTool: String { return self._s[1939]! } - public var Checkout_PaymentMethod: String { return self._s[1941]! } + public var NotificationsSound_Alert: String { return self._s[1940]! } + public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1941]! } + public var WebSearch_SearchNoResults: String { return self._s[1942]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1944]! } + public var Wallet_Configuration_SourceInfo: String { return self._s[1945]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1946]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1947]! } + public var PhotoEditor_CurvesTool: String { return self._s[1948]! } + public var Checkout_PaymentMethod: String { return self._s[1950]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1942]!, self._r[1942]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1951]!, self._r[1951]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1943]! } - public var Camera_PhotoMode: String { return self._s[1946]! } - public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1947]! } - public var Appearance_TextSize_Apply: String { return self._s[1948]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1950]! } - public var CallSettings_OnMobile: String { return self._s[1951]! } - public var Tour_Text2: String { return self._s[1952]! } + public var Contacts_AccessDeniedError: String { return self._s[1952]! } + public var Camera_PhotoMode: String { return self._s[1955]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1956]! } + public var Appearance_TextSize_Apply: String { return self._s[1957]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1959]! } + public var CallSettings_OnMobile: String { return self._s[1960]! } + public var Tour_Text2: String { return self._s[1961]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1953]!, self._r[1953]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1962]!, self._r[1962]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1955]! } - public var Permissions_Skip: String { return self._s[1956]! } - public var Wallet_Words_NotDoneOk: String { return self._s[1957]! } - public var SecretImage_Title: String { return self._s[1958]! } - public var Watch_MessageView_Title: String { return self._s[1959]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1960]! } - public var AttachmentMenu_Poll: String { return self._s[1961]! } + public var DialogList_EncryptionProcessing: String { return self._s[1964]! } + public var Permissions_Skip: String { return self._s[1965]! } + public var Wallet_Words_NotDoneOk: String { return self._s[1966]! } + public var SecretImage_Title: String { return self._s[1967]! } + public var Watch_MessageView_Title: String { return self._s[1968]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1969]! } + public var AttachmentMenu_Poll: String { return self._s[1970]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1962]!, self._r[1962]!, [_0]) + return formatWithArgumentRanges(self._s[1971]!, self._r[1971]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1963]!, self._r[1963]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1972]!, self._r[1972]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1964]! } - public var WallpaperPreview_Title: String { return self._s[1965]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1966]! } - public var Settings_ProxyConnecting: String { return self._s[1967]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1969]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[1970]! } - public var Wallet_Intro_Title: String { return self._s[1971]! } - public var TwoFactorSetup_Password_Action: String { return self._s[1972]! } - public var Profile_MessageLifetime5s: String { return self._s[1973]! } - public var Username_InvalidCharacters: String { return self._s[1974]! } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1975]! } - public var ScheduledMessages_ClearAll: String { return self._s[1976]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1977]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1978]! } - public var Settings_AddAccount: String { return self._s[1979]! } - public var Notification_CreatedChannel: String { return self._s[1982]! } + public var Notification_CallCanceled: String { return self._s[1973]! } + public var WallpaperPreview_Title: String { return self._s[1974]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1975]! } + public var Settings_ProxyConnecting: String { return self._s[1976]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1978]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[1979]! } + public var Wallet_Intro_Title: String { return self._s[1980]! } + public var TwoFactorSetup_Password_Action: String { return self._s[1981]! } + public var Profile_MessageLifetime5s: String { return self._s[1982]! } + public var Username_InvalidCharacters: String { return self._s[1983]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1984]! } + public var ScheduledMessages_ClearAll: String { return self._s[1985]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1986]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1987]! } + public var Settings_AddAccount: String { return self._s[1988]! } + public var Notification_CreatedChannel: String { return self._s[1991]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1983]!, self._r[1983]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1992]!, self._r[1992]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1985]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1986]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[1987]! } - public var Contacts_TopSection: String { return self._s[1988]! } - public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1989]! } + public var Passcode_AppLockedAlert: String { return self._s[1994]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1995]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[1996]! } + public var Contacts_TopSection: String { return self._s[1997]! } + public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1998]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1990]!, self._r[1990]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1999]!, self._r[1999]!, [_0, _1]) } - public var Wallet_Info_Receive: String { return self._s[1991]! } - public var Wallet_Completed_ViewWallet: String { return self._s[1992]! } + public var Wallet_Info_Receive: String { return self._s[2000]! } + public var Wallet_Completed_ViewWallet: String { return self._s[2001]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1993]!, self._r[1993]!, [_0]) + return formatWithArgumentRanges(self._s[2002]!, self._r[2002]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1994]! } - public var UserInfo_TapToCall: String { return self._s[1995]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1997]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1998]! } - public var Common_Search: String { return self._s[1999]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[2000]! } + public var ReportPeer_ReasonSpam: String { return self._s[2003]! } + public var UserInfo_TapToCall: String { return self._s[2004]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[2006]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[2007]! } + public var Common_Search: String { return self._s[2008]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[2009]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2001]!, self._r[2001]!, [_0]) + return formatWithArgumentRanges(self._s[2010]!, self._r[2010]!, [_0]) } - public var Wallet_Month_ShortJuly: String { return self._s[2002]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[2004]! } - public var Message_InvoiceLabel: String { return self._s[2005]! } - public var Conversation_InputTextPlaceholder: String { return self._s[2006]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[2007]! } + public var Wallet_Month_ShortJuly: String { return self._s[2011]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[2013]! } + public var Message_InvoiceLabel: String { return self._s[2014]! } + public var Conversation_InputTextPlaceholder: String { return self._s[2015]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[2016]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2008]!, self._r[2008]!, [_0]) + return formatWithArgumentRanges(self._s[2017]!, self._r[2017]!, [_0]) } - public var IntentsSettings_Reset: String { return self._s[2009]! } - public var Conversation_Info: String { return self._s[2010]! } - public var Login_InfoDeletePhoto: String { return self._s[2011]! } - public var Passport_Language_vi: String { return self._s[2013]! } - public var UserInfo_ScamUserWarning: String { return self._s[2014]! } - public var Conversation_Search: String { return self._s[2015]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[2017]! } - public var ReportPeer_ReasonPornography: String { return self._s[2018]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[2019]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[2020]! } - public var Map_LiveLocationGroupDescription: String { return self._s[2021]! } - public var Channel_Setup_TypeHeader: String { return self._s[2022]! } - public var AuthSessions_LoggedIn: String { return self._s[2023]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2024]! } - public var Login_SmsRequestState3: String { return self._s[2025]! } - public var Passport_Address_EditUtilityBill: String { return self._s[2026]! } - public var Appearance_ReduceMotionInfo: String { return self._s[2027]! } - public var Join_ChannelsTooMuch: String { return self._s[2028]! } - public var Channel_Edit_LinkItem: String { return self._s[2029]! } - public var Privacy_Calls_P2PNever: String { return self._s[2030]! } - public var Conversation_AddToReadingList: String { return self._s[2032]! } - public var Share_MultipleMessagesDisabled: String { return self._s[2033]! } - public var Message_Animation: String { return self._s[2034]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[2035]! } - public var Map_Unknown: String { return self._s[2036]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[2037]! } + public var IntentsSettings_Reset: String { return self._s[2018]! } + public var Conversation_Info: String { return self._s[2019]! } + public var Login_InfoDeletePhoto: String { return self._s[2020]! } + public var Passport_Language_vi: String { return self._s[2022]! } + public var UserInfo_ScamUserWarning: String { return self._s[2023]! } + public var Conversation_Search: String { return self._s[2024]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[2026]! } + public var ReportPeer_ReasonPornography: String { return self._s[2027]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[2028]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[2029]! } + public var Map_LiveLocationGroupDescription: String { return self._s[2030]! } + public var Channel_Setup_TypeHeader: String { return self._s[2031]! } + public var AuthSessions_LoggedIn: String { return self._s[2032]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2033]! } + public var Login_SmsRequestState3: String { return self._s[2034]! } + public var Passport_Address_EditUtilityBill: String { return self._s[2035]! } + public var Appearance_ReduceMotionInfo: String { return self._s[2036]! } + public var Join_ChannelsTooMuch: String { return self._s[2037]! } + public var Channel_Edit_LinkItem: String { return self._s[2038]! } + public var Privacy_Calls_P2PNever: String { return self._s[2039]! } + public var Conversation_AddToReadingList: String { return self._s[2041]! } + public var Share_MultipleMessagesDisabled: String { return self._s[2042]! } + public var Message_Animation: String { return self._s[2043]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[2044]! } + public var Map_Unknown: String { return self._s[2045]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[2046]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2038]!, self._r[2038]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, [_1, _2]) } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2039]!, self._r[2039]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2048]!, self._r[2048]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[2040]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[2041]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2042]! } + public var Call_StatusRequesting: String { return self._s[2049]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[2050]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2051]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2043]!, self._r[2043]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2052]!, self._r[2052]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2044]!, self._r[2044]!, [_0]) + return formatWithArgumentRanges(self._s[2053]!, self._r[2053]!, [_0]) } - public var Update_Skip: String { return self._s[2045]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2046]! } - public var BlockedUsers_Title: String { return self._s[2047]! } - public var Weekday_Monday: String { return self._s[2048]! } + public var Update_Skip: String { return self._s[2054]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2055]! } + public var BlockedUsers_Title: String { return self._s[2056]! } + public var Weekday_Monday: String { return self._s[2057]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2049]!, self._r[2049]!, [_1]) + return formatWithArgumentRanges(self._s[2058]!, self._r[2058]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[2050]! } - public var NotificationsSound_Bell: String { return self._s[2051]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[2052]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2053]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2054]! } - public var ChatSettings_Groups: String { return self._s[2055]! } - public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2056]! } + public var Username_CheckingUsername: String { return self._s[2059]! } + public var NotificationsSound_Bell: String { return self._s[2060]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[2061]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2062]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2063]! } + public var ChatSettings_Groups: String { return self._s[2064]! } + public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2065]! } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2057]!, self._r[2057]!, [_0]) + return formatWithArgumentRanges(self._s[2066]!, self._r[2066]!, [_0]) } - public var Your_card_was_declined: String { return self._s[2058]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2060]! } - public var Wallet_Month_ShortApril: String { return self._s[2061]! } - public var ChatList_Unmute: String { return self._s[2062]! } - public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2063]! } - public var PhotoEditor_CurvesAll: String { return self._s[2064]! } - public var Weekday_ShortTuesday: String { return self._s[2065]! } - public var DialogList_Read: String { return self._s[2066]! } - public var Appearance_AppIconClassic: String { return self._s[2067]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2068]! } - public var Passport_Identity_Gender: String { return self._s[2069]! } + public var Your_card_was_declined: String { return self._s[2067]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2069]! } + public var Wallet_Month_ShortApril: String { return self._s[2070]! } + public var ChatList_Unmute: String { return self._s[2071]! } + public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2072]! } + public var PhotoEditor_CurvesAll: String { return self._s[2073]! } + public var Weekday_ShortTuesday: String { return self._s[2074]! } + public var DialogList_Read: String { return self._s[2075]! } + public var Appearance_AppIconClassic: String { return self._s[2076]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2077]! } + public var Passport_Identity_Gender: String { return self._s[2078]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2070]!, self._r[2070]!, [_0]) + return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_0]) } - public var Target_SelectGroup: String { return self._s[2071]! } - public var Map_HomeAndWorkInfo: String { return self._s[2073]! } + public var Target_SelectGroup: String { return self._s[2080]! } + public var Map_HomeAndWorkInfo: String { return self._s[2082]! } public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2074]!, self._r[2074]!, [_0]) + return formatWithArgumentRanges(self._s[2083]!, self._r[2083]!, [_0]) } - public var Passport_Language_en: String { return self._s[2075]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2076]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2077]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[2078]! } - public var ScheduledMessages_SendNow: String { return self._s[2079]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[2081]! } - public var Login_InfoHelp: String { return self._s[2082]! } - public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2083]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2084]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2085]! } + public var Passport_Language_en: String { return self._s[2084]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2085]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2086]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[2087]! } + public var ScheduledMessages_SendNow: String { return self._s[2088]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[2090]! } + public var Login_InfoHelp: String { return self._s[2091]! } + public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2092]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2093]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2094]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2086]!, self._r[2086]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2095]!, self._r[2095]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[2089]! } - public var CreatePoll_Title: String { return self._s[2090]! } - public var MessagePoll_QuizNoUsers: String { return self._s[2091]! } - public var Conversation_ViewTheme: String { return self._s[2092]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2093]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2094]! } - public var TwoFactorSetup_Intro_Text: String { return self._s[2095]! } - public var UserInfo_GroupsInCommon: String { return self._s[2096]! } - public var TelegramWallet_Intro_TermsUrl: String { return self._s[2097]! } - public var Call_AudioRouteHide: String { return self._s[2098]! } + public var SocksProxySetup_AddProxy: String { return self._s[2098]! } + public var CreatePoll_Title: String { return self._s[2099]! } + public var MessagePoll_QuizNoUsers: String { return self._s[2100]! } + public var Conversation_ViewTheme: String { return self._s[2101]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2102]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2103]! } + public var TwoFactorSetup_Intro_Text: String { return self._s[2104]! } + public var UserInfo_GroupsInCommon: String { return self._s[2105]! } + public var TelegramWallet_Intro_TermsUrl: String { return self._s[2106]! } + public var Call_AudioRouteHide: String { return self._s[2107]! } public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2100]!, self._r[2100]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2109]!, self._r[2109]!, [_1, _2]) } - public var ContactInfo_PhoneLabelMobile: String { return self._s[2101]! } - public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2102]! } - public var CreatePoll_QuizOptionsHeader: String { return self._s[2103]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[2110]! } + public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2111]! } + public var CreatePoll_QuizOptionsHeader: String { return self._s[2112]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2104]!, self._r[2104]!, [_0]) + return formatWithArgumentRanges(self._s[2113]!, self._r[2113]!, [_0]) } - public var TextFormat_Bold: String { return self._s[2105]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[2106]! } - public var StickerPackActionInfo_AddedTitle: String { return self._s[2107]! } - public var Notifications_Title: String { return self._s[2108]! } - public var Group_Username_InvalidTooShort: String { return self._s[2109]! } - public var Channel_ErrorAddTooMuch: String { return self._s[2110]! } + public var TextFormat_Bold: String { return self._s[2114]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[2115]! } + public var StickerPackActionInfo_AddedTitle: String { return self._s[2116]! } + public var Notifications_Title: String { return self._s[2117]! } + public var Group_Username_InvalidTooShort: String { return self._s[2118]! } + public var Channel_ErrorAddTooMuch: String { return self._s[2119]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, ["\(_0)"]) } - public var VoiceOver_DiscardPreparedContent: String { return self._s[2113]! } - public var Stickers_SuggestAdded: String { return self._s[2114]! } - public var Login_CountryCode: String { return self._s[2115]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[2116]! } - public var Map_GetDirections: String { return self._s[2117]! } - public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2118]! } - public var Login_PhoneFloodError: String { return self._s[2119]! } + public var VoiceOver_DiscardPreparedContent: String { return self._s[2122]! } + public var Stickers_SuggestAdded: String { return self._s[2123]! } + public var Login_CountryCode: String { return self._s[2124]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[2125]! } + public var Map_GetDirections: String { return self._s[2126]! } + public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2127]! } + public var Login_PhoneFloodError: String { return self._s[2128]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_0]) + return formatWithArgumentRanges(self._s[2129]!, self._r[2129]!, [_0]) } public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2121]!, self._r[2121]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_1, _2, _3]) } - public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2122]! } - public var Settings_SetUsername: String { return self._s[2124]! } - public var Group_Location_ChangeLocation: String { return self._s[2125]! } - public var Notification_GroupInviterSelf: String { return self._s[2126]! } - public var InstantPage_TapToOpenLink: String { return self._s[2127]! } + public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2131]! } + public var Settings_SetUsername: String { return self._s[2133]! } + public var Group_Location_ChangeLocation: String { return self._s[2134]! } + public var Notification_GroupInviterSelf: String { return self._s[2135]! } + public var InstantPage_TapToOpenLink: String { return self._s[2136]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2128]!, self._r[2128]!, [_0]) + return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_0]) } - public var Watch_Suggestion_TalkLater: String { return self._s[2129]! } - public var SecretChat_Title: String { return self._s[2130]! } - public var Group_UpgradeNoticeText1: String { return self._s[2131]! } - public var AuthSessions_Title: String { return self._s[2132]! } + public var Watch_Suggestion_TalkLater: String { return self._s[2138]! } + public var SecretChat_Title: String { return self._s[2139]! } + public var Group_UpgradeNoticeText1: String { return self._s[2140]! } + public var AuthSessions_Title: String { return self._s[2141]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2133]!, self._r[2133]!, [_0]) + return formatWithArgumentRanges(self._s[2142]!, self._r[2142]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[2134]! } - public var Channel_About_Title: String { return self._s[2135]! } - public var Theme_ThemeChanged: String { return self._s[2136]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[2137]! } + public var PhotoEditor_CropAuto: String { return self._s[2143]! } + public var Channel_About_Title: String { return self._s[2144]! } + public var Theme_ThemeChanged: String { return self._s[2145]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[2146]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2139]!, self._r[2139]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2148]!, self._r[2148]!, ["\(_0)"]) } - public var VoiceOver_MessageContextReport: String { return self._s[2140]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2142]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[2143]! } + public var VoiceOver_MessageContextReport: String { return self._s[2149]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2151]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[2152]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2144]!, self._r[2144]!, [_1]) + return formatWithArgumentRanges(self._s[2153]!, self._r[2153]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2146]!, self._r[2146]!, [_0]) + return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, [_0]) } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2147]!, self._r[2147]!, [_0]) + return formatWithArgumentRanges(self._s[2156]!, self._r[2156]!, [_0]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[2148]! } - public var PeopleNearby_DiscoverDescription: String { return self._s[2150]! } - public var Presence_online: String { return self._s[2152]! } - public var PasscodeSettings_Title: String { return self._s[2153]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2154]! } - public var Web_OpenExternal: String { return self._s[2155]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[2157]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2158]! } - public var LocalGroup_Title: String { return self._s[2159]! } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[2157]! } + public var PeopleNearby_DiscoverDescription: String { return self._s[2159]! } + public var Presence_online: String { return self._s[2161]! } + public var PasscodeSettings_Title: String { return self._s[2162]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2163]! } + public var Web_OpenExternal: String { return self._s[2164]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[2166]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2167]! } + public var LocalGroup_Title: String { return self._s[2168]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2160]!, self._r[2160]!, [_0]) - } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2161]! } - public var Conversation_StopQuizConfirmation: String { return self._s[2162]! } - public var Map_YouAreHere: String { return self._s[2163]! } - public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2164]!, self._r[2164]!, [_0]) - } - public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2165]!, self._r[2165]!, [_0]) - } - public var Theme_Context_ChangeColors: String { return self._s[2166]! } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2167]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2168]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2169]!, self._r[2169]!, [_0]) } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2170]!, self._r[2170]!, [_0]) - } - public var SocksProxySetup_Username: String { return self._s[2171]! } - public var Bot_Start: String { return self._s[2172]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2170]! } + public var Conversation_StopQuizConfirmation: String { return self._s[2171]! } + public var Map_YouAreHere: String { return self._s[2172]! } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2173]!, self._r[2173]!, [_0]) } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2174]!, self._r[2174]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[2175]! } - public var AccentColor_Title: String { return self._s[2177]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2178]! } + public var Theme_Context_ChangeColors: String { return self._s[2175]! } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2176]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2177]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2178]!, self._r[2178]!, [_0]) + } + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2179]!, self._r[2179]!, [_0]) + } + public var SocksProxySetup_Username: String { return self._s[2180]! } + public var Bot_Start: String { return self._s[2181]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2182]!, self._r[2182]!, [_0]) + } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2183]!, self._r[2183]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[2184]! } + public var AccentColor_Title: String { return self._s[2187]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2188]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2179]!, self._r[2179]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2189]!, self._r[2189]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2180]!, self._r[2180]!, [_0]) + return formatWithArgumentRanges(self._s[2190]!, self._r[2190]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2181]!, self._r[2181]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2191]!, self._r[2191]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[2182]! } - public var Login_InfoAvatarPhoto: String { return self._s[2183]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2184]! } - public var Tour_Title4: String { return self._s[2185]! } - public var Passport_Identity_Translation: String { return self._s[2186]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2187]! } - public var Login_TermsOfServiceLabel: String { return self._s[2189]! } - public var Passport_Language_it: String { return self._s[2190]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2191]! } - public var Passport_Identity_SelfieHelp: String { return self._s[2192]! } - public var Conversation_ClearAll: String { return self._s[2194]! } - public var Wallet_Send_UninitializedText: String { return self._s[2196]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[2197]! } - public var TwoStepAuth_FloodError: String { return self._s[2198]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[2192]! } + public var Login_InfoAvatarPhoto: String { return self._s[2193]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2194]! } + public var Tour_Title4: String { return self._s[2195]! } + public var Passport_Identity_Translation: String { return self._s[2196]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2197]! } + public var Login_TermsOfServiceLabel: String { return self._s[2199]! } + public var Passport_Language_it: String { return self._s[2200]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2201]! } + public var Passport_Identity_SelfieHelp: String { return self._s[2202]! } + public var Conversation_ClearAll: String { return self._s[2204]! } + public var Wallet_Send_UninitializedText: String { return self._s[2206]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[2207]! } + public var TwoStepAuth_FloodError: String { return self._s[2208]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2199]!, self._r[2199]!, [_1]) + return formatWithArgumentRanges(self._s[2209]!, self._r[2209]!, [_1]) } - public var Paint_Delete: String { return self._s[2200]! } + public var Paint_Delete: String { return self._s[2210]! } public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2201]!, self._r[2201]!, [_0]) + return formatWithArgumentRanges(self._s[2211]!, self._r[2211]!, [_0]) } - public var Privacy_AddNewPeer: String { return self._s[2202]! } + public var Privacy_AddNewPeer: String { return self._s[2212]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2203]!, self._r[2203]!, [_1]) + return formatWithArgumentRanges(self._s[2213]!, self._r[2213]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[2204]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[2214]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2205]!, self._r[2205]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2215]!, self._r[2215]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[2206]! } + public var Message_PinnedAudioMessage: String { return self._s[2216]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2207]!, self._r[2207]!, [_0]) + return formatWithArgumentRanges(self._s[2217]!, self._r[2217]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[2208]! } - public var Notifications_GroupNotificationsSound: String { return self._s[2209]! } - public var Wallet_Month_GenNovember: String { return self._s[2210]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[2211]! } - public var Conversation_MessageEditedLabel: String { return self._s[2212]! } + public var Notification_Mute1hMin: String { return self._s[2218]! } + public var Notifications_GroupNotificationsSound: String { return self._s[2219]! } + public var Wallet_Month_GenNovember: String { return self._s[2220]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[2221]! } + public var Conversation_MessageEditedLabel: String { return self._s[2222]! } public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2213]!, self._r[2213]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2223]!, self._r[2223]!, [_0, _1]) } - public var Notification_Exceptions_AlwaysOff: String { return self._s[2214]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2215]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[2224]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2225]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2216]!, self._r[2216]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[2226]!, self._r[2226]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[2217]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[2227]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_1]) + return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[2219]! } - public var Month_GenOctober: String { return self._s[2220]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2221]! } - public var EnterPasscode_EnterPasscode: String { return self._s[2222]! } - public var MediaPicker_TimerTooltip: String { return self._s[2224]! } - public var SharedMedia_TitleAll: String { return self._s[2225]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2228]! } - public var Conversation_RestrictedMedia: String { return self._s[2229]! } - public var AccessDenied_PhotosRestricted: String { return self._s[2230]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2232]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2233]! } + public var AccessDenied_LocationTracking: String { return self._s[2229]! } + public var Month_GenOctober: String { return self._s[2230]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2231]! } + public var EnterPasscode_EnterPasscode: String { return self._s[2232]! } + public var MediaPicker_TimerTooltip: String { return self._s[2234]! } + public var SharedMedia_TitleAll: String { return self._s[2235]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2238]! } + public var Conversation_RestrictedMedia: String { return self._s[2239]! } + public var AccessDenied_PhotosRestricted: String { return self._s[2240]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2242]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2243]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2234]!, self._r[2234]!, [_0]) - } - public var Conversation_SavedMessages: String { return self._s[2237]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[2239]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2240]! } - public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2242]!, self._r[2242]!, [_0]) - } - public var VoiceOver_Chat_YourMessage: String { return self._s[2243]! } - public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2244]!, self._r[2244]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[2245]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2246]! } - public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2247]!, self._r[2247]!, [_1, _2]) - } - public var Checkout_PasswordEntry_Title: String { return self._s[2248]! } - public var PhotoEditor_FadeTool: String { return self._s[2249]! } - public var Privacy_ContactsReset: String { return self._s[2250]! } - public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Conversation_SavedMessages: String { return self._s[2247]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[2249]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2250]! } + public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2252]!, self._r[2252]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[2253]! } - public var ChatList_Mute: String { return self._s[2254]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2253]! } + public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2254]!, self._r[2254]!, [_0]) + } + public var ReportPeer_AlertSuccess: String { return self._s[2255]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2256]! } + public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2257]!, self._r[2257]!, [_1, _2]) + } + public var Checkout_PasswordEntry_Title: String { return self._s[2258]! } + public var PhotoEditor_FadeTool: String { return self._s[2259]! } + public var Privacy_ContactsReset: String { return self._s[2260]! } + public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2262]!, self._r[2262]!, [_0]) + } + public var Message_PinnedVideoMessage: String { return self._s[2263]! } + public var ChatList_Mute: String { return self._s[2264]! } public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2255]!, self._r[2255]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2265]!, self._r[2265]!, [_1, _2, _3]) } - public var Permissions_CellularDataText_v0: String { return self._s[2256]! } - public var Conversation_PinnedQuiz: String { return self._s[2258]! } - public var ShareMenu_SelectChats: String { return self._s[2260]! } - public var ChatList_Context_Unarchive: String { return self._s[2261]! } - public var MusicPlayer_VoiceNote: String { return self._s[2262]! } - public var Conversation_RestrictedText: String { return self._s[2263]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2264]! } - public var Wallet_Month_GenApril: String { return self._s[2265]! } - public var Wallet_Month_ShortMarch: String { return self._s[2266]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[2267]! } - public var Cache_Videos: String { return self._s[2268]! } - public var PrivacySettings_PhoneNumber: String { return self._s[2269]! } - public var Wallet_Month_GenFebruary: String { return self._s[2270]! } - public var FeatureDisabled_Oops: String { return self._s[2272]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[2273]! } + public var Permissions_CellularDataText_v0: String { return self._s[2266]! } + public var Conversation_PinnedQuiz: String { return self._s[2268]! } + public var ShareMenu_SelectChats: String { return self._s[2270]! } + public var ChatList_Context_Unarchive: String { return self._s[2271]! } + public var MusicPlayer_VoiceNote: String { return self._s[2272]! } + public var Conversation_RestrictedText: String { return self._s[2273]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2274]! } + public var Wallet_Month_GenApril: String { return self._s[2275]! } + public var Wallet_Month_ShortMarch: String { return self._s[2276]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[2277]! } + public var Cache_Videos: String { return self._s[2278]! } + public var PrivacySettings_PhoneNumber: String { return self._s[2279]! } + public var Wallet_Month_GenFebruary: String { return self._s[2280]! } + public var FeatureDisabled_Oops: String { return self._s[2282]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[2283]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2274]!, self._r[2274]!, [_0]) + return formatWithArgumentRanges(self._s[2284]!, self._r[2284]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[2276]! } - public var GroupPermission_NoSendPolls: String { return self._s[2277]! } - public var Wallet_Qr_ScanCode: String { return self._s[2278]! } - public var Message_VideoExpired: String { return self._s[2280]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[2281]! } - public var Notifications_Badge: String { return self._s[2282]! } - public var Wallet_Receive_AddressCopied: String { return self._s[2283]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[2284]! } - public var Username_InvalidTooShort: String { return self._s[2285]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2286]! } - public var Channel_AdminLog_PinMessages: String { return self._s[2287]! } - public var ArchivedChats_IntroTitle3: String { return self._s[2288]! } + public var Stickers_GroupStickersHelp: String { return self._s[2286]! } + public var GroupPermission_NoSendPolls: String { return self._s[2287]! } + public var Wallet_Qr_ScanCode: String { return self._s[2288]! } + public var Message_VideoExpired: String { return self._s[2290]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2291]! } + public var Notifications_Badge: String { return self._s[2292]! } + public var Wallet_Receive_AddressCopied: String { return self._s[2293]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2294]! } + public var Username_InvalidTooShort: String { return self._s[2295]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2296]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2297]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2298]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2289]!, self._r[2289]!, [_1]) + return formatWithArgumentRanges(self._s[2299]!, self._r[2299]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[2290]! } - public var Conversation_DefaultRestrictedText: String { return self._s[2291]! } - public var SharedMedia_CategoryDocs: String { return self._s[2294]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2300]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2301]! } + public var SharedMedia_CategoryDocs: String { return self._s[2304]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2295]!, self._r[2295]!, [_1]) + return formatWithArgumentRanges(self._s[2305]!, self._r[2305]!, [_1]) } - public var Wallet_Send_UninitializedTitle: String { return self._s[2296]! } - public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2297]! } - public var Privacy_Forwards_NeverLink: String { return self._s[2299]! } + public var Wallet_Send_UninitializedTitle: String { return self._s[2306]! } + public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2307]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2309]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2300]!, self._r[2300]!, [_1]) + return formatWithArgumentRanges(self._s[2310]!, self._r[2310]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2301]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2311]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2302]!, self._r[2302]!, [_0]) + return formatWithArgumentRanges(self._s[2312]!, self._r[2312]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2303]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2304]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2305]! } - public var Channel_UpdatePhotoItem: String { return self._s[2306]! } - public var GroupInfo_LeftStatus: String { return self._s[2307]! } - public var Watch_MessageView_Forward: String { return self._s[2309]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2310]! } - public var Cache_ClearEmpty: String { return self._s[2312]! } - public var Localization_LanguageName: String { return self._s[2313]! } - public var Wallet_AccessDenied_Title: String { return self._s[2314]! } - public var WebSearch_GIFs: String { return self._s[2315]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2316]! } - public var Wallet_AccessDenied_Settings: String { return self._s[2317]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2318]! } - public var Common_Back: String { return self._s[2319]! } - public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2320]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2321]! } - public var Wallet_Send_Send: String { return self._s[2322]! } + public var ChatSettings_PrivateChats: String { return self._s[2313]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2314]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2315]! } + public var Channel_UpdatePhotoItem: String { return self._s[2316]! } + public var GroupInfo_LeftStatus: String { return self._s[2317]! } + public var Watch_MessageView_Forward: String { return self._s[2319]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2320]! } + public var Cache_ClearEmpty: String { return self._s[2322]! } + public var Localization_LanguageName: String { return self._s[2323]! } + public var Wallet_AccessDenied_Title: String { return self._s[2324]! } + public var WebSearch_GIFs: String { return self._s[2325]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2326]! } + public var Wallet_AccessDenied_Settings: String { return self._s[2327]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2328]! } + public var Common_Back: String { return self._s[2329]! } + public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2330]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2331]! } + public var Wallet_Send_Send: String { return self._s[2332]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2324]!, self._r[2324]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2334]!, self._r[2334]!, [_1, _2]) } - public var Wallet_Info_RefreshErrorTitle: String { return self._s[2325]! } - public var Wallet_Month_GenJune: String { return self._s[2326]! } - public var Passport_Email_Help: String { return self._s[2327]! } - public var Watch_Conversation_Reply: String { return self._s[2329]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2332]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2333]! } - public var Channel_BanUser_Unban: String { return self._s[2335]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2336]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2337]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2339]! } - public var Wallet_Send_AddressHeader: String { return self._s[2340]! } - public var Passport_Identity_Name: String { return self._s[2341]! } + public var Wallet_Info_RefreshErrorTitle: String { return self._s[2335]! } + public var Wallet_Month_GenJune: String { return self._s[2336]! } + public var Passport_Email_Help: String { return self._s[2337]! } + public var Watch_Conversation_Reply: String { return self._s[2339]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2342]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2343]! } + public var Channel_BanUser_Unban: String { return self._s[2345]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2346]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2347]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2349]! } + public var Wallet_Send_AddressHeader: String { return self._s[2350]! } + public var Passport_Identity_Name: String { return self._s[2351]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_0]) + return formatWithArgumentRanges(self._s[2352]!, self._r[2352]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2343]! } - public var Conversation_BlockUser: String { return self._s[2344]! } - public var Month_GenJanuary: String { return self._s[2345]! } - public var ChatSettings_TextSize: String { return self._s[2346]! } - public var Notification_PassportValuePhone: String { return self._s[2347]! } - public var MediaPlayer_UnknownArtist: String { return self._s[2348]! } - public var Passport_Language_ne: String { return self._s[2349]! } - public var Notification_CallBack: String { return self._s[2350]! } - public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2351]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2352]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2353]! } + public var Conversation_BlockUser: String { return self._s[2354]! } + public var Month_GenJanuary: String { return self._s[2355]! } + public var ChatSettings_TextSize: String { return self._s[2356]! } + public var Notification_PassportValuePhone: String { return self._s[2357]! } + public var MediaPlayer_UnknownArtist: String { return self._s[2358]! } + public var Passport_Language_ne: String { return self._s[2359]! } + public var Notification_CallBack: String { return self._s[2360]! } + public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2361]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2362]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2353]!, self._r[2353]!, [_0]) + return formatWithArgumentRanges(self._s[2363]!, self._r[2363]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2354]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2355]! } - public var Stickers_FrequentlyUsed: String { return self._s[2356]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2357]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2359]! } + public var Channel_Info_Management: String { return self._s[2364]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2365]! } + public var Stickers_FrequentlyUsed: String { return self._s[2367]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2368]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2370]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2360]!, self._r[2360]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2371]!, self._r[2371]!, [_1, "\(_2)"]) } - public var TwoFactorSetup_Password_Title: String { return self._s[2361]! } - public var Passport_Address_EditResidentialAddress: String { return self._s[2362]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2363]! } - public var CreatePoll_TextHeader: String { return self._s[2364]! } + public var TwoFactorSetup_Password_Title: String { return self._s[2372]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2373]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2374]! } + public var CreatePoll_TextHeader: String { return self._s[2375]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2365]!, self._r[2365]!, [_0]) + return formatWithArgumentRanges(self._s[2376]!, self._r[2376]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2366]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2367]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2369]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2370]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2371]! } + public var PhotoEditor_QualityMedium: String { return self._s[2377]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2378]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2380]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2381]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2382]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2372]!, self._r[2372]!, [_0]) + return formatWithArgumentRanges(self._s[2383]!, self._r[2383]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2373]!, self._r[2373]!, [_1]) + return formatWithArgumentRanges(self._s[2384]!, self._r[2384]!, [_1]) } - public var LogoutOptions_LogOutWalletInfo: String { return self._s[2374]! } - public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2375]! } - public var Conversation_LinkDialogOpen: String { return self._s[2377]! } - public var TwoFactorSetup_Hint_Title: String { return self._s[2378]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2379]! } - public var Settings_Username: String { return self._s[2381]! } - public var Conversation_Block: String { return self._s[2383]! } - public var Wallpaper_Wallpaper: String { return self._s[2384]! } - public var SocksProxySetup_UseProxy: String { return self._s[2386]! } - public var Wallet_Send_Confirmation: String { return self._s[2387]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2388]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2389]! } - public var MessageTimer_Forever: String { return self._s[2390]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2391]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2392]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2393]! } - public var Passport_Language_da: String { return self._s[2394]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2395]! } + public var LogoutOptions_LogOutWalletInfo: String { return self._s[2385]! } + public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2386]! } + public var Conversation_LinkDialogOpen: String { return self._s[2388]! } + public var TwoFactorSetup_Hint_Title: String { return self._s[2389]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2390]! } + public var Settings_Username: String { return self._s[2392]! } + public var Conversation_Block: String { return self._s[2394]! } + public var Wallpaper_Wallpaper: String { return self._s[2395]! } + public var SocksProxySetup_UseProxy: String { return self._s[2397]! } + public var Wallet_Send_Confirmation: String { return self._s[2398]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2399]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2400]! } + public var MessageTimer_Forever: String { return self._s[2401]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2402]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2403]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2404]! } + public var Passport_Language_da: String { return self._s[2405]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2407]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2396]!, self._r[2396]!, [_0]) + return formatWithArgumentRanges(self._s[2408]!, self._r[2408]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[2397]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2409]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2399]!, self._r[2399]!, [_0]) + return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_0]) } - public var Settings_AddDevice: String { return self._s[2400]! } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2402]! } - public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2403]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2404]! } - public var Conversation_PinnedPoll: String { return self._s[2405]! } - public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2406]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2407]! } - public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2408]! } + public var Settings_AddDevice: String { return self._s[2412]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2414]! } + public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2415]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2416]! } + public var Conversation_PinnedPoll: String { return self._s[2417]! } + public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2418]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2419]! } + public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2420]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2409]!, self._r[2409]!, [_1]) + return formatWithArgumentRanges(self._s[2421]!, self._r[2421]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[2410]! } - public var Cache_ByPeerHeader: String { return self._s[2411]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2422]! } + public var Cache_ByPeerHeader: String { return self._s[2423]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2412]!, self._r[2412]!, [_0]) + return formatWithArgumentRanges(self._s[2424]!, self._r[2424]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2413]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2416]! } - public var Wallet_Completed_Title: String { return self._s[2417]! } - public var Notification_PinnedMessage: String { return self._s[2418]! } - public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2419]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2421]! } - public var Contacts_SortBy: String { return self._s[2422]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2425]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2428]! } + public var Wallet_Completed_Title: String { return self._s[2429]! } + public var Notification_PinnedMessage: String { return self._s[2430]! } + public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2431]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2433]! } + public var Contacts_SortBy: String { return self._s[2434]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2423]!, self._r[2423]!, [_1]) + return formatWithArgumentRanges(self._s[2435]!, self._r[2435]!, [_1]) } - public var Appearance_ColorThemeNight: String { return self._s[2425]! } + public var Appearance_ColorThemeNight: String { return self._s[2437]! } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2426]!, self._r[2426]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2438]!, self._r[2438]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2427]! } - public var Watch_UserInfo_Service: String { return self._s[2428]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2430]! } - public var Conversation_Unpin: String { return self._s[2432]! } - public var CancelResetAccount_Title: String { return self._s[2433]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2434]! } + public var Call_EncryptionKey_Title: String { return self._s[2439]! } + public var Watch_UserInfo_Service: String { return self._s[2440]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2442]! } + public var Conversation_Unpin: String { return self._s[2444]! } + public var CancelResetAccount_Title: String { return self._s[2445]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2446]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2436]!, self._r[2436]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2448]!, self._r[2448]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2437]! } - public var Appearance_BubbleCorners_Title: String { return self._s[2438]! } - public var CallSettings_Title: String { return self._s[2439]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2440]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2442]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2443]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2449]! } + public var Appearance_BubbleCorners_Title: String { return self._s[2450]! } + public var CallSettings_Title: String { return self._s[2451]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2452]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2454]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2455]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2444]!, self._r[2444]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2456]!, self._r[2456]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2445]! } - public var LoginPassword_PasswordHelp: String { return self._s[2446]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2447]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2448]! } - public var ChatContextMenu_TextSelectionTip: String { return self._s[2449]! } - public var Checkout_TotalPaidAmount: String { return self._s[2450]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2457]! } + public var LoginPassword_PasswordHelp: String { return self._s[2458]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2459]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2460]! } + public var ChatContextMenu_TextSelectionTip: String { return self._s[2461]! } + public var Checkout_TotalPaidAmount: String { return self._s[2462]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2451]!, self._r[2451]!, [_0]) + return formatWithArgumentRanges(self._s[2463]!, self._r[2463]!, [_0]) } - public var ChatState_Updating: String { return self._s[2452]! } - public var PasscodeSettings_ChangePasscode: String { return self._s[2453]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2455]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2456]! } + public var ChatState_Updating: String { return self._s[2464]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2465]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2467]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2468]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2457]!, self._r[2457]!, [_1]) + return formatWithArgumentRanges(self._s[2469]!, self._r[2469]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2458]! } - public var Contacts_InviteFriends: String { return self._s[2460]! } - public var Map_ChooseLocationTitle: String { return self._s[2461]! } - public var Conversation_StopPoll: String { return self._s[2463]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2470]! } + public var Contacts_InviteFriends: String { return self._s[2472]! } + public var Map_ChooseLocationTitle: String { return self._s[2473]! } + public var Conversation_StopPoll: String { return self._s[2475]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2464]!, self._r[2464]!, [_0]) + return formatWithArgumentRanges(self._s[2476]!, self._r[2476]!, [_0]) } - public var Call_Camera: String { return self._s[2465]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2466]! } - public var AppWallet_Intro_Text: String { return self._s[2467]! } - public var Appearance_BubbleCornersSetting: String { return self._s[2468]! } - public var Calls_RatingFeedback: String { return self._s[2469]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2471]! } - public var Wallet_Alert_OK: String { return self._s[2472]! } - public var NotificationsSound_Pulse: String { return self._s[2473]! } - public var Watch_LastSeen_Lately: String { return self._s[2474]! } - public var ReportGroupLocation_Report: String { return self._s[2477]! } - public var Widget_NoUsers: String { return self._s[2478]! } - public var Conversation_UnvotePoll: String { return self._s[2479]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2481]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2482]! } - public var NotificationsSound_Circles: String { return self._s[2483]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2486]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2487]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2488]! } - public var Proxy_TooltipUnavailable: String { return self._s[2489]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2491]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2493]! } - public var Conversation_FileDropbox: String { return self._s[2494]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2495]! } - public var Tour_Text3: String { return self._s[2497]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2499]! } - public var GroupPermission_NoSendMessages: String { return self._s[2500]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2501]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2502]! } + public var Call_Camera: String { return self._s[2477]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2478]! } + public var AppWallet_Intro_Text: String { return self._s[2479]! } + public var Appearance_BubbleCornersSetting: String { return self._s[2480]! } + public var Calls_RatingFeedback: String { return self._s[2481]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2483]! } + public var Wallet_Alert_OK: String { return self._s[2484]! } + public var NotificationsSound_Pulse: String { return self._s[2485]! } + public var Watch_LastSeen_Lately: String { return self._s[2486]! } + public var ReportGroupLocation_Report: String { return self._s[2489]! } + public var Widget_NoUsers: String { return self._s[2490]! } + public var Conversation_UnvotePoll: String { return self._s[2491]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2493]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2494]! } + public var NotificationsSound_Circles: String { return self._s[2495]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2498]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2499]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2500]! } + public var Proxy_TooltipUnavailable: String { return self._s[2501]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2503]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2505]! } + public var Conversation_FileDropbox: String { return self._s[2506]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2507]! } + public var Tour_Text3: String { return self._s[2509]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2512]! } + public var GroupPermission_NoSendMessages: String { return self._s[2513]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2514]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2515]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2504]!, self._r[2504]!, [_0]) + return formatWithArgumentRanges(self._s[2517]!, self._r[2517]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2505]! } - public var Checkout_ShippingOption_Title: String { return self._s[2506]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2507]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2518]! } + public var Checkout_ShippingOption_Title: String { return self._s[2519]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2520]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2508]!, self._r[2508]!, [_0]) + return formatWithArgumentRanges(self._s[2521]!, self._r[2521]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2509]!, self._r[2509]!, [_0]) + return formatWithArgumentRanges(self._s[2522]!, self._r[2522]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2510]! } - public var EditTheme_FileReadError: String { return self._s[2511]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2512]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2513]! } - public var AutoDownloadSettings_Photos: String { return self._s[2515]! } - public var Appearance_PreviewIncomingText: String { return self._s[2516]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2517]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2518]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2519]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2520]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2521]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2522]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2523]! } - public var Notification_SecretChatScreenshot: String { return self._s[2524]! } - public var AccessDenied_Wallpapers: String { return self._s[2525]! } - public var ChatList_Context_Mute: String { return self._s[2527]! } - public var Passport_Address_City: String { return self._s[2528]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2529]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2530]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2531]! } - public var AccessDenied_LocationDisabled: String { return self._s[2532]! } - public var Group_Location_Title: String { return self._s[2533]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2535]! } - public var GroupInfo_Sound: String { return self._s[2536]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2537]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2538]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2539]! } - public var Contacts_Title: String { return self._s[2540]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2541]! } - public var Passport_Language_fr: String { return self._s[2542]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2543]! } - public var Notifications_ResetAllNotifications: String { return self._s[2544]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2546]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2548]! } - public var Checkout_NewCard_Title: String { return self._s[2549]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2550]! } - public var Conversation_ForwardChats: String { return self._s[2551]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2553]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2554]! } - public var Settings_FAQ: String { return self._s[2556]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2557]! } - public var Conversation_ContextMenuForward: String { return self._s[2558]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2561]! } - public var PrivacyPolicy_Title: String { return self._s[2564]! } - public var Notifications_TextTone: String { return self._s[2565]! } - public var Profile_CreateNewContact: String { return self._s[2566]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2567]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2569]! } - public var Call_Speaker: String { return self._s[2570]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2571]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2573]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2574]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2523]! } + public var EditTheme_FileReadError: String { return self._s[2524]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2525]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2526]! } + public var AutoDownloadSettings_Photos: String { return self._s[2528]! } + public var Appearance_PreviewIncomingText: String { return self._s[2529]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2530]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2531]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2532]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2533]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2534]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2535]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2536]! } + public var Notification_SecretChatScreenshot: String { return self._s[2537]! } + public var AccessDenied_Wallpapers: String { return self._s[2538]! } + public var ChatList_Context_Mute: String { return self._s[2540]! } + public var Passport_Address_City: String { return self._s[2541]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2542]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2543]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2544]! } + public var AccessDenied_LocationDisabled: String { return self._s[2545]! } + public var Group_Location_Title: String { return self._s[2546]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2548]! } + public var GroupInfo_Sound: String { return self._s[2549]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2550]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2551]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2552]! } + public var Contacts_Title: String { return self._s[2553]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2554]! } + public var Passport_Language_fr: String { return self._s[2555]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2556]! } + public var Notifications_ResetAllNotifications: String { return self._s[2557]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2559]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2561]! } + public var Checkout_NewCard_Title: String { return self._s[2562]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2563]! } + public var Conversation_ForwardChats: String { return self._s[2564]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2566]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2567]! } + public var Settings_FAQ: String { return self._s[2569]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2570]! } + public var Conversation_ContextMenuForward: String { return self._s[2571]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2574]! } + public var PrivacyPolicy_Title: String { return self._s[2577]! } + public var Notifications_TextTone: String { return self._s[2578]! } + public var Profile_CreateNewContact: String { return self._s[2579]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2580]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2582]! } + public var Call_Speaker: String { return self._s[2583]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2584]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2586]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2587]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2575]!, self._r[2575]!, [_0]) + return formatWithArgumentRanges(self._s[2588]!, self._r[2588]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2576]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2577]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2578]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2579]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2580]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2581]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2582]! } - public var Bot_Unblock: String { return self._s[2583]! } - public var TextFormat_Italic: String { return self._s[2584]! } - public var WallpaperSearch_ColorPink: String { return self._s[2585]! } - public var Settings_About_Help: String { return self._s[2587]! } - public var SearchImages_Title: String { return self._s[2588]! } - public var Weekday_Wednesday: String { return self._s[2589]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2590]! } - public var ExplicitContent_AlertTitle: String { return self._s[2591]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2589]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2590]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2591]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2592]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2593]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2594]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2595]! } + public var Bot_Unblock: String { return self._s[2596]! } + public var TextFormat_Italic: String { return self._s[2597]! } + public var WallpaperSearch_ColorPink: String { return self._s[2598]! } + public var Settings_About_Help: String { return self._s[2600]! } + public var SearchImages_Title: String { return self._s[2601]! } + public var Weekday_Wednesday: String { return self._s[2602]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2603]! } + public var ExplicitContent_AlertTitle: String { return self._s[2604]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2592]!, self._r[2592]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2593]! } - public var Weekday_Thursday: String { return self._s[2594]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2595]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2596]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2606]! } + public var Weekday_Thursday: String { return self._s[2607]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2608]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2609]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2597]!, self._r[2597]!, [_0]) + return formatWithArgumentRanges(self._s[2610]!, self._r[2610]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2598]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2599]! } - public var Passport_RequestedInformation: String { return self._s[2600]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2601]! } - public var Conversation_EncryptionProcessing: String { return self._s[2603]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2604]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2606]! } - public var Channel_Setup_Title: String { return self._s[2607]! } - public var Conversation_SearchPlaceholder: String { return self._s[2608]! } - public var OldChannels_GroupEmptyFormat: String { return self._s[2609]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2610]! } - public var Checkout_ErrorGeneric: String { return self._s[2611]! } - public var Passport_Language_hu: String { return self._s[2612]! } - public var GroupPermission_EditingDisabled: String { return self._s[2613]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2615]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2611]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2612]! } + public var Passport_RequestedInformation: String { return self._s[2613]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2614]! } + public var Conversation_EncryptionProcessing: String { return self._s[2616]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2617]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2619]! } + public var Channel_Setup_Title: String { return self._s[2620]! } + public var Conversation_SearchPlaceholder: String { return self._s[2621]! } + public var OldChannels_GroupEmptyFormat: String { return self._s[2622]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2623]! } + public var Checkout_ErrorGeneric: String { return self._s[2624]! } + public var Passport_Language_hu: String { return self._s[2625]! } + public var GroupPermission_EditingDisabled: String { return self._s[2626]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2628]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_0]) + return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2619]!, self._r[2619]!, [_1]) + return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_1]) } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2620]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2633]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2621]!, self._r[2621]!, [_0]) + return formatWithArgumentRanges(self._s[2634]!, self._r[2634]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2622]! } - public var Group_Location_Info: String { return self._s[2623]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2624]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2625]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2635]! } + public var Group_Location_Info: String { return self._s[2636]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2637]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2638]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2626]!, self._r[2626]!, [_0]) + return formatWithArgumentRanges(self._s[2639]!, self._r[2639]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2627]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2628]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2629]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2630]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2640]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2641]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2642]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2643]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_0]) + return formatWithArgumentRanges(self._s[2644]!, self._r[2644]!, [_0]) } public func Notification_PinnedQuizMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_0]) + return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2633]! } - public var Message_PinnedAnimationMessage: String { return self._s[2635]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2637]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2638]! } - public var Wallet_Info_TransactionTo: String { return self._s[2640]! } - public var Stats_ViewsBySourceTitle: String { return self._s[2641]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2642]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2643]! } - public var Embed_PlayingInPIP: String { return self._s[2644]! } - public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2645]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2646]! } + public var Passport_Language_cs: String { return self._s[2646]! } + public var Message_PinnedAnimationMessage: String { return self._s[2648]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2650]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2651]! } + public var Wallet_Info_TransactionTo: String { return self._s[2653]! } + public var Stats_ViewsBySourceTitle: String { return self._s[2654]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2655]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2656]! } + public var Embed_PlayingInPIP: String { return self._s[2657]! } + public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2658]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2659]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2647]!, self._r[2647]!, [_0]) + return formatWithArgumentRanges(self._s[2660]!, self._r[2660]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2648]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2661]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2649]!, self._r[2649]!, [_1]) - } - public var Notification_PaymentSent: String { return self._s[2650]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2651]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2652]! } - public var AutoNightTheme_System: String { return self._s[2653]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2654]! } - public var CreatePoll_QuizTitle: String { return self._s[2655]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2656]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2657]! } - public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2660]!, self._r[2660]!, [_1]) - } - public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2661]!, self._r[2661]!, [_1]) - } - public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2662]!, self._r[2662]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2664]! } - public var PasscodeSettings_HelpTop: String { return self._s[2665]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2666]! } - public var PeerInfo_AddToContacts: String { return self._s[2667]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2668]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2669]! } - public var EditTheme_ShortLink: String { return self._s[2670]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2671]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2672]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2673]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2674]! } - public var Call_Accept: String { return self._s[2676]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2677]! } - public var Month_GenMarch: String { return self._s[2679]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2680]! } - public var LoginPassword_Title: String { return self._s[2681]! } - public var Call_End: String { return self._s[2682]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2683]! } - public var VoiceOver_Chat_Contact: String { return self._s[2684]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2685]! } - public var CallSettings_Always: String { return self._s[2686]! } - public var CallFeedback_Success: String { return self._s[2687]! } - public var TwoStepAuth_SetupHint: String { return self._s[2688]! } + public var Notification_PaymentSent: String { return self._s[2663]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2664]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2665]! } + public var AutoNightTheme_System: String { return self._s[2666]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2667]! } + public var CreatePoll_QuizTitle: String { return self._s[2668]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2669]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2670]! } + public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2673]!, self._r[2673]!, [_1]) + } + public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2674]!, self._r[2674]!, [_1]) + } + public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2675]!, self._r[2675]!, [_1]) + } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2677]! } + public var PasscodeSettings_HelpTop: String { return self._s[2678]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2679]! } + public var PeerInfo_AddToContacts: String { return self._s[2680]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2681]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2682]! } + public var EditTheme_ShortLink: String { return self._s[2683]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2684]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2685]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2686]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2687]! } + public var Call_Accept: String { return self._s[2689]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2690]! } + public var Month_GenMarch: String { return self._s[2692]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2693]! } + public var LoginPassword_Title: String { return self._s[2694]! } + public var Call_End: String { return self._s[2695]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2696]! } + public var VoiceOver_Chat_Contact: String { return self._s[2697]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2698]! } + public var CallSettings_Always: String { return self._s[2699]! } + public var CallFeedback_Success: String { return self._s[2700]! } + public var TwoStepAuth_SetupHint: String { return self._s[2701]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2689]!, self._r[2689]!, [_1]) + return formatWithArgumentRanges(self._s[2702]!, self._r[2702]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2690]! } - public var PeerInfo_ButtonAddMember: String { return self._s[2691]! } - public var Login_PhoneTitle: String { return self._s[2692]! } - public var Passport_FieldPhoneHelp: String { return self._s[2693]! } - public var Weekday_ShortSunday: String { return self._s[2694]! } - public var Passport_InfoFAQ_URL: String { return self._s[2695]! } - public var ContactInfo_Job: String { return self._s[2697]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2698]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2699]! } - public var CreatePoll_QuizTip: String { return self._s[2700]! } - public var TwoFactorSetup_Email_Text: String { return self._s[2701]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2702]! } - public var Invite_ChannelsTooMuch: String { return self._s[2703]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2704]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2705]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2706]! } - public var Wallet_Receive_AmountText: String { return self._s[2707]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2708]! } - public var CallFeedback_ReasonNoise: String { return self._s[2709]! } - public var Appearance_AppIconDefault: String { return self._s[2711]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2712]! } - public var MediaPicker_AddCaption: String { return self._s[2713]! } - public var CallSettings_TabIconDescription: String { return self._s[2714]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2703]! } + public var PeerInfo_ButtonAddMember: String { return self._s[2704]! } + public var Login_PhoneTitle: String { return self._s[2705]! } + public var Passport_FieldPhoneHelp: String { return self._s[2706]! } + public var Weekday_ShortSunday: String { return self._s[2707]! } + public var Passport_InfoFAQ_URL: String { return self._s[2708]! } + public var ContactInfo_Job: String { return self._s[2710]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2711]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2712]! } + public var CreatePoll_QuizTip: String { return self._s[2713]! } + public var TwoFactorSetup_Email_Text: String { return self._s[2714]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2715]! } + public var Invite_ChannelsTooMuch: String { return self._s[2716]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2717]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2718]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2719]! } + public var Wallet_Receive_AmountText: String { return self._s[2720]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2721]! } + public var CallFeedback_ReasonNoise: String { return self._s[2722]! } + public var Appearance_AppIconDefault: String { return self._s[2724]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2725]! } + public var MediaPicker_AddCaption: String { return self._s[2726]! } + public var CallSettings_TabIconDescription: String { return self._s[2727]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2715]!, self._r[2715]!, [_0]) + return formatWithArgumentRanges(self._s[2728]!, self._r[2728]!, [_0]) } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2716]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2729]! } public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2717]!, self._r[2717]!, [_0]) + return formatWithArgumentRanges(self._s[2730]!, self._r[2730]!, [_0]) } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2718]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2719]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2720]! } - public var DialogList_SearchSectionRecent: String { return self._s[2721]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2722]! } - public var CreatePoll_Anonymous: String { return self._s[2723]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2726]! } - public var LastSeen_WithinAWeek: String { return self._s[2727]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2728]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2730]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2731]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2732]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2733]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2734]! } + public var DialogList_SearchSectionRecent: String { return self._s[2735]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2736]! } + public var CreatePoll_Anonymous: String { return self._s[2737]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2740]! } + public var LastSeen_WithinAWeek: String { return self._s[2741]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2742]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2744]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2745]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2732]!, self._r[2732]!, [_0]) + return formatWithArgumentRanges(self._s[2746]!, self._r[2746]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2733]! } - public var Conversation_StatusLeftGroup: String { return self._s[2734]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2735]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2737]! } - public var GroupPermission_AddSuccess: String { return self._s[2738]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2740]! } - public var Conversation_ContextMenuCopy: String { return self._s[2741]! } - public var AccessDenied_CallMicrophone: String { return self._s[2742]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2747]! } + public var Conversation_StatusLeftGroup: String { return self._s[2748]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2749]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2751]! } + public var GroupPermission_AddSuccess: String { return self._s[2752]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2754]! } + public var Conversation_ContextMenuCopy: String { return self._s[2755]! } + public var AccessDenied_CallMicrophone: String { return self._s[2756]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2743]!, self._r[2743]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2757]!, self._r[2757]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2744]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2745]! } - public var Checkout_PaymentMethod_New: String { return self._s[2746]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2747]! } - public var PhotoEditor_QualityTool: String { return self._s[2748]! } - public var Login_SendCodeViaSms: String { return self._s[2749]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2750]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2751]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2752]! } - public var Login_EmailNotConfiguredError: String { return self._s[2753]! } - public var SocksProxySetup_Status: String { return self._s[2754]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2755]! } - public var PrivacyPolicy_Accept: String { return self._s[2756]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2757]! } - public var Appearance_AppIconClassicX: String { return self._s[2758]! } + public var Login_InvalidFirstNameError: String { return self._s[2758]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2759]! } + public var Checkout_PaymentMethod_New: String { return self._s[2760]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2761]! } + public var PhotoEditor_QualityTool: String { return self._s[2762]! } + public var Login_SendCodeViaSms: String { return self._s[2763]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2764]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2765]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2766]! } + public var Login_EmailNotConfiguredError: String { return self._s[2767]! } + public var SocksProxySetup_Status: String { return self._s[2768]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2769]! } + public var PrivacyPolicy_Accept: String { return self._s[2770]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2771]! } + public var Appearance_AppIconClassicX: String { return self._s[2772]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2759]!, self._r[2759]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2773]!, self._r[2773]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2760]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2762]! } - public var AutoNightTheme_Automatic: String { return self._s[2763]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2764]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2765]! } - public var Cache_Help: String { return self._s[2766]! } - public var Group_ErrorAccessDenied: String { return self._s[2767]! } - public var Passport_Language_fa: String { return self._s[2768]! } - public var Wallet_Intro_Text: String { return self._s[2769]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2770]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2771]! } - public var PrivacySettings_LastSeen: String { return self._s[2772]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2774]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2776]! } + public var AutoNightTheme_Automatic: String { return self._s[2777]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2778]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2779]! } + public var Cache_Help: String { return self._s[2780]! } + public var Group_ErrorAccessDenied: String { return self._s[2781]! } + public var Passport_Language_fa: String { return self._s[2782]! } + public var Wallet_Intro_Text: String { return self._s[2783]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2784]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2785]! } + public var PrivacySettings_LastSeen: String { return self._s[2786]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2773]!, self._r[2773]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2787]!, self._r[2787]!, [_0, _1]) } - public var Wallet_Configuration_Apply: String { return self._s[2777]! } - public var Preview_SaveGif: String { return self._s[2778]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2779]! } - public var Profile_About: String { return self._s[2780]! } - public var Channel_About_Placeholder: String { return self._s[2781]! } - public var Login_InfoTitle: String { return self._s[2782]! } + public var Wallet_Configuration_Apply: String { return self._s[2791]! } + public var Preview_SaveGif: String { return self._s[2792]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2793]! } + public var Profile_About: String { return self._s[2794]! } + public var Channel_About_Placeholder: String { return self._s[2795]! } + public var Login_InfoTitle: String { return self._s[2796]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2783]!, self._r[2783]!, [_0]) + return formatWithArgumentRanges(self._s[2797]!, self._r[2797]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2784]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2786]! } - public var ContactInfo_Title: String { return self._s[2787]! } - public var Media_ShareThisVideo: String { return self._s[2788]! } - public var Weekday_ShortFriday: String { return self._s[2789]! } - public var AccessDenied_Contacts: String { return self._s[2791]! } - public var Notification_CallIncomingShort: String { return self._s[2792]! } - public var Group_Setup_TypePublic: String { return self._s[2793]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2794]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2795]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2798]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2799]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2800]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2801]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2802]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2798]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2800]! } + public var ContactInfo_Title: String { return self._s[2801]! } + public var Media_ShareThisVideo: String { return self._s[2802]! } + public var Weekday_ShortFriday: String { return self._s[2803]! } + public var AccessDenied_Contacts: String { return self._s[2805]! } + public var Notification_CallIncomingShort: String { return self._s[2806]! } + public var Group_Setup_TypePublic: String { return self._s[2807]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2808]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2809]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2812]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2813]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2814]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2815]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2816]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2803]!, self._r[2803]!, [_0]) + return formatWithArgumentRanges(self._s[2817]!, self._r[2817]!, [_0]) } - public var DialogList_Typing: String { return self._s[2804]! } - public var CallFeedback_IncludeLogs: String { return self._s[2806]! } - public var Checkout_Phone: String { return self._s[2808]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2811]! } - public var Privacy_Calls_Integration: String { return self._s[2812]! } - public var Notifications_PermissionsAllow: String { return self._s[2813]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2818]! } - public var Settings_ChatSettings: String { return self._s[2819]! } - public var Conversation_SendingOptionsTooltip: String { return self._s[2820]! } + public var DialogList_Typing: String { return self._s[2818]! } + public var CallFeedback_IncludeLogs: String { return self._s[2820]! } + public var Checkout_Phone: String { return self._s[2822]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2825]! } + public var Privacy_Calls_Integration: String { return self._s[2826]! } + public var Notifications_PermissionsAllow: String { return self._s[2827]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2833]! } + public var Settings_ChatSettings: String { return self._s[2834]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[2835]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2822]!, self._r[2822]!, [_0]) + return formatWithArgumentRanges(self._s[2837]!, self._r[2837]!, [_0]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2823]!, self._r[2823]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2838]!, self._r[2838]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2825]! } + public var GroupRemoved_DeleteUser: String { return self._s[2840]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2826]!, self._r[2826]!, [_0]) + return formatWithArgumentRanges(self._s[2841]!, self._r[2841]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2827]!, self._r[2827]!, [_1]) + return formatWithArgumentRanges(self._s[2842]!, self._r[2842]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2828]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2829]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2831]! } - public var Conversation_Unblock: String { return self._s[2832]! } - public var PrivacySettings_DataSettings: String { return self._s[2833]! } - public var WallpaperPreview_PatternPaternApply: String { return self._s[2834]! } - public var Group_PublicLink_Info: String { return self._s[2835]! } + public var Login_ContinueWithLocalization: String { return self._s[2843]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2844]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2846]! } + public var Conversation_Unblock: String { return self._s[2847]! } + public var PrivacySettings_DataSettings: String { return self._s[2848]! } + public var WallpaperPreview_PatternPaternApply: String { return self._s[2849]! } + public var Group_PublicLink_Info: String { return self._s[2850]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2836]!, self._r[2836]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2851]!, self._r[2851]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2837]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2852]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2838]!, self._r[2838]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2853]!, self._r[2853]!, [_0, _1]) } - public var OldChannels_ChannelsHeader: String { return self._s[2840]! } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2841]! } - public var PrivacySettings_Passcode: String { return self._s[2843]! } - public var Call_Mute: String { return self._s[2844]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2845]! } - public var Passport_Language_dz: String { return self._s[2846]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2847]! } - public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2848]! } - public var Passport_Language_tk: String { return self._s[2849]! } + public var OldChannels_ChannelsHeader: String { return self._s[2855]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2856]! } + public var PrivacySettings_Passcode: String { return self._s[2858]! } + public var Call_Mute: String { return self._s[2859]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2860]! } + public var Passport_Language_dz: String { return self._s[2861]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2862]! } + public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2863]! } + public var Passport_Language_tk: String { return self._s[2864]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2850]!, self._r[2850]!, [_0]) + return formatWithArgumentRanges(self._s[2865]!, self._r[2865]!, [_0]) } - public var Settings_Search: String { return self._s[2851]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2852]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2853]! } - public var Wallet_Configuration_SourceJSON: String { return self._s[2854]! } - public var Conversation_ContextMenuReply: String { return self._s[2855]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2856]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2857]! } - public var Tour_Title1: String { return self._s[2858]! } - public var Wallet_Alert_Cancel: String { return self._s[2859]! } - public var Conversation_ClearGroupHistory: String { return self._s[2861]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2862]! } - public var WallpaperPreview_Motion: String { return self._s[2863]! } + public var Settings_Search: String { return self._s[2866]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2867]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2868]! } + public var Wallet_Configuration_SourceJSON: String { return self._s[2869]! } + public var Conversation_ContextMenuReply: String { return self._s[2870]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2871]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2872]! } + public var Tour_Title1: String { return self._s[2873]! } + public var Wallet_Alert_Cancel: String { return self._s[2874]! } + public var Conversation_ClearGroupHistory: String { return self._s[2876]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2877]! } + public var WallpaperPreview_Motion: String { return self._s[2878]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2864]!, self._r[2864]!, [_0]) + return formatWithArgumentRanges(self._s[2879]!, self._r[2879]!, [_0]) } - public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2865]! } - public var Call_RateCall: String { return self._s[2866]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2867]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2868]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2869]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2871]! } + public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2880]! } + public var Call_RateCall: String { return self._s[2881]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2882]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2883]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2884]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2886]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2873]!, self._r[2873]!, [_0]) + return formatWithArgumentRanges(self._s[2888]!, self._r[2888]!, [_0]) } - public var Compose_Create: String { return self._s[2874]! } - public var Contacts_InviteToTelegram: String { return self._s[2875]! } - public var GroupInfo_Notifications: String { return self._s[2876]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2878]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2879]! } - public var Month_GenApril: String { return self._s[2880]! } - public var Appearance_AutoNightTheme: String { return self._s[2881]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2883]! } - public var Login_CodeSentSms: String { return self._s[2885]! } + public var Compose_Create: String { return self._s[2889]! } + public var Contacts_InviteToTelegram: String { return self._s[2890]! } + public var GroupInfo_Notifications: String { return self._s[2891]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2893]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2894]! } + public var Month_GenApril: String { return self._s[2895]! } + public var Appearance_AutoNightTheme: String { return self._s[2896]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2898]! } + public var Login_CodeSentSms: String { return self._s[2900]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2886]!, self._r[2886]!, [_0]) + return formatWithArgumentRanges(self._s[2901]!, self._r[2901]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2887]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2888]! } - public var Passport_Language_hr: String { return self._s[2889]! } - public var Common_ActionNotAllowedError: String { return self._s[2890]! } + public var EmptyGroupInfo_Line3: String { return self._s[2902]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2903]! } + public var Passport_Language_hr: String { return self._s[2904]! } + public var Common_ActionNotAllowedError: String { return self._s[2905]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2891]!, self._r[2891]!, [_0]) + return formatWithArgumentRanges(self._s[2906]!, self._r[2906]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2892]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2893]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2894]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2895]! } - public var Privacy_SecretChatsTitle: String { return self._s[2896]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2898]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2899]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2900]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2901]! } - public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2902]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2903]! } - public var Preview_DeleteGif: String { return self._s[2904]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2905]! } - public var Group_ErrorNotMutualContact: String { return self._s[2906]! } - public var Notification_MessageLifetime5s: String { return self._s[2907]! } - public var Wallet_Send_OwnAddressAlertText: String { return self._s[2908]! } - public var OldChannels_ChannelFormat: String { return self._s[2909]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2907]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2908]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2909]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2910]! } + public var Privacy_SecretChatsTitle: String { return self._s[2911]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2913]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2914]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2915]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2916]! } + public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2917]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2918]! } + public var Preview_DeleteGif: String { return self._s[2919]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2920]! } + public var Group_ErrorNotMutualContact: String { return self._s[2921]! } + public var Notification_MessageLifetime5s: String { return self._s[2922]! } + public var Wallet_Send_OwnAddressAlertText: String { return self._s[2923]! } + public var OldChannels_ChannelFormat: String { return self._s[2924]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2910]!, self._r[2910]!, [_0]) + return formatWithArgumentRanges(self._s[2925]!, self._r[2925]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2911]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2913]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2914]! } - public var Passport_Address_AddBankStatement: String { return self._s[2915]! } - public var Notification_CallIncoming: String { return self._s[2916]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2917]! } - public var Compose_NewGroupTitle: String { return self._s[2918]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2920]! } - public var Passport_Address_Postcode: String { return self._s[2922]! } + public var VoiceOver_Chat_Video: String { return self._s[2926]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2928]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2929]! } + public var Passport_Address_AddBankStatement: String { return self._s[2930]! } + public var Notification_CallIncoming: String { return self._s[2931]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2932]! } + public var Compose_NewGroupTitle: String { return self._s[2933]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2935]! } + public var Passport_Address_Postcode: String { return self._s[2937]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2923]!, self._r[2923]!, [_0]) + return formatWithArgumentRanges(self._s[2938]!, self._r[2938]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2924]! } - public var Wallet_Month_ShortOctober: String { return self._s[2925]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2926]! } - public var WallpaperColors_Title: String { return self._s[2927]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2928]! } - public var VoiceOver_MessageContextForward: String { return self._s[2929]! } - public var GroupPermission_Duration: String { return self._s[2930]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2939]! } + public var Wallet_Month_ShortOctober: String { return self._s[2940]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2941]! } + public var WallpaperColors_Title: String { return self._s[2942]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2943]! } + public var VoiceOver_MessageContextForward: String { return self._s[2944]! } + public var GroupPermission_Duration: String { return self._s[2945]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2931]!, self._r[2931]!, [_0]) + return formatWithArgumentRanges(self._s[2946]!, self._r[2946]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2932]! } - public var Username_Placeholder: String { return self._s[2933]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2934]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2935]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2936]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2947]! } + public var Username_Placeholder: String { return self._s[2948]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2949]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2950]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2951]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2938]!, self._r[2938]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2953]!, self._r[2953]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2939]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2940]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2941]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2942]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2943]! } - public var Conversation_ContextMenuMore: String { return self._s[2944]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2945]! } - public var CallSettings_TabIcon: String { return self._s[2946]! } - public var KeyCommand_Find: String { return self._s[2947]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2948]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2949]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2950]! } - public var Message_PinnedGame: String { return self._s[2951]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2952]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2954]! } - public var Login_CallRequestState2: String { return self._s[2956]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2958]! } + public var Passport_PasswordDescription: String { return self._s[2954]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2955]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2956]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2957]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2958]! } + public var Conversation_ContextMenuMore: String { return self._s[2959]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2960]! } + public var CallSettings_TabIcon: String { return self._s[2961]! } + public var KeyCommand_Find: String { return self._s[2962]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2963]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2964]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2965]! } + public var Message_PinnedGame: String { return self._s[2966]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2967]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2969]! } + public var Login_CallRequestState2: String { return self._s[2971]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2973]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2959]!, self._r[2959]!, [_0]) + return formatWithArgumentRanges(self._s[2974]!, self._r[2974]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2961]!, self._r[2961]!, [_0]) + return formatWithArgumentRanges(self._s[2976]!, self._r[2976]!, [_0]) } - public var AuthSessions_AddDevice: String { return self._s[2962]! } - public var WallpaperPreview_Blurred: String { return self._s[2963]! } - public var Conversation_InstantPagePreview: String { return self._s[2964]! } - public var PeerInfo_ButtonUnmute: String { return self._s[2965]! } + public var AuthSessions_AddDevice: String { return self._s[2977]! } + public var WallpaperPreview_Blurred: String { return self._s[2978]! } + public var Conversation_InstantPagePreview: String { return self._s[2979]! } + public var PeerInfo_ButtonUnmute: String { return self._s[2980]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2966]!, self._r[2966]!, [_0]) + return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2969]! } - public var WallpaperSearch_ColorRed: String { return self._s[2970]! } - public var GroupPermission_NoPinMessages: String { return self._s[2971]! } - public var Passport_Language_es: String { return self._s[2972]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2974]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2975]! } + public var SecretTimer_VideoDescription: String { return self._s[2984]! } + public var WallpaperSearch_ColorRed: String { return self._s[2985]! } + public var GroupPermission_NoPinMessages: String { return self._s[2986]! } + public var Passport_Language_es: String { return self._s[2987]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2989]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2990]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2976]!, self._r[2976]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2991]!, self._r[2991]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2977]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2978]! } - public var Watch_UserInfo_Unmute: String { return self._s[2979]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2980]! } - public var AccessDenied_CameraRestricted: String { return self._s[2982]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2992]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2993]! } + public var Watch_UserInfo_Unmute: String { return self._s[2994]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2995]! } + public var AccessDenied_CameraRestricted: String { return self._s[2997]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2983]!, self._r[2983]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2998]!, self._r[2998]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2985]! } - public var Settings_CopyUsername: String { return self._s[2986]! } - public var Contacts_SearchLabel: String { return self._s[2987]! } - public var Map_OpenInYandexNavigator: String { return self._s[2989]! } - public var PasscodeSettings_EncryptData: String { return self._s[2990]! } - public var Settings_Wallet: String { return self._s[2991]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2992]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2993]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2994]! } - public var DialogList_AdNoticeAlert: String { return self._s[2995]! } - public var Wallet_Month_GenMay: String { return self._s[2997]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2998]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2999]! } - public var Localization_LanguageCustom: String { return self._s[3000]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3001]! } - public var CallFeedback_Title: String { return self._s[3002]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[3005]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[3006]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[3007]! } - public var Conversation_InfoGroup: String { return self._s[3008]! } - public var Compose_NewMessage: String { return self._s[3009]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[3010]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[3011]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[3012]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[3013]! } + public var ChatList_ReadAll: String { return self._s[3000]! } + public var Settings_CopyUsername: String { return self._s[3001]! } + public var Contacts_SearchLabel: String { return self._s[3002]! } + public var Map_OpenInYandexNavigator: String { return self._s[3004]! } + public var PasscodeSettings_EncryptData: String { return self._s[3005]! } + public var Settings_Wallet: String { return self._s[3006]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[3007]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[3008]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[3009]! } + public var DialogList_AdNoticeAlert: String { return self._s[3010]! } + public var Wallet_Month_GenMay: String { return self._s[3012]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[3013]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[3014]! } + public var Localization_LanguageCustom: String { return self._s[3015]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3016]! } + public var CallFeedback_Title: String { return self._s[3017]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[3020]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[3021]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[3022]! } + public var Conversation_InfoGroup: String { return self._s[3023]! } + public var Compose_NewMessage: String { return self._s[3024]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[3025]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[3026]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[3027]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[3028]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3014]!, self._r[3014]!, [_0]) - } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[3015]! } - public var Login_CancelSignUpConfirmation: String { return self._s[3016]! } - public var ChangePhoneNumberCode_Help: String { return self._s[3017]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[3018]! } - public var Channel_BlackList_Title: String { return self._s[3019]! } - public var UserInfo_PhoneCall: String { return self._s[3020]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3022]! } - public var Wallet_Month_ShortJanuary: String { return self._s[3023]! } - public var State_connecting: String { return self._s[3024]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[3025]! } - public var Wallet_Month_GenMarch: String { return self._s[3026]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[3027]! } - public var AuthSessions_AddedDeviceTerminate: String { return self._s[3028]! } - public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3029]!, self._r[3029]!, [_0]) } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[3030]! } + public var Login_CancelSignUpConfirmation: String { return self._s[3031]! } + public var ChangePhoneNumberCode_Help: String { return self._s[3032]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[3033]! } + public var Channel_BlackList_Title: String { return self._s[3034]! } + public var UserInfo_PhoneCall: String { return self._s[3035]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3037]! } + public var Wallet_Month_ShortJanuary: String { return self._s[3038]! } + public var State_connecting: String { return self._s[3039]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[3040]! } + public var Wallet_Month_GenMarch: String { return self._s[3041]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[3042]! } + public var AuthSessions_AddedDeviceTerminate: String { return self._s[3043]! } + public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3044]!, self._r[3044]!, [_0]) + } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3030]!, self._r[3030]!, [_0]) + return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[3031]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3032]! } - public var Passport_Identity_EditPassport: String { return self._s[3033]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[3035]! } - public var Localization_EnglishLanguageName: String { return self._s[3036]! } - public var Share_AuthDescription: String { return self._s[3037]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3038]! } - public var Passport_Identity_Surname: String { return self._s[3039]! } - public var Compose_TokenListPlaceholder: String { return self._s[3040]! } - public var Wallet_AccessDenied_Camera: String { return self._s[3041]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[3042]! } - public var Settings_AboutEmpty: String { return self._s[3043]! } - public var Conversation_Unmute: String { return self._s[3044]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[3046]! } - public var Wallet_Sending_Text: String { return self._s[3047]! } + public var Notifications_GroupNotifications: String { return self._s[3046]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3047]! } + public var Passport_Identity_EditPassport: String { return self._s[3048]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[3050]! } + public var Localization_EnglishLanguageName: String { return self._s[3051]! } + public var Share_AuthDescription: String { return self._s[3052]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3053]! } + public var Passport_Identity_Surname: String { return self._s[3054]! } + public var Compose_TokenListPlaceholder: String { return self._s[3055]! } + public var Wallet_AccessDenied_Camera: String { return self._s[3056]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[3057]! } + public var Settings_AboutEmpty: String { return self._s[3058]! } + public var Conversation_Unmute: String { return self._s[3059]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[3061]! } + public var Wallet_Sending_Text: String { return self._s[3062]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3048]!, self._r[3048]!, [_1]) + return formatWithArgumentRanges(self._s[3063]!, self._r[3063]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[3049]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3051]! } - public var ChatSettings_Appearance: String { return self._s[3052]! } - public var ClearCache_StorageUsage: String { return self._s[3053]! } - public var Appearance_PickAccentColor: String { return self._s[3054]! } + public var Login_CodeSentCall: String { return self._s[3064]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3066]! } + public var ChatSettings_Appearance: String { return self._s[3067]! } + public var ClearCache_StorageUsage: String { return self._s[3068]! } + public var Appearance_PickAccentColor: String { return self._s[3069]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3055]!, self._r[3055]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3070]!, self._r[3070]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3056]!, self._r[3056]!, [_1]) + return formatWithArgumentRanges(self._s[3071]!, self._r[3071]!, [_1]) } - public var Notification_CallMissed: String { return self._s[3057]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3058]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3059]! } - public var Wallet_Month_GenOctober: String { return self._s[3061]! } - public var ChatAdmins_AdminLabel: String { return self._s[3062]! } - public var KeyCommand_JumpToNextChat: String { return self._s[3063]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[3065]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3066]! } - public var Month_GenJune: String { return self._s[3067]! } - public var IntentsSettings_MainAccountInfo: String { return self._s[3068]! } - public var Watch_Location_Current: String { return self._s[3069]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3070]! } - public var Conversation_TitleMute: String { return self._s[3071]! } - public var Map_PlacesInThisArea: String { return self._s[3072]! } + public var Notification_CallMissed: String { return self._s[3072]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3073]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3074]! } + public var Wallet_Month_GenOctober: String { return self._s[3076]! } + public var ChatAdmins_AdminLabel: String { return self._s[3077]! } + public var KeyCommand_JumpToNextChat: String { return self._s[3078]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[3080]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3081]! } + public var Month_GenJune: String { return self._s[3082]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[3083]! } + public var Watch_Location_Current: String { return self._s[3084]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3085]! } + public var Conversation_TitleMute: String { return self._s[3086]! } + public var Map_PlacesInThisArea: String { return self._s[3087]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3073]!, self._r[3073]!, [_1]) + return formatWithArgumentRanges(self._s[3088]!, self._r[3088]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[3074]! } + public var GroupInfo_DeleteAndExit: String { return self._s[3089]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3075]!, self._r[3075]!, [_0]) + return formatWithArgumentRanges(self._s[3090]!, self._r[3090]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[3076]! } - public var Chat_SlowmodeSendError: String { return self._s[3077]! } - public var MaskStickerSettings_Info: String { return self._s[3078]! } - public var EditTheme_Expand_TopInfo: String { return self._s[3079]! } + public var Call_ReportPlaceholder: String { return self._s[3091]! } + public var Chat_SlowmodeSendError: String { return self._s[3092]! } + public var MaskStickerSettings_Info: String { return self._s[3093]! } + public var EditTheme_Expand_TopInfo: String { return self._s[3094]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3080]!, self._r[3080]!, [_0]) + return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[3081]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[3083]! } - public var Contacts_ShareTelegram: String { return self._s[3084]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3085]! } - public var Map_AddressOnMap: String { return self._s[3086]! } - public var Channel_ErrorAccessDenied: String { return self._s[3087]! } - public var UserInfo_ScamBotWarning: String { return self._s[3089]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[3090]! } - public var Call_ConnectionErrorTitle: String { return self._s[3091]! } - public var UserInfo_NotificationsEnable: String { return self._s[3092]! } - public var ArchivedChats_IntroText1: String { return self._s[3093]! } - public var Tour_Text4: String { return self._s[3096]! } - public var WallpaperSearch_Recent: String { return self._s[3097]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[3098]! } - public var PeopleNearby_MakeVisibleTitle: String { return self._s[3099]! } - public var Profile_MessageLifetime2s: String { return self._s[3101]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3102]! } - public var Notification_MessageLifetime2s: String { return self._s[3103]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[3096]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[3098]! } + public var Contacts_ShareTelegram: String { return self._s[3099]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3100]! } + public var Map_AddressOnMap: String { return self._s[3101]! } + public var Channel_ErrorAccessDenied: String { return self._s[3102]! } + public var UserInfo_ScamBotWarning: String { return self._s[3104]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[3105]! } + public var Call_ConnectionErrorTitle: String { return self._s[3106]! } + public var UserInfo_NotificationsEnable: String { return self._s[3107]! } + public var ArchivedChats_IntroText1: String { return self._s[3108]! } + public var Tour_Text4: String { return self._s[3111]! } + public var WallpaperSearch_Recent: String { return self._s[3112]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[3113]! } + public var PeopleNearby_MakeVisibleTitle: String { return self._s[3114]! } + public var Profile_MessageLifetime2s: String { return self._s[3116]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3117]! } + public var Notification_MessageLifetime2s: String { return self._s[3118]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3104]!, self._r[3104]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3119]!, self._r[3119]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[3105]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[3106]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3107]! } + public var Cache_ClearCache: String { return self._s[3120]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[3121]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3122]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3111]!, self._r[3111]!, [_0]) + return formatWithArgumentRanges(self._s[3126]!, self._r[3126]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3113]!, self._r[3113]!, [_0]) + return formatWithArgumentRanges(self._s[3128]!, self._r[3128]!, [_0]) } - public var LocalGroup_Text: String { return self._s[3114]! } - public var PeerInfo_PaneMembers: String { return self._s[3115]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3116]! } - public var SocksProxySetup_TypeSocks: String { return self._s[3117]! } - public var ChatList_UnarchiveAction: String { return self._s[3118]! } - public var AutoNightTheme_Title: String { return self._s[3119]! } - public var InstantPage_FeedbackButton: String { return self._s[3120]! } - public var Passport_FieldAddress: String { return self._s[3121]! } + public var LocalGroup_Text: String { return self._s[3129]! } + public var PeerInfo_PaneMembers: String { return self._s[3130]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3131]! } + public var SocksProxySetup_TypeSocks: String { return self._s[3132]! } + public var ChatList_UnarchiveAction: String { return self._s[3133]! } + public var AutoNightTheme_Title: String { return self._s[3134]! } + public var InstantPage_FeedbackButton: String { return self._s[3135]! } + public var Passport_FieldAddress: String { return self._s[3136]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3122]!, self._r[3122]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[3123]! } + public var Month_ShortMarch: String { return self._s[3138]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3124]!, self._r[3124]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3139]!, self._r[3139]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3125]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3126]! } - public var Passport_FloodError: String { return self._s[3127]! } - public var SecretGif_Title: String { return self._s[3128]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3129]! } - public var ChatList_Context_UnhideArchive: String { return self._s[3130]! } - public var Passport_Language_th: String { return self._s[3132]! } - public var Passport_Address_Address: String { return self._s[3133]! } - public var Login_InvalidLastNameError: String { return self._s[3134]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3135]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[3136]! } - public var ChatList_Context_Archive: String { return self._s[3137]! } - public var SettingsSearch_FAQ: String { return self._s[3138]! } - public var ShareMenu_Send: String { return self._s[3139]! } - public var ChatState_Connecting: String { return self._s[3140]! } - public var WallpaperSearch_ColorYellow: String { return self._s[3142]! } - public var Month_GenNovember: String { return self._s[3144]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3146]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3140]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3141]! } + public var Passport_FloodError: String { return self._s[3142]! } + public var SecretGif_Title: String { return self._s[3143]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3144]! } + public var ChatList_Context_UnhideArchive: String { return self._s[3145]! } + public var Passport_Language_th: String { return self._s[3147]! } + public var Passport_Address_Address: String { return self._s[3148]! } + public var Login_InvalidLastNameError: String { return self._s[3149]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3150]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[3151]! } + public var ChatList_Context_Archive: String { return self._s[3152]! } + public var SettingsSearch_FAQ: String { return self._s[3153]! } + public var ShareMenu_Send: String { return self._s[3154]! } + public var ChatState_Connecting: String { return self._s[3155]! } + public var WallpaperSearch_ColorYellow: String { return self._s[3157]! } + public var Month_GenNovember: String { return self._s[3159]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3161]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3147]!, self._r[3147]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3162]!, self._r[3162]!, [_1, _2]) } - public var Conversation_SwipeToReplyHintText: String { return self._s[3148]! } - public var Checkout_Email: String { return self._s[3149]! } - public var NotificationsSound_Tritone: String { return self._s[3150]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[3152]! } - public var Wallet_ContextMenuCopy: String { return self._s[3154]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3163]! } + public var Checkout_Email: String { return self._s[3164]! } + public var NotificationsSound_Tritone: String { return self._s[3165]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[3167]! } + public var Wallet_ContextMenuCopy: String { return self._s[3169]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3156]!, self._r[3156]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3171]!, self._r[3171]!, [_1, _2, _3]) } - public var Appearance_TextSize_Automatic: String { return self._s[3157]! } + public var Appearance_TextSize_Automatic: String { return self._s[3172]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_1]) + return formatWithArgumentRanges(self._s[3174]!, self._r[3174]!, [_1]) } public func StickerPackActionInfo_AddedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3159]!, self._r[3159]!, [_0]) - } - public var ChangePhoneNumberNumber_Help: String { return self._s[3160]! } - public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3161]!, self._r[3161]!, [_1, _1, _1, _2]) - } - public var ChatList_UndoArchiveTitle: String { return self._s[3162]! } - public var Notification_Exceptions_Add: String { return self._s[3163]! } - public var DialogList_You: String { return self._s[3164]! } - public var MediaPicker_Send: String { return self._s[3167]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3168]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3169]! } - public var Call_AudioRouteSpeaker: String { return self._s[3170]! } - public var Watch_UserInfo_Title: String { return self._s[3171]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[3172]! } - public var Appearance_AccentColor: String { return self._s[3174]! } - public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3175]!, self._r[3175]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3176]! } - public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_1, _2]) + public var ChangePhoneNumberNumber_Help: String { return self._s[3176]! } + public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_1, _1, _1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[3178]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3179]! } - public var Notification_CallOutgoing: String { return self._s[3180]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3181]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3182]! } - public var Call_RecordingDisabledMessage: String { return self._s[3183]! } - public var Message_Game: String { return self._s[3184]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[3185]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3186]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3187]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3188]! } - public var Date_DialogDateFormat: String { return self._s[3190]! } - public var WallpaperColors_SetCustomColor: String { return self._s[3191]! } - public var Notifications_InAppNotifications: String { return self._s[3192]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3178]! } + public var Notification_Exceptions_Add: String { return self._s[3179]! } + public var DialogList_You: String { return self._s[3180]! } + public var MediaPicker_Send: String { return self._s[3183]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3184]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3185]! } + public var Call_AudioRouteSpeaker: String { return self._s[3186]! } + public var Watch_UserInfo_Title: String { return self._s[3187]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[3188]! } + public var Appearance_AccentColor: String { return self._s[3190]! } + public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3191]!, self._r[3191]!, [_0]) + } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3192]! } + public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_1, _2]) + } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[3194]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3195]! } + public var Notification_CallOutgoing: String { return self._s[3196]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3197]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3198]! } + public var Call_RecordingDisabledMessage: String { return self._s[3199]! } + public var Message_Game: String { return self._s[3200]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[3201]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3202]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3203]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3204]! } + public var Date_DialogDateFormat: String { return self._s[3206]! } + public var WallpaperColors_SetCustomColor: String { return self._s[3207]! } + public var Notifications_InAppNotifications: String { return self._s[3208]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_0]) + return formatWithArgumentRanges(self._s[3209]!, self._r[3209]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3194]!, self._r[3194]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3210]!, self._r[3210]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[3195]! } + public var NewContact_Title: String { return self._s[3211]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3196]!, self._r[3196]!, [_0]) + return formatWithArgumentRanges(self._s[3212]!, self._r[3212]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[3197]! } + public var Conversation_ViewContactDetails: String { return self._s[3213]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3199]!, self._r[3199]!, [_1]) + return formatWithArgumentRanges(self._s[3215]!, self._r[3215]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3200]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3201]! } - public var PrivacySettings_Title: String { return self._s[3202]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3205]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[3206]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[3207]! } - public var Contacts_PhoneNumber: String { return self._s[3208]! } - public var PeerInfo_ButtonMute: String { return self._s[3209]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3211]! } - public var Map_ShowPlaces: String { return self._s[3212]! } - public var ChatAdmins_Title: String { return self._s[3213]! } - public var InstantPage_Reference: String { return self._s[3215]! } - public var Wallet_Info_Updating: String { return self._s[3216]! } - public var ReportGroupLocation_Text: String { return self._s[3217]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3216]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3217]! } + public var PrivacySettings_Title: String { return self._s[3218]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3221]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[3222]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[3223]! } + public var Contacts_PhoneNumber: String { return self._s[3224]! } + public var PeerInfo_ButtonMute: String { return self._s[3225]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3227]! } + public var Map_ShowPlaces: String { return self._s[3228]! } + public var ChatAdmins_Title: String { return self._s[3229]! } + public var InstantPage_Reference: String { return self._s[3231]! } + public var Wallet_Info_Updating: String { return self._s[3232]! } + public var ReportGroupLocation_Text: String { return self._s[3233]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3234]!, self._r[3234]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[3219]! } - public var Watch_UserInfo_Block: String { return self._s[3220]! } - public var ChatSettings_Stickers: String { return self._s[3221]! } - public var ChatSettings_DownloadInBackground: String { return self._s[3222]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3223]! } + public var Camera_FlashOff: String { return self._s[3235]! } + public var Watch_UserInfo_Block: String { return self._s[3236]! } + public var ChatSettings_Stickers: String { return self._s[3237]! } + public var ChatSettings_DownloadInBackground: String { return self._s[3238]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3239]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3224]!, self._r[3224]!, [_0]) + return formatWithArgumentRanges(self._s[3240]!, self._r[3240]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[3225]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3226]! } - public var AutoDownloadSettings_Cellular: String { return self._s[3227]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[3228]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3229]! } - public var VoiceOver_MessageContextShare: String { return self._s[3230]! } + public var Settings_ViewPhoto: String { return self._s[3241]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3242]! } + public var AutoDownloadSettings_Cellular: String { return self._s[3243]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[3244]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3245]! } + public var VoiceOver_MessageContextShare: String { return self._s[3246]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3232]!, self._r[3232]!, [_0]) + return formatWithArgumentRanges(self._s[3248]!, self._r[3248]!, [_0]) } - public var Privacy_DeleteDrafts: String { return self._s[3233]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3234]! } + public var Privacy_DeleteDrafts: String { return self._s[3249]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3250]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3235]!, self._r[3235]!, [_0]) + return formatWithArgumentRanges(self._s[3251]!, self._r[3251]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[3236]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3237]! } - public var DialogList_SavedMessages: String { return self._s[3238]! } - public var GroupInfo_UpgradeButton: String { return self._s[3239]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3241]! } - public var DialogList_Pin: String { return self._s[3242]! } + public var DialogList_SavedMessagesHelp: String { return self._s[3252]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3253]! } + public var DialogList_SavedMessages: String { return self._s[3254]! } + public var GroupInfo_UpgradeButton: String { return self._s[3255]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3257]! } + public var DialogList_Pin: String { return self._s[3258]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3243]!, self._r[3243]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3259]!, self._r[3259]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3244]!, self._r[3244]!, [_0]) + return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3245]! } - public var UserInfo_NotificationsDisable: String { return self._s[3246]! } - public var Conversation_ContextMenuCancelEditing: String { return self._s[3247]! } - public var Paint_Outlined: String { return self._s[3248]! } - public var Activity_PlayingGame: String { return self._s[3249]! } - public var SearchImages_NoImagesFound: String { return self._s[3250]! } - public var SocksProxySetup_ProxyType: String { return self._s[3251]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3253]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3254]! } - public var Settings_AppLanguage: String { return self._s[3255]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3256]! } - public var Common_ChoosePhoto: String { return self._s[3257]! } - public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3258]! } - public var CallFeedback_ReasonEcho: String { return self._s[3259]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3261]! } + public var UserInfo_NotificationsDisable: String { return self._s[3262]! } + public var Conversation_ContextMenuCancelEditing: String { return self._s[3263]! } + public var Paint_Outlined: String { return self._s[3264]! } + public var Activity_PlayingGame: String { return self._s[3265]! } + public var SearchImages_NoImagesFound: String { return self._s[3266]! } + public var SocksProxySetup_ProxyType: String { return self._s[3267]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3269]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3270]! } + public var Settings_AppLanguage: String { return self._s[3271]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3272]! } + public var Common_ChoosePhoto: String { return self._s[3273]! } + public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3274]! } + public var CallFeedback_ReasonEcho: String { return self._s[3275]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_1]) - } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3261]! } - public var PollResults_Collapse: String { return self._s[3262]! } - public var Activity_UploadingVideo: String { return self._s[3263]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3264]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3265]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3266]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3267]! } - public var PUSH_SENDER_YOU: String { return self._s[3268]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3269]! } - public var Checkout_PayWithTouchId: String { return self._s[3270]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3271]! } - public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3273]!, self._r[3273]!, [_1]) - } - public var Notifications_ExceptionsNone: String { return self._s[3274]! } - public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3275]!, self._r[3275]!, [_0]) - } - public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3276]!, self._r[3276]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3278]! } - public var Passport_Address_Region: String { return self._s[3281]! } - public var ChatList_DeleteChat: String { return self._s[3282]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3283]! } - public var PhotoEditor_TiltShift: String { return self._s[3284]! } - public var Settings_FAQ_URL: String { return self._s[3285]! } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3286]! } - public var Passport_Language_sl: String { return self._s[3287]! } - public var Settings_PrivacySettings: String { return self._s[3289]! } - public var SharedMedia_TitleLink: String { return self._s[3290]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3291]! } - public var Settings_SetProfilePhoto: String { return self._s[3292]! } - public var Channel_About_Help: String { return self._s[3293]! } - public var Contacts_PermissionsEnable: String { return self._s[3294]! } - public var Wallet_Sending_Title: String { return self._s[3295]! } - public var PeerInfo_PaneMedia: String { return self._s[3296]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3297]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3298]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3300]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3301]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3302]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3303]! } - public var OldChannels_Title: String { return self._s[3304]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3305]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3307]! } - public var Map_OpenInYandexMaps: String { return self._s[3309]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3310]! } - public var VoiceOver_MessageContextReply: String { return self._s[3311]! } - public var PhotoEditor_SaturationTool: String { return self._s[3313]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3277]! } + public var PollResults_Collapse: String { return self._s[3278]! } + public var Activity_UploadingVideo: String { return self._s[3279]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3280]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3281]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3282]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3283]! } + public var PUSH_SENDER_YOU: String { return self._s[3284]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3285]! } + public var Checkout_PayWithTouchId: String { return self._s[3286]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3287]! } + public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3289]!, self._r[3289]!, [_1]) + } + public var Notifications_ExceptionsNone: String { return self._s[3290]! } + public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3291]!, self._r[3291]!, [_0]) + } + public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3292]!, self._r[3292]!, [_1]) + } + public var AuthSessions_IncompleteAttempts: String { return self._s[3294]! } + public var Passport_Address_Region: String { return self._s[3297]! } + public var ChatList_DeleteChat: String { return self._s[3298]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3299]! } + public var PhotoEditor_TiltShift: String { return self._s[3300]! } + public var Settings_FAQ_URL: String { return self._s[3301]! } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3302]! } + public var Passport_Language_sl: String { return self._s[3304]! } + public var Settings_PrivacySettings: String { return self._s[3306]! } + public var SharedMedia_TitleLink: String { return self._s[3307]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3308]! } + public var Settings_SetProfilePhoto: String { return self._s[3309]! } + public var Channel_About_Help: String { return self._s[3310]! } + public var Contacts_PermissionsEnable: String { return self._s[3311]! } + public var Wallet_Sending_Title: String { return self._s[3312]! } + public var PeerInfo_PaneMedia: String { return self._s[3313]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3314]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3315]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3317]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3318]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3319]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3320]! } + public var OldChannels_Title: String { return self._s[3321]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3322]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3324]! } + public var Map_OpenInYandexMaps: String { return self._s[3326]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3327]! } + public var VoiceOver_MessageContextReply: String { return self._s[3328]! } + public var PhotoEditor_SaturationTool: String { return self._s[3330]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3314]!, self._r[3314]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3331]!, self._r[3331]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3315]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3316]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3317]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3332]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3333]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3334]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3318]!, self._r[3318]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3335]!, self._r[3335]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3319]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3321]! } - public var SettingsSearch_Synonyms_Wallet: String { return self._s[3322]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3336]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3338]! } + public var SettingsSearch_Synonyms_Wallet: String { return self._s[3339]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3323]!, self._r[3323]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3340]!, self._r[3340]!, [_1, _2]) } - public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3324]! } + public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3341]! } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3325]!, self._r[3325]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_1, _2, _3]) } - public var WallpaperPreview_PatternTitle: String { return self._s[3326]! } - public var GroupInfo_PublicLinkAdd: String { return self._s[3327]! } - public var Passport_PassportInformation: String { return self._s[3330]! } - public var Theme_Unsupported: String { return self._s[3331]! } - public var WatchRemote_AlertTitle: String { return self._s[3332]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3333]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3335]! } + public var WallpaperPreview_PatternTitle: String { return self._s[3343]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3344]! } + public var Passport_PassportInformation: String { return self._s[3347]! } + public var Theme_Unsupported: String { return self._s[3348]! } + public var WatchRemote_AlertTitle: String { return self._s[3349]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3350]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3352]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3336]!, self._r[3336]!, [_0]) - } - public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3337]!, self._r[3337]!, [_1]) - } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3338]! } - public var Wallet_Navigation_Done: String { return self._s[3340]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3341]! } - public var AccessDenied_CameraDisabled: String { return self._s[3342]! } - public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3343]!, self._r[3343]!, [_0]) - } - public var ClearCache_Forever: String { return self._s[3344]! } - public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3345]! } - public var CreatePoll_Quiz: String { return self._s[3346]! } - public var PhotoEditor_ContrastTool: String { return self._s[3349]! } - public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3350]!, self._r[3350]!, [_1]) - } - public var DialogList_Draft: String { return self._s[3351]! } - public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3352]! } - public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3353]!, self._r[3353]!, [_0]) } - public var Privacy_TopPeersDelete: String { return self._s[3355]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3356]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3357]! } - public var WebSearch_RecentSectionClear: String { return self._s[3358]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3359]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3361]! } - public var PeerInfo_ButtonMore: String { return self._s[3363]! } - public var Common_Done: String { return self._s[3364]! } - public var Shortcut_SwitchAccount: String { return self._s[3365]! } - public var AuthSessions_EmptyText: String { return self._s[3366]! } - public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3367]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3368]! } - public var Tour_Title5: String { return self._s[3369]! } - public var Wallet_Settings_Title: String { return self._s[3370]! } - public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_0]) + public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3354]!, self._r[3354]!, [_1]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3372]! } - public var Conversation_LinkDialogSave: String { return self._s[3373]! } - public var GroupInfo_ActionRestrict: String { return self._s[3374]! } - public var Checkout_Title: String { return self._s[3375]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3377]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3379]! } - public var Notification_RenamedGroup: String { return self._s[3380]! } - public var PeopleNearby_Groups: String { return self._s[3381]! } - public var Checkout_PayWithFaceId: String { return self._s[3382]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3383]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3385]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3386]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3387]! } - public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3355]! } + public var Wallet_Navigation_Done: String { return self._s[3357]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3358]! } + public var AccessDenied_CameraDisabled: String { return self._s[3359]! } + public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3360]!, self._r[3360]!, [_0]) + } + public var ClearCache_Forever: String { return self._s[3361]! } + public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3362]! } + public var CreatePoll_Quiz: String { return self._s[3363]! } + public var PhotoEditor_ContrastTool: String { return self._s[3366]! } + public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3367]!, self._r[3367]!, [_1]) + } + public var DialogList_Draft: String { return self._s[3368]! } + public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3369]! } + public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3370]!, self._r[3370]!, [_0]) + } + public var Privacy_TopPeersDelete: String { return self._s[3372]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3373]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3374]! } + public var WebSearch_RecentSectionClear: String { return self._s[3375]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3376]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3378]! } + public var PeerInfo_ButtonMore: String { return self._s[3380]! } + public var Common_Done: String { return self._s[3381]! } + public var Shortcut_SwitchAccount: String { return self._s[3382]! } + public var AuthSessions_EmptyText: String { return self._s[3383]! } + public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3384]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3385]! } + public var Tour_Title5: String { return self._s[3386]! } + public var Wallet_Settings_Title: String { return self._s[3387]! } + public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3388]!, self._r[3388]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3390]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3389]! } + public var Conversation_LinkDialogSave: String { return self._s[3390]! } + public var GroupInfo_ActionRestrict: String { return self._s[3391]! } + public var Checkout_Title: String { return self._s[3392]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3394]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3396]! } + public var Notification_RenamedGroup: String { return self._s[3397]! } + public var PeopleNearby_Groups: String { return self._s[3398]! } + public var Checkout_PayWithFaceId: String { return self._s[3399]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3400]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3402]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3403]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3404]! } + public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3405]!, self._r[3405]!, [_0]) + } + public var Profile_AddToExisting: String { return self._s[3407]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3391]!, self._r[3391]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3408]!, self._r[3408]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3393]! } - public var Permissions_PrivacyPolicy: String { return self._s[3394]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3395]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3396]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3398]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3400]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3401]! } + public var Cache_Files: String { return self._s[3410]! } + public var Permissions_PrivacyPolicy: String { return self._s[3411]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3412]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3413]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3415]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3417]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3418]! } public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3402]!, self._r[3402]!, [_0]) + return formatWithArgumentRanges(self._s[3419]!, self._r[3419]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3403]! } - public var VoiceOver_AttachMedia: String { return self._s[3406]! } - public var ChatList_EmptyChatFilterList: String { return self._s[3407]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3408]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3420]! } + public var VoiceOver_AttachMedia: String { return self._s[3423]! } + public var ChatList_EmptyChatFilterList: String { return self._s[3424]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3425]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3409]!, self._r[3409]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3426]!, self._r[3426]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3410]! } - public var Conversation_SetReminder_Title: String { return self._s[3411]! } - public var Passport_FieldAddressHelp: String { return self._s[3412]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3413]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3414]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3427]! } + public var Conversation_SetReminder_Title: String { return self._s[3428]! } + public var Passport_FieldAddressHelp: String { return self._s[3429]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3430]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3431]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3415]!, self._r[3415]!, [_0]) + return formatWithArgumentRanges(self._s[3432]!, self._r[3432]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3416]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3417]! } - public var Login_UnknownError: String { return self._s[3418]! } - public var Group_UpgradeNoticeText2: String { return self._s[3421]! } - public var Watch_Compose_AddContact: String { return self._s[3422]! } - public var ClearCache_StorageServiceFiles: String { return self._s[3423]! } - public var Web_Error: String { return self._s[3424]! } - public var Gif_Search: String { return self._s[3425]! } - public var Profile_MessageLifetime1h: String { return self._s[3426]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3427]! } - public var Channel_Username_CheckingUsername: String { return self._s[3428]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3429]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3430]! } - public var Channel_AboutItem: String { return self._s[3431]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3433]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3434]! } - public var GroupInfo_SharedMedia: String { return self._s[3435]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3433]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3434]! } + public var Login_UnknownError: String { return self._s[3435]! } + public var Group_UpgradeNoticeText2: String { return self._s[3438]! } + public var Watch_Compose_AddContact: String { return self._s[3439]! } + public var ClearCache_StorageServiceFiles: String { return self._s[3440]! } + public var Web_Error: String { return self._s[3441]! } + public var Gif_Search: String { return self._s[3442]! } + public var Profile_MessageLifetime1h: String { return self._s[3443]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3444]! } + public var Channel_Username_CheckingUsername: String { return self._s[3445]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3446]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3447]! } + public var Channel_AboutItem: String { return self._s[3448]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3450]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3451]! } + public var GroupInfo_SharedMedia: String { return self._s[3452]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3436]!, self._r[3436]!, [_1]) + return formatWithArgumentRanges(self._s[3453]!, self._r[3453]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3437]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3454]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3438]!, self._r[3438]!, [_1]) + return formatWithArgumentRanges(self._s[3455]!, self._r[3455]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3439]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3440]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3441]! } - public var CreatePoll_AddOption: String { return self._s[3442]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3443]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3444]! } - public var Channel_Management_AddModerator: String { return self._s[3445]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3446]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3447]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3448]! } - public var Theme_Colors_Background: String { return self._s[3449]! } - public var NotificationsSound_Hello: String { return self._s[3451]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3452]! } - public var Channel_Stickers_Placeholder: String { return self._s[3454]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3456]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3457]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3458]! } + public var CreatePoll_AddOption: String { return self._s[3459]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3460]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3461]! } + public var Channel_Management_AddModerator: String { return self._s[3462]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3463]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3464]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3465]! } + public var Theme_Colors_Background: String { return self._s[3466]! } + public var NotificationsSound_Hello: String { return self._s[3469]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3471]! } + public var Channel_Stickers_Placeholder: String { return self._s[3473]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3455]!, self._r[3455]!, [_0]) + return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3456]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3457]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3458]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3459]! } - public var AutoDownloadSettings_Channels: String { return self._s[3460]! } - public var Passport_Language_mn: String { return self._s[3461]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3464]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3465]! } - public var Passport_Language_ja: String { return self._s[3467]! } - public var Settings_About_Title: String { return self._s[3468]! } - public var Settings_NotificationsAndSounds: String { return self._s[3469]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3470]! } - public var Settings_BlockedUsers: String { return self._s[3471]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3475]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3476]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3477]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3478]! } + public var AutoDownloadSettings_Channels: String { return self._s[3479]! } + public var Passport_Language_mn: String { return self._s[3480]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3483]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3484]! } + public var Passport_Language_ja: String { return self._s[3486]! } + public var Settings_About_Title: String { return self._s[3487]! } + public var Settings_NotificationsAndSounds: String { return self._s[3488]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3489]! } + public var Settings_BlockedUsers: String { return self._s[3490]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3472]!, self._r[3472]!, [_0]) + return formatWithArgumentRanges(self._s[3491]!, self._r[3491]!, [_0]) } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3473]! } - public var Wallet_Weekday_Today: String { return self._s[3474]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3475]! } - public var Widget_ApplicationLocked: String { return self._s[3476]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3477]! } - public var Channel_Username_Title: String { return self._s[3478]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3492]! } + public var Wallet_Weekday_Today: String { return self._s[3493]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3494]! } + public var Widget_ApplicationLocked: String { return self._s[3495]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3496]! } + public var Channel_Username_Title: String { return self._s[3497]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3479]!, self._r[3479]!, [_0]) + return formatWithArgumentRanges(self._s[3498]!, self._r[3498]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3481]! } - public var AppleWatch_Title: String { return self._s[3482]! } - public var Activity_RecordingVideoMessage: String { return self._s[3483]! } + public var AttachmentMenu_File: String { return self._s[3500]! } + public var AppleWatch_Title: String { return self._s[3501]! } + public var Activity_RecordingVideoMessage: String { return self._s[3502]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3484]!, self._r[3484]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3503]!, self._r[3503]!, [_1, _2]) } - public var Theme_Colors_Messages: String { return self._s[3485]! } - public var Weekday_Saturday: String { return self._s[3486]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3487]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3488]! } - public var Common_Next: String { return self._s[3490]! } - public var Channel_Stickers_YourStickers: String { return self._s[3492]! } - public var Message_Theme: String { return self._s[3493]! } - public var Call_AudioRouteHeadphones: String { return self._s[3494]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3496]! } - public var Watch_Contacts_NoResults: String { return self._s[3498]! } - public var PhotoEditor_TintTool: String { return self._s[3501]! } - public var LoginPassword_ResetAccount: String { return self._s[3503]! } - public var Settings_SavedMessages: String { return self._s[3504]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3505]! } - public var Bot_GenericSupportStatus: String { return self._s[3506]! } - public var StickerPack_Add: String { return self._s[3507]! } - public var Checkout_TotalAmount: String { return self._s[3508]! } - public var Your_cards_number_is_invalid: String { return self._s[3509]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3510]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3511]! } + public var Theme_Colors_Messages: String { return self._s[3504]! } + public var Weekday_Saturday: String { return self._s[3505]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3506]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3507]! } + public var Common_Next: String { return self._s[3509]! } + public var Channel_Stickers_YourStickers: String { return self._s[3511]! } + public var Message_Theme: String { return self._s[3512]! } + public var Call_AudioRouteHeadphones: String { return self._s[3513]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3515]! } + public var Watch_Contacts_NoResults: String { return self._s[3517]! } + public var PhotoEditor_TintTool: String { return self._s[3520]! } + public var LoginPassword_ResetAccount: String { return self._s[3522]! } + public var Settings_SavedMessages: String { return self._s[3523]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3524]! } + public var Bot_GenericSupportStatus: String { return self._s[3525]! } + public var StickerPack_Add: String { return self._s[3526]! } + public var Checkout_TotalAmount: String { return self._s[3527]! } + public var Your_cards_number_is_invalid: String { return self._s[3528]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3529]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3530]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3512]!, self._r[3512]!, [_0]) + return formatWithArgumentRanges(self._s[3531]!, self._r[3531]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3513]!, self._r[3513]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3532]!, self._r[3532]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3514]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3533]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3516]!, self._r[3516]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3535]!, self._r[3535]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3517]!, self._r[3517]!, [_0]) + return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3518]! } - public var StickerPack_Share: String { return self._s[3519]! } - public var Passport_DeleteAddress: String { return self._s[3520]! } - public var Settings_Passport: String { return self._s[3521]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3522]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3523]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3524]! } - public var Contacts_PermissionsText: String { return self._s[3525]! } - public var Group_Setup_HistoryVisible: String { return self._s[3526]! } - public var Wallet_Month_ShortDecember: String { return self._s[3528]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3529]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3530]! } - public var SocksProxySetup_Title: String { return self._s[3531]! } - public var Notification_Mute1h: String { return self._s[3532]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3537]! } + public var StickerPack_Share: String { return self._s[3538]! } + public var Passport_DeleteAddress: String { return self._s[3539]! } + public var Settings_Passport: String { return self._s[3540]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3541]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3542]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3543]! } + public var Contacts_PermissionsText: String { return self._s[3544]! } + public var Group_Setup_HistoryVisible: String { return self._s[3545]! } + public var Wallet_Month_ShortDecember: String { return self._s[3547]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3548]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3549]! } + public var SocksProxySetup_Title: String { return self._s[3550]! } + public var Notification_Mute1h: String { return self._s[3551]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3533]!, self._r[3533]!, [_0]) + return formatWithArgumentRanges(self._s[3552]!, self._r[3552]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3534]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3553]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3535]!, self._r[3535]!, [_1]) + return formatWithArgumentRanges(self._s[3554]!, self._r[3554]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3536]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3539]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3541]! } - public var DialogList_NoMessagesText: String { return self._s[3542]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3543]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3544]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3546]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3547]! } - public var Common_TakePhotoOrVideo: String { return self._s[3548]! } - public var Wallet_Words_Text: String { return self._s[3549]! } - public var Call_StatusBusy: String { return self._s[3550]! } - public var Conversation_PinnedMessage: String { return self._s[3551]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3552]! } - public var ChatList_EmptyChatListNewMessage: String { return self._s[3553]! } - public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3554]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3555]! } - public var Undo_ChatCleared: String { return self._s[3556]! } - public var AppleWatch_ReplyPresets: String { return self._s[3557]! } - public var Passport_DiscardMessageDescription: String { return self._s[3559]! } - public var Login_NetworkError: String { return self._s[3560]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3555]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3558]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3560]! } + public var DialogList_NoMessagesText: String { return self._s[3561]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3562]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3563]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3565]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3566]! } + public var Common_TakePhotoOrVideo: String { return self._s[3567]! } + public var Wallet_Words_Text: String { return self._s[3568]! } + public var Call_StatusBusy: String { return self._s[3569]! } + public var Conversation_PinnedMessage: String { return self._s[3570]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3571]! } + public var ChatList_EmptyChatListNewMessage: String { return self._s[3572]! } + public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3573]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3574]! } + public var Undo_ChatCleared: String { return self._s[3575]! } + public var AppleWatch_ReplyPresets: String { return self._s[3576]! } + public var Passport_DiscardMessageDescription: String { return self._s[3578]! } + public var Login_NetworkError: String { return self._s[3579]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3561]!, self._r[3561]!, [_0]) + return formatWithArgumentRanges(self._s[3580]!, self._r[3580]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3562]!, self._r[3562]!, [_0]) + return formatWithArgumentRanges(self._s[3581]!, self._r[3581]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3563]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3565]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3566]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3582]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3584]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3585]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3568]!, self._r[3568]!, [_0]) + return formatWithArgumentRanges(self._s[3587]!, self._r[3587]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3569]! } - public var VoiceOver_Chat_Music: String { return self._s[3570]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3571]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3573]! } - public var ConversationMedia_Title: String { return self._s[3574]! } - public var EncryptionKey_Title: String { return self._s[3576]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3577]! } - public var Notification_Exceptions_AddException: String { return self._s[3578]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3579]! } - public var Profile_MessageLifetime1m: String { return self._s[3580]! } + public var Call_ConnectionErrorMessage: String { return self._s[3588]! } + public var VoiceOver_Chat_Music: String { return self._s[3589]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3590]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3592]! } + public var ConversationMedia_Title: String { return self._s[3593]! } + public var EncryptionKey_Title: String { return self._s[3595]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3596]! } + public var Notification_Exceptions_AddException: String { return self._s[3597]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3598]! } + public var Profile_MessageLifetime1m: String { return self._s[3599]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3581]!, self._r[3581]!, [_1]) + return formatWithArgumentRanges(self._s[3600]!, self._r[3600]!, [_1]) } - public var Month_GenMay: String { return self._s[3582]! } + public var Month_GenMay: String { return self._s[3601]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3583]!, self._r[3583]!, [_0]) + return formatWithArgumentRanges(self._s[3602]!, self._r[3602]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3584]! } - public var Wallet_Send_AddressInfo: String { return self._s[3585]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3586]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3587]! } + public var PeopleNearby_Users: String { return self._s[3603]! } + public var Wallet_Send_AddressInfo: String { return self._s[3604]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3605]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3606]! } public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3589]!, self._r[3589]!, [_0]) + return formatWithArgumentRanges(self._s[3608]!, self._r[3608]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3590]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3591]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3592]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3593]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3594]! } - public var Channel_JoinChannel: String { return self._s[3596]! } - public var Appearance_Animations: String { return self._s[3599]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3609]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3610]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3611]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3612]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3613]! } + public var Channel_JoinChannel: String { return self._s[3615]! } + public var Appearance_Animations: String { return self._s[3618]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3600]!, self._r[3600]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3619]!, self._r[3619]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3602]! } - public var Appearance_ShareTheme: String { return self._s[3603]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3604]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3606]! } - public var StickerPackActionInfo_RemovedTitle: String { return self._s[3607]! } - public var Passport_Address_Street: String { return self._s[3608]! } - public var Conversation_AddContact: String { return self._s[3609]! } - public var Login_PhonePlaceholder: String { return self._s[3610]! } - public var Channel_Members_InviteLink: String { return self._s[3612]! } - public var Bot_Stop: String { return self._s[3613]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3615]! } - public var Notification_PassportValueAddress: String { return self._s[3616]! } - public var Month_ShortJuly: String { return self._s[3617]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3618]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3619]! } - public var Passport_Identity_ReverseSide: String { return self._s[3620]! } - public var Watch_Stickers_Recents: String { return self._s[3623]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3625]! } - public var Map_SendThisLocation: String { return self._s[3626]! } + public var Stickers_GroupStickers: String { return self._s[3621]! } + public var Appearance_ShareTheme: String { return self._s[3622]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3623]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3625]! } + public var StickerPackActionInfo_RemovedTitle: String { return self._s[3626]! } + public var Passport_Address_Street: String { return self._s[3627]! } + public var Conversation_AddContact: String { return self._s[3628]! } + public var Login_PhonePlaceholder: String { return self._s[3629]! } + public var Channel_Members_InviteLink: String { return self._s[3631]! } + public var Bot_Stop: String { return self._s[3632]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3634]! } + public var Notification_PassportValueAddress: String { return self._s[3635]! } + public var Month_ShortJuly: String { return self._s[3636]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3637]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3638]! } + public var Passport_Identity_ReverseSide: String { return self._s[3639]! } + public var Watch_Stickers_Recents: String { return self._s[3642]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3644]! } + public var Map_SendThisLocation: String { return self._s[3645]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3627]!, self._r[3627]!, [_0]) + return formatWithArgumentRanges(self._s[3646]!, self._r[3646]!, [_0]) } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3628]!, self._r[3628]!, [_0]) + return formatWithArgumentRanges(self._s[3647]!, self._r[3647]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[3629]! } - public var Wallet_Intro_NotNow: String { return self._s[3630]! } + public var ConvertToSupergroup_Note: String { return self._s[3648]! } + public var Wallet_Intro_NotNow: String { return self._s[3649]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3631]!, self._r[3631]!, [_0]) + return formatWithArgumentRanges(self._s[3650]!, self._r[3650]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3632]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3651]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3633]!, self._r[3633]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3652]!, self._r[3652]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3635]! } - public var Wallpaper_SearchShort: String { return self._s[3636]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3638]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3639]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3640]! } + public var Login_CallRequestState3: String { return self._s[3654]! } + public var Wallpaper_SearchShort: String { return self._s[3655]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3657]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3658]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3659]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3641]!, self._r[3641]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3660]!, self._r[3660]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3642]! } - public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3644]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3647]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3661]! } + public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3663]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3666]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3648]!, self._r[3648]!, [_0]) - } - public var Passport_CorrectErrors: String { return self._s[3649]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3650]! } - public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3651]!, self._r[3651]!, [_0]) - } - public var Map_SendMyCurrentLocation: String { return self._s[3652]! } - public var Channel_DiscussionGroup: String { return self._s[3653]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3654]! } - public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3655]!, self._r[3655]!, [_1, _2]) - } - public var SharedMedia_SearchNoResults: String { return self._s[3656]! } - public var Permissions_NotificationsText_v0: String { return self._s[3657]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3658]! } - public var Appearance_AppIcon: String { return self._s[3659]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3660]! } - public var LoginPassword_FloodError: String { return self._s[3661]! } - public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3663]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3664]! } - public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3665]!, self._r[3665]!, [_0]) - } - public var Passport_Language_bn: String { return self._s[3666]! } - public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3667]!, self._r[3667]!, [_0]) } - public var ChatList_Context_Pin: String { return self._s[3668]! } - public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3669]!, self._r[3669]!, [_0]) - } - public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Passport_CorrectErrors: String { return self._s[3668]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3669]! } + public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3670]!, self._r[3670]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3671]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3675]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3677]! } - public var Wallet_Month_GenDecember: String { return self._s[3678]! } - public var Contacts_PermissionsAllow: String { return self._s[3679]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3680]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3681]! } - public var WallpaperPreview_Pattern: String { return self._s[3682]! } - public var Paint_Duplicate: String { return self._s[3683]! } - public var Passport_Address_Country: String { return self._s[3684]! } - public var Notification_RenamedChannel: String { return self._s[3686]! } - public var ChatList_Context_Unmute: String { return self._s[3687]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3688]! } - public var Group_MessagePhotoUpdated: String { return self._s[3689]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3690]! } - public var Conversation_ContextMenuBan: String { return self._s[3691]! } - public var TwoStepAuth_EmailSent: String { return self._s[3692]! } - public var MessagePoll_NoVotes: String { return self._s[3693]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3694]! } - public var Passport_Language_is: String { return self._s[3696]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3698]! } - public var Tour_Text5: String { return self._s[3699]! } + public var Map_SendMyCurrentLocation: String { return self._s[3671]! } + public var Channel_DiscussionGroup: String { return self._s[3672]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3673]! } + public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3674]!, self._r[3674]!, [_1, _2]) + } + public var SharedMedia_SearchNoResults: String { return self._s[3675]! } + public var Permissions_NotificationsText_v0: String { return self._s[3676]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3677]! } + public var Appearance_AppIcon: String { return self._s[3678]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3679]! } + public var LoginPassword_FloodError: String { return self._s[3680]! } + public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3682]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3683]! } + public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3684]!, self._r[3684]!, [_0]) + } + public var Passport_Language_bn: String { return self._s[3685]! } + public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3686]!, self._r[3686]!, [_0]) + } + public var ChatList_Context_Pin: String { return self._s[3687]! } + public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3688]!, self._r[3688]!, [_0]) + } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3689]!, self._r[3689]!, [_0]) + } + public var Wallet_Navigation_Close: String { return self._s[3690]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3694]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3696]! } + public var Wallet_Month_GenDecember: String { return self._s[3697]! } + public var Contacts_PermissionsAllow: String { return self._s[3698]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3699]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3700]! } + public var WallpaperPreview_Pattern: String { return self._s[3701]! } + public var Paint_Duplicate: String { return self._s[3702]! } + public var Passport_Address_Country: String { return self._s[3703]! } + public var Notification_RenamedChannel: String { return self._s[3705]! } + public var ChatList_Context_Unmute: String { return self._s[3706]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3707]! } + public var Group_MessagePhotoUpdated: String { return self._s[3708]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3709]! } + public var Conversation_ContextMenuBan: String { return self._s[3710]! } + public var TwoStepAuth_EmailSent: String { return self._s[3711]! } + public var MessagePoll_NoVotes: String { return self._s[3712]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3713]! } + public var Passport_Language_is: String { return self._s[3715]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3717]! } + public var Tour_Text5: String { return self._s[3718]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3702]!, self._r[3702]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3721]!, self._r[3721]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3703]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3704]! } + public var Undo_SecretChatDeleted: String { return self._s[3722]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3723]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3705]!, self._r[3705]!, [_0]) + return formatWithArgumentRanges(self._s[3724]!, self._r[3724]!, [_0]) } - public var Forward_ErrorDisabledForChat: String { return self._s[3706]! } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3707]! } - public var Paint_Edit: String { return self._s[3709]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3711]! } - public var Undo_DeletedGroup: String { return self._s[3713]! } - public var LoginPassword_ForgotPassword: String { return self._s[3714]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3715]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3716]! } + public var Forward_ErrorDisabledForChat: String { return self._s[3725]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3726]! } + public var Paint_Edit: String { return self._s[3728]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3730]! } + public var Undo_DeletedGroup: String { return self._s[3732]! } + public var LoginPassword_ForgotPassword: String { return self._s[3733]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3734]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3735]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3717]!, self._r[3717]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3736]!, self._r[3736]!, [_0, _1]) } - public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3718]! } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3719]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3720]! } - public var Passport_Language_uz: String { return self._s[3721]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3722]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3723]! } - public var Map_StopLiveLocation: String { return self._s[3725]! } - public var VoiceOver_MessageContextSend: String { return self._s[3727]! } - public var PasscodeSettings_Help: String { return self._s[3728]! } - public var NotificationsSound_Input: String { return self._s[3729]! } - public var Share_Title: String { return self._s[3732]! } - public var LogoutOptions_Title: String { return self._s[3733]! } - public var Wallet_Send_AddressText: String { return self._s[3734]! } - public var Login_TermsOfServiceAgree: String { return self._s[3735]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3736]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3737]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3738]! } - public var EnterPasscode_EnterTitle: String { return self._s[3739]! } + public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3737]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3738]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3739]! } + public var Passport_Language_uz: String { return self._s[3740]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3741]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3742]! } + public var Map_StopLiveLocation: String { return self._s[3744]! } + public var VoiceOver_MessageContextSend: String { return self._s[3746]! } + public var PasscodeSettings_Help: String { return self._s[3747]! } + public var NotificationsSound_Input: String { return self._s[3748]! } + public var Share_Title: String { return self._s[3751]! } + public var LogoutOptions_Title: String { return self._s[3752]! } + public var Wallet_Send_AddressText: String { return self._s[3753]! } + public var Login_TermsOfServiceAgree: String { return self._s[3754]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3755]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3756]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3757]! } + public var EnterPasscode_EnterTitle: String { return self._s[3758]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3740]!, self._r[3740]!, [_0]) + return formatWithArgumentRanges(self._s[3759]!, self._r[3759]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3741]! } - public var Conversation_AddToContacts: String { return self._s[3742]! } + public var Settings_CopyPhoneNumber: String { return self._s[3760]! } + public var Conversation_AddToContacts: String { return self._s[3761]! } public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3743]!, self._r[3743]!, [_0]) + return formatWithArgumentRanges(self._s[3762]!, self._r[3762]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[3744]! } + public var NotificationsSound_Keys: String { return self._s[3763]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3745]!, self._r[3745]!, [_0]) + return formatWithArgumentRanges(self._s[3764]!, self._r[3764]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3746]! } - public var Message_Video: String { return self._s[3747]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3748]! } + public var Notification_MessageLifetime1w: String { return self._s[3765]! } + public var Message_Video: String { return self._s[3766]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3767]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3749]!, self._r[3749]!, [_1]) + return formatWithArgumentRanges(self._s[3768]!, self._r[3768]!, [_1]) } - public var Wallet_Receive_AmountInfo: String { return self._s[3752]! } - public var Stats_Overview: String { return self._s[3753]! } + public var Wallet_Receive_AmountInfo: String { return self._s[3771]! } + public var Stats_Overview: String { return self._s[3772]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3754]!, self._r[3754]!, [_0]) + return formatWithArgumentRanges(self._s[3773]!, self._r[3773]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3755]!, self._r[3755]!, [_0]) + return formatWithArgumentRanges(self._s[3774]!, self._r[3774]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3756]! } + public var Passport_Language_mk: String { return self._s[3775]! } public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3757]!, self._r[3757]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3776]!, self._r[3776]!, [_1, _2, _3]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3758]! } - public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3759]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3761]! } - public var PrivacyPolicy_Decline: String { return self._s[3762]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3763]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3764]! } - public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3765]! } - public var Permissions_SiriAllow_v0: String { return self._s[3767]! } - public var Wallet_Month_ShortAugust: String { return self._s[3768]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3769]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3777]! } + public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3778]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3780]! } + public var PrivacyPolicy_Decline: String { return self._s[3781]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3782]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3783]! } + public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3784]! } + public var Permissions_SiriAllow_v0: String { return self._s[3786]! } + public var Wallet_Month_ShortAugust: String { return self._s[3787]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3788]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3770]!, self._r[3770]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3789]!, self._r[3789]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3771]!, self._r[3771]!, [_0]) + return formatWithArgumentRanges(self._s[3790]!, self._r[3790]!, [_0]) } - public var Paint_Regular: String { return self._s[3772]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3773]! } - public var SocksProxySetup_ShareLink: String { return self._s[3774]! } - public var Wallet_Qr_Title: String { return self._s[3775]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3776]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3778]! } - public var Wallet_Settings_Configuration: String { return self._s[3779]! } - public var GroupInfo_InviteByLink: String { return self._s[3780]! } - public var MessageTimer_Custom: String { return self._s[3781]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3782]! } - public var Conversation_StopQuizConfirmationTitle: String { return self._s[3783]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3785]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3786]! } - public var VoiceOver_Chat_Selected: String { return self._s[3787]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3788]! } - public var Channel_Username_InvalidTaken: String { return self._s[3789]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3790]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3791]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3792]! } - public var Settings_ChatBackground: String { return self._s[3793]! } - public var Channel_Subscribers_Title: String { return self._s[3794]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3795]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3796]! } - public var Watch_ConnectionDescription: String { return self._s[3797]! } - public var OldChannels_NoticeText: String { return self._s[3800]! } - public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3801]! } - public var IntentsSettings_SuggestBy: String { return self._s[3803]! } - public var Theme_ThemeChangedText: String { return self._s[3804]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3805]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3806]! } - public var Wallet_Send_TransactionInProgress: String { return self._s[3807]! } - public var EditProfile_Title: String { return self._s[3808]! } - public var NotificationsSound_Bamboo: String { return self._s[3810]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3812]! } - public var Login_SmsRequestState2: String { return self._s[3813]! } - public var Passport_Language_ar: String { return self._s[3814]! } + public var Paint_Regular: String { return self._s[3791]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3792]! } + public var SocksProxySetup_ShareLink: String { return self._s[3793]! } + public var Wallet_Qr_Title: String { return self._s[3794]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3795]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3797]! } + public var Wallet_Settings_Configuration: String { return self._s[3798]! } + public var GroupInfo_InviteByLink: String { return self._s[3799]! } + public var MessageTimer_Custom: String { return self._s[3800]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3801]! } + public var Conversation_StopQuizConfirmationTitle: String { return self._s[3802]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3804]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3805]! } + public var VoiceOver_Chat_Selected: String { return self._s[3806]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3807]! } + public var Channel_Username_InvalidTaken: String { return self._s[3808]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3809]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3810]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3811]! } + public var Settings_ChatBackground: String { return self._s[3812]! } + public var Channel_Subscribers_Title: String { return self._s[3813]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3814]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3815]! } + public var Watch_ConnectionDescription: String { return self._s[3816]! } + public var OldChannels_NoticeText: String { return self._s[3819]! } + public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3820]! } + public var IntentsSettings_SuggestBy: String { return self._s[3822]! } + public var Theme_ThemeChangedText: String { return self._s[3823]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3824]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3825]! } + public var Wallet_Send_TransactionInProgress: String { return self._s[3826]! } + public var EditProfile_Title: String { return self._s[3827]! } + public var NotificationsSound_Bamboo: String { return self._s[3829]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3831]! } + public var Login_SmsRequestState2: String { return self._s[3832]! } + public var Passport_Language_ar: String { return self._s[3833]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3815]!, self._r[3815]!, [_0]) + return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3816]! } - public var Wallet_Created_Text: String { return self._s[3817]! } - public var Conversation_MessageDialogEdit: String { return self._s[3819]! } - public var Wallet_Created_Proceed: String { return self._s[3820]! } - public var Wallet_Words_Done: String { return self._s[3821]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3822]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3835]! } + public var Wallet_Created_Text: String { return self._s[3836]! } + public var Conversation_MessageDialogEdit: String { return self._s[3838]! } + public var Wallet_Created_Proceed: String { return self._s[3839]! } + public var Wallet_Words_Done: String { return self._s[3840]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3841]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3823]!, self._r[3823]!, [_1]) + return formatWithArgumentRanges(self._s[3842]!, self._r[3842]!, [_1]) } - public var Common_Close: String { return self._s[3824]! } - public var GroupInfo_PublicLink: String { return self._s[3825]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3826]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3827]! } + public var Common_Close: String { return self._s[3843]! } + public var GroupInfo_PublicLink: String { return self._s[3844]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3845]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3846]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3831]!, self._r[3831]!, [_0]) + return formatWithArgumentRanges(self._s[3850]!, self._r[3850]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3832]! } + public var UserInfo_About_Placeholder: String { return self._s[3851]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3833]!, self._r[3833]!, [_0]) + return formatWithArgumentRanges(self._s[3852]!, self._r[3852]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3834]! } - public var Channel_Info_Banned: String { return self._s[3836]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3853]! } + public var Channel_Info_Banned: String { return self._s[3855]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3837]!, self._r[3837]!, [_0]) + return formatWithArgumentRanges(self._s[3856]!, self._r[3856]!, [_0]) } - public var Appearance_Other: String { return self._s[3838]! } - public var Passport_Language_my: String { return self._s[3839]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3840]! } + public var Appearance_Other: String { return self._s[3857]! } + public var Passport_Language_my: String { return self._s[3858]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3859]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3841]!, self._r[3841]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3860]!, self._r[3860]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3842]! } - public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3843]! } - public var Preview_CopyAddress: String { return self._s[3844]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3861]! } + public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3862]! } + public var Preview_CopyAddress: String { return self._s[3863]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3845]!, self._r[3845]!, [_0]) + return formatWithArgumentRanges(self._s[3864]!, self._r[3864]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3846]! } - public var UserInfo_BotSettings: String { return self._s[3847]! } - public var LiveLocation_MenuStopAll: String { return self._s[3849]! } - public var Passport_PasswordCreate: String { return self._s[3850]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3851]! } - public var Message_PinnedLocationMessage: String { return self._s[3852]! } - public var Map_Satellite: String { return self._s[3853]! } - public var Watch_Message_Unsupported: String { return self._s[3854]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3855]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3856]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3865]! } + public var UserInfo_BotSettings: String { return self._s[3866]! } + public var LiveLocation_MenuStopAll: String { return self._s[3868]! } + public var Passport_PasswordCreate: String { return self._s[3869]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3870]! } + public var Message_PinnedLocationMessage: String { return self._s[3871]! } + public var Map_Satellite: String { return self._s[3872]! } + public var Watch_Message_Unsupported: String { return self._s[3873]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3874]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3875]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3857]!, self._r[3857]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3876]!, self._r[3876]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3858]!, self._r[3858]!, [_0]) + return formatWithArgumentRanges(self._s[3877]!, self._r[3877]!, [_0]) } - public var Wallet_WordImport_Continue: String { return self._s[3859]! } + public var Wallet_WordImport_Continue: String { return self._s[3878]! } public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3860]!, self._r[3860]!, [_0]) + return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3861]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3862]! } - public var NotificationsSound_None: String { return self._s[3863]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3864]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3866]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3867]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3880]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3881]! } + public var NotificationsSound_None: String { return self._s[3882]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3883]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3885]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3886]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3868]!, self._r[3868]!, [_1]) + return formatWithArgumentRanges(self._s[3887]!, self._r[3887]!, [_1]) } - public var Cache_Indexing: String { return self._s[3869]! } - public var DialogList_RecentTitlePeople: String { return self._s[3871]! } - public var DialogList_EncryptionRejected: String { return self._s[3872]! } - public var GroupInfo_Administrators: String { return self._s[3873]! } - public var Passport_ScanPassportHelp: String { return self._s[3874]! } - public var Application_Name: String { return self._s[3875]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3876]! } - public var PeopleNearby_MakeVisible: String { return self._s[3878]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3879]! } - public var Stats_GrowthTitle: String { return self._s[3880]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3881]! } + public var Cache_Indexing: String { return self._s[3888]! } + public var DialogList_RecentTitlePeople: String { return self._s[3890]! } + public var DialogList_EncryptionRejected: String { return self._s[3891]! } + public var GroupInfo_Administrators: String { return self._s[3892]! } + public var Passport_ScanPassportHelp: String { return self._s[3893]! } + public var Application_Name: String { return self._s[3894]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3895]! } + public var PeopleNearby_MakeVisible: String { return self._s[3897]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3898]! } + public var Stats_GrowthTitle: String { return self._s[3899]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3900]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3882]!, self._r[3882]!, [_0]) + return formatWithArgumentRanges(self._s[3901]!, self._r[3901]!, [_0]) } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3883]!, self._r[3883]!, [_0]) - } - public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3884]!, self._r[3884]!, [_0]) - } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3885]! } - public var Privacy_ChatsTitle: String { return self._s[3886]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3887]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3888]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3889]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3890]! } - public var WebBrowser_Title: String { return self._s[3891]! } - public var Group_LinkedChannel: String { return self._s[3892]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3893]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3894]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3895]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3896]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3897]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3899]! } - public var Channel_Setup_TypePublic: String { return self._s[3901]! } - public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3902]!, self._r[3902]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3904]! } - public var MessagePoll_ViewResults: String { return self._s[3905]! } - public var Map_OpenInMaps: String { return self._s[3907]! } + public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3903]!, self._r[3903]!, [_0]) + } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3904]! } + public var Privacy_ChatsTitle: String { return self._s[3905]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3906]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3907]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3908]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3909]! } + public var WebBrowser_Title: String { return self._s[3910]! } + public var Group_LinkedChannel: String { return self._s[3911]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3912]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3913]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3914]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3915]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3916]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3918]! } + public var Channel_Setup_TypePublic: String { return self._s[3920]! } + public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3921]!, self._r[3921]!, [_0]) + } + public var Channel_TypeSetup_Title: String { return self._s[3923]! } + public var MessagePoll_ViewResults: String { return self._s[3924]! } + public var Map_OpenInMaps: String { return self._s[3926]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3908]!, self._r[3908]!, [_1]) + return formatWithArgumentRanges(self._s[3927]!, self._r[3927]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3910]! } + public var NotificationsSound_Tremolo: String { return self._s[3929]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3911]!, self._r[3911]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3930]!, self._r[3930]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3912]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3913]! } - public var Passport_PasswordHelp: String { return self._s[3914]! } - public var Login_CodeExpiredError: String { return self._s[3915]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3916]! } - public var Conversation_TitleUnmute: String { return self._s[3917]! } - public var Passport_Identity_ScansHelp: String { return self._s[3918]! } - public var Passport_Language_lo: String { return self._s[3919]! } - public var Camera_FlashAuto: String { return self._s[3920]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3921]! } - public var Common_Cancel: String { return self._s[3922]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3923]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3924]! } - public var Appearance_TintAllColors: String { return self._s[3925]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3931]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3932]! } + public var Passport_PasswordHelp: String { return self._s[3934]! } + public var Login_CodeExpiredError: String { return self._s[3935]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3936]! } + public var Conversation_TitleUnmute: String { return self._s[3937]! } + public var Passport_Identity_ScansHelp: String { return self._s[3938]! } + public var Passport_Language_lo: String { return self._s[3939]! } + public var Camera_FlashAuto: String { return self._s[3940]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3941]! } + public var Common_Cancel: String { return self._s[3942]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3943]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3944]! } + public var Appearance_TintAllColors: String { return self._s[3945]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3926]!, self._r[3926]!, [_1]) + return formatWithArgumentRanges(self._s[3946]!, self._r[3946]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3927]! } - public var ChatSettings_Title: String { return self._s[3929]! } - public var Passport_PasswordReset: String { return self._s[3930]! } - public var SocksProxySetup_TypeNone: String { return self._s[3931]! } - public var EditTheme_Title: String { return self._s[3934]! } - public var PhoneNumberHelp_Help: String { return self._s[3935]! } - public var Checkout_EnterPassword: String { return self._s[3936]! } - public var Activity_UploadingDocument: String { return self._s[3938]! } - public var Share_AuthTitle: String { return self._s[3939]! } - public var State_Connecting: String { return self._s[3940]! } - public var Profile_MessageLifetime1w: String { return self._s[3941]! } - public var Conversation_ContextMenuReport: String { return self._s[3942]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3943]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3944]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3947]! } + public var ChatSettings_Title: String { return self._s[3949]! } + public var Passport_PasswordReset: String { return self._s[3950]! } + public var SocksProxySetup_TypeNone: String { return self._s[3951]! } + public var EditTheme_Title: String { return self._s[3954]! } + public var PhoneNumberHelp_Help: String { return self._s[3955]! } + public var Checkout_EnterPassword: String { return self._s[3956]! } + public var Activity_UploadingDocument: String { return self._s[3958]! } + public var Share_AuthTitle: String { return self._s[3959]! } + public var State_Connecting: String { return self._s[3960]! } + public var Profile_MessageLifetime1w: String { return self._s[3961]! } + public var Conversation_ContextMenuReport: String { return self._s[3962]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3963]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3964]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3945]!, self._r[3945]!, [_0]) + return formatWithArgumentRanges(self._s[3965]!, self._r[3965]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3946]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3947]! } - public var PeerInfo_PaneAudio: String { return self._s[3948]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3950]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3951]! } - public var PhotoEditor_Set: String { return self._s[3952]! } - public var EmptyGroupInfo_Title: String { return self._s[3953]! } - public var Login_PadPhoneHelp: String { return self._s[3954]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3956]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3958]! } - public var NotificationsSound_Complete: String { return self._s[3959]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3960]! } - public var Group_Info_AdminLog: String { return self._s[3961]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3962]! } + public var AuthSessions_Terminate: String { return self._s[3966]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3967]! } + public var PeerInfo_PaneAudio: String { return self._s[3968]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3970]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3971]! } + public var PhotoEditor_Set: String { return self._s[3972]! } + public var EmptyGroupInfo_Title: String { return self._s[3973]! } + public var Login_PadPhoneHelp: String { return self._s[3975]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3977]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3979]! } + public var NotificationsSound_Complete: String { return self._s[3980]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3981]! } + public var Group_Info_AdminLog: String { return self._s[3982]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3983]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3963]!, self._r[3963]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3984]!, self._r[3984]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3964]! } - public var Group_Location_CreateInThisPlace: String { return self._s[3966]! } - public var Conversation_Admin: String { return self._s[3967]! } - public var Conversation_GifTooltip: String { return self._s[3968]! } - public var Passport_NotLoggedInMessage: String { return self._s[3969]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3985]! } + public var Group_Location_CreateInThisPlace: String { return self._s[3987]! } + public var Conversation_Admin: String { return self._s[3988]! } + public var Conversation_GifTooltip: String { return self._s[3989]! } + public var Passport_NotLoggedInMessage: String { return self._s[3990]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3971]!, self._r[3971]!, [_0]) + return formatWithArgumentRanges(self._s[3992]!, self._r[3992]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3972]! } - public var SharedMedia_EmptyTitle: String { return self._s[3974]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3976]! } - public var Username_Help: String { return self._s[3977]! } - public var DialogList_LanguageTooltip: String { return self._s[3979]! } - public var Map_LoadError: String { return self._s[3980]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3981]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3982]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3983]! } - public var Notification_Exceptions_NewException: String { return self._s[3984]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3985]! } - public var WatchRemote_AlertText: String { return self._s[3986]! } + public var Profile_MessageLifetimeForever: String { return self._s[3993]! } + public var SharedMedia_EmptyTitle: String { return self._s[3995]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3997]! } + public var Username_Help: String { return self._s[3998]! } + public var DialogList_LanguageTooltip: String { return self._s[4000]! } + public var Map_LoadError: String { return self._s[4001]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[4002]! } + public var Channel_AdminLog_AddMembers: String { return self._s[4003]! } + public var ArchivedChats_IntroTitle2: String { return self._s[4004]! } + public var Notification_Exceptions_NewException: String { return self._s[4005]! } + public var TwoStepAuth_EmailTitle: String { return self._s[4006]! } + public var WatchRemote_AlertText: String { return self._s[4007]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3987]!, self._r[3987]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4008]!, self._r[4008]!, [_1, _2, _3]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3991]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[4012]! } public func PUSH_PINNED_QUIZ(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3992]!, self._r[3992]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_1, _2]) } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3993]!, self._r[3993]!, [_0]) + return formatWithArgumentRanges(self._s[4014]!, self._r[4014]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3994]! } - public var WebBrowser_DefaultBrowser: String { return self._s[3995]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3996]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[4015]! } + public var WebBrowser_DefaultBrowser: String { return self._s[4016]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[4017]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3997]!, self._r[3997]!, [_0]) + return formatWithArgumentRanges(self._s[4018]!, self._r[4018]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3998]!, self._r[3998]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4019]!, self._r[4019]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3999]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[4000]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[4002]! } - public var Wallet_Created_ExportErrorText: String { return self._s[4003]! } - public var ChatList_UndoArchiveText1: String { return self._s[4004]! } - public var AccessDenied_VideoMicrophone: String { return self._s[4005]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4006]! } - public var Cache_ClearNone: String { return self._s[4007]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[4008]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[4009]! } + public var Group_AdminLog_EmptyText: String { return self._s[4020]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[4021]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[4023]! } + public var Wallet_Created_ExportErrorText: String { return self._s[4024]! } + public var ChatList_UndoArchiveText1: String { return self._s[4025]! } + public var AccessDenied_VideoMicrophone: String { return self._s[4026]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4027]! } + public var Cache_ClearNone: String { return self._s[4028]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[4029]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[4030]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4010]!, self._r[4010]!, [_0]) + return formatWithArgumentRanges(self._s[4031]!, self._r[4031]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[4011]! } + public var Passport_Identity_Country: String { return self._s[4032]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4012]!, self._r[4012]!, [_0]) - } - public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_0]) - } - public var Exceptions_AddToExceptions: String { return self._s[4014]! } - public var AccessDenied_Settings: String { return self._s[4015]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[4016]! } - public var Month_ShortMay: String { return self._s[4017]! } - public var Compose_NewGroup: String { return self._s[4019]! } - public var Group_Setup_TypePrivate: String { return self._s[4021]! } - public var Login_PadPhoneHelpTitle: String { return self._s[4023]! } - public var Appearance_ThemeDayClassic: String { return self._s[4024]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[4025]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[4026]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[4027]! } - public var Conversation_typing: String { return self._s[4029]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[4030]! } - public var Paint_Masks: String { return self._s[4031]! } - public var Contacts_DeselectAll: String { return self._s[4032]! } - public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4033]!, self._r[4033]!, [_0]) } - public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[4034]! } - public var Username_InvalidTaken: String { return self._s[4035]! } - public var Call_StatusNoAnswer: String { return self._s[4036]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[4037]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4038]! } - public var Passport_Identity_Selfie: String { return self._s[4039]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[4040]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[4041]! } - public var Conversation_ClearSecretHistory: String { return self._s[4042]! } - public var PeopleNearby_Description: String { return self._s[4044]! } - public var NetworkUsageSettings_Title: String { return self._s[4045]! } - public var Your_cards_security_code_is_invalid: String { return self._s[4047]! } - public var Stats_EnabledNotifications: String { return self._s[4048]! } + public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4034]!, self._r[4034]!, [_0]) + } + public var Exceptions_AddToExceptions: String { return self._s[4035]! } + public var AccessDenied_Settings: String { return self._s[4036]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[4037]! } + public var Month_ShortMay: String { return self._s[4038]! } + public var Compose_NewGroup: String { return self._s[4040]! } + public var Group_Setup_TypePrivate: String { return self._s[4042]! } + public var Login_PadPhoneHelpTitle: String { return self._s[4044]! } + public var Appearance_ThemeDayClassic: String { return self._s[4045]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[4046]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[4047]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[4048]! } + public var Conversation_typing: String { return self._s[4050]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[4051]! } + public var Paint_Masks: String { return self._s[4052]! } + public var Contacts_DeselectAll: String { return self._s[4053]! } + public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4054]!, self._r[4054]!, [_0]) + } + public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[4055]! } + public var Username_InvalidTaken: String { return self._s[4056]! } + public var Call_StatusNoAnswer: String { return self._s[4057]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[4058]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4059]! } + public var Passport_Identity_Selfie: String { return self._s[4060]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[4061]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[4062]! } + public var Conversation_ClearSecretHistory: String { return self._s[4063]! } + public var PeopleNearby_Description: String { return self._s[4065]! } + public var NetworkUsageSettings_Title: String { return self._s[4066]! } + public var Your_cards_security_code_is_invalid: String { return self._s[4068]! } + public var Stats_EnabledNotifications: String { return self._s[4069]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4050]!, self._r[4050]!, [_0]) + return formatWithArgumentRanges(self._s[4071]!, self._r[4071]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4051]!, self._r[4051]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4072]!, self._r[4072]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[4053]! } - public var VoiceOver_Navigation_Search: String { return self._s[4054]! } - public var Map_LiveLocationTitle: String { return self._s[4055]! } - public var Login_InfoAvatarAdd: String { return self._s[4056]! } - public var Passport_Identity_FilesView: String { return self._s[4057]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[4058]! } - public var Privacy_Calls_NeverAllow: String { return self._s[4059]! } - public var VoiceOver_Chat_File: String { return self._s[4060]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4061]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[4074]! } + public var VoiceOver_Navigation_Search: String { return self._s[4075]! } + public var Map_LiveLocationTitle: String { return self._s[4076]! } + public var Login_InfoAvatarAdd: String { return self._s[4077]! } + public var Passport_Identity_FilesView: String { return self._s[4078]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[4079]! } + public var Privacy_Calls_NeverAllow: String { return self._s[4080]! } + public var VoiceOver_Chat_File: String { return self._s[4081]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4082]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4062]!, self._r[4062]!, [_0]) + return formatWithArgumentRanges(self._s[4083]!, self._r[4083]!, [_0]) } - public var ChatList_EmptyChatList: String { return self._s[4063]! } - public var ContactInfo_PhoneNumberHidden: String { return self._s[4064]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[4065]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4066]! } + public var ChatList_EmptyChatList: String { return self._s[4084]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[4085]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[4086]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4087]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4067]!, self._r[4067]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4088]!, self._r[4088]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4068]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[4069]! } - public var Tour_Title2: String { return self._s[4070]! } - public var Wallet_Sent_ViewWallet: String { return self._s[4071]! } - public var Conversation_FileOpenIn: String { return self._s[4072]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4073]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4074]! } - public var Wallpaper_Set: String { return self._s[4075]! } - public var Passport_Identity_Translations: String { return self._s[4077]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4089]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[4090]! } + public var Tour_Title2: String { return self._s[4091]! } + public var Wallet_Sent_ViewWallet: String { return self._s[4092]! } + public var Conversation_FileOpenIn: String { return self._s[4093]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4094]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4095]! } + public var Wallpaper_Set: String { return self._s[4096]! } + public var Passport_Identity_Translations: String { return self._s[4098]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_0]) + return formatWithArgumentRanges(self._s[4099]!, self._r[4099]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[4079]! } + public var Channel_LeaveChannel: String { return self._s[4100]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4080]!, self._r[4080]!, [_1]) + return formatWithArgumentRanges(self._s[4101]!, self._r[4101]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4082]! } - public var PhotoEditor_HighlightsTint: String { return self._s[4083]! } - public var MessagePoll_LabelPoll: String { return self._s[4084]! } - public var Passport_Email_Delete: String { return self._s[4085]! } - public var Conversation_Mute: String { return self._s[4087]! } - public var Channel_AddBotAsAdmin: String { return self._s[4088]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[4090]! } - public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4091]! } - public var ChatSettings_IntentsSettings: String { return self._s[4093]! } - public var Channel_Management_LabelOwner: String { return self._s[4094]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4103]! } + public var PhotoEditor_HighlightsTint: String { return self._s[4104]! } + public var MessagePoll_LabelPoll: String { return self._s[4105]! } + public var Passport_Email_Delete: String { return self._s[4106]! } + public var Conversation_Mute: String { return self._s[4108]! } + public var Channel_AddBotAsAdmin: String { return self._s[4109]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[4111]! } + public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4112]! } + public var ChatSettings_IntentsSettings: String { return self._s[4114]! } + public var Channel_Management_LabelOwner: String { return self._s[4115]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4095]!, self._r[4095]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4116]!, self._r[4116]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[4096]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[4097]! } - public var Common_No: String { return self._s[4098]! } - public var Weekday_Sunday: String { return self._s[4099]! } - public var Notification_Reply: String { return self._s[4100]! } - public var Conversation_ViewMessage: String { return self._s[4101]! } + public var Calls_CallTabDescription: String { return self._s[4117]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[4118]! } + public var Common_No: String { return self._s[4119]! } + public var Weekday_Sunday: String { return self._s[4120]! } + public var Notification_Reply: String { return self._s[4121]! } + public var Conversation_ViewMessage: String { return self._s[4122]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4102]!, self._r[4102]!, [_0]) + return formatWithArgumentRanges(self._s[4123]!, self._r[4123]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4103]!, self._r[4103]!, [_0]) + return formatWithArgumentRanges(self._s[4124]!, self._r[4124]!, [_0]) } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4104]!, self._r[4104]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4125]!, self._r[4125]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4105]! } - public var Wallet_Send_Title: String { return self._s[4106]! } - public var Message_PinnedDocumentMessage: String { return self._s[4107]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[4108]! } - public var DialogList_TabTitle: String { return self._s[4110]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[4111]! } - public var Passport_FieldEmail: String { return self._s[4112]! } - public var Conversation_UnpinMessageAlert: String { return self._s[4113]! } - public var Passport_Address_TypeBankStatement: String { return self._s[4114]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[4115]! } - public var Passport_Identity_ExpiryDate: String { return self._s[4116]! } - public var Privacy_Calls_P2P: String { return self._s[4117]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4126]! } + public var Wallet_Send_Title: String { return self._s[4127]! } + public var Message_PinnedDocumentMessage: String { return self._s[4128]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[4129]! } + public var DialogList_TabTitle: String { return self._s[4131]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[4132]! } + public var Passport_FieldEmail: String { return self._s[4133]! } + public var Conversation_UnpinMessageAlert: String { return self._s[4134]! } + public var Passport_Address_TypeBankStatement: String { return self._s[4135]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[4136]! } + public var Passport_Identity_ExpiryDate: String { return self._s[4137]! } + public var Privacy_Calls_P2P: String { return self._s[4138]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4119]!, self._r[4119]!, [_0]) + return formatWithArgumentRanges(self._s[4140]!, self._r[4140]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[4120]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[4141]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4121]!, self._r[4121]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4142]!, self._r[4142]!, [_1, _2]) } - public var Stickers_ClearRecent: String { return self._s[4122]! } - public var EnterPasscode_ChangeTitle: String { return self._s[4123]! } - public var TwoFactorSetup_Email_Title: String { return self._s[4124]! } - public var Passport_InfoText: String { return self._s[4125]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4126]! } + public var Stickers_ClearRecent: String { return self._s[4143]! } + public var EnterPasscode_ChangeTitle: String { return self._s[4144]! } + public var TwoFactorSetup_Email_Title: String { return self._s[4145]! } + public var Passport_InfoText: String { return self._s[4146]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4147]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4127]!, self._r[4127]!, [_0]) - } - public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4128]!, self._r[4128]!, [_1, _2, _3]) - } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4129]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[4130]! } - public var VoiceOver_Navigation_Compose: String { return self._s[4131]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[4132]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[4134]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4135]! } - public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4136]!, self._r[4136]!, [_1, _2]) - } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4139]! } - public var ChatSettings_OpenLinksIn: String { return self._s[4140]! } - public var Map_HomeAndWorkTitle: String { return self._s[4141]! } - public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4143]!, self._r[4143]!, [_0]) - } - public var DialogList_Unread: String { return self._s[4144]! } - public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4145]!, self._r[4145]!, [_1, _2]) - } - public var User_DeletedAccount: String { return self._s[4146]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4147]! } - public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4148]!, self._r[4148]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[4149]! } - public var SharedMedia_CategoryMedia: String { return self._s[4150]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4151]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4152]! } - public var Watch_ChatList_Compose: String { return self._s[4153]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4154]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[4155]! } - public var Watch_Microphone_Access: String { return self._s[4156]! } - public var Group_Setup_HistoryHeader: String { return self._s[4157]! } - public var Map_SetThisLocation: String { return self._s[4158]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4159]! } - public var Activity_UploadingPhoto: String { return self._s[4160]! } - public var Conversation_Edit: String { return self._s[4162]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[4163]! } - public var Login_TermsOfServiceDecline: String { return self._s[4164]! } - public var Message_PinnedContactMessage: String { return self._s[4165]! } - public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4149]!, self._r[4149]!, [_1, _2, _3]) + } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4150]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[4151]! } + public var VoiceOver_Navigation_Compose: String { return self._s[4152]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[4153]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[4155]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4156]! } + public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4157]!, self._r[4157]!, [_1, _2]) + } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4160]! } + public var ChatSettings_OpenLinksIn: String { return self._s[4161]! } + public var Map_HomeAndWorkTitle: String { return self._s[4162]! } + public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4164]!, self._r[4164]!, [_0]) + } + public var DialogList_Unread: String { return self._s[4165]! } + public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4166]!, self._r[4166]!, [_1, _2]) } + public var User_DeletedAccount: String { return self._s[4167]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4168]! } + public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4169]!, self._r[4169]!, [_0]) + } + public var UserInfo_NotificationsDefault: String { return self._s[4170]! } + public var SharedMedia_CategoryMedia: String { return self._s[4171]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4172]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4173]! } + public var Watch_ChatList_Compose: String { return self._s[4174]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4175]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[4176]! } + public var Watch_Microphone_Access: String { return self._s[4177]! } + public var Group_Setup_HistoryHeader: String { return self._s[4178]! } + public var Map_SetThisLocation: String { return self._s[4179]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4180]! } + public var Activity_UploadingPhoto: String { return self._s[4181]! } + public var Conversation_Edit: String { return self._s[4183]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[4184]! } + public var Login_TermsOfServiceDecline: String { return self._s[4185]! } + public var Message_PinnedContactMessage: String { return self._s[4186]! } + public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4187]!, self._r[4187]!, [_1, _2]) + } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4167]!, self._r[4167]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[4188]!, self._r[4188]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[4168]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4170]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4171]! } + public var Appearance_LargeEmoji: String { return self._s[4189]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4191]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4192]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4172]!, self._r[4172]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4193]!, self._r[4193]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[4173]! } - public var Message_PinnedPhotoMessage: String { return self._s[4174]! } - public var Passport_FieldPhone: String { return self._s[4175]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4176]! } - public var Stats_NotificationsTitle: String { return self._s[4177]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[4178]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[4180]! } - public var Conversation_Call: String { return self._s[4181]! } - public var Common_TakePhoto: String { return self._s[4183]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4184]! } - public var Wallet_Receive_CommentHeader: String { return self._s[4185]! } - public var Channel_NotificationLoading: String { return self._s[4186]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[4194]! } + public var Message_PinnedPhotoMessage: String { return self._s[4195]! } + public var Passport_FieldPhone: String { return self._s[4196]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4197]! } + public var Stats_NotificationsTitle: String { return self._s[4198]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[4199]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[4201]! } + public var Conversation_Call: String { return self._s[4202]! } + public var Common_TakePhoto: String { return self._s[4204]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4205]! } + public var Wallet_Receive_CommentHeader: String { return self._s[4206]! } + public var Channel_NotificationLoading: String { return self._s[4207]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4187]!, self._r[4187]!, [_0]) + return formatWithArgumentRanges(self._s[4208]!, self._r[4208]!, [_0]) } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4188]!, self._r[4188]!, [_0]) + return formatWithArgumentRanges(self._s[4209]!, self._r[4209]!, [_0]) } public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4189]!, self._r[4189]!, [_1]) + return formatWithArgumentRanges(self._s[4210]!, self._r[4210]!, [_1]) } - public var Permissions_SiriTitle_v0: String { return self._s[4190]! } + public var Permissions_SiriTitle_v0: String { return self._s[4211]! } public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4191]!, self._r[4191]!, [_0]) - } - public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4192]!, self._r[4192]!, [_0]) - } - public var Channel_MessagePhotoRemoved: String { return self._s[4193]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[4194]! } - public var ClearCache_FreeSpace: String { return self._s[4195]! } - public var Appearance_BubbleCorners_Apply: String { return self._s[4196]! } - public var Common_edit: String { return self._s[4197]! } - public var PrivacySettings_AuthSessions: String { return self._s[4198]! } - public var Month_ShortJune: String { return self._s[4199]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4200]! } - public var Call_ReportSend: String { return self._s[4201]! } - public var Watch_LastSeen_JustNow: String { return self._s[4202]! } - public var Notifications_MessageNotifications: String { return self._s[4203]! } - public var WallpaperSearch_ColorGreen: String { return self._s[4204]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4206]! } - public var Group_Status: String { return self._s[4207]! } - public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4208]!, self._r[4208]!, [_0, _1]) - } - public var TextFormat_AddLinkTitle: String { return self._s[4209]! } - public var ShareMenu_ShareTo: String { return self._s[4210]! } - public var Conversation_Moderate_Ban: String { return self._s[4211]! } - public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4212]!, self._r[4212]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[4213]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4214]! } + public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4213]!, self._r[4213]!, [_0]) + } + public var Channel_MessagePhotoRemoved: String { return self._s[4214]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[4215]! } + public var ClearCache_FreeSpace: String { return self._s[4216]! } + public var Appearance_BubbleCorners_Apply: String { return self._s[4217]! } + public var Common_edit: String { return self._s[4218]! } + public var PrivacySettings_AuthSessions: String { return self._s[4219]! } + public var Month_ShortJune: String { return self._s[4220]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4221]! } + public var Call_ReportSend: String { return self._s[4222]! } + public var Watch_LastSeen_JustNow: String { return self._s[4223]! } + public var Notifications_MessageNotifications: String { return self._s[4224]! } + public var WallpaperSearch_ColorGreen: String { return self._s[4225]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4227]! } + public var Group_Status: String { return self._s[4228]! } + public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4229]!, self._r[4229]!, [_0, _1]) + } + public var TextFormat_AddLinkTitle: String { return self._s[4230]! } + public var ShareMenu_ShareTo: String { return self._s[4231]! } + public var Conversation_Moderate_Ban: String { return self._s[4232]! } + public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4233]!, self._r[4233]!, [_0]) + } + public var SharedMedia_ViewInChat: String { return self._s[4234]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4235]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4215]!, self._r[4215]!, [_1]) + return formatWithArgumentRanges(self._s[4236]!, self._r[4236]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4216]!, self._r[4216]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4237]!, self._r[4237]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4218]!, self._r[4218]!, [_0]) + return formatWithArgumentRanges(self._s[4239]!, self._r[4239]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[4219]! } - public var Appearance_ReduceMotion: String { return self._s[4220]! } + public var Map_OpenInHereMaps: String { return self._s[4240]! } + public var Appearance_ReduceMotion: String { return self._s[4241]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4221]!, self._r[4221]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4242]!, self._r[4242]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[4222]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[4223]! } - public var PhotoEditor_Skip: String { return self._s[4224]! } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[4243]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[4244]! } + public var PhotoEditor_Skip: String { return self._s[4245]! } + public func StickerPack_RemoveMaskCount(_ 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 MessageTimer_ShortMinutes(_ 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[1 * 6 + Int(form.rawValue)]!, stringValue) } - public func ServiceMessage_GameScoreSelfSimple(_ 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[2 * 6 + Int(form.rawValue)]!, stringValue) } - public func Map_ETAHours(_ 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[3 * 6 + Int(form.rawValue)]!, stringValue) } - public func Wallpaper_DeleteConfirmation(_ 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[4 * 6 + Int(form.rawValue)]!, stringValue) } - public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { + public func Wallpaper_DeleteConfirmation(_ 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 StickerPack_StickerCount(_ 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[6 * 6 + Int(form.rawValue)]!, stringValue) } - public func SharedMedia_Link(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[7 * 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[7 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func Call_Seconds(_ 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[8 * 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[9 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Media_ShareItem(_ value: Int32) -> String { + public func Conversation_StatusOnline(_ 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) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, _1, _2) } - public func ForwardedPolls(_ value: Int32) -> String { + 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[11 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func SharedMedia_Link(_ 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 GroupInfo_ParticipantCount(_ value: Int32) -> String { + public func LastSeen_HoursAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Years(_ 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[14 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notifications_ExceptionMuteExpires_Days(_ 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[15 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_StatusMembers(_ value: Int32) -> String { + public func OldChannels_InactiveWeek(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, _1, _2) } - public func SharedMedia_Generic(_ 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[18 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortHours(_ 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[19 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func ForwardedVideoMessages(_ 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 PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) } public func MessagePoll_VotedCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_File(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_ROUNDS(_ 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[25 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Call_ShortMinutes(_ 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 ChatList_DeletedChats(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_SelectedMessages(_ 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 Media_ShareVideo(_ 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) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, _1, _2) } public func MuteExpires_Hours(_ 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) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) } - public func StickerPack_AddStickerCount(_ 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[33 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfSimple(_ 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 PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) - } - public func GroupInfo_ShowMoreMembers(_ 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 LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortSeconds(_ 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 ForwardedVideoMessages(_ 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 Map_ETAMinutes(_ 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 OldChannels_InactiveYear(_ 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 ForwardedFiles(_ 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) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) } public func Notification_GameScoreExtended(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 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[48 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func UserCount(_ 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 ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Video(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusOnline(_ 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 AttachmentMenu_SendPhoto(_ 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 Passport_Scans(_ 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 StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Seconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactPhoneNumberCount(_ 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 ServiceMessage_GameScoreSelfExtended(_ 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 StickerPack_AddMaskCount(_ 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_SendItem(_ 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 MuteExpires_Days(_ 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 Watch_UserInfo_Mute(_ 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 LiveLocation_MenuChatsCount(_ 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 ForwardedGifs(_ 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 ForwardedContacts(_ 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 ForwardedPhotos(_ 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 ForwardedMessages(_ 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 AttachmentMenu_SendVideo(_ 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 Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func DialogList_LiveLocationChatsCount(_ 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 MessageTimer_Months(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedLocations(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PeopleNearby_ShowMorePeople(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_InactiveMonth(_ 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 MessagePoll_QuizCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Minutes(_ 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 MuteExpires_Minutes(_ 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 MuteFor_Hours(_ 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 VoiceOver_Chat_PollOptionCount(_ 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 Contacts_ImportersCount(_ 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 Chat_DeleteMessagesConfirmation(_ 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 Contacts_InviteContacts(_ 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 VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) } public func InviteText_ContactsCountText(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) } - public func ChatList_SelectedChats(_ 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[92 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) } - public func MuteFor_Days(_ 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[93 * 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[94 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func QuickSend_Photos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_InactiveWeek(_ 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 MessageTimer_ShortDays(_ 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 PollResults_ShowMore(_ 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 ForwardedAudios(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveStickerCount(_ 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 AttachmentMenu_SendGif(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ 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 VoiceOver_Chat_PollVotes(_ 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 Theme_UsersCount(_ 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 ForwardedStickers(_ 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) + return String(format: self._ps[29 * 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[106 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[30 * 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[31 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedPhotos(_ 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 Call_ShortMinutes(_ 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 Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveYear(_ 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 PrivacyLastSeenSettings_AddUsers(_ 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 StickerPack_AddMaskCount(_ 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 Watch_LastSeen_HoursAgo(_ 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 MessagePoll_QuizCount(_ 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 LastSeen_MinutesAgo(_ 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 ForwardedStickers(_ 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 OldChannels_GroupFormat(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortDays(_ 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 SharedMedia_DeleteItemsConfirmation(_ 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 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 MessageTimer_Minutes(_ 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 ServiceMessage_GameScoreSimple(_ 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[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[49 * 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[50 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func GroupInfo_ShowMoreMembers(_ 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 Stats_MessageViews(_ 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 Passport_Scans(_ 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 PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[60 * 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[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeletedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[64 * 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[65 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Stats_MessageForwards(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[68 * 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[69 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[70 * 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[71 * 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[72 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[73 * 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[74 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Contacts_InviteContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[75 * 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[76 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[77 * 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[78 * 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[79 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedAudios(_ 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 AttachmentMenu_SendGif(_ 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 ForwardedContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfExtended(_ 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 PeopleNearby_ShowMorePeople(_ 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 PollResults_ShowMore(_ 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 SharedMedia_File(_ 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 Call_Minutes(_ 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 PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, _2, _1, _3) } public func Media_SharePhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfSimple(_ 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 Watch_UserInfo_Mute(_ 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 OldChannels_InactiveMonth(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[97 * 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[98 * 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[99 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[100 * 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[101 * 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[102 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_Leave(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Invitation_Members(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 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[107 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func UserCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSimple(_ 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[109 * 6 + Int(form.rawValue)]!, stringValue) @@ -5302,82 +5301,101 @@ public final class PresentationStrings: Equatable { let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) } - public func OldChannels_Leave(_ value: Int32) -> String { + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[111 * 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[112 * 6 + Int(form.rawValue)]!, _1, _2) + public func Conversation_SelectedMessages(_ 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 SharedMedia_DeleteItemsConfirmation(_ 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[113 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSelfExtended(_ 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 Call_ShortSeconds(_ 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[115 * 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[116 * 6 + Int(form.rawValue)]!, _1, _2) + public func MessageTimer_Years(_ 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 ForwardedVideos(_ value: Int32) -> String { + public func MessageTimer_ShortHours(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + public func InstantPage_Views(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, _1, _2) + public func Conversation_StatusSubscribers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notifications_ExceptionMuteExpires_Hours(_ 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[120 * 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[121 * 6 + Int(form.rawValue)]!, _0, _1) + public func Map_ETAHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Weeks(_ 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[122 * 6 + Int(form.rawValue)]!, stringValue) } - public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + public func QuickSend_Photos(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, stringValue) } - public func LastSeen_HoursAgo(_ value: Int32) -> String { + public func Theme_UsersCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, stringValue) } - public func OldChannels_GroupFormat(_ 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[125 * 6 + Int(form.rawValue)]!, stringValue) } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[126 * 6 + Int(form.rawValue)]!, stringValue) } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[127 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[128 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[129 * 6 + Int(form.rawValue)]!, stringValue) + } public init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) { self.primaryComponent = primaryComponent diff --git a/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/Contents.json index 147027fa6d..a08f875796 100644 --- a/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chart/arrow_left.imageset/Contents.json @@ -8,5 +8,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" } } \ No newline at end of file diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 7f2c20ee23..1393f0cb4b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -193,6 +193,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G private var resolvePeerByNameDisposable: MetaDisposable? private var shareStatusDisposable: MetaDisposable? private var clearCacheDisposable: MetaDisposable? + private var bankCardDisposable: MetaDisposable? private let editingMessage = ValuePromise(nil, ignoreRepeated: true) private let startingBot = ValuePromise(false, ignoreRepeated: true) @@ -1056,7 +1057,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G var cancelImpl: (() -> Void)? let presentationData = strongSelf.presentationData let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) self?.present(controller, in: .window(.root)) @@ -1362,60 +1363,67 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return } -// var signal = getBankCardInfo(account: strongSelf.context.account, cardNumber: number) -// -// var cancelImpl: (() -> Void)? -// let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } -// let progressSignal = Signal { subscriber in -// let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { -// cancelImpl?() -// })) -// strongSelf.present(controller, in: .window(.root), with: 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 = { -// disposable.set(nil) -// } -// disposable.set((signal -// |> deliverOnMainQueue).start(next: { [weak self] info in -// if let strongSelf = self, let info = info { -// let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) -// var items: [ActionSheetItem] = [] -// items.append(ActionSheetTextItem(title: info.title)) -// for url in info.urls { -// items.append(ActionSheetButtonItem(title: url.title, color: .accent, action: { [weak actionSheet] in -// actionSheet?.dismissAnimated() -// if let strongSelf = self { -// strongSelf.controllerInteraction?.openUrl(url.url, false, false, message) -// } -// })) -// } -// items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet] in -// actionSheet?.dismissAnimated() -// UIPasteboard.general.string = number -// })) -// actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [ -// ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in -// actionSheet?.dismissAnimated() -// }) -// ])]) -// strongSelf.present(actionSheet, in: .window(.root)) -// } -// })) + var signal = getBankCardInfo(account: strongSelf.context.account, cardNumber: number) + let disposable: MetaDisposable + if let current = strongSelf.bankCardDisposable { + disposable = current + } else { + disposable = MetaDisposable() + strongSelf.bankCardDisposable = disposable + } + + var cancelImpl: (() -> Void)? + let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } + let progressSignal = Signal { subscriber in + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + cancelImpl?() + })) + strongSelf.present(controller, in: .window(.root), with: 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 = { + disposable.set(nil) + } + disposable.set((signal + |> deliverOnMainQueue).start(next: { [weak self] info in + if let strongSelf = self, let info = info { + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) + var items: [ActionSheetItem] = [] + items.append(ActionSheetTextItem(title: info.title)) + for url in info.urls { + items.append(ActionSheetButtonItem(title: url.title, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.controllerInteraction?.openUrl(url.url, false, false, message) + } + })) + } + items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + UIPasteboard.general.string = number + })) + actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + }) + ])]) + strongSelf.present(actionSheet, in: .window(.root)) + } + })) strongSelf.chatDisplayNode.dismissInput() } @@ -2555,6 +2563,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.resolvePeerByNameDisposable?.dispose() self.shareStatusDisposable?.dispose() self.clearCacheDisposable?.dispose() + self.bankCardDisposable?.dispose() self.botCallbackAlertMessageDisposable?.dispose() self.selectMessagePollOptionDisposables?.dispose() for (_, info) in self.contextQueryStates { @@ -5597,7 +5606,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G var cancelImpl: (() -> Void)? let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) strongSelf.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) @@ -7656,7 +7665,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G var cancelImpl: (() -> Void)? let presentationData = strongSelf.presentationData let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) self?.present(controller, in: .window(.root)) diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift index 53a7b86c40..bde70d062b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift @@ -1494,7 +1494,6 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { } if let textInputPanelNode = self.textInputPanelNode, updateInputTextState { - textInputPanelNode.updateInputTextState(chatPresentationInterfaceState.interfaceState.effectiveInputState, keepSendButtonEnabled: keepSendButtonEnabled, extendedSearchLayout: extendedSearchLayout, accessoryItems: chatPresentationInterfaceState.inputTextPanelState.accessoryItems, animated: transition.isAnimated) } else { self.textInputPanelNode?.updateKeepSendButtonEnabled(keepSendButtonEnabled: keepSendButtonEnabled, extendedSearchLayout: extendedSearchLayout, animated: transition.isAnimated) diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index 0742b7d9c5..51410a8295 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -613,12 +613,12 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { } } |> distinctUntilChanged - - let animatedEmojiStickers = loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .animatedEmoji, forceActualized: false) - |> map { result -> [String: [StickerPackItem]] in - switch result { + + let animatedEmojiStickers = combineLatest(loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .animatedEmoji, forceActualized: false), loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .dice, forceActualized: false)) + |> map { animatedEmoji, dice -> [String: [StickerPackItem]] in + var animatedEmojiStickers: [String: [StickerPackItem]] = [:] + switch animatedEmoji { case let .result(_, items, _): - var animatedEmojiStickers: [String: [StickerPackItem]] = [:] for case let item as StickerPackItem in items { if let emoji = item.getStringRepresentationsOfIndexKeys().first { animatedEmojiStickers[emoji.basicEmoji.0] = [item] @@ -628,22 +628,22 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { } } } - - if let path = getAppBundle().path(forResource: "Dice_1", ofType: "tgs") { - var dices: [StickerPackItem] = [] - for i in 1...6 { - let path = path.replacingOccurrences(of: "_1", with: "_\(i)") - let id = arc4random64() - let resource = LocalFileReferenceMediaResource(localFilePath: path, randomId: id) - dices.append(StickerPackItem(index: ItemCollectionItemIndex(index: Int32(i), id: Int64(i)), file: TelegramMediaFile(fileId: MediaId(namespace: 10, id: Int64(i)), partialReference: nil, resource: resource, previewRepresentations: [], immediateThumbnailData: nil, mimeType: "application/x-tgsticker", size: nil, attributes: []), indexKeys: [])) - } - animatedEmojiStickers["🎲".strippedEmoji] = dices - } - - return animatedEmojiStickers default: - return [:] + break } + switch dice { + case let .result(_, items, _): + var diceStickers: [StickerPackItem] = [] + for case let item as StickerPackItem in items { + if let emoji = item.getStringRepresentationsOfIndexKeys().first { + diceStickers.append(item) + } + } + animatedEmojiStickers["🎲".strippedEmoji] = diceStickers + default: + break + } + return animatedEmojiStickers } let previousHistoryAppearsCleared = Atomic(value: nil) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index 0731b00c15..627a56966d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -19,10 +19,271 @@ import TelegramAnimatedStickerNode import Emoji import Markdown +import RLottieBinding +import AppBundle +import GZip + private let nameFont = Font.medium(14.0) private let inlineBotPrefixFont = Font.regular(14.0) private let inlineBotNameFont = nameFont +private final class ManagedAnimationState { + let item: ManagedAnimationItem + + private let instance: LottieInstance + + let frameCount: Int + let fps: Double + + var relativeTime: Double = 0.0 + var frameIndex: Int? + + private let renderContext: DrawingContext + + init?(displaySize: CGSize, item: ManagedAnimationItem, current: ManagedAnimationState?) { + let resolvedInstance: LottieInstance + let renderContext: DrawingContext + + if let current = current { + resolvedInstance = current.instance + renderContext = current.renderContext + } else { + guard let path = item.source.path else { + return nil + } + guard let data = try? Data(contentsOf: URL(fileURLWithPath: path)) else { + return nil + } + guard let unpackedData = TGGUnzipData(data, 5 * 1024 * 1024) else { + return nil + } + guard let instance = LottieInstance(data: unpackedData, cacheKey: item.source.cacheKey) else { + return nil + } + resolvedInstance = instance + renderContext = DrawingContext(size: displaySize, scale: UIScreenScale, premultiplied: true, clear: true) + } + + self.item = item + self.instance = resolvedInstance + self.renderContext = renderContext + + self.frameCount = Int(self.instance.frameCount) + self.fps = Double(self.instance.frameRate) + } + + func draw() -> UIImage? { + self.instance.renderFrame(with: Int32(self.frameIndex ?? 0), into: self.renderContext.bytes.assumingMemoryBound(to: UInt8.self), width: Int32(self.renderContext.size.width * self.renderContext.scale), height: Int32(self.renderContext.size.height * self.renderContext.scale), bytesPerRow: Int32(self.renderContext.bytesPerRow)) + return self.renderContext.generateImage() + } +} + +struct ManagedAnimationFrameRange: Equatable { + var startFrame: Int + var endFrame: Int +} + +enum ManagedAnimationSource: Equatable { + case local(String) + case resource(MediaBox, MediaResource) + + var cacheKey: String { + switch self { + case let .local(name): + return name + case let .resource(mediaBox, resource): + return resource.id.uniqueId + } + } + + var path: String? { + switch self { + case let .local(name): + return getAppBundle().path(forResource: name, ofType: "tgs") + case let .resource(mediaBox, resource): + return mediaBox.completedResourcePath(resource) + } + } + + static func == (lhs: ManagedAnimationSource, rhs: ManagedAnimationSource) -> Bool { + switch lhs { + case let .local(lhsPath): + if case let .local(rhsPath) = rhs, lhsPath == rhsPath { + return true + } else { + return false + } + case let .resource(lhsMediaBox, lhsResource): + if case let .resource(rhsMediaBox, rhsResource) = rhs, lhsMediaBox === rhsMediaBox, lhsResource.isEqual(to: rhsResource) { + return true + } else { + return false + } + } + } +} + +struct ManagedAnimationItem: Equatable { + let source: ManagedAnimationSource + var frames: ManagedAnimationFrameRange + var duration: Double +} + +class ManagedAnimationNode: ASDisplayNode { + let intrinsicSize: CGSize + + private let imageNode: ASImageNode + private let displayLink: CADisplayLink + + fileprivate var state: ManagedAnimationState? + fileprivate var trackStack: [ManagedAnimationItem] = [] + fileprivate var didTryAdvancingState = false + + init(size: CGSize) { + self.intrinsicSize = size + + self.imageNode = ASImageNode() + self.imageNode.displayWithoutProcessing = true + self.imageNode.displaysAsynchronously = false + self.imageNode.frame = CGRect(origin: CGPoint(), size: self.intrinsicSize) + + final class DisplayLinkTarget: NSObject { + private let f: () -> Void + + init(_ f: @escaping () -> Void) { + self.f = f + } + + @objc func event() { + self.f() + } + } + var displayLinkUpdate: (() -> Void)? + self.displayLink = CADisplayLink(target: DisplayLinkTarget { + displayLinkUpdate?() + }, selector: #selector(DisplayLinkTarget.event)) + + super.init() + + self.addSubnode(self.imageNode) + + self.displayLink.add(to: RunLoop.main, forMode: .common) + + displayLinkUpdate = { [weak self] in + self?.updateAnimation() + } + } + + func advanceState() { + guard !self.trackStack.isEmpty else { + return + } + + let item = self.trackStack.removeFirst() + + if let state = self.state, state.item.source == item.source { + self.state = ManagedAnimationState(displaySize: self.intrinsicSize, item: item, current: state) + } else { + self.state = ManagedAnimationState(displaySize: self.intrinsicSize, item: item, current: nil) + } + + self.didTryAdvancingState = false + } + + fileprivate func updateAnimation() { + if self.state == nil { + self.advanceState() + } + + guard let state = self.state else { + return + } + let timestamp = CACurrentMediaTime() + + let fps = state.fps + let frameRange = state.item.frames + + let duration: Double = state.item.duration + var t = state.relativeTime / duration + t = max(0.0, t) + t = min(1.0, t) + + let frameOffset = Int(Double(frameRange.startFrame) * (1.0 - t) + Double(frameRange.endFrame) * t) + let lowerBound: Int = 0 + let upperBound = state.frameCount - 1 + let frameIndex = max(lowerBound, min(upperBound, frameOffset)) + + if state.frameIndex != frameIndex { + state.frameIndex = frameIndex + if let image = state.draw() { + self.imageNode.image = image + } + } + + var animationAdvancement: Double = 1.0 / 60.0 + animationAdvancement *= Double(min(2, self.trackStack.count + 1)) + + state.relativeTime += animationAdvancement + + if state.relativeTime >= duration && !self.didTryAdvancingState { + self.didTryAdvancingState = true + self.advanceState() + } + } + + func trackTo(item: ManagedAnimationItem) { + self.trackStack.append(item) + self.didTryAdvancingState = false + self.updateAnimation() + } +} + +enum ManagedDiceAnimationState: Equatable { + case rolling + case value(Int) +} + +final class ManagedDiceAnimationNode: ManagedAnimationNode { + private let context: AccountContext + private var diceState: ManagedDiceAnimationState = .rolling + private let disposable = MetaDisposable() + + init(context: AccountContext) { + self.context = context + + super.init(size: CGSize(width: 136.0, height: 136.0)) + + self.trackTo(item: ManagedAnimationItem(source: .local("DiceRolling"), frames: ManagedAnimationFrameRange(startFrame: 0, endFrame: 0), duration: 0.3)) + } + + deinit { + self.disposable.dispose() + } + + func setState(_ diceState: ManagedDiceAnimationState) { + let previousState = self.diceState + self.diceState = diceState + + switch previousState { + case .rolling: + switch diceState { + case let .value(value): + self.trackTo(item: ManagedAnimationItem(source: .local("DiceRolling"), frames: ManagedAnimationFrameRange(startFrame: 0, endFrame: 0), duration: 0.3)) + case .rolling: + break + } + case let .value(currentValue): + switch diceState { + case .rolling: + self.trackTo(item: ManagedAnimationItem(source: .local("DiceRolling"), frames: ManagedAnimationFrameRange(startFrame: 0, endFrame: 0), duration: 0.3)) + case let .value(value): + break + } + } + } +} + + private class ChatMessageHeartbeatHaptic { private var hapticFeedback = HapticFeedback() private var timer: SwiftSignalKit.Timer? @@ -257,7 +518,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { if self.telegramFile == nil { var emojiFile: TelegramMediaFile? - if emoji == "🎲" { + if false && emoji == "🎲" { var pointsValue: Int if let value = item.controllerInteraction.seenDicePointsValue[item.message.id] { pointsValue = value @@ -901,27 +1162,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { } else if let _ = self.emojiFile { let (emoji, fitz) = item.message.text.basicEmoji if emoji == "🎲" { - if !self.animationNode.isPlaying { - var pointsValue = Int(arc4random_uniform(6)) - item.controllerInteraction.seenDicePointsValue[item.message.id] = pointsValue - item.controllerInteraction.seenOneTimeAnimatedMedia.remove(item.message.id) - - var emojiFile: TelegramMediaFile? - if let diceEmojis = item.associatedData.animatedEmojiStickers[emoji] { - emojiFile = diceEmojis[pointsValue].file - } - - self.emojiFile = emojiFile - if let emojiFile = emojiFile { - let dimensions = emojiFile.dimensions ?? PixelDimensions(width: 512, height: 512) - self.imageNode.setSignal(chatMessageAnimatedSticker(postbox: item.context.account.postbox, file: emojiFile, small: false, size: dimensions.cgSize.aspectFilled(CGSize(width: 384.0, height: 384.0)), fitzModifier: nil, thumbnail: false)) - self.disposable.set(freeMediaFileInteractiveFetched(account: item.context.account, fileReference: .standalone(media: emojiFile)).start()) - } - self.isPlaying = false - self.didSetUpAnimationNode = false - self.updateVisibility() - self.animationNode.playIfNeeded() - } + } else { var startTime: Signal if self.animationNode.playIfNeeded() { diff --git a/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift b/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift index 9d7591e00c..990b0646a6 100644 --- a/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift +++ b/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift @@ -14,48 +14,49 @@ import SettingsUI public func navigateToChatControllerImpl(_ params: NavigateToChatControllerParams) { var found = false var isFirst = true - for controller in params.navigationController.viewControllers.reversed() { - if let controller = controller as? ChatControllerImpl, controller.chatLocation == params.chatLocation && (controller.subject != .scheduledMessages || controller.subject == params.subject) { - if let updateTextInputState = params.updateTextInputState { - controller.updateTextInputState(updateTextInputState) + if params.useExisting { + for controller in params.navigationController.viewControllers.reversed() { + if let controller = controller as? ChatControllerImpl, controller.chatLocation == params.chatLocation && (controller.subject != .scheduledMessages || controller.subject == params.subject) { + if let updateTextInputState = params.updateTextInputState { + controller.updateTextInputState(updateTextInputState) + } + if let subject = params.subject, case let .message(messageId) = subject { + let navigationController = params.navigationController + let animated = params.animated + controller.navigateToMessage(messageLocation: .id(messageId), animated: isFirst, completion: { [weak navigationController, weak controller] in + if let navigationController = navigationController, let controller = controller { + let _ = navigationController.popToViewController(controller, animated: animated) + } + }, customPresentProgress: { [weak navigationController] c, a in + (navigationController?.viewControllers.last as? ViewController)?.present(c, in: .window(.root), with: a) + }) + } else if params.scrollToEndIfExists && isFirst { + controller.scrollToEndOfHistory() + let _ = params.navigationController.popToViewController(controller, animated: params.animated) + params.completion() + } else if params.activateMessageSearch { + controller.activateSearch() + let _ = params.navigationController.popToViewController(controller, animated: params.animated) + params.completion() + } else { + let _ = params.navigationController.popToViewController(controller, animated: params.animated) + params.completion() + } + controller.purposefulAction = params.purposefulAction + if params.activateInput { + controller.activateInput() + } + if let botStart = params.botStart { + controller.updateChatPresentationInterfaceState(interactive: false, { state -> ChatPresentationInterfaceState in + return state.updatedBotStartPayload(botStart.payload) + }) + } + found = true + break } - if let subject = params.subject, case let .message(messageId) = subject { - let navigationController = params.navigationController - let animated = params.animated - controller.navigateToMessage(messageLocation: .id(messageId), animated: isFirst, completion: { [weak navigationController, weak controller] in - if let navigationController = navigationController, let controller = controller { - let _ = navigationController.popToViewController(controller, animated: animated) - } - }, customPresentProgress: { [weak navigationController] c, a in - (navigationController?.viewControllers.last as? ViewController)?.present(c, in: .window(.root), with: a) - }) - } else if params.scrollToEndIfExists && isFirst { - controller.scrollToEndOfHistory() - let _ = params.navigationController.popToViewController(controller, animated: params.animated) - params.completion() - } else if params.activateMessageSearch { - controller.activateSearch() - let _ = params.navigationController.popToViewController(controller, animated: params.animated) - params.completion() - } else { - let _ = params.navigationController.popToViewController(controller, animated: params.animated) - params.completion() - } - controller.purposefulAction = params.purposefulAction - if params.activateInput { - controller.activateInput() - } - if let botStart = params.botStart { - controller.updateChatPresentationInterfaceState(interactive: false, { state -> ChatPresentationInterfaceState in - return state.updatedBotStartPayload(botStart.payload) - }) - } - found = true - break + isFirst = false } - isFirst = false } - if !found { let controller: ChatControllerImpl if let chatController = params.chatController as? ChatControllerImpl { diff --git a/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift b/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift index 3ac3a2bf4f..db29b57c7c 100644 --- a/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift +++ b/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift @@ -324,7 +324,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur var cancelImpl: (() -> Void)? let progressSignal = Signal { subscriber in - let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { + let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: { cancelImpl?() })) present(controller, nil) diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift index 15ff1752b1..2d9edbe0d4 100644 --- a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift @@ -726,6 +726,11 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro result.append(.more) } else if let channel = peer as? TelegramChannel { var displayLeave = !channel.flags.contains(.isCreator) + var canViewStats = false + if let cachedChannelData = cachedData as? CachedChannelData { + canViewStats = cachedChannelData.flags.contains(.canViewStats) + } + switch channel.info { case .broadcast: if !channel.flags.contains(.isCreator) { @@ -744,6 +749,10 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro displayLeave = false } + if canViewStats { + displayLeave = false + } + result.append(.mute) result.append(.search) if displayLeave { @@ -755,6 +764,7 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro displayMore = false } } + if displayMore { result.append(.more) } diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift index bb2a47f6ea..6446ed0f53 100644 --- a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift +++ b/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift @@ -2705,7 +2705,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD } self.view.endEditing(true) - controller.push(channelStatsController(context: self.context, peer: peer, cachedPeerData: cachedData)) + controller.push(channelStatsController(context: self.context, peerId: peer.id, cachedPeerData: cachedData)) } private func openReport(user: Bool) { diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 989b8c032d..4a4a8803c8 100644 Binary files a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping and b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping differ