ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option to simulate stickers import

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-06-18 08:49:39 +03:00
parent d8e36f149f
commit ec915d2620
4 changed files with 94 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
submodules/DebugSettingsUI/BUILD
View File

@ -19,6 +19,7 @@ swift_library(
"//submodules/PresentationDataUtils:PresentationDataUtils", "//submodules/PresentationDataUtils:PresentationDataUtils",
"//submodules/OverlayStatusController:OverlayStatusController", "//submodules/OverlayStatusController:OverlayStatusController",
"//submodules/AccountContext:AccountContext", "//submodules/AccountContext:AccountContext",
"//submodules/AppBundle:AppBundle",
], ],
visibility = [ visibility = [
"//visibility:public", "//visibility:public",

145
submodules/DebugSettingsUI/Sources/DebugController.swift
View File

@ -13,6 +13,7 @@ import ItemListUI
import PresentationDataUtils import PresentationDataUtils
import OverlayStatusController import OverlayStatusController
import AccountContext import AccountContext
import AppBundle
@objc private final class DebugControllerMailComposeDelegate: NSObject, MFMailComposeViewControllerDelegate { @objc private final class DebugControllerMailComposeDelegate: NSObject, MFMailComposeViewControllerDelegate {
public func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) { public func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
@ -27,18 +28,21 @@ private final class DebugControllerArguments {
let presentController: (ViewController, ViewControllerPresentationArguments?) -> Void let presentController: (ViewController, ViewControllerPresentationArguments?) -> Void
let pushController: (ViewController) -> Void let pushController: (ViewController) -> Void
let getRootController: () -> UIViewController? let getRootController: () -> UIViewController?
let getNavigationController: () -> NavigationController?
init(sharedContext: SharedAccountContext, context: AccountContext?, mailComposeDelegate: DebugControllerMailComposeDelegate, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping (ViewController) -> Void, getRootController: @escaping () -> UIViewController?) { init(sharedContext: SharedAccountContext, context: AccountContext?, mailComposeDelegate: DebugControllerMailComposeDelegate, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping (ViewController) -> Void, getRootController: @escaping () -> UIViewController?, getNavigationController: @escaping () -> NavigationController?) {
self.sharedContext = sharedContext self.sharedContext = sharedContext
self.context = context self.context = context
self.mailComposeDelegate = mailComposeDelegate self.mailComposeDelegate = mailComposeDelegate
self.presentController = presentController self.presentController = presentController
self.pushController = pushController self.pushController = pushController
self.getRootController = getRootController self.getRootController = getRootController
self.getNavigationController = getNavigationController
} }
} }
private enum DebugControllerSection: Int32 { private enum DebugControllerSection: Int32 {
case sticker
case logs case logs
case logging case logging
case experiments case experiments
@ -48,6 +52,7 @@ private enum DebugControllerSection: Int32 {
} }
private enum DebugControllerEntry: ItemListNodeEntry { private enum DebugControllerEntry: ItemListNodeEntry {
case testStickerImport(PresentationTheme)
case sendLogs(PresentationTheme) case sendLogs(PresentationTheme)
case sendOneLog(PresentationTheme) case sendOneLog(PresentationTheme)
case sendShareLogs case sendShareLogs
@ -86,6 +91,8 @@ private enum DebugControllerEntry: ItemListNodeEntry {
var section: ItemListSectionId { var section: ItemListSectionId {
switch self { switch self {
case .testStickerImport:
return DebugControllerSection.sticker.rawValue
case .sendLogs, .sendOneLog, .sendShareLogs, .sendNotificationLogs, .sendCriticalLogs: case .sendLogs, .sendOneLog, .sendShareLogs, .sendNotificationLogs, .sendCriticalLogs:
return DebugControllerSection.logs.rawValue return DebugControllerSection.logs.rawValue
case .accounts: case .accounts:
@ -107,68 +114,70 @@ private enum DebugControllerEntry: ItemListNodeEntry {
var stableId: Int { var stableId: Int {
switch self { switch self {
case .sendLogs: case .testStickerImport:
return 0 return 0
case .sendOneLog: case .sendLogs:
return 1 return 1
case .sendShareLogs: case .sendOneLog:
return 2 return 2
case .sendNotificationLogs: case .sendShareLogs:
return 3 return 3
case .sendCriticalLogs: case .sendNotificationLogs:
return 4 return 4
case .accounts: case .sendCriticalLogs:
return 5 return 5
case .logToFile: case .accounts:
return 6 return 6
case .logToConsole: case .logToFile:
return 7 return 7
case .redactSensitiveData: case .logToConsole:
return 8 return 8
case .enableRaiseToSpeak: case .redactSensitiveData:
return 9 return 9
case .keepChatNavigationStack: case .enableRaiseToSpeak:
return 10 return 10
case .skipReadHistory: case .keepChatNavigationStack:
return 11 return 11
case .crashOnSlowQueries: case .skipReadHistory:
return 12 return 12
case .clearTips: case .crashOnSlowQueries:
return 13 return 13
case .crash: case .clearTips:
return 14 return 14
case .resetData: case .crash:
return 15 return 15
case .resetDatabase: case .resetData:
return 16 return 16
case .resetDatabaseAndCache: case .resetDatabase:
return 17 return 17
case .resetHoles: case .resetDatabaseAndCache:
return 18 return 18
case .reindexUnread: case .resetHoles:
return 19 return 19
case .resetBiometricsData: case .reindexUnread:
return 20 return 20
case .optimizeDatabase: case .resetBiometricsData:
return 21 return 21
case .photoPreview: case .optimizeDatabase:
return 22 return 22
case .knockoutWallpaper: case .photoPreview:
return 23 return 23
case .demoVideoChats: case .knockoutWallpaper:
return 24 return 24
case .experimentalCompatibility: case .demoVideoChats:
return 25 return 25
case .enableNoiseSuppression: case .experimentalCompatibility:
return 26 return 26
case .playerEmbedding: case .enableNoiseSuppression:
return 27 return 27
case .playlistPlayback: case .playerEmbedding:
return 28 return 28
case .voiceConference: case .playlistPlayback:
return 29 return 29
case .voiceConference:
return 30
case let .preferredVideoCodec(index, _, _, _): case let .preferredVideoCodec(index, _, _, _):
return 30 + index return 31 + index
case .disableVideoAspectScaling: case .disableVideoAspectScaling:
return 100 return 100
case .enableVoipTcp: case .enableVoipTcp:
@ -187,7 +196,22 @@ private enum DebugControllerEntry: ItemListNodeEntry {
func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem { func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
let arguments = arguments as! DebugControllerArguments let arguments = arguments as! DebugControllerArguments
switch self { switch self {
case let .sendLogs(theme): case .testStickerImport:
return ItemListActionItem(presentationData: presentationData, title: "Simulate Stickers Import", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
guard let context = arguments.context else {
return
}
if let url = getAppBundle().url(forResource: "importstickers", withExtension: "json"), let data = try? Data(contentsOf: url) {
let dataType = "org.telegram.third-party.stickerset"
if #available(iOS 10.0, *) {
UIPasteboard.general.setItems([[dataType: data]], options: [UIPasteboard.OptionsKey.localOnly: true, UIPasteboard.OptionsKey.expirationDate: NSDate(timeIntervalSinceNow: 60)])
} else {
UIPasteboard.general.setData(data, forPasteboardType: dataType)
}
context.sharedContext.openResolvedUrl(.importStickers, context: context, urlContext: .generic, navigationController: arguments.getNavigationController(), openPeer: { _, _ in }, sendFile: nil, sendSticker: nil, requestMessageActionUrlAuth: nil, joinVoiceChat: nil, present: { c, a in arguments.presentController(c, a as? ViewControllerPresentationArguments) }, dismissInput: {}, contentContext: nil)
}
})
case .sendLogs:
return ItemListDisclosureItem(presentationData: presentationData, title: "Send Logs (Up to 40 MB)", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(presentationData: presentationData, title: "Send Logs (Up to 40 MB)", label: "", sectionId: self.section, style: .blocks, action: {
let _ = (Logger.shared.collectLogs() let _ = (Logger.shared.collectLogs()
|> deliverOnMainQueue).start(next: { logs in |> deliverOnMainQueue).start(next: { logs in
@ -257,7 +281,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
arguments.presentController(actionSheet, nil) arguments.presentController(actionSheet, nil)
}) })
}) })
case let .sendOneLog(theme): case .sendOneLog:
return ItemListDisclosureItem(presentationData: presentationData, title: "Send Latest Logs (Up to 4 MB)", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(presentationData: presentationData, title: "Send Latest Logs (Up to 4 MB)", label: "", sectionId: self.section, style: .blocks, action: {
let _ = (Logger.shared.collectLogs() let _ = (Logger.shared.collectLogs()
|> deliverOnMainQueue).start(next: { logs in |> deliverOnMainQueue).start(next: { logs in
@ -339,7 +363,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
arguments.presentController(actionSheet, nil) arguments.presentController(actionSheet, nil)
}) })
}) })
case let .sendShareLogs: case .sendShareLogs:
return ItemListDisclosureItem(presentationData: presentationData, title: "Send Share Logs (Up to 40 MB)", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(presentationData: presentationData, title: "Send Share Logs (Up to 40 MB)", label: "", sectionId: self.section, style: .blocks, action: {
let _ = (Logger.shared.collectLogs(prefix: "/share-logs") let _ = (Logger.shared.collectLogs(prefix: "/share-logs")
|> deliverOnMainQueue).start(next: { logs in |> deliverOnMainQueue).start(next: { logs in
@ -409,7 +433,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
arguments.presentController(actionSheet, nil) arguments.presentController(actionSheet, nil)
}) })
}) })
case let .sendNotificationLogs(theme): case .sendNotificationLogs:
return ItemListDisclosureItem(presentationData: presentationData, title: "Send Notification Logs", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(presentationData: presentationData, title: "Send Notification Logs", label: "", sectionId: self.section, style: .blocks, action: {
let _ = (Logger(rootPath: arguments.sharedContext.basePath, basePath: arguments.sharedContext.basePath + "/notificationServiceLogs").collectLogs() let _ = (Logger(rootPath: arguments.sharedContext.basePath, basePath: arguments.sharedContext.basePath + "/notificationServiceLogs").collectLogs()
|> deliverOnMainQueue).start(next: { logs in |> deliverOnMainQueue).start(next: { logs in
@ -434,7 +458,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
arguments.pushController(controller) arguments.pushController(controller)
}) })
}) })
case let .sendCriticalLogs(theme): case .sendCriticalLogs:
return ItemListDisclosureItem(presentationData: presentationData, title: "Send Critical Logs", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(presentationData: presentationData, title: "Send Critical Logs", label: "", sectionId: self.section, style: .blocks, action: {
let _ = (Logger.shared.collectShortLogFiles() let _ = (Logger.shared.collectShortLogFiles()
|> deliverOnMainQueue).start(next: { logs in |> deliverOnMainQueue).start(next: { logs in
@ -487,38 +511,38 @@ private enum DebugControllerEntry: ItemListNodeEntry {
arguments.presentController(actionSheet, nil) arguments.presentController(actionSheet, nil)
}) })
}) })
case let .accounts(theme): case .accounts:
return ItemListDisclosureItem(presentationData: presentationData, title: "Accounts", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(presentationData: presentationData, title: "Accounts", label: "", sectionId: self.section, style: .blocks, action: {
guard let context = arguments.context else { guard let context = arguments.context else {
return return
} }
arguments.pushController(debugAccountsController(context: context, accountManager: arguments.sharedContext.accountManager)) arguments.pushController(debugAccountsController(context: context, accountManager: arguments.sharedContext.accountManager))
}) })
case let .logToFile(theme, value): case let .logToFile(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Log to File", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Log to File", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, { let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, {
$0.withUpdatedLogToFile(value) $0.withUpdatedLogToFile(value)
}).start() }).start()
}) })
case let .logToConsole(theme, value): case let .logToConsole(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Log to Console", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Log to Console", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, { let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, {
$0.withUpdatedLogToConsole(value) $0.withUpdatedLogToConsole(value)
}).start() }).start()
}) })
case let .redactSensitiveData(theme, value): case let .redactSensitiveData(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Remove Sensitive Data", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Remove Sensitive Data", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, { let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, {
$0.withUpdatedRedactSensitiveData(value) $0.withUpdatedRedactSensitiveData(value)
}).start() }).start()
}) })
case let .enableRaiseToSpeak(theme, value): case let .enableRaiseToSpeak(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Enable Raise to Speak", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Enable Raise to Speak", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = updateMediaInputSettingsInteractively(accountManager: arguments.sharedContext.accountManager, { let _ = updateMediaInputSettingsInteractively(accountManager: arguments.sharedContext.accountManager, {
$0.withUpdatedEnableRaiseToSpeak(value) $0.withUpdatedEnableRaiseToSpeak(value)
}).start() }).start()
}) })
case let .keepChatNavigationStack(theme, value): case let .keepChatNavigationStack(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Keep Chat Stack", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Keep Chat Stack", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
var settings = settings var settings = settings
@ -526,7 +550,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
return settings return settings
}).start() }).start()
}) })
case let .skipReadHistory(theme, value): case let .skipReadHistory(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Skip read history", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Skip read history", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
var settings = settings var settings = settings
@ -534,7 +558,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
return settings return settings
}).start() }).start()
}) })
case let .crashOnSlowQueries(theme, value): case let .crashOnSlowQueries(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Crash when slow", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Crash when slow", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
var settings = settings var settings = settings
@ -542,7 +566,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
return settings return settings
}).start() }).start()
}) })
case let .clearTips(theme): case .clearTips:
return ItemListActionItem(presentationData: presentationData, title: "Clear Tips", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Clear Tips", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
let _ = (arguments.sharedContext.accountManager.transaction { transaction -> Void in let _ = (arguments.sharedContext.accountManager.transaction { transaction -> Void in
transaction.clearNotices() transaction.clearNotices()
@ -556,11 +580,11 @@ private enum DebugControllerEntry: ItemListNodeEntry {
}).start() }).start()
} }
}) })
case let .crash(theme): case .crash:
return ItemListActionItem(presentationData: presentationData, title: "Crash", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Crash", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
preconditionFailure() preconditionFailure()
}) })
case let .resetData(theme): case .resetData:
return ItemListActionItem(presentationData: presentationData, title: "Reset Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Reset Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
let presentationData = arguments.sharedContext.currentPresentationData.with { $0 } let presentationData = arguments.sharedContext.currentPresentationData.with { $0 }
let actionSheet = ActionSheetController(presentationData: presentationData) let actionSheet = ActionSheetController(presentationData: presentationData)
@ -579,7 +603,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
])]) ])])
arguments.presentController(actionSheet, nil) arguments.presentController(actionSheet, nil)
}) })
case let .resetDatabase(theme): case .resetDatabase:
return ItemListActionItem(presentationData: presentationData, title: "Clear Database", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Clear Database", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
guard let context = arguments.context else { guard let context = arguments.context else {
return return
@ -602,7 +626,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
])]) ])])
arguments.presentController(actionSheet, nil) arguments.presentController(actionSheet, nil)
}) })
case let .resetDatabaseAndCache(theme): case .resetDatabaseAndCache:
return ItemListActionItem(presentationData: presentationData, title: "Clear Database and Cache", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Clear Database and Cache", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
guard let context = arguments.context else { guard let context = arguments.context else {
return return
@ -625,7 +649,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
])]) ])])
arguments.presentController(actionSheet, nil) arguments.presentController(actionSheet, nil)
}) })
case let .resetHoles(theme): case .resetHoles:
return ItemListActionItem(presentationData: presentationData, title: "Reset Holes", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Reset Holes", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
guard let context = arguments.context else { guard let context = arguments.context else {
return return
@ -640,7 +664,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
controller.dismiss() controller.dismiss()
}) })
}) })
case let .reindexUnread(theme): case .reindexUnread:
return ItemListActionItem(presentationData: presentationData, title: "Reindex Unread Counters", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Reindex Unread Counters", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
guard let context = arguments.context else { guard let context = arguments.context else {
return return
@ -655,13 +679,13 @@ private enum DebugControllerEntry: ItemListNodeEntry {
controller.dismiss() controller.dismiss()
}) })
}) })
case let .resetBiometricsData(theme): case .resetBiometricsData:
return ItemListActionItem(presentationData: presentationData, title: "Reset Biometrics Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Reset Biometrics Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
let _ = updatePresentationPasscodeSettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in let _ = updatePresentationPasscodeSettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
return settings.withUpdatedBiometricsDomainState(nil).withUpdatedShareBiometricsDomainState(nil) return settings.withUpdatedBiometricsDomainState(nil).withUpdatedShareBiometricsDomainState(nil)
}).start() }).start()
}) })
case let .optimizeDatabase(theme): case .optimizeDatabase:
return ItemListActionItem(presentationData: presentationData, title: "Optimize Database", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { return ItemListActionItem(presentationData: presentationData, title: "Optimize Database", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
guard let context = arguments.context else { guard let context = arguments.context else {
return return
@ -677,7 +701,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
arguments.presentController(controller, nil) arguments.presentController(controller, nil)
}) })
}) })
case let .photoPreview(theme, value): case let .photoPreview(_, value):
return ItemListSwitchItem(presentationData: presentationData, title: "Media Preview (Updated)", value: value, sectionId: self.section, style: .blocks, updated: { value in return ItemListSwitchItem(presentationData: presentationData, title: "Media Preview (Updated)", value: value, sectionId: self.section, style: .blocks, updated: { value in
let _ = arguments.sharedContext.accountManager.transaction ({ transaction in let _ = arguments.sharedContext.accountManager.transaction ({ transaction in
transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in
@ -783,9 +807,9 @@ private enum DebugControllerEntry: ItemListNodeEntry {
}) })
}).start() }).start()
}) })
case let .hostInfo(theme, string): case let .hostInfo(_, string):
return ItemListTextItem(presentationData: presentationData, text: .plain(string), sectionId: self.section) return ItemListTextItem(presentationData: presentationData, text: .plain(string), sectionId: self.section)
case let .versionInfo(theme): case .versionInfo:
let bundle = Bundle.main let bundle = Bundle.main
let bundleId = bundle.bundleIdentifier ?? "" let bundleId = bundle.bundleIdentifier ?? ""
let bundleVersion = bundle.infoDictionary?["CFBundleShortVersionString"] ?? "" let bundleVersion = bundle.infoDictionary?["CFBundleShortVersionString"] ?? ""
@ -800,6 +824,7 @@ private func debugControllerEntries(sharedContext: SharedAccountContext, present
let isMainApp = sharedContext.applicationBindings.isMainApp let isMainApp = sharedContext.applicationBindings.isMainApp
entries.append(.testStickerImport(presentationData.theme))
entries.append(.sendLogs(presentationData.theme)) entries.append(.sendLogs(presentationData.theme))
entries.append(.sendOneLog(presentationData.theme)) entries.append(.sendOneLog(presentationData.theme))
entries.append(.sendShareLogs) entries.append(.sendShareLogs)
@ -872,6 +897,7 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
var pushControllerImpl: ((ViewController) -> Void)? var pushControllerImpl: ((ViewController) -> Void)?
var dismissImpl: (() -> Void)? var dismissImpl: (() -> Void)?
var getRootControllerImpl: (() -> UIViewController?)? var getRootControllerImpl: (() -> UIViewController?)?
var getNavigationControllerImpl: (() -> NavigationController?)?
let arguments = DebugControllerArguments(sharedContext: sharedContext, context: context, mailComposeDelegate: DebugControllerMailComposeDelegate(), presentController: { controller, arguments in let arguments = DebugControllerArguments(sharedContext: sharedContext, context: context, mailComposeDelegate: DebugControllerMailComposeDelegate(), presentController: { controller, arguments in
presentControllerImpl?(controller, arguments) presentControllerImpl?(controller, arguments)
@ -879,6 +905,8 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
pushControllerImpl?(controller) pushControllerImpl?(controller)
}, getRootController: { }, getRootController: {
return getRootControllerImpl?() return getRootControllerImpl?()
}, getNavigationController: {
return getNavigationControllerImpl?()
}) })
let appGroupName = "group.\(Bundle.main.bundleIdentifier!)" let appGroupName = "group.\(Bundle.main.bundleIdentifier!)"
@ -945,5 +973,8 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
getRootControllerImpl = { [weak controller] in getRootControllerImpl = { [weak controller] in
return controller?.view.window?.rootViewController return controller?.view.window?.rootViewController
} }
getNavigationControllerImpl = { [weak controller] in
return controller?.navigationController as? NavigationController
}
return controller return controller
} }

4
submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift
View File

@ -732,6 +732,10 @@ final class ImportStickerPackControllerNode: ViewControllerTracingNode, UIScroll
transition = .animated(duration: 0.4, curve: .spring) transition = .animated(duration: 0.4, curve: .spring)
} else { } else {
transition = .immediate transition = .immediate
self.contentTitleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
self.contentGridNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
self.installActionButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
} }
self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition) self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition)

1
submodules/TelegramUI/Resources/importstickers.json Normal file
View File

File diff suppressed because one or more lines are too long