chore: migrate to new version + fixed several critical bugs

- Migrated project to latest Telegram iOS base (v12.3.2+)
- Fixed circular dependency between GhostModeManager and MiscSettingsManager
- Fixed multiple Bazel build configuration errors (select() default conditions)
- Fixed duplicate type definitions in PeerInfoScreen
- Fixed swiftmodule directory resolution in build scripts
- Added Ghostgram Settings tab in main Settings menu with all 5 features
- Cleared sensitive credentials from config.json (template-only now)
- Excluded bazel-cache from version control

submodules/PeerInfoUI/BUILD

@@ -80,6 +80,9 @@ swift_library(
         "//submodules/TelegramUI/Components/PeerManagement/OwnershipTransferController",
         "//submodules/TelegramUI/Components/PeerManagement/OldChannelsController",
         "//submodules/TelegramUI/Components/PeerInfo/MessagePriceItem",
+        "//submodules/TelegramUI/Components/GlassBackgroundComponent",
+        "//submodules/ComponentFlow",
+        "//submodules/Components/ComponentDisplayAdapters",
     ],
     visibility = [
         "//visibility:public",

submodules/PeerInfoUI/CreateExternalMediaStreamScreen/Sources/CreateExternalMediaStreamScreen.swift

@@ -242,7 +242,7 @@ private final class CreateExternalMediaStreamScreenComponent: CombinedComponent
                         component: AnyComponentWithIdentity(id: "close", component: AnyComponent(
                             BundleIconComponent(
                                 name: "Navigation/Close",
-                                tintColor: theme.rootController.navigationBar.glassBarButtonForegroundColor
+                                tintColor: theme.chat.inputPanel.panelControlColor
                             )
                         )),
                         action: { _ in

submodules/PeerInfoUI/Sources/ChannelAdminController.swift

@@ -1091,7 +1091,7 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                 text = presentationData.strings.Channel_EditAdmin_CannotEdit
             }
             
-            presentControllerImpl?(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+            presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
         })
     }, transferOwnership: {
         let _ = (context.engine.data.get(
@@ -1104,19 +1104,30 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
             }
             
             transferOwnershipDisposable.set((context.engine.peers.checkOwnershipTranfserAvailability(memberId: adminId) |> deliverOnMainQueue).start(error: { error in
-                let controller = channelOwnershipTransferController(context: context, updatedPresentationData: updatedPresentationData, peer: peer, member: member, initialError: error, present: { c, a in
-                    presentControllerImpl?(c, a)
-                }, completion: { upgradedPeerId in
-                    if let upgradedPeerId = upgradedPeerId {
-                        upgradedToSupergroupImpl(upgradedPeerId, {
+                let controller = channelOwnershipTransferController(
+                    context: context,
+                    updatedPresentationData: updatedPresentationData,
+                    peer: peer,
+                    member: member,
+                    initialError: error,
+                    present: { c, a in
+                        presentControllerImpl?(c, a)
+                    },
+                    push: { c in
+                        pushControllerImpl?(c)
+                    },
+                    completion: { upgradedPeerId in
+                        if let upgradedPeerId = upgradedPeerId {
+                            upgradedToSupergroupImpl(upgradedPeerId, {
+                                dismissImpl?()
+                                transferedOwnership(member.id)
+                            })
+                        } else {
                             dismissImpl?()
                             transferedOwnership(member.id)
-                        })
-                    } else {
-                        dismissImpl?()
-                        transferedOwnership(member.id)
+                        }
                     }
-                })
+                )
                 presentControllerImpl?(controller, nil)
             }))
         })
@@ -1617,20 +1628,21 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                 rightNavigationButton = nil
                 footerItem = ChannelAdminAddBotFooterItem(theme: presentationData.theme, title: state.adminRights ? presentationData.strings.Bot_AddToChat_Add_AddAsAdmin : presentationData.strings.Bot_AddToChat_Add_AddAsMember, action: {
                     if state.adminRights {
-                        let theme = AlertControllerTheme(presentationData: presentationData)
-                        let attributedTitle = NSAttributedString(string: presentationData.strings.Bot_AddToChat_Add_AdminAlertTitle, font: Font.semibold(presentationData.listsFontSize.baseDisplaySize), textColor: theme.primaryColor, paragraphAlignment: .center)
-                      
                         let text = isGroup ? presentationData.strings.Bot_AddToChat_Add_AdminAlertTextGroup(peerTitle).string : presentationData.strings.Bot_AddToChat_Add_AdminAlertTextChannel(peerTitle).string
-                        
-                        let body = MarkdownAttributeSet(font: Font.regular(presentationData.listsFontSize.baseDisplaySize * 13.0 / 17.0), textColor: theme.primaryColor)
-                        let bold = MarkdownAttributeSet(font: Font.semibold(presentationData.listsFontSize.baseDisplaySize * 13.0 / 17.0), textColor: theme.primaryColor)
-                        let attributedText = parseMarkdownIntoAttributedString(text, attributes: MarkdownAttributes(body: body, bold: bold, link: body, linkAttribute: { _ in return nil }), textAlignment: .center)
-                                               
-                        let controller = richTextAlertController(context: context, title: attributedTitle, text: attributedText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Bot_AddToChat_Add_AdminAlertAdd, action: {
-                            rightButtonActionImpl()
-                        }), TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
-                        })], actionLayout: .vertical)
-                        presentControllerImpl?(controller, nil)
+
+                        let alertController = textAlertController(
+                            context: context,
+                            updatedPresentationData: updatedPresentationData,
+                            title: presentationData.strings.Bot_AddToChat_Add_AdminAlertTitle,
+                            text: text,
+                            actions: [
+                                TextAlertAction(type: .defaultAction, title: presentationData.strings.Bot_AddToChat_Add_AdminAlertAdd, action: { rightButtonActionImpl()
+                                }),
+                                TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}),
+                            ],
+                            actionLayout: .vertical
+                        )
+                        presentControllerImpl?(alertController, nil)
                     } else {
                         rightButtonActionImpl()
                     }

submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSearchContainerNode.swift

@@ -135,7 +135,7 @@ final class ChannelDiscussionGroupSearchContainerNode: SearchDisplayControllerCo
         
         super.init()
         
-        self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
+        self.dimNode.backgroundColor = .clear
         self.listNode.backgroundColor = self.presentationData.theme.chatList.backgroundColor
         self.listNode.isHidden = true
         

submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupHeaderItem.swift

@@ -90,7 +90,7 @@ class ChannelDiscussionGroupSetupHeaderItemNode: ListViewItemNode {
         self.labelNode.contentMode = .left
         self.labelNode.contentsScale = UIScreen.main.scale
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.imageNode)
         self.addSubnode(self.titleNode)

submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupSearchItem.swift

@@ -9,6 +9,11 @@ import ItemListUI
 import PresentationDataUtils
 import AccountContext
 import SearchBarNode
+import GlassBackgroundComponent
+import ComponentFlow
+import ComponentDisplayAdapters
+import AppBundle
+import ActivityIndicator
 
 final class ChannelDiscussionGroupSetupSearchItem: ItemListControllerSearch {
     let context: AccountContext
@@ -84,8 +89,8 @@ private final class ChannelDiscussionGroupSetupSearchItemNode: ItemListControlle
     }
     
     override func updateLayout(layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
-        transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: navigationBarHeight), size: CGSize(width: layout.size.width, height: layout.size.height - navigationBarHeight)))
-        self.containerNode.containerLayoutUpdated(layout.withUpdatedSize(CGSize(width: layout.size.width, height: layout.size.height - navigationBarHeight)), navigationBarHeight: 0.0, transition: transition)
+        transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: layout.size.height)))
+        self.containerNode.containerLayoutUpdated(layout.withUpdatedSize(CGSize(width: layout.size.width, height: layout.size.height)), navigationBarHeight: navigationBarHeight, transition: transition)
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
@@ -100,17 +105,40 @@ private final class ChannelDiscussionGroupSetupSearchItemNode: ItemListControlle
 private let searchBarFont = Font.regular(17.0)
 
 private final class ChannelDiscussionSearchNavigationContentNode: NavigationBarContentNode, ItemListControllerSearchNavigationContentNode {
+    private struct Params: Equatable {
+        let size: CGSize
+        let leftInset: CGFloat
+        let rightInset: CGFloat
+        
+        init(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) {
+            self.size = size
+            self.leftInset = leftInset
+            self.rightInset = rightInset
+        }
+    }
+    
     private var theme: PresentationTheme
     private let strings: PresentationStrings
     
     private let cancel: () -> Void
     
+    private let backgroundContainer: GlassBackgroundContainerView
+    private let backgroundView: GlassBackgroundView
+    private let iconView: UIImageView
+    private var activityIndicator: ActivityIndicator?
     private let searchBar: SearchBarNode
+    private let close: (background: GlassBackgroundView, icon: UIImageView)
+    
+    private var params: Params?
     
     private var queryUpdated: ((String) -> Void)?
     var activity: Bool = false {
         didSet {
-            searchBar.activity = activity
+            if self.activity != oldValue {
+                if let params = self.params {
+                    let _ = self.updateLayout(size: params.size, leftInset: params.leftInset, rightInset: params.rightInset, transition: .immediate)
+                }
+            }
         }
     }
     init(theme: PresentationTheme, strings: PresentationStrings, cancel: @escaping () -> Void, updateActivity: @escaping(@escaping(Bool)->Void) -> Void) {
@@ -119,11 +147,42 @@ private final class ChannelDiscussionSearchNavigationContentNode: NavigationBarC
         
         self.cancel = cancel
         
-        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern)
+        self.backgroundContainer = GlassBackgroundContainerView()
+        self.backgroundView = GlassBackgroundView()
+        self.backgroundContainer.contentView.addSubview(self.backgroundView)
+        self.iconView = UIImageView()
+        self.backgroundView.contentView.addSubview(self.iconView)
+        
+        self.close = (GlassBackgroundView(), UIImageView())
+        self.close.background.contentView.addSubview(self.close.icon)
+        
+        self.searchBar = SearchBarNode(
+            theme: SearchBarNodeTheme(
+                background: .clear,
+                separator: .clear,
+                inputFill: .clear,
+                primaryText: theme.chat.inputPanel.panelControlColor,
+                placeholder: theme.chat.inputPanel.inputPlaceholderColor,
+                inputIcon: theme.chat.inputPanel.inputControlColor,
+                inputClear: theme.chat.inputPanel.panelControlColor,
+                accent: theme.chat.inputPanel.panelControlAccentColor,
+                keyboard: theme.rootController.keyboardColor
+            ),
+            presentationTheme: theme,
+            strings: strings,
+            fieldStyle: .inlineNavigation,
+            forceSeparator: false,
+            displayBackground: false,
+            cancelText: nil
+        )
         
         super.init()
         
-        self.addSubnode(self.searchBar)
+        self.view.addSubview(self.backgroundContainer)
+        self.backgroundView.contentView.addSubview(self.searchBar.view)
+        
+        self.backgroundContainer.contentView.addSubview(self.close.background)
+        self.close.background.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.onCloseTapGesture(_:))))
         
         self.searchBar.cancel = { [weak self] in
             self?.searchBar.deactivate(clear: false)
@@ -141,13 +200,21 @@ private final class ChannelDiscussionSearchNavigationContentNode: NavigationBarC
         self.updatePlaceholder()
     }
     
+    @objc private func onCloseTapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.searchBar.cancel?()
+        }
+    }
+    
     func setQueryUpdated(_ f: @escaping (String) -> Void) {
         self.queryUpdated = f
     }
     
     func updateTheme(_ theme: PresentationTheme) {
         self.theme = theme
-        self.searchBar.updateThemeAndStrings(theme: SearchBarNodeTheme(theme: self.theme), strings: self.strings)
+        if let params = self.params {
+            let _ = self.updateLayout(size: params.size, leftInset: params.leftInset, rightInset: params.rightInset, transition: .immediate)
+        }
         self.updatePlaceholder()
     }
     
@@ -158,13 +225,87 @@ private final class ChannelDiscussionSearchNavigationContentNode: NavigationBarC
     }
     
     override var nominalHeight: CGFloat {
-        return 54.0
+        return 60.0
     }
     
-    override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) {
-        let searchBarFrame = CGRect(origin: CGPoint(x: 0.0, y: size.height - self.nominalHeight), size: CGSize(width: size.width, height: 54.0))
-        self.searchBar.frame = searchBarFrame
-        self.searchBar.updateLayout(boundingSize: searchBarFrame.size, leftInset: leftInset, rightInset: rightInset, transition: transition)
+    override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) -> CGSize {
+        self.params = Params(size: size, leftInset: leftInset, rightInset: rightInset)
+        
+        let transition = ComponentTransition(transition)
+        
+        let backgroundFrame = CGRect(origin: CGPoint(x: leftInset + 16.0, y: 6.0), size: CGSize(width: size.width - 16.0 * 2.0 - leftInset - rightInset - 44.0 - 8.0, height: 44.0))
+        let closeFrame = CGRect(origin: CGPoint(x: size.width - 16.0 - rightInset - 44.0, y: backgroundFrame.minY), size: CGSize(width: 44.0, height: 44.0))
+        
+        transition.setFrame(view: self.backgroundContainer, frame: CGRect(origin: CGPoint(), size: size))
+        self.backgroundContainer.update(size: size, isDark: self.theme.overallDarkAppearance, transition: transition)
+        
+        transition.setFrame(view: self.backgroundView, frame: backgroundFrame)
+        self.backgroundView.update(size: backgroundFrame.size, cornerRadius: backgroundFrame.height * 0.5, isDark: self.theme.overallDarkAppearance, tintColor: .init(kind: .panel, color: UIColor(white: self.theme.overallDarkAppearance ? 0.0 : 1.0, alpha: 0.6)), isInteractive: true, transition: transition)
+
+        if self.iconView.image == nil {
+            self.iconView.image = UIImage(bundleImageName: "Navigation/Search")?.withRenderingMode(.alwaysTemplate)
+        }
+        transition.setTintColor(view: self.iconView, color: self.theme.rootController.navigationSearchBar.inputIconColor)
+        
+        if let image = self.iconView.image {
+            let imageSize: CGSize
+            let iconFrame: CGRect
+            let iconFraction: CGFloat = 0.8
+            imageSize = CGSize(width: image.size.width * iconFraction, height: image.size.height * iconFraction)
+            iconFrame = CGRect(origin: CGPoint(x: 12.0, y: floor((backgroundFrame.height - imageSize.height) * 0.5)), size: imageSize)
+            transition.setPosition(view: self.iconView, position: iconFrame.center)
+            transition.setBounds(view: self.iconView, bounds: CGRect(origin: CGPoint(), size: iconFrame.size))
+        }
+        
+        if self.activity {
+            let activityIndicator: ActivityIndicator
+            if let current = self.activityIndicator {
+                activityIndicator = current
+            } else {
+                activityIndicator = ActivityIndicator(type: .custom(self.theme.chat.inputPanel.inputControlColor, 14.0, 14.0, false))
+                self.activityIndicator = activityIndicator
+                self.backgroundView.contentView.addSubview(activityIndicator.view)
+            }
+            let indicatorSize = activityIndicator.measure(CGSize(width: 32.0, height: 32.0))
+            let indicatorFrame = CGRect(origin: CGPoint(x: 15.0, y: floorToScreenPixels((backgroundFrame.height - indicatorSize.height) * 0.5)), size: indicatorSize)
+            transition.setPosition(view: activityIndicator.view, position: indicatorFrame.center)
+            transition.setBounds(view: activityIndicator.view, bounds: CGRect(origin: CGPoint(), size: indicatorFrame.size))
+        } else if let activityIndicator = self.activityIndicator {
+            self.activityIndicator = nil
+            activityIndicator.view.removeFromSuperview()
+        }
+        self.iconView.isHidden = self.activity
+        
+        let searchBarFrame = CGRect(origin: CGPoint(x: 36.0, y: 0.0), size: CGSize(width: backgroundFrame.width - 36.0 - 4.0, height: 44.0))
+        transition.setFrame(view: self.searchBar.view, frame: searchBarFrame)
+        self.searchBar.updateLayout(boundingSize: searchBarFrame.size, leftInset: 0.0, rightInset: 0.0, transition: transition.containedViewLayoutTransition)
+        
+        if self.close.icon.image == nil {
+            self.close.icon.image = generateImage(CGSize(width: 40.0, height: 40.0), contextGenerator: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                
+                context.setLineWidth(2.0)
+                context.setLineCap(.round)
+                context.setStrokeColor(UIColor.white.cgColor)
+                
+                context.beginPath()
+                context.move(to: CGPoint(x: 12.0, y: 12.0))
+                context.addLine(to: CGPoint(x: size.width - 12.0, y: size.height - 12.0))
+                context.move(to: CGPoint(x: size.width - 12.0, y: 12.0))
+                context.addLine(to: CGPoint(x: 12.0, y: size.height - 12.0))
+                context.strokePath()
+            })?.withRenderingMode(.alwaysTemplate)
+        }
+        
+        if let image = close.icon.image {
+            self.close.icon.frame = image.size.centered(in: CGRect(origin: CGPoint(), size: closeFrame.size))
+        }
+        self.close.icon.tintColor = self.theme.chat.inputPanel.panelControlColor
+        
+        transition.setFrame(view: self.close.background, frame: closeFrame)
+        self.close.background.update(size: closeFrame.size, cornerRadius: closeFrame.height * 0.5, isDark: self.theme.overallDarkAppearance, tintColor: .init(kind: .panel, color: UIColor(white: self.theme.overallDarkAppearance ? 0.0 : 1.0, alpha: 0.6)), isInteractive: true, transition: transition)
+        
+        return size
     }
     
     func activate() {

submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift

@@ -1203,7 +1203,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                 strongSelf.enqueueEmptyQueryTransition(transition, firstTime: firstTime)
                 
                 if entries == nil {
-                    strongSelf.emptyQueryListNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
+                    strongSelf.emptyQueryListNode.backgroundColor = .clear
                 } else {
                     strongSelf.emptyQueryListNode.backgroundColor = presentationData.theme.chatList.backgroundColor
                 }

submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift

@@ -42,8 +42,9 @@ public final class ChannelMembersSearchControllerImpl: ViewController, ChannelMe
             self.presentationData = self.presentationData.withUpdated(theme: forceTheme)
         }
         
-        super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData))
+        super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
         
+        self._hasGlassStyle = true
         self.navigationPresentation = .modal
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style

submodules/PeerInfoUI/Sources/ChannelMembersSearchControllerNode.swift

@@ -685,7 +685,7 @@ class ChannelMembersSearchControllerNode: ASDisplayNode {
             if let requestDeactivateSearch = self?.requestDeactivateSearch {
                 requestDeactivateSearch()
             }
-        })
+        }, fieldStyle: placeholderNode.fieldStyle)
         
         self.searchDisplayController?.containerLayoutUpdated(containerLayout, navigationBarHeight: navigationBarHeight, transition: .immediate)
         self.searchDisplayController?.activate(insertSubnode: { [weak self, weak placeholderNode] subnode, isSearchBar in

submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift

@@ -1132,22 +1132,26 @@ public func channelPermissionsController(context: AccountContext, updatedPresent
         controller.navigationPresentation = .modal
         controller.setState(.custom(icon: .animation("BroadcastGroup"), title: presentationData.strings.BroadcastGroups_IntroTitle, subtitle: nil, text: presentationData.strings.BroadcastGroups_IntroText, buttonTitle: presentationData.strings.BroadcastGroups_Convert, secondaryButtonTitle: presentationData.strings.BroadcastGroups_Cancel, footerText: nil), animated: false)
         controller.proceed = { [weak controller] result in
-            let attributedTitle = NSAttributedString(string: presentationData.strings.BroadcastGroups_ConfirmationAlert_Title, font: Font.semibold(presentationData.listsFontSize.baseDisplaySize), textColor: presentationData.theme.actionSheet.primaryTextColor, paragraphAlignment: .center)
-            let body = MarkdownAttributeSet(font: Font.regular(presentationData.listsFontSize.baseDisplaySize * 13.0 / 17.0), textColor: presentationData.theme.actionSheet.primaryTextColor)
-            let bold = MarkdownAttributeSet(font: Font.semibold(presentationData.listsFontSize.baseDisplaySize * 13.0 / 17.0), textColor: presentationData.theme.actionSheet.primaryTextColor)
-            let attributedText = parseMarkdownIntoAttributedString(presentationData.strings.BroadcastGroups_ConfirmationAlert_Text, attributes: MarkdownAttributes(body: body, bold: bold, link: body, linkAttribute: { _ in return nil }), textAlignment: .center)
-            
-            let alertController = richTextAlertController(context: context, title: attributedTitle, text: attributedText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.BroadcastGroups_ConfirmationAlert_Convert, action: { [weak controller] in
-                controller?.dismiss()
-                
-                let _ = (convertGroupToGigagroup(account: context.account, peerId: originalPeerId)
-                |> deliverOnMainQueue).start(completed: {
-                    let participantsLimit = context.currentLimitsConfiguration.with { $0 }.maxSupergroupMemberCount
-                    presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .gigagroupConversion(text: presentationData.strings.BroadcastGroups_Success(presentationStringsFormattedNumber(participantsLimit, presentationData.dateTimeFormat.decimalSeparator)).string), elevatedLayout: true, action: { _ in return false }), nil)
-                    
-                    dismissToChatController?()
-                })
-            })])
+            let alertController = textAlertController(
+                context: context,
+                updatedPresentationData: updatedPresentationData,
+                title: presentationData.strings.BroadcastGroups_ConfirmationAlert_Title,
+                text: presentationData.strings.BroadcastGroups_ConfirmationAlert_Text,
+                actions: [
+                    TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}),
+                    TextAlertAction(type: .defaultAction, title: presentationData.strings.BroadcastGroups_ConfirmationAlert_Convert, action: { [weak controller] in
+                        controller?.dismiss()
+                        
+                        let _ = (convertGroupToGigagroup(account: context.account, peerId: originalPeerId)
+                        |> deliverOnMainQueue).start(completed: {
+                            let participantsLimit = context.currentLimitsConfiguration.with { $0 }.maxSupergroupMemberCount
+                            presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .gigagroupConversion(text: presentationData.strings.BroadcastGroups_Success(presentationStringsFormattedNumber(participantsLimit, presentationData.dateTimeFormat.decimalSeparator)).string), elevatedLayout: true, action: { _ in return false }), nil)
+                            
+                            dismissToChatController?()
+                        })
+                    })
+                ]
+            )
             controller?.present(alertController, in: .window(.root))
         }
         pushControllerImpl?(controller)

submodules/PeerInfoUI/Sources/ChatSlowmodeItem.swift

@@ -95,7 +95,7 @@ class ChatSlowmodeItemNode: ListViewItemNode {
             return textNode
         }
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.textNodes.forEach(self.addSubnode)
     }

submodules/PeerInfoUI/Sources/ChatUnrestrictBoostersItem.swift

@@ -103,7 +103,7 @@ class ChatUnrestrictBoostersItemNode: ListViewItemNode {
             return textNode
         }
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.iconNodes.forEach(self.addSubnode)
         self.textNodes.forEach(self.addSubnode)

submodules/PeerInfoUI/Sources/GroupInfoSearchItem.swift

@@ -110,8 +110,8 @@ private final class ChannelMembersSearchItemNode: ItemListControllerSearchNode {
     }
     
     override func updateLayout(layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
-        transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: navigationBarHeight), size: CGSize(width: layout.size.width, height: layout.size.height - navigationBarHeight)))
-        self.containerNode.containerLayoutUpdated(layout.withUpdatedSize(CGSize(width: layout.size.width, height: layout.size.height - navigationBarHeight)), navigationBarHeight: 0.0, transition: transition)
+        transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: layout.size.height)))
+        self.containerNode.containerLayoutUpdated(layout.withUpdatedSize(CGSize(width: layout.size.width, height: layout.size.height)), navigationBarHeight: navigationBarHeight, transition: transition)
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {

submodules/PeerInfoUI/Sources/GroupInfoSearchNavigationContentNode.swift

@@ -8,24 +8,53 @@ import TelegramPresentationData
 import ItemListUI
 import PresentationDataUtils
 import SearchBarNode
+import GlassBackgroundComponent
+import ComponentFlow
+import ComponentDisplayAdapters
+import AppBundle
+import ActivityIndicator
 
 private let searchBarFont = Font.regular(17.0)
 
 final class GroupInfoSearchNavigationContentNode: NavigationBarContentNode, ItemListControllerSearchNavigationContentNode {
+    private struct Params: Equatable {
+        let size: CGSize
+        let leftInset: CGFloat
+        let rightInset: CGFloat
+        
+        init(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) {
+            self.size = size
+            self.leftInset = leftInset
+            self.rightInset = rightInset
+        }
+    }
+    
     private var theme: PresentationTheme
     private let strings: PresentationStrings
     private let searchMode: ChannelMembersSearchMode
     
     private let cancel: () -> Void
     
+    private let backgroundContainer: GlassBackgroundContainerView
+    private let backgroundView: GlassBackgroundView
+    private let iconView: UIImageView
+    private var activityIndicator: ActivityIndicator?
     private let searchBar: SearchBarNode
+    private let close: (background: GlassBackgroundView, icon: UIImageView)
+    
+    private var params: Params?
     
     private var queryUpdated: ((String) -> Void)?
     var activity: Bool = false {
         didSet {
-            searchBar.activity = activity
+            if self.activity != oldValue {
+                if let params = self.params {
+                    let _ = self.updateLayout(size: params.size, leftInset: params.leftInset, rightInset: params.rightInset, transition: .immediate)
+                }
+            }
         }
     }
+    
     init(theme: PresentationTheme, strings: PresentationStrings, mode: ChannelMembersSearchMode, cancel: @escaping () -> Void, updateActivity: @escaping(@escaping(Bool)->Void) -> Void) {
         self.theme = theme
         self.strings = strings
@@ -33,11 +62,42 @@ final class GroupInfoSearchNavigationContentNode: NavigationBarContentNode, Item
         
         self.cancel = cancel
         
-        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern, displayBackground: false)
+        self.backgroundContainer = GlassBackgroundContainerView()
+        self.backgroundView = GlassBackgroundView()
+        self.backgroundContainer.contentView.addSubview(self.backgroundView)
+        self.iconView = UIImageView()
+        self.backgroundView.contentView.addSubview(self.iconView)
+        
+        self.close = (GlassBackgroundView(), UIImageView())
+        self.close.background.contentView.addSubview(self.close.icon)
+        
+        self.searchBar = SearchBarNode(
+            theme: SearchBarNodeTheme(
+                background: .clear,
+                separator: .clear,
+                inputFill: .clear,
+                primaryText: theme.chat.inputPanel.panelControlColor,
+                placeholder: theme.chat.inputPanel.inputPlaceholderColor,
+                inputIcon: theme.chat.inputPanel.inputControlColor,
+                inputClear: theme.chat.inputPanel.panelControlColor,
+                accent: theme.chat.inputPanel.panelControlAccentColor,
+                keyboard: theme.rootController.keyboardColor
+            ),
+            presentationTheme: theme,
+            strings: strings,
+            fieldStyle: .inlineNavigation,
+            forceSeparator: false,
+            displayBackground: false,
+            cancelText: nil
+        )
         
         super.init()
         
-        self.addSubnode(self.searchBar)
+        self.view.addSubview(self.backgroundContainer)
+        self.backgroundView.contentView.addSubview(self.searchBar.view)
+        
+        self.backgroundContainer.contentView.addSubview(self.close.background)
+        self.close.background.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.onCloseTapGesture(_:))))
         
         self.searchBar.cancel = { [weak self] in
             self?.searchBar.deactivate(clear: false)
@@ -55,13 +115,21 @@ final class GroupInfoSearchNavigationContentNode: NavigationBarContentNode, Item
         self.updatePlaceholder()
     }
     
+    @objc private func onCloseTapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.searchBar.cancel?()
+        }
+    }
+    
     func setQueryUpdated(_ f: @escaping (String) -> Void) {
         self.queryUpdated = f
     }
     
     func updateTheme(_ theme: PresentationTheme) {
         self.theme = theme
-        self.searchBar.updateThemeAndStrings(theme: SearchBarNodeTheme(theme: self.theme), strings: self.strings)
+        if let params = self.params {
+            let _ = self.updateLayout(size: params.size, leftInset: params.leftInset, rightInset: params.rightInset, transition: .immediate)
+        }
         self.updatePlaceholder()
     }
     
@@ -77,13 +145,87 @@ final class GroupInfoSearchNavigationContentNode: NavigationBarContentNode, Item
     }
     
     override var nominalHeight: CGFloat {
-        return 54.0
+        return 60.0
     }
     
-    override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) {
-        let searchBarFrame = CGRect(origin: CGPoint(x: 0.0, y: size.height - self.nominalHeight), size: CGSize(width: size.width, height: 54.0))
-        self.searchBar.frame = searchBarFrame
-        self.searchBar.updateLayout(boundingSize: searchBarFrame.size, leftInset: leftInset, rightInset: rightInset, transition: transition)
+    override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) -> CGSize {
+        self.params = Params(size: size, leftInset: leftInset, rightInset: rightInset)
+        
+        let transition = ComponentTransition(transition)
+        
+        let backgroundFrame = CGRect(origin: CGPoint(x: leftInset + 16.0, y: 6.0), size: CGSize(width: size.width - 16.0 * 2.0 - leftInset - rightInset - 44.0 - 8.0, height: 44.0))
+        let closeFrame = CGRect(origin: CGPoint(x: size.width - 16.0 - rightInset - 44.0, y: backgroundFrame.minY), size: CGSize(width: 44.0, height: 44.0))
+        
+        transition.setFrame(view: self.backgroundContainer, frame: CGRect(origin: CGPoint(), size: size))
+        self.backgroundContainer.update(size: size, isDark: self.theme.overallDarkAppearance, transition: transition)
+        
+        transition.setFrame(view: self.backgroundView, frame: backgroundFrame)
+        self.backgroundView.update(size: backgroundFrame.size, cornerRadius: backgroundFrame.height * 0.5, isDark: self.theme.overallDarkAppearance, tintColor: .init(kind: .panel, color: UIColor(white: self.theme.overallDarkAppearance ? 0.0 : 1.0, alpha: 0.6)), isInteractive: true, transition: transition)
+
+        if self.iconView.image == nil {
+            self.iconView.image = UIImage(bundleImageName: "Navigation/Search")?.withRenderingMode(.alwaysTemplate)
+        }
+        transition.setTintColor(view: self.iconView, color: self.theme.rootController.navigationSearchBar.inputIconColor)
+        
+        if let image = self.iconView.image {
+            let imageSize: CGSize
+            let iconFrame: CGRect
+            let iconFraction: CGFloat = 0.8
+            imageSize = CGSize(width: image.size.width * iconFraction, height: image.size.height * iconFraction)
+            iconFrame = CGRect(origin: CGPoint(x: 12.0, y: floor((backgroundFrame.height - imageSize.height) * 0.5)), size: imageSize)
+            transition.setPosition(view: self.iconView, position: iconFrame.center)
+            transition.setBounds(view: self.iconView, bounds: CGRect(origin: CGPoint(), size: iconFrame.size))
+        }
+        
+        if self.activity {
+            let activityIndicator: ActivityIndicator
+            if let current = self.activityIndicator {
+                activityIndicator = current
+            } else {
+                activityIndicator = ActivityIndicator(type: .custom(self.theme.chat.inputPanel.inputControlColor, 14.0, 14.0, false))
+                self.activityIndicator = activityIndicator
+                self.backgroundView.contentView.addSubview(activityIndicator.view)
+            }
+            let indicatorSize = activityIndicator.measure(CGSize(width: 32.0, height: 32.0))
+            let indicatorFrame = CGRect(origin: CGPoint(x: 15.0, y: floorToScreenPixels((backgroundFrame.height - indicatorSize.height) * 0.5)), size: indicatorSize)
+            transition.setPosition(view: activityIndicator.view, position: indicatorFrame.center)
+            transition.setBounds(view: activityIndicator.view, bounds: CGRect(origin: CGPoint(), size: indicatorFrame.size))
+        } else if let activityIndicator = self.activityIndicator {
+            self.activityIndicator = nil
+            activityIndicator.view.removeFromSuperview()
+        }
+        self.iconView.isHidden = self.activity
+        
+        let searchBarFrame = CGRect(origin: CGPoint(x: 36.0, y: 0.0), size: CGSize(width: backgroundFrame.width - 36.0 - 4.0, height: 44.0))
+        transition.setFrame(view: self.searchBar.view, frame: searchBarFrame)
+        self.searchBar.updateLayout(boundingSize: searchBarFrame.size, leftInset: 0.0, rightInset: 0.0, transition: transition.containedViewLayoutTransition)
+        
+        if self.close.icon.image == nil {
+            self.close.icon.image = generateImage(CGSize(width: 40.0, height: 40.0), contextGenerator: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                
+                context.setLineWidth(2.0)
+                context.setLineCap(.round)
+                context.setStrokeColor(UIColor.white.cgColor)
+                
+                context.beginPath()
+                context.move(to: CGPoint(x: 12.0, y: 12.0))
+                context.addLine(to: CGPoint(x: size.width - 12.0, y: size.height - 12.0))
+                context.move(to: CGPoint(x: size.width - 12.0, y: 12.0))
+                context.addLine(to: CGPoint(x: 12.0, y: size.height - 12.0))
+                context.strokePath()
+            })?.withRenderingMode(.alwaysTemplate)
+        }
+        
+        if let image = close.icon.image {
+            self.close.icon.frame = image.size.centered(in: CGRect(origin: CGPoint(), size: closeFrame.size))
+        }
+        self.close.icon.tintColor = self.theme.chat.inputPanel.panelControlColor
+        
+        transition.setFrame(view: self.close.background, frame: closeFrame)
+        self.close.background.update(size: closeFrame.size, cornerRadius: closeFrame.height * 0.5, isDark: self.theme.overallDarkAppearance, tintColor: .init(kind: .panel, color: UIColor(white: self.theme.overallDarkAppearance ? 0.0 : 1.0, alpha: 0.6)), isInteractive: true, transition: transition)
+        
+        return size
     }
     
     func activate() {
@@ -94,4 +236,3 @@ final class GroupInfoSearchNavigationContentNode: NavigationBarContentNode, Item
         self.searchBar.deactivate(clear: false)
     }
 }
-

submodules/PeerInfoUI/Sources/ItemListCallListItem.swift

@@ -174,7 +174,7 @@ public class ItemListCallListItemNode: ListViewItemNode {
         
         self.accessibilityArea = AccessibilityAreaNode()
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.titleNode)
         self.addSubnode(self.accessibilityArea)

submodules/PeerInfoUI/Sources/ItemListReactionItem.swift

@@ -168,7 +168,7 @@ public class ItemListReactionItemNode: ListViewItemNode, ItemListItemNode {
         
         self.activateArea = AccessibilityAreaNode()
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.titleNode)
         self.addSubnode(self.switchNode)

submodules/PeerInfoUI/Sources/ItemListSecretChatKeyItem.swift

@@ -123,7 +123,7 @@ class ItemListSecretChatKeyItemNode: ListViewItemNode {
         self.highlightedBackgroundNode = ASDisplayNode()
         self.highlightedBackgroundNode.isLayerBacked = true
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.titleNode)
         self.addSubnode(self.keyNode)

submodules/PeerInfoUI/Sources/PeerAutoremoveTimeoutItem.swift

@@ -125,7 +125,7 @@ class PeerRemoveTimeoutItemNode: ListViewItemNode, ItemListItemNode {
             return TextNode()
         }
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.titleNodes.forEach(self.addSubnode)
         

submodules/PeerInfoUI/Sources/UserInfoEditingPhoneActionItem.swift

@@ -100,7 +100,7 @@ class UserInfoEditingPhoneActionItemNode: ListViewItemNode {
         self.highlightedBackgroundNode = ASDisplayNode()
         self.highlightedBackgroundNode.isLayerBacked = true
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.iconNode)
         self.addSubnode(self.titleNode)

submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift

@@ -131,7 +131,7 @@ class UserInfoEditingPhoneItemNode: ItemListRevealOptionsItemNode, ItemListItemN
         self.clearButton.displaysAsynchronously = false
         self.clearButton.isHidden = true
         
-        super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
+        super.init(layerBacked: false, rotated: false, seeThrough: false)
         
         self.addSubnode(self.editableControlNode)
         self.addSubnode(self.labelNode)