iOS 26: Fix Dotorg login navigation bar appearance (#24810)

* Remove navigation bar custom appearnance

* Remove Help notifications support form login flow

Author: kean

Sources/WordPressAuthenticator/Features/NUX/NUXTableViewController.swift

@@ -6,7 +6,6 @@ import UIKit
 open class NUXTableViewController: UITableViewController, NUXViewControllerBase, UIViewControllerTransitioningDelegate {
     // MARK: NUXViewControllerBase properties
     /// these properties comply with NUXViewControllerBase and are duplicated with NUXViewController
-    public var helpNotificationIndicator: WPHelpIndicatorView = WPHelpIndicatorView()
     public var helpButton: UIButton = UIButton(type: .custom)
     public var dismissBlock: ((_ cancelled: Bool) -> Void)?
     public var loginFields = LoginFields()

Sources/WordPressAuthenticator/Features/NUX/NUXViewController.swift

@@ -8,7 +8,6 @@ import UIKit
 open class NUXViewController: UIViewController, NUXViewControllerBase, UIViewControllerTransitioningDelegate {
     // MARK: NUXViewControllerBase properties
     /// these properties comply with NUXViewControllerBase and are duplicated with NUXTableViewController
-    public var helpNotificationIndicator: WPHelpIndicatorView = WPHelpIndicatorView()
     public var helpButton: UIButton = UIButton(type: .custom)
     public var dismissBlock: ((_ cancelled: Bool) -> Void)?
     public var loginFields = LoginFields()

Sources/WordPressAuthenticator/Features/NUX/NUXViewControllerBase.swift

@@ -14,7 +14,6 @@ private enum Constants {
 /// base protocol for NUX view controllers
 public protocol NUXViewControllerBase {
     var sourceTag: WordPressSupportSourceTag { get }
-    var helpNotificationIndicator: WPHelpIndicatorView { get }
     var helpButton: UIButton { get }
     var loginFields: LoginFields { get }
     var dismissBlock: ((_ cancelled: Bool) -> Void)? { get }
@@ -106,15 +105,6 @@ extension NUXViewControllerBase where Self: UIViewController, Self: UIViewContro
         self.dismiss(animated: true, completion: nil)
     }
 
-    // MARK: - Notifications
-
-    /// Updates the notification indicatorand its visibility.
-    ///
-    func refreshSupportNotificationIndicator() {
-        let showIndicator = WordPressAuthenticator.shared.delegate?.showSupportNotificationIndicator ?? false
-        helpNotificationIndicator.isHidden = !showIndicator
-    }
-
     // MARK: - Actions
 
     func handleBackgroundTapGesture() {
@@ -142,48 +132,6 @@ extension NUXViewControllerBase where Self: UIViewController, Self: UIViewContro
         displaySupportViewController(from: sourceTag)
     }
 
-    // MARK: - Navbar Help and App Logo methods
-
-    func styleNavigationBar(forUnified: Bool = false) {
-        var backgroundColor: UIColor
-        var buttonTextColor: UIColor
-        var titleTextColor: UIColor
-        var hideBottomBorder: Bool
-
-        if forUnified {
-            // Unified nav bar style
-            backgroundColor = WordPressAuthenticator.shared.unifiedStyle?.navBarBackgroundColor ??
-                              WordPressAuthenticator.shared.style.navBarBackgroundColor
-            buttonTextColor = WordPressAuthenticator.shared.unifiedStyle?.navButtonTextColor ??
-                              WordPressAuthenticator.shared.style.navButtonTextColor
-            titleTextColor = WordPressAuthenticator.shared.unifiedStyle?.navTitleTextColor ??
-                             WordPressAuthenticator.shared.style.primaryTitleColor
-            hideBottomBorder = true
-        } else {
-            // Original nav bar style
-            backgroundColor = WordPressAuthenticator.shared.style.navBarBackgroundColor
-            buttonTextColor = WordPressAuthenticator.shared.style.navButtonTextColor
-            titleTextColor = WordPressAuthenticator.shared.style.primaryTitleColor
-            hideBottomBorder = false
-        }
-
-        setupNavBarIcon(showIcon: !forUnified)
-        setHelpButtonTextColor(forUnified: forUnified)
-
-        let buttonItemAppearance = UIBarButtonItem.appearance(whenContainedInInstancesOf: [LoginNavigationController.self])
-        buttonItemAppearance.tintColor = buttonTextColor
-        buttonItemAppearance.setTitleTextAttributes([.foregroundColor: buttonTextColor], for: .normal)
-
-        let appearance = UINavigationBarAppearance()
-        appearance.shadowColor = hideBottomBorder ? .clear : .separator
-        appearance.backgroundColor = backgroundColor
-        appearance.titleTextAttributes = [.foregroundColor: titleTextColor]
-
-        UINavigationBar.appearance(whenContainedInInstancesOf: [LoginNavigationController.self]).standardAppearance = appearance
-        UINavigationBar.appearance(whenContainedInInstancesOf: [LoginNavigationController.self]).compactAppearance = appearance
-        UINavigationBar.appearance(whenContainedInInstancesOf: [LoginNavigationController.self]).scrollEdgeAppearance = appearance
-    }
-
     /// Add/remove the nav bar app logo.
     ///
     func setupNavBarIcon(showIcon: Bool = true) {
@@ -213,24 +161,6 @@ extension NUXViewControllerBase where Self: UIViewController, Self: UIViewContro
         }
 
         addHelpButtonToNavController()
-        refreshSupportNotificationIndicator()
-    }
-
-    /// Sets the Help button text color.
-    ///
-    /// - Parameters:
-    ///     - forUnified: Indicates whether to use text color for the unified auth flows or the original auth flows.
-    ///
-    func setHelpButtonTextColor(forUnified: Bool) {
-        let navButtonTextColor: UIColor = {
-            if forUnified {
-                return WordPressAuthenticator.shared.unifiedStyle?.navButtonTextColor ?? WordPressAuthenticator.shared.style.navButtonTextColor
-            }
-            return WordPressAuthenticator.shared.style.navButtonTextColor
-        }()
-
-        helpButton.setTitleColor(navButtonTextColor, for: .normal)
-        helpButton.setTitleColor(navButtonTextColor.withAlphaComponent(0.4), for: .highlighted)
     }
 
     // MARK: - Helpers
@@ -240,7 +170,6 @@ extension NUXViewControllerBase where Self: UIViewController, Self: UIViewContro
     private func addHelpButtonToNavController() {
         let barButtonView = createBarButtonView()
         addHelpButton(to: barButtonView)
-        addNotificationIndicatorView(to: barButtonView)
         addRightBarButtonItem(with: barButtonView)
     }
 
@@ -263,7 +192,7 @@ extension NUXViewControllerBase where Self: UIViewController, Self: UIViewContro
 
     private func addHelpButton(to superView: UIView) {
         helpButton.setTitle(NSLocalizedString("Help", comment: "Help button"), for: .normal)
-        setHelpButtonTextColor(forUnified: false)
+        helpButton.setTitleColor(.label, for: [])
         helpButton.accessibilityIdentifier = "authenticator-help-button"
 
         helpButton.on(.touchUpInside) { [weak self] control in
@@ -279,45 +208,6 @@ extension NUXViewControllerBase where Self: UIViewController, Self: UIViewContro
         helpButton.bottomAnchor.constraint(equalTo: superView.bottomAnchor).isActive = true
     }
 
-    // MARK: Notification Indicator settings
-
-    private func addNotificationIndicatorView(to superView: UIView) {
-        setupNotificationsIndicator()
-        layoutNotificationIndicatorView(helpNotificationIndicator, to: superView)
-    }
-
-    private func setupNotificationsIndicator() {
-        helpNotificationIndicator.isHidden = true
-
-        addNotificationObserver(
-            NotificationCenter.default.addObserver(forName: .wordpressSupportNotificationReceived, object: nil, queue: nil) { [weak self] _ in
-                self?.refreshSupportNotificationIndicator()
-            }
-        )
-
-        addNotificationObserver(
-            NotificationCenter.default.addObserver(forName: .wordpressSupportNotificationCleared, object: nil, queue: nil) { [weak self] _ in
-                self?.refreshSupportNotificationIndicator()
-            }
-        )
-    }
-
-    private func layoutNotificationIndicatorView(_ view: UIView, to superView: UIView) {
-        superView.addSubview(view)
-        view.translatesAutoresizingMaskIntoConstraints = false
-
-        let centerOffset = Constants.notificationIndicatorCenterOffset
-        let xConstant = helpButton.contentEdgeInsets.top + centerOffset.x
-        let yConstant = helpButton.contentEdgeInsets.top + centerOffset.y
-
-        NSLayoutConstraint.activate([
-            view.centerXAnchor.constraint(equalTo: helpButton.trailingAnchor, constant: xConstant),
-            view.centerYAnchor.constraint(equalTo: helpButton.topAnchor, constant: yConstant),
-            view.widthAnchor.constraint(equalToConstant: Constants.notificationIndicatorSize.width),
-            view.heightAnchor.constraint(equalToConstant: Constants.notificationIndicatorSize.height)
-            ])
-    }
-
     // MARK: - UIViewControllerTransitioningDelegate
 
     /// Displays the support vc.

Sources/WordPressAuthenticator/Features/NUX/WPHelpIndicatorView.swift

@@ -65,7 +65,6 @@ class LoginSocialErrorViewController: NUXTableViewController {
         let unifiedApple = unifiedAuthEnabled && loginFields.meta.socialService == .apple
         forUnified = unifiedGoogle || unifiedApple
 
-        styleNavigationBar(forUnified: forUnified)
         styleBackground()
     }
 

Sources/WordPressAuthenticator/Features/SignIn/LoginSocialErrorViewController.swift

@@ -51,7 +51,6 @@ open class LoginViewController: NUXViewController, LoginFacadeDelegate {
         super.viewDidLoad()
 
         displayError(message: "")
-        styleNavigationBar(forUnified: true)
         styleBackground()
         styleInstructions()
 

Sources/WordPressAuthenticator/Features/SignIn/LoginViewController.swift

@@ -8,12 +8,4 @@ extension NSNotification.Name {
     /// Posted whenever a Jetpack Login was successfully performed.
     ///
     public static let wordpressLoginFinishedJetpackLogin = Foundation.Notification.Name(rawValue: "WordPressLoginFinishedJetpackLogin")
-
-    /// Posted whenever a Support notification is received.
-    ///
-    public static let wordpressSupportNotificationReceived = NSNotification.Name(rawValue: "WordPressSupportNotificationReceived")
-
-    /// Posted whenever a Support notification has been viewed.
-    ///
-    public static let wordpressSupportNotificationCleared = NSNotification.Name(rawValue: "WordPressSupportNotificationCleared")
 }

Sources/WordPressAuthenticator/Helpers/Authenticator/WordPressAuthenticator+Notifications.swift

@@ -100,14 +100,6 @@ import WordPressKit
 
     // MARK: - Public Methods
 
-    public func supportPushNotificationReceived() {
-        NotificationCenter.default.post(name: .wordpressSupportNotificationReceived, object: nil)
-    }
-
-    public func supportPushNotificationCleared() {
-        NotificationCenter.default.post(name: .wordpressSupportNotificationCleared, object: nil)
-    }
-
     /// Indicates if the specified ViewController belongs to the Authentication Flow, or not.
     ///
     public class func isAuthenticationViewController(_ viewController: UIViewController) -> Bool {

Sources/WordPressAuthenticator/Helpers/Authenticator/WordPressAuthenticator.swift

@@ -17,10 +17,6 @@ public protocol WordPressAuthenticatorDelegate: AnyObject {
     ///
     var wpcomTermsOfServiceEnabled: Bool { get }
 
-    /// Indicates if the Support notification indicator should be displayed.
-    ///
-    var showSupportNotificationIndicator: Bool { get }
-
     /// Indicates if Support is available or not.
     ///
     var supportEnabled: Bool { get }

Sources/WordPressAuthenticator/Helpers/Authenticator/WordPressAuthenticatorDelegateProtocol.swift

@@ -39,7 +39,6 @@ final class TwoFAViewController: LoginViewController {
         removeGoogleWaitingView()
 
         navigationItem.title = WordPressAuthenticator.shared.displayStrings.logInTitle
-        styleNavigationBar(forUnified: true)
 
         defaultTableViewMargin = tableViewLeadingConstraint?.constant ?? 0
         setTableViewMargins(forWidth: view.frame.width)