Update Ghostgram features

submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift

@@ -23,6 +23,7 @@ import ThemeCarouselItem
 import ThemeAccentColorScreen
 import WallpaperGridScreen
 import PeerNameColorItem
+import DeviceModel
 
 private final class ThemeSettingsControllerArguments {
     let context: AccountContext
@@ -38,13 +39,34 @@ private final class ThemeSettingsControllerArguments {
     let openBubbleSettings: () -> Void
     let openPowerSavingSettings: () -> Void
     let openStickersAndEmoji: () -> Void
+    let toggleSendWithCmdEnter: (Bool) -> Void
     let toggleShowNextMediaOnTap: (Bool) -> Void
     let selectAppIcon: (PresentationAppIcon) -> Void
     let editTheme: (PresentationCloudTheme) -> Void
     let themeContextAction: (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void
     let colorContextAction: (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void
     
-    init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, openThemeSettings: @escaping () -> Void, openWallpaperSettings: @escaping () -> Void, openNameColorSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference, Bool) -> Void, toggleNightTheme: @escaping (Bool) -> Void, openAutoNightTheme: @escaping () -> Void, openTextSize: @escaping () -> Void, openBubbleSettings: @escaping () -> Void, openPowerSavingSettings: @escaping () -> Void, openStickersAndEmoji: @escaping () -> Void, toggleShowNextMediaOnTap: @escaping (Bool) -> Void, selectAppIcon: @escaping (PresentationAppIcon) -> Void, editTheme: @escaping (PresentationCloudTheme) -> Void, themeContextAction: @escaping (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void, colorContextAction: @escaping (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void) {
+    init(
+        context: AccountContext,
+        selectTheme: @escaping (PresentationThemeReference) -> Void,
+        openThemeSettings: @escaping () -> Void,
+        openWallpaperSettings: @escaping () -> Void,
+        openNameColorSettings: @escaping () -> Void,
+        selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void,
+        openAccentColorPicker: @escaping (PresentationThemeReference, Bool) -> Void,
+        toggleNightTheme: @escaping (Bool) -> Void,
+        openAutoNightTheme: @escaping () -> Void,
+        openTextSize: @escaping () -> Void,
+        openBubbleSettings: @escaping () -> Void,
+        openPowerSavingSettings: @escaping () -> Void,
+        openStickersAndEmoji: @escaping () -> Void,
+        toggleSendWithCmdEnter: @escaping (Bool) -> Void,
+        toggleShowNextMediaOnTap: @escaping (Bool) -> Void,
+        selectAppIcon: @escaping (PresentationAppIcon) -> Void,
+        editTheme: @escaping (PresentationCloudTheme) -> Void,
+        themeContextAction: @escaping (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void,
+        colorContextAction: @escaping (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void
+    ) {
         self.context = context
         self.selectTheme = selectTheme
         self.openThemeSettings = openThemeSettings
@@ -58,6 +80,7 @@ private final class ThemeSettingsControllerArguments {
         self.openBubbleSettings = openBubbleSettings
         self.openPowerSavingSettings = openPowerSavingSettings
         self.openStickersAndEmoji = openStickersAndEmoji
+        self.toggleSendWithCmdEnter = toggleSendWithCmdEnter
         self.toggleShowNextMediaOnTap = toggleShowNextMediaOnTap
         self.selectAppIcon = selectAppIcon
         self.editTheme = editTheme
@@ -84,6 +107,9 @@ public enum ThemeSettingsEntryTag: ItemListItemTag {
     case powerSaving
     case stickersAndEmoji
     case animations
+    case sendWithCmdEnter
+    case tapForNextMedia
+    case nightMode
     
     public func isEqual(to other: ItemListItemTag) -> Bool {
         if let other = other as? ThemeSettingsEntryTag, self == other {
@@ -110,6 +136,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
     case powerSaving
     case stickersAndEmoji
     case otherHeader(PresentationTheme, String)
+    case sendWithCmdEnter(PresentationTheme, String, Bool)
     case showNextMediaOnTap(PresentationTheme, String, Bool)
     case showNextMediaOnTapInfo(PresentationTheme, String)
     
@@ -125,7 +152,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
                 return ThemeSettingsControllerSection.icon.rawValue
             case .powerSaving, .stickersAndEmoji:
                 return ThemeSettingsControllerSection.message.rawValue
-            case .otherHeader, .showNextMediaOnTap, .showNextMediaOnTapInfo:
+            case .otherHeader, .sendWithCmdEnter, .showNextMediaOnTap, .showNextMediaOnTapInfo:
                 return ThemeSettingsControllerSection.other.rawValue
         }
     }
@@ -162,10 +189,12 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
             return 13
         case .otherHeader:
             return 14
-        case .showNextMediaOnTap:
+        case .sendWithCmdEnter:
             return 15
-        case .showNextMediaOnTapInfo:
+        case .showNextMediaOnTap:
             return 16
+        case .showNextMediaOnTapInfo:
+            return 17
         }
     }
     
@@ -261,6 +290,12 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
+            case let .sendWithCmdEnter(lhsTheme, lhsTitle, lhsValue):
+                if case let .sendWithCmdEnter(rhsTheme, rhsTitle, rhsValue) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle, lhsValue == rhsValue {
+                    return true
+                } else {
+                    return false
+                }
             case let .showNextMediaOnTap(lhsTheme, lhsTitle, lhsValue):
                 if case let .showNextMediaOnTap(rhsTheme, rhsTitle, rhsValue) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle, lhsValue == rhsValue {
                     return true
@@ -318,7 +353,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
             case let .autoNight(_, title, value, enabled):
                 return ItemListSwitchItem(presentationData: presentationData, systemStyle: .glass, title: title, value: value, enabled: enabled, sectionId: self.section, style: .blocks, updated: { value in
                     arguments.toggleNightTheme(value)
-                }, tag: nil)
+                }, tag: ThemeSettingsEntryTag.nightMode)
             case let .autoNightTheme(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, systemStyle: .glass, icon: nil, title: text, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
                     arguments.openAutoNightTheme()
@@ -349,17 +384,35 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
                 })
             case let .otherHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
+            case let .sendWithCmdEnter(_, title, value):
+                return ItemListSwitchItem(presentationData: presentationData, systemStyle: .glass, title: title, value: value, sectionId: self.section, style: .blocks, updated: { value in
+                    arguments.toggleSendWithCmdEnter(value)
+                }, tag: ThemeSettingsEntryTag.sendWithCmdEnter)
             case let .showNextMediaOnTap(_, title, value):
                 return ItemListSwitchItem(presentationData: presentationData, systemStyle: .glass, title: title, value: value, sectionId: self.section, style: .blocks, updated: { value in
                     arguments.toggleShowNextMediaOnTap(value)
-                }, tag: ThemeSettingsEntryTag.animations)
+                }, tag: ThemeSettingsEntryTag.tapForNextMedia)
             case let .showNextMediaOnTapInfo(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
         }
     }
 }
 
-private func themeSettingsControllerEntries(presentationData: PresentationData, presentationThemeSettings: PresentationThemeSettings, mediaSettings: MediaDisplaySettings, themeReference: PresentationThemeReference, availableThemes: [PresentationThemeReference], availableAppIcons: [PresentationAppIcon], currentAppIconName: String?, isPremium: Bool, chatThemes: [PresentationThemeReference], animatedEmojiStickers: [String: [StickerPackItem]], accountPeer: EnginePeer?, nameColors: PeerNameColors) -> [ThemeSettingsControllerEntry] {
+private func themeSettingsControllerEntries(
+    presentationData: PresentationData,
+    presentationThemeSettings: PresentationThemeSettings,
+    chatSettings: ChatSettings,
+    mediaSettings: MediaDisplaySettings,
+    themeReference: PresentationThemeReference,
+    availableThemes: [PresentationThemeReference],
+    availableAppIcons: [PresentationAppIcon],
+    currentAppIconName: String?,
+    isPremium: Bool,
+    chatThemes: [PresentationThemeReference],
+    animatedEmojiStickers: [String: [StickerPackItem]],
+    accountPeer: EnginePeer?,
+    nameColors: PeerNameColors
+) -> [ThemeSettingsControllerEntry] {
     var entries: [ThemeSettingsControllerEntry] = []
     
     let strings = presentationData.strings
@@ -435,6 +488,9 @@ private func themeSettingsControllerEntries(presentationData: PresentationData,
     }
     
     entries.append(.otherHeader(presentationData.theme, strings.Appearance_Other.uppercased()))
+    if DeviceModel.current.isIpad {
+        entries.append(.sendWithCmdEnter(presentationData.theme, "Send with Cmd+Enter", chatSettings.sendWithCmdEnter))
+    }
     entries.append(.showNextMediaOnTap(presentationData.theme, strings.Appearance_ShowNextMediaOnTap, mediaSettings.showNextMediaOnTap))
     entries.append(.showNextMediaOnTapInfo(presentationData.theme, strings.Appearance_ShowNextMediaOnTapInfo))
     
@@ -513,73 +569,96 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
         return animatedEmojiStickers
     }
     
-    let arguments = ThemeSettingsControllerArguments(context: context, selectTheme: { theme in
+    let selectThemeArgument: (PresentationThemeReference) -> Void = { theme in
         selectThemeImpl?(theme)
-    }, openThemeSettings: {
+    }
+    let openThemeSettingsArgument: () -> Void = {
         pushControllerImpl?(themePickerController(context: context))
-    }, openWallpaperSettings: {
+    }
+    let openWallpaperSettingsArgument: () -> Void = {
         pushControllerImpl?(ThemeGridController(context: context))
-    }, openNameColorSettings: {
+    }
+    let openNameColorSettingsArgument: () -> Void = {
         pushControllerImpl?(UserAppearanceScreen(context: context))
-    }, selectAccentColor: { accentColor in
+    }
+    let selectAccentColorArgument: (PresentationThemeAccentColor?) -> Void = { accentColor in
         selectAccentColorImpl?(accentColor)
-    }, openAccentColorPicker: { themeReference, create in
+    }
+    let openAccentColorPickerArgument: (PresentationThemeReference, Bool) -> Void = { themeReference, create in
         openAccentColorPickerImpl?(themeReference, create)
-    }, toggleNightTheme: { value in
+    }
+    let toggleNightThemeArgument: (Bool) -> Void = { value in
         let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in
             var current = current
             current.automaticThemeSwitchSetting.force = value
             return current
         }).start()
         presentCrossfadeControllerImpl?(true)
-    }, openAutoNightTheme: {
+    }
+    let openAutoNightThemeArgument: () -> Void = {
         pushControllerImpl?(themeAutoNightSettingsController(context: context))
-    }, openTextSize: {
+    }
+    let openTextSizeArgument: () -> Void = {
         let _ = (context.sharedContext.accountManager.sharedData(keys: Set([ApplicationSpecificSharedDataKeys.presentationThemeSettings]))
         |> take(1)
         |> deliverOnMainQueue).start(next: { view in
             let settings = view.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings]?.get(PresentationThemeSettings.self) ?? PresentationThemeSettings.defaultSettings
             pushControllerImpl?(TextSizeSelectionController(context: context, presentationThemeSettings: settings))
         })
-    }, openBubbleSettings: {
+    }
+    let openBubbleSettingsArgument: () -> Void = {
         let _ = (context.sharedContext.accountManager.sharedData(keys: Set([ApplicationSpecificSharedDataKeys.presentationThemeSettings]))
         |> take(1)
         |> deliverOnMainQueue).start(next: { view in
             let settings = view.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings]?.get(PresentationThemeSettings.self) ?? PresentationThemeSettings.defaultSettings
             pushControllerImpl?(BubbleSettingsController(context: context, presentationThemeSettings: settings))
         })
-    }, openPowerSavingSettings: {
+    }
+    let openPowerSavingSettingsArgument: () -> Void = {
         pushControllerImpl?(energySavingSettingsScreen(context: context))
-    }, openStickersAndEmoji: {
+    }
+    let openStickersAndEmojiArgument: () -> Void = {
         let _ = (archivedPacks.get() |> take(1) |> deliverOnMainQueue).start(next: { archivedStickerPacks in
             pushControllerImpl?(installedStickerPacksController(context: context, mode: .general, archivedPacks: archivedStickerPacks, updatedPacks: { _ in
             }))
         })
-    }, toggleShowNextMediaOnTap: { value in
+    }
+    let toggleSendWithCmdEnterArgument: (Bool) -> Void = { value in
+        let _ = updateChatSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in
+            return current.withUpdatedSendWithCmdEnter(value)
+        }).start()
+    }
+    let toggleShowNextMediaOnTapArgument: (Bool) -> Void = { value in
         let _ = updateMediaDisplaySettingsInteractively(accountManager: context.sharedContext.accountManager, { current in
             return current.withUpdatedShowNextMediaOnTap(value)
         }).start()
-    }, selectAppIcon: { icon in
-        let _ = (context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: context.account.peerId))
-        |> deliverOnMainQueue).start(next: { peer in
-            let isPremium = peer?.isPremium ?? false
-            if icon.isPremium && !isPremium {
-                var replaceImpl: ((ViewController) -> Void)?
-                let controller = PremiumDemoScreen(context: context, subject: .appIcons, source: .other, action: {
-                    let controller = PremiumIntroScreen(context: context, source: .appIcons)
-                    replaceImpl?(controller)
-                })
-                replaceImpl = { [weak controller] c in
-                    controller?.replace(with: c)
-                }
-                pushControllerImpl?(controller)
-            } else {
-                currentAppIconName.set(icon.name)
-                context.sharedContext.applicationBindings.requestSetAlternateIconName(icon.isDefault ? nil : icon.name, { _ in
-                })
+    }
+    
+    func selectAppIconArgument(_ icon: PresentationAppIcon) {
+        let isPremium = context.isPremium
+        if icon.isPremium && !isPremium {
+            var replaceImpl: ((ViewController) -> Void)?
+            let controller = PremiumDemoScreen(context: context, subject: .appIcons, source: .other, action: {
+                let controller = PremiumIntroScreen(context: context, source: .appIcons)
+                replaceImpl?(controller)
+            })
+            replaceImpl = { [weak controller] c in
+                controller?.replace(with: c)
             }
-        })
-    }, editTheme: { theme in
+            pushControllerImpl?(controller)
+        } else if icon.isSGPro && context.sharedContext.immediateSGStatus.status < 2 {
+            if let payWallController = context.sharedContext.makeSGPayWallController(context: context) {
+                presentControllerImpl?(payWallController, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+            } else {
+                presentControllerImpl?(context.sharedContext.makeSGUpdateIOSController(), nil)
+            }
+        } else {
+            currentAppIconName.set(icon.name)
+            context.sharedContext.applicationBindings.requestSetAlternateIconName(icon.isDefault ? nil : icon.name, { _ in
+            })
+        }
+    }
+    let editThemeArgument: (PresentationCloudTheme) -> Void = { theme in
         let controller = editThemeController(context: context, mode: .edit(theme), navigateToChat: { peerId in
             let _ = (context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId))
             |> deliverOnMainQueue).start(next: { peer in
@@ -592,7 +671,8 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
             })
         })
         pushControllerImpl?(controller)
-    }, themeContextAction: { isCurrent, reference, node, gesture in
+    }
+    let themeContextActionArgument: (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void = { isCurrent, reference, node, gesture in
         let _ = (context.sharedContext.accountManager.transaction { transaction -> (PresentationThemeAccentColor?, TelegramWallpaper?) in
             let settings = transaction.getSharedData(ApplicationSpecificSharedDataKeys.presentationThemeSettings)?.get(PresentationThemeSettings.self) ?? PresentationThemeSettings.defaultSettings
             let accentColor = settings.themeSpecificAccentColors[reference.index]
@@ -779,10 +859,11 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
                 })))
             }
             
-            let contextController = ContextController(presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture)
+            let contextController = makeContextController(presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture)
             presentInGlobalOverlayImpl?(contextController, nil)
         })
-    }, colorContextAction: { isCurrent, reference, accentColor, node, gesture in
+    }
+    let colorContextActionArgument: (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void = { isCurrent, reference, accentColor, node, gesture in
         let _ = (context.sharedContext.accountManager.transaction { transaction -> (ThemeSettingsColorOption?, TelegramWallpaper?) in
             let settings = transaction.getSharedData(ApplicationSpecificSharedDataKeys.presentationThemeSettings)?.get(PresentationThemeSettings.self) ?? PresentationThemeSettings.defaultSettings
             var wallpaper: TelegramWallpaper?
@@ -1028,17 +1109,56 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
                     }
                 }
             }
-            let contextController = ContextController(presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture)
+            let contextController = makeContextController(presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(ContextController.Items(content: .list(items))), gesture: gesture)
             presentInGlobalOverlayImpl?(contextController, nil)
         })
-    })
+    }
 
-    let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings, SharedDataKeys.chatThemes, ApplicationSpecificSharedDataKeys.mediaDisplaySettings]), cloudThemes.get(), availableAppIcons, currentAppIconName.get(), removedThemeIndexesPromise.get(), animatedEmojiStickers, context.account.postbox.peerView(id: context.account.peerId), context.engine.data.subscribe(TelegramEngine.EngineData.Item.Peer.Peer(id: context.account.peerId)))
-    |> map { presentationData, sharedData, cloudThemes, availableAppIcons, currentAppIconName, removedThemeIndexes, animatedEmojiStickers, peerView, accountPeer -> (ItemListControllerState, (ItemListNodeState, Any)) in
+    let arguments: ThemeSettingsControllerArguments = ThemeSettingsControllerArguments(
+        context: context,
+        selectTheme: selectThemeArgument,
+        openThemeSettings: openThemeSettingsArgument,
+        openWallpaperSettings: openWallpaperSettingsArgument,
+        openNameColorSettings: openNameColorSettingsArgument,
+        selectAccentColor: selectAccentColorArgument,
+        openAccentColorPicker: openAccentColorPickerArgument,
+        toggleNightTheme: toggleNightThemeArgument,
+        openAutoNightTheme: openAutoNightThemeArgument,
+        openTextSize: openTextSizeArgument,
+        openBubbleSettings: openBubbleSettingsArgument,
+        openPowerSavingSettings: openPowerSavingSettingsArgument,
+        openStickersAndEmoji: openStickersAndEmojiArgument,
+        toggleSendWithCmdEnter: toggleSendWithCmdEnterArgument,
+        toggleShowNextMediaOnTap: toggleShowNextMediaOnTapArgument,
+        selectAppIcon: selectAppIconArgument,
+        editTheme: editThemeArgument,
+        themeContextAction: themeContextActionArgument,
+        colorContextAction: colorContextActionArgument
+    )
+
+    let signal: Signal<(ItemListControllerState, (ItemListNodeState, ThemeSettingsControllerArguments)), NoError> = combineLatest(
+        queue: .mainQueue(),
+        context.sharedContext.presentationData,
+        context.sharedContext.accountManager.sharedData(keys: [
+            ApplicationSpecificSharedDataKeys.presentationThemeSettings,
+            ApplicationSpecificSharedDataKeys.chatSettings,
+            ApplicationSpecificSharedDataKeys.mediaDisplaySettings,
+            SharedDataKeys.chatThemes
+        ]),
+        cloudThemes.get(),
+        availableAppIcons,
+        currentAppIconName.get(),
+        removedThemeIndexesPromise.get(),
+        animatedEmojiStickers,
+        context.account.postbox.peerView(id: context.account.peerId),
+        context.engine.data.subscribe(TelegramEngine.EngineData.Item.Peer.Peer(id: context.account.peerId))
+    )
+    |> map { presentationData, sharedData, cloudThemes, availableAppIcons, currentAppIconName, removedThemeIndexes, animatedEmojiStickers, peerView, accountPeer -> (ItemListControllerState, (ItemListNodeState, ThemeSettingsControllerArguments)) in
         let settings = sharedData.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings]?.get(PresentationThemeSettings.self) ?? PresentationThemeSettings.defaultSettings
+        let chatSettings = sharedData.entries[ApplicationSpecificSharedDataKeys.chatSettings]?.get(ChatSettings.self) ?? ChatSettings.defaultSettings
         let mediaSettings = sharedData.entries[ApplicationSpecificSharedDataKeys.mediaDisplaySettings]?.get(MediaDisplaySettings.self) ?? MediaDisplaySettings.defaultSettings
         
-        let isPremium = peerView.peers[peerView.peerId]?.isPremium ?? false
+        let isPremium = context.sharedContext.immediateSGStatus.status > 1
         
         let themeReference: PresentationThemeReference
         if presentationData.autoNightModeTriggered {
@@ -1075,7 +1195,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
         chatThemes.insert(.builtin(.dayClassic), at: 0)
         
         let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.Appearance_Title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back))
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: themeSettingsControllerEntries(presentationData: presentationData, presentationThemeSettings: settings, mediaSettings: mediaSettings, themeReference: themeReference, availableThemes: availableThemes, availableAppIcons: availableAppIcons, currentAppIconName: currentAppIconName, isPremium: isPremium, chatThemes: chatThemes, animatedEmojiStickers: animatedEmojiStickers, accountPeer: accountPeer, nameColors: context.peerNameColors), style: .blocks, ensureVisibleItemTag: focusOnItemTag, animateChanges: false)
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: themeSettingsControllerEntries(presentationData: presentationData, presentationThemeSettings: settings, chatSettings: chatSettings, mediaSettings: mediaSettings, themeReference: themeReference, availableThemes: availableThemes, availableAppIcons: availableAppIcons, currentAppIconName: currentAppIconName, isPremium: isPremium, chatThemes: chatThemes, animatedEmojiStickers: animatedEmojiStickers, accountPeer: accountPeer, nameColors: context.peerNameColors), style: .blocks, ensureVisibleItemTag: focusOnItemTag, animateChanges: false)
         
         return (controllerState, (listState, arguments))
     }
@@ -1309,6 +1429,21 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
             presentCrossfadeControllerImpl?(true)
         })
     }
+    
+    if let focusOnItemTag {
+        var didFocusOnItem = false
+        controller.afterTransactionCompleted = { [weak controller] in
+            if !didFocusOnItem, let controller {
+                controller.forEachItemNode { itemNode in
+                    if let itemNode = itemNode as? ItemListItemNode, let tag = itemNode.tag, tag.isEqual(to: focusOnItemTag) {
+                        didFocusOnItem = true
+                        itemNode.displayHighlight()
+                    }
+                }
+            }
+        }
+    }
+    
     return controller
 }