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/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift

@@ -133,7 +133,7 @@ private final class AutodownloadDataUsagePickerItemNode: ListViewItemNode {
         
         self.activateArea = AccessibilityAreaNode()
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.lowTextNode)
         self.addSubnode(self.mediumTextNode)

submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift

@@ -143,7 +143,7 @@ private final class AutodownloadSizeLimitItemNode: ListViewItemNode {
         self.maxTextNode.isUserInteractionEnabled = false
         self.maxTextNode.displaysAsynchronously = false
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.textNode)
         self.addSubnode(self.minTextNode)

submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift

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

submodules/SettingsUI/Sources/Data and Storage/EnergyUsageBatteryLevelItem.swift

@@ -112,7 +112,7 @@ class EnergyUsageBatteryLevelItemNode: ListViewItemNode {
         self.batteryBackgroundNode = ASImageNode()
         self.batteryForegroundNode = ASImageNode()
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.leftTextNode)
         self.addSubnode(self.rightTextNode)

submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift

@@ -107,7 +107,7 @@ private final class KeepMediaDurationPickerItemNode: ListViewItemNode {
         }
         self.textNodes = textNodes
 
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         for textNode in textNodes {
             self.addSubnode(textNode)

submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift

@@ -122,7 +122,7 @@ private final class MaximumCacheSizePickerItemNode: ListViewItemNode {
         }
         self.textNodes = textNodes
 
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         for textNode in textNodes {
             self.addSubnode(textNode)

submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift

@@ -14,6 +14,7 @@ import PresentationDataUtils
 import UrlEscaping
 
 public final class ProxyServerActionSheetController: ActionSheetController {
+    private let sharedContext: SharedAccountContext
     private var presentationDisposable: Disposable?
     
     private let _ready = Promise<Bool>()
@@ -25,10 +26,11 @@ public final class ProxyServerActionSheetController: ActionSheetController {
     
     convenience public init(context: AccountContext, server: ProxyServerSettings) {
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        self.init(presentationData: presentationData, accountManager: context.sharedContext.accountManager, postbox: context.account.postbox, network: context.account.network, server: server, updatedPresentationData: context.sharedContext.presentationData)
+        self.init(sharedContext: context.sharedContext, presentationData: presentationData, accountManager: context.sharedContext.accountManager, postbox: context.account.postbox, network: context.account.network, server: server, updatedPresentationData: context.sharedContext.presentationData)
     }
     
-    public init(presentationData: PresentationData, accountManager: AccountManager<TelegramAccountManagerTypes>, postbox: Postbox, network: Network, server: ProxyServerSettings, updatedPresentationData: Signal<PresentationData, NoError>?) {
+    public init(sharedContext: SharedAccountContext, presentationData: PresentationData, accountManager: AccountManager<TelegramAccountManagerTypes>, postbox: Postbox, network: Network, server: ProxyServerSettings, updatedPresentationData: Signal<PresentationData, NoError>?) {
+        self.sharedContext = sharedContext
         let sheetTheme = ActionSheetControllerTheme(presentationData: presentationData)
         super.init(theme: sheetTheme)
         
@@ -39,7 +41,7 @@ public final class ProxyServerActionSheetController: ActionSheetController {
             items.append(ActionSheetTextItem(title: presentationData.strings.SocksProxySetup_AdNoticeHelp))
         }
         items.append(ProxyServerInfoItem(strings: presentationData.strings, network: network, server: server))
-        items.append(ProxyServerActionItem(accountManager:accountManager, postbox: postbox, network: network, presentationData: presentationData, server: server, dismiss: { [weak self] success in
+        items.append(ProxyServerActionItem(sharedContext: sharedContext, accountManager:accountManager, postbox: postbox, network: network, presentationData: presentationData, server: server, dismiss: { [weak self] success in
             guard let strongSelf = self, !strongSelf.isDismissed else {
                 return
             }
@@ -262,6 +264,7 @@ private final class ProxyServerInfoItemNode: ActionSheetItemNode {
 }
 
 private final class ProxyServerActionItem: ActionSheetItem {
+    private let sharedContext: SharedAccountContext
     private let accountManager: AccountManager<TelegramAccountManagerTypes>
     private let postbox: Postbox
     private let network: Network
@@ -270,7 +273,8 @@ private final class ProxyServerActionItem: ActionSheetItem {
     private let dismiss: (Bool) -> Void
     private let present: (ViewController, Any?) -> Void
     
-    init(accountManager: AccountManager<TelegramAccountManagerTypes>, postbox: Postbox, network: Network, presentationData: PresentationData, server: ProxyServerSettings, dismiss: @escaping (Bool) -> Void, present: @escaping (ViewController, Any?) -> Void) {
+    init(sharedContext: SharedAccountContext, accountManager: AccountManager<TelegramAccountManagerTypes>, postbox: Postbox, network: Network, presentationData: PresentationData, server: ProxyServerSettings, dismiss: @escaping (Bool) -> Void, present: @escaping (ViewController, Any?) -> Void) {
+        self.sharedContext = sharedContext
         self.accountManager = accountManager
         self.postbox = postbox
         self.network = network
@@ -281,7 +285,7 @@ private final class ProxyServerActionItem: ActionSheetItem {
     }
     
     func node(theme: ActionSheetControllerTheme) -> ActionSheetItemNode {
-        return ProxyServerActionItemNode(accountManager: self.accountManager, postbox: self.postbox, network: self.network, presentationData: self.presentationData, theme: theme, server: self.server, dismiss: self.dismiss, present: self.present)
+        return ProxyServerActionItemNode(sharedContext: self.sharedContext, accountManager: self.accountManager, postbox: self.postbox, network: self.network, presentationData: self.presentationData, theme: theme, server: self.server, dismiss: self.dismiss, present: self.present)
     }
     
     func updateNode(_ node: ActionSheetItemNode) {
@@ -289,6 +293,7 @@ private final class ProxyServerActionItem: ActionSheetItem {
 }
 
 private final class ProxyServerActionItemNode: ActionSheetItemNode {
+    private let sharedContext: SharedAccountContext
     private let accountManager: AccountManager<TelegramAccountManagerTypes>
     private let postbox: Postbox
     private let network: Network
@@ -305,7 +310,8 @@ private final class ProxyServerActionItemNode: ActionSheetItemNode {
     private let disposable = MetaDisposable()
     private var revertSettings: ProxySettings?
     
-    init(accountManager: AccountManager<TelegramAccountManagerTypes>, postbox: Postbox, network: Network, presentationData: PresentationData, theme: ActionSheetControllerTheme, server: ProxyServerSettings, dismiss: @escaping (Bool) -> Void, present: @escaping (ViewController, Any?) -> Void) {
+    init(sharedContext: SharedAccountContext, accountManager: AccountManager<TelegramAccountManagerTypes>, postbox: Postbox, network: Network, presentationData: PresentationData, theme: ActionSheetControllerTheme, server: ProxyServerSettings, dismiss: @escaping (Bool) -> Void, present: @escaping (ViewController, Any?) -> Void) {
+        self.sharedContext = sharedContext
         self.accountManager = accountManager
         self.postbox = postbox
         self.network = network
@@ -430,7 +436,7 @@ private final class ProxyServerActionItemNode: ActionSheetItemNode {
                             strongSelf.buttonNode.isUserInteractionEnabled = true
                             strongSelf.requestLayoutUpdate()
                             
-                            strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: nil, text: strongSelf.presentationData.strings.SocksProxySetup_FailedToConnect, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                            strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: strongSelf.presentationData.strings.SocksProxySetup_FailedToConnect, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                         }
                     }
                 }))

submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift

@@ -114,7 +114,7 @@ private final class ProxySettingsActionItemNode: ListViewItemNode {
         self.highlightedBackgroundNode = ASDisplayNode()
         self.highlightedBackgroundNode.isLayerBacked = true
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.isAccessibilityElement = true
         

submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift

@@ -174,7 +174,7 @@ private final class ProxySettingsServerItemNode: ItemListRevealOptionsItemNode {
         self.highlightedBackgroundNode = ASDisplayNode()
         self.highlightedBackgroundNode.isLayerBacked = true
         
-        super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
+        super.init(layerBacked: false, rotated: false, seeThrough: false)
         
         self.addSubnode(self.titleNode)
         self.addSubnode(self.statusNode)

submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift

@@ -119,7 +119,7 @@ private final class StorageUsageItemNode: ListViewItemNode {
         self.lineNodes = []
         self.descriptionNodes = []
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.lineMaskNode)
     }

submodules/SettingsUI/Sources/Data and Storage/WebBrowserDomainController.swift

@@ -7,465 +7,99 @@ import TelegramCore
 import TelegramPresentationData
 import AccountContext
 import UrlEscaping
-import ActivityIndicator
+import ComponentFlow
+import AlertComponent
+import AlertInputFieldComponent
 
-private final class WebBrowserDomainInputFieldNode: ASDisplayNode, ASEditableTextNodeDelegate {
-    private var theme: PresentationTheme
-    private let backgroundNode: ASImageNode
-    fileprivate let textInputNode: EditableTextNode
-    private let placeholderNode: ASTextNode
+public func webBrowserDomainController(context: AccountContext, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)? = nil, apply: @escaping (String?) -> Void) -> ViewController {
+    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+    let strings = presentationData.strings
     
-    var updateHeight: (() -> Void)?
-    var complete: (() -> Void)?
-    var textChanged: ((String) -> Void)?
+    let inputState = AlertInputFieldComponent.ExternalState()
     
-    private let backgroundInsets = UIEdgeInsets(top: 8.0, left: 16.0, bottom: 15.0, right: 16.0)
-    private let inputInsets = UIEdgeInsets(top: 5.0, left: 12.0, bottom: 5.0, right: 12.0)
-    
-    var text: String {
-        get {
-            return self.textInputNode.attributedText?.string ?? ""
-        }
-        set {
-            self.textInputNode.attributedText = NSAttributedString(string: newValue, font: Font.regular(17.0), textColor: self.theme.actionSheet.inputTextColor)
-            self.placeholderNode.isHidden = !newValue.isEmpty
-        }
+    let doneIsEnabled: Signal<Bool, NoError> = inputState.valueSignal
+    |> map { value in
+        return !value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
     }
     
-    var placeholder: String = "" {
-        didSet {
-            self.placeholderNode.attributedText = NSAttributedString(string: self.placeholder, font: Font.regular(17.0), textColor: self.theme.actionSheet.inputPlaceholderColor)
-        }
-    }
-    
-    init(theme: PresentationTheme, placeholder: String) {
-        self.theme = theme
+    let doneInProgressPromise = ValuePromise<Bool>(false)
+                
+    var content: [AnyComponentWithIdentity<AlertComponentEnvironment>] = []
+    content.append(AnyComponentWithIdentity(
+        id: "title",
+        component: AnyComponent(
+            AlertTitleComponent(title: strings.WebBrowser_Exceptions_Create_Title)
+        )
+    ))
+    content.append(AnyComponentWithIdentity(
+        id: "text",
+        component: AnyComponent(
+            AlertTextComponent(content: .plain(strings.WebBrowser_Exceptions_Create_Text))
+        )
+    ))
         
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.displaysAsynchronously = false
-        self.backgroundNode.displayWithoutProcessing = true
-        self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 12.0, color: theme.actionSheet.inputHollowBackgroundColor, strokeColor: theme.actionSheet.inputBorderColor, strokeWidth: 1.0)
-        
-        self.textInputNode = EditableTextNode()
-        self.textInputNode.typingAttributes = [NSAttributedString.Key.font.rawValue: Font.regular(17.0), NSAttributedString.Key.foregroundColor.rawValue: theme.actionSheet.inputTextColor]
-        self.textInputNode.clipsToBounds = true
-        self.textInputNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0)
-        self.textInputNode.textContainerInset = UIEdgeInsets(top: self.inputInsets.top, left: 0.0, bottom: self.inputInsets.bottom, right: 0.0)
-        self.textInputNode.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance
-        self.textInputNode.keyboardType = .URL
-        self.textInputNode.autocapitalizationType = .none
-        self.textInputNode.returnKeyType = .done
-        self.textInputNode.autocorrectionType = .no
-        self.textInputNode.tintColor = theme.actionSheet.controlAccentColor
-        
-        self.placeholderNode = ASTextNode()
-        self.placeholderNode.isUserInteractionEnabled = false
-        self.placeholderNode.displaysAsynchronously = false
-        self.placeholderNode.attributedText = NSAttributedString(string: placeholder, font: Font.regular(17.0), textColor: self.theme.actionSheet.inputPlaceholderColor)
-        
-        super.init()
-        
-        self.textInputNode.delegate = self
-        
-        self.addSubnode(self.backgroundNode)
-        self.addSubnode(self.textInputNode)
-        self.addSubnode(self.placeholderNode)
-    }
-    
-    func updateTheme(_ theme: PresentationTheme) {
-        self.theme = theme
-        
-        self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 12.0, color: self.theme.actionSheet.inputHollowBackgroundColor, strokeColor: self.theme.actionSheet.inputBorderColor, strokeWidth: 1.0)
-        self.textInputNode.keyboardAppearance = self.theme.rootController.keyboardColor.keyboardAppearance
-        self.placeholderNode.attributedText = NSAttributedString(string: self.placeholderNode.attributedText?.string ?? "", font: Font.regular(17.0), textColor: self.theme.actionSheet.inputPlaceholderColor)
-        self.textInputNode.tintColor = self.theme.actionSheet.controlAccentColor
-    }
-    
-    func updateLayout(width: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
-        let backgroundInsets = self.backgroundInsets
-        let inputInsets = self.inputInsets
-        
-        let textFieldHeight = self.calculateTextFieldMetrics(width: width)
-        let panelHeight = textFieldHeight + backgroundInsets.top + backgroundInsets.bottom
-        
-        let backgroundFrame = CGRect(origin: CGPoint(x: backgroundInsets.left, y: backgroundInsets.top), size: CGSize(width: width - backgroundInsets.left - backgroundInsets.right, height: panelHeight - backgroundInsets.top - backgroundInsets.bottom))
-        transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
-        
-        let placeholderSize = self.placeholderNode.measure(backgroundFrame.size)
-        transition.updateFrame(node: self.placeholderNode, frame: CGRect(origin: CGPoint(x: backgroundFrame.minX + inputInsets.left, y: backgroundFrame.minY + floor((backgroundFrame.size.height - placeholderSize.height) / 2.0)), size: placeholderSize))
-        
-        transition.updateFrame(node: self.textInputNode, frame: CGRect(origin: CGPoint(x: backgroundFrame.minX + inputInsets.left, y: backgroundFrame.minY), size: CGSize(width: backgroundFrame.size.width - inputInsets.left - inputInsets.right, height: backgroundFrame.size.height)))
-        
-        return panelHeight
-    }
-    
-    func activateInput() {
-        self.textInputNode.becomeFirstResponder()
-    }
-    
-    func deactivateInput() {
-        self.textInputNode.resignFirstResponder()
-    }
-    
-    @objc func editableTextNodeDidUpdateText(_ editableTextNode: ASEditableTextNode) {
-        self.updateTextNodeText(animated: true)
-        self.textChanged?(editableTextNode.textView.text)
-        self.placeholderNode.isHidden = !(editableTextNode.textView.text ?? "").isEmpty
-    }
-    
-    private let domainRegex = try? NSRegularExpression(pattern: "^(https?://)?([a-zA-Z0-9-]+\\.?)*([a-zA-Z]*)?(:)?(/)?$", options: [])
-    private let pathRegex = try? NSRegularExpression(pattern: "^(https?://)?([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}/", options: [])
-    
-    var inProgress = false
-    
-    func editableTextNode(_ editableTextNode: ASEditableTextNode, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
-        if self.inProgress {
-            return false
-        }
-        if text == "\n" {
-            self.complete?()
-            return false
-        }
-        
-        if let domainRegex = self.domainRegex, let pathRegex = self.pathRegex {
-            let updatedText = (editableTextNode.textView.text as NSString).replacingCharacters(in: range, with: text)
-            let domainMatches = domainRegex.matches(in: updatedText, options: [], range: NSRange(location: 0, length: updatedText.utf16.count))
-            let pathMatches = pathRegex.matches(in: updatedText, options: [], range: NSRange(location: 0, length: updatedText.utf16.count))
-                 
-            if domainMatches.count > 0, pathMatches.count == 0 {
-                return true
-            } else {
-                return false
-            }
-        }
-        
-        return true
-    }
-    
-    private func calculateTextFieldMetrics(width: CGFloat) -> CGFloat {
-        let backgroundInsets = self.backgroundInsets
-        let inputInsets = self.inputInsets
-        
-        let unboundTextFieldHeight = max(33.0, ceil(self.textInputNode.measure(CGSize(width: width - backgroundInsets.left - backgroundInsets.right - inputInsets.left - inputInsets.right, height: CGFloat.greatestFiniteMagnitude)).height))
-        
-        return min(61.0, max(33.0, unboundTextFieldHeight))
-    }
-    
-    private func updateTextNodeText(animated: Bool) {
-        let backgroundInsets = self.backgroundInsets
-        
-        let textFieldHeight = self.calculateTextFieldMetrics(width: self.bounds.size.width)
-        
-        let panelHeight = textFieldHeight + backgroundInsets.top + backgroundInsets.bottom
-        if !self.bounds.size.height.isEqual(to: panelHeight) {
-            self.updateHeight?()
-        }
-    }
-    
-    @objc func clearPressed() {
-        self.textInputNode.attributedText = nil
-        self.deactivateInput()
-    }
-}
-
-private final class WebBrowserDomainAlertContentNode: AlertContentNode {
-    private let strings: PresentationStrings
-    
-    private let titleNode: ASTextNode
-    private let textNode: ASTextNode
-    let activityIndicator: ActivityIndicator
-    let inputFieldNode: WebBrowserDomainInputFieldNode
-    
-    private let actionNodesSeparator: ASDisplayNode
-    private let actionNodes: [TextAlertContentActionNode]
-    private let actionVerticalSeparators: [ASDisplayNode]
-    
-    private let disposable = MetaDisposable()
-    
-    private var validLayout: CGSize?
-    
-    private let hapticFeedback = HapticFeedback()
-    
-    var complete: (() -> Void)? {
-        didSet {
-            self.inputFieldNode.complete = self.complete
-        }
-    }
-    
-    override var dismissOnOutsideTap: Bool {
-        return self.isUserInteractionEnabled
-    }
-        
-    init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, actions: [TextAlertAction]) {
-        self.strings = strings
-        
-        self.titleNode = ASTextNode()
-        self.titleNode.maximumNumberOfLines = 2
-        self.textNode = ASTextNode()
-        self.textNode.maximumNumberOfLines = 2
-        
-        self.activityIndicator = ActivityIndicator(type: .custom(ptheme.rootController.navigationBar.secondaryTextColor, 20.0, 1.5, false), speed: .slow)
-        self.activityIndicator.isHidden = true
-        
-        self.inputFieldNode = WebBrowserDomainInputFieldNode(theme: ptheme, placeholder: strings.WebBrowser_Exceptions_Create_Placeholder)
-        self.inputFieldNode.text = ""
-        
-        self.actionNodesSeparator = ASDisplayNode()
-        self.actionNodesSeparator.isLayerBacked = true
-        
-        self.actionNodes = actions.map { action -> TextAlertContentActionNode in
-            return TextAlertContentActionNode(theme: theme, action: action)
-        }
-        
-        var actionVerticalSeparators: [ASDisplayNode] = []
-        if actions.count > 1 {
-            for _ in 0 ..< actions.count - 1 {
-                let separatorNode = ASDisplayNode()
-                separatorNode.isLayerBacked = true
-                actionVerticalSeparators.append(separatorNode)
-            }
-        }
-        self.actionVerticalSeparators = actionVerticalSeparators
-        
-        super.init()
-        
-        self.addSubnode(self.titleNode)
-        self.addSubnode(self.textNode)
-        
-        self.addSubnode(self.inputFieldNode)
-        self.addSubnode(self.activityIndicator)
-        
-        self.addSubnode(self.actionNodesSeparator)
-        
-        for actionNode in self.actionNodes {
-            self.addSubnode(actionNode)
-        }
-        self.actionNodes.last?.actionEnabled = false
-        
-        for separatorNode in self.actionVerticalSeparators {
-            self.addSubnode(separatorNode)
-        }
-        
-        self.inputFieldNode.updateHeight = { [weak self] in
-            if let strongSelf = self {
-                if let _ = strongSelf.validLayout {
-                    strongSelf.requestLayout?(.animated(duration: 0.15, curve: .spring))
-                }
-            }
-        }
-        
-        self.inputFieldNode.textChanged = { [weak self] text in
-            if let strongSelf = self, let lastNode = strongSelf.actionNodes.last {
-                lastNode.actionEnabled = !text.isEmpty
-            }
-        }
-        
-        self.updateTheme(theme)
-    }
-    
-    deinit {
-        self.disposable.dispose()
-    }
-    
-    var link: String {
-        return self.inputFieldNode.text
-    }
-
-    override func updateTheme(_ theme: AlertControllerTheme) {
-        self.titleNode.attributedText = NSAttributedString(string: self.strings.WebBrowser_Exceptions_Create_Title, font: Font.bold(17.0), textColor: theme.primaryColor, paragraphAlignment: .center)
-        self.textNode.attributedText = NSAttributedString(string: self.strings.WebBrowser_Exceptions_Create_Text, font: Font.regular(13.0), textColor: theme.primaryColor, paragraphAlignment: .center)
-
-        self.actionNodesSeparator.backgroundColor = theme.separatorColor
-        for actionNode in self.actionNodes {
-            actionNode.updateTheme(theme)
-        }
-        for separatorNode in self.actionVerticalSeparators {
-            separatorNode.backgroundColor = theme.separatorColor
-        }
-        
-        if let size = self.validLayout {
-            _ = self.updateLayout(size: size, transition: .immediate)
-        }
-    }
-    
-    override func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
-        var size = size
-        size.width = min(size.width, 270.0)
-        let measureSize = CGSize(width: size.width - 16.0 * 2.0, height: CGFloat.greatestFiniteMagnitude)
-        
-        let hadValidLayout = self.validLayout != nil
-        
-        self.validLayout = size
-        
-        var origin: CGPoint = CGPoint(x: 0.0, y: 20.0)
-        let spacing: CGFloat = 5.0
-        
-        let titleSize = self.titleNode.measure(measureSize)
-        transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - titleSize.width) / 2.0), y: origin.y), size: titleSize))
-        origin.y += titleSize.height + 4.0
-        
-        let textSize = self.textNode.measure(measureSize)
-        transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - textSize.width) / 2.0), y: origin.y), size: textSize))
-        origin.y += textSize.height + 6.0 + spacing
-        
-        let actionButtonHeight: CGFloat = 44.0
-        var minActionsWidth: CGFloat = 0.0
-        let maxActionWidth: CGFloat = floor(size.width / CGFloat(self.actionNodes.count))
-        let actionTitleInsets: CGFloat = 8.0
-        
-        var effectiveActionLayout = TextAlertContentActionLayout.horizontal
-        for actionNode in self.actionNodes {
-            let actionTitleSize = actionNode.titleNode.updateLayout(CGSize(width: maxActionWidth, height: actionButtonHeight))
-            if case .horizontal = effectiveActionLayout, actionTitleSize.height > actionButtonHeight * 0.6667 {
-                effectiveActionLayout = .vertical
-            }
-            switch effectiveActionLayout {
-                case .horizontal:
-                    minActionsWidth += actionTitleSize.width + actionTitleInsets
-                case .vertical:
-                    minActionsWidth = max(minActionsWidth, actionTitleSize.width + actionTitleInsets)
-            }
-        }
-        
-        let insets = UIEdgeInsets(top: 18.0, left: 18.0, bottom: 9.0, right: 18.0)
-        
-        var contentWidth = max(titleSize.width, minActionsWidth)
-        contentWidth = max(contentWidth, 234.0)
-        
-        var actionsHeight: CGFloat = 0.0
-        switch effectiveActionLayout {
-            case .horizontal:
-                actionsHeight = actionButtonHeight
-            case .vertical:
-                actionsHeight = actionButtonHeight * CGFloat(self.actionNodes.count)
-        }
-        
-        let resultWidth = contentWidth + insets.left + insets.right
-        
-        let inputFieldWidth = resultWidth
-        let inputFieldHeight = self.inputFieldNode.updateLayout(width: inputFieldWidth, transition: transition)
-        let inputHeight = inputFieldHeight
-        let inputFrame = CGRect(x: 0.0, y: origin.y, width: resultWidth, height: inputFieldHeight)
-        transition.updateFrame(node: self.inputFieldNode, frame: inputFrame)
-        transition.updateAlpha(node: self.inputFieldNode, alpha: inputHeight > 0.0 ? 1.0 : 0.0)
-        
-        let activitySize = CGSize(width: 20.0, height: 20.0)
-        transition.updateFrame(node: self.activityIndicator, frame: CGRect(origin: CGPoint(x: inputFrame.maxX - activitySize.width - 23.0, y: inputFrame.midY - activitySize.height / 2.0 - 3.0), size: activitySize))
-        
-        let resultSize = CGSize(width: resultWidth, height: titleSize.height + textSize.height + spacing + inputHeight + actionsHeight  + insets.top + insets.bottom)
-        
-        transition.updateFrame(node: self.actionNodesSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
-        
-        var actionOffset: CGFloat = 0.0
-        let actionWidth: CGFloat = floor(resultSize.width / CGFloat(self.actionNodes.count))
-        var separatorIndex = -1
-        var nodeIndex = 0
-        for actionNode in self.actionNodes {
-            if separatorIndex >= 0 {
-                let separatorNode = self.actionVerticalSeparators[separatorIndex]
-                switch effectiveActionLayout {
-                    case .horizontal:
-                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: actionOffset - UIScreenPixel, y: resultSize.height - actionsHeight), size: CGSize(width: UIScreenPixel, height: actionsHeight - UIScreenPixel)))
-                    case .vertical:
-                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
-                }
-            }
-            separatorIndex += 1
-            
-            let currentActionWidth: CGFloat
-            switch effectiveActionLayout {
-                case .horizontal:
-                    if nodeIndex == self.actionNodes.count - 1 {
-                        currentActionWidth = resultSize.width - actionOffset
-                    } else {
-                        currentActionWidth = actionWidth
-                    }
-                case .vertical:
-                    currentActionWidth = resultSize.width
-            }
-            
-            let actionNodeFrame: CGRect
-            switch effectiveActionLayout {
-                case .horizontal:
-                    actionNodeFrame = CGRect(origin: CGPoint(x: actionOffset, y: resultSize.height - actionsHeight), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
-                    actionOffset += currentActionWidth
-                case .vertical:
-                    actionNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
-                    actionOffset += actionButtonHeight
-            }
-            
-            transition.updateFrame(node: actionNode, frame: actionNodeFrame)
-            
-            nodeIndex += 1
-        }
-        
-        if !hadValidLayout {
-            self.inputFieldNode.activateInput()
-        }
-        
-        return resultSize
-    }
-    
-    func animateError() {
-        self.inputFieldNode.layer.addShakeAnimation()
-        self.hapticFeedback.error()
-    }
-}
-
-public func webBrowserDomainController(context: AccountContext, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)? = nil, apply: @escaping (String?) -> Void) -> AlertController {
-    let presentationData = updatedPresentationData?.initial ?? context.sharedContext.currentPresentationData.with { $0 }
-    
-    var dismissImpl: ((Bool) -> Void)?
+    let domainRegex = try? NSRegularExpression(pattern: "^(https?://)?([a-zA-Z0-9-]+\\.?)*([a-zA-Z]*)?(:)?(/)?$", options: [])
+    let pathRegex = try? NSRegularExpression(pattern: "^(https?://)?([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}/", options: [])
     var applyImpl: (() -> Void)?
+    content.append(AnyComponentWithIdentity(
+        id: "input",
+        component: AnyComponent(
+            AlertInputFieldComponent(
+                context: context,
+                initialValue: nil,
+                placeholder: strings.WebBrowser_Exceptions_Create_Placeholder,
+                characterLimit: nil,
+                hasClearButton: true,
+                keyboardType: .URL,
+                autocapitalizationType: .none,
+                autocorrectionType: .no,
+                isInitiallyFocused: true,
+                externalState: inputState,
+                shouldChangeText: { updatedText in
+                    guard let domainRegex, let pathRegex else {
+                        return true
+                    }
+                    let domainMatches = domainRegex.matches(in: updatedText, options: [], range: NSRange(location: 0, length: updatedText.utf16.count))
+                    let pathMatches = pathRegex.matches(in: updatedText, options: [], range: NSRange(location: 0, length: updatedText.utf16.count))
+                    if domainMatches.count > 0, pathMatches.count == 0 {
+                        return true
+                    } else {
+                        return false
+                    }
+                },
+                returnKeyAction: {
+                    applyImpl?()
+                }
+            )
+        )
+    ))
     
-    var inProgress = false
-    let actions: [TextAlertAction] = [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
-        if !inProgress {
-            dismissImpl?(true)
-            apply(nil)
-        }
-    }), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Done, action: {
-        if !inProgress {
-            applyImpl?()
-        }
-    })]
-    
-    let contentNode = WebBrowserDomainAlertContentNode(theme: AlertControllerTheme(presentationData: presentationData), ptheme: presentationData.theme, strings: presentationData.strings, actions: actions)
-    contentNode.complete = {
-        applyImpl?()
+    var effectiveUpdatedPresentationData: (PresentationData, Signal<PresentationData, NoError>)
+    if let updatedPresentationData {
+        effectiveUpdatedPresentationData = updatedPresentationData
+    } else {
+        effectiveUpdatedPresentationData = (presentationData, context.sharedContext.presentationData)
     }
-    applyImpl = { [weak contentNode] in
-        guard let contentNode = contentNode else {
-            return
-        }
-        inProgress = true
-        contentNode.inputFieldNode.inProgress = true
-        contentNode.activityIndicator.isHidden = false
-        
-        let updatedLink = explicitUrl(contentNode.link)
+    
+    let alertController = AlertScreen(
+        configuration: AlertScreen.Configuration(allowInputInset: true),
+        content: content,
+        actions: [
+            .init(title: strings.Common_Cancel),
+            .init(title: strings.Common_Done, type: .default, action: {
+                applyImpl?()
+            }, autoDismiss: false, isEnabled: doneIsEnabled, progress: doneInProgressPromise.get())
+        ],
+        updatedPresentationData: effectiveUpdatedPresentationData
+    )
+    applyImpl = {
+        let updatedLink = explicitUrl(inputState.value)
         if !updatedLink.isEmpty && isValidUrl(updatedLink, validSchemes: ["http": true, "https": true]) {
+            doneInProgressPromise.set(true)
             apply(updatedLink)
         } else {
-            contentNode.animateError()
+            inputState.animateError()
         }
     }
-    
-    let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: contentNode)
-    let presentationDataDisposable = (updatedPresentationData?.signal ?? context.sharedContext.presentationData).start(next: { [weak controller, weak contentNode] presentationData in
-        controller?.theme = AlertControllerTheme(presentationData: presentationData)
-        contentNode?.inputFieldNode.updateTheme(presentationData.theme)
-    })
-    controller.dismissed = { _ in
-        presentationDataDisposable.dispose()
-    }
-    dismissImpl = { [weak controller] animated in
-        contentNode.inputFieldNode.deactivateInput()
-        if animated {
-            controller?.dismissAnimated()
-        } else {
-            controller?.dismiss()
-        }
-    }
-    return controller
+    return alertController
 }

submodules/SettingsUI/Sources/Data and Storage/WebBrowserDomainExceptionItem.swift

@@ -132,7 +132,7 @@ final class WebBrowserDomainExceptionItemNode: ItemListRevealOptionsItemNode, It
         
         self.activateArea = AccessibilityAreaNode()
         
-        super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
+        super.init(layerBacked: false, rotated: false, seeThrough: false)
         
         self.addSubnode(self.iconNode)
         self.addSubnode(self.titleNode)

submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift

@@ -117,7 +117,7 @@ private final class WebBrowserItemNode: ListViewItemNode {
         
         self.activateArea = AccessibilityAreaNode()
         
-        super.init(layerBacked: false, dynamicBounce: false)
+        super.init(layerBacked: false)
         
         self.addSubnode(self.iconNode)
         self.addSubnode(self.checkIconNode)

submodules/SettingsUI/Sources/Data and Storage/WebBrowserSettingsController.swift

@@ -419,7 +419,7 @@ public func webBrowserSettingsController(context: AccountContext) -> ViewControl
         })
         dismissImpl = { [weak linkController] in
             linkController?.view.endEditing(true)
-            linkController?.dismissAnimated()
+            linkController?.dismiss(completion: nil)
         }
         controller?.present(linkController, in: .window(.root))
     }