[All] [MBL-19382] iOS 26 redesign

Core/Core/Common/CommonModels/AppEnvironment/BrandStyle/Brand.swift

@@ -241,14 +241,28 @@ public struct Brand: Equatable {
         }
     }
 
-    public func headerImageView() -> UIImageView {
-        let logoView = UIImageView(frame: CGRect(x: 0, y: 0, width: 44, height: 44))
-        logoView.contentMode = .scaleAspectFit
-        logoView.heightAnchor.constraint(equalToConstant: 44).isActive = true
-        logoView.widthAnchor.constraint(equalToConstant: 44).isActive = true
-        logoView.image = headerImage
-        logoView.backgroundColor = headerImageBackground
-        logoView.accessibilityElementsHidden = true
-        return logoView
-    }
+	@available(iOS, deprecated: 26, message: "Remove conditional code when iOS 18 support is dropped")
+	public func headerImageView() -> UIImageView {
+		if #available(iOS 26, *) {
+			let logoView = UIImageView(frame: CGRect(x: 0, y: 0, width: 44, height: 44))
+			logoView.contentMode = .scaleAspectFit
+			logoView.heightAnchor.constraint(equalToConstant: 44).isActive = true
+			logoView.widthAnchor.constraint(equalToConstant: 44).isActive = true
+			logoView.image = headerImage
+			logoView.backgroundColor = headerImageBackground
+			logoView.layer.cornerRadius = 8
+			logoView.clipsToBounds = true
+			logoView.accessibilityElementsHidden = true
+			return logoView
+		} else {
+			let logoView = UIImageView(frame: CGRect(x: 0, y: 0, width: 44, height: 44))
+			logoView.contentMode = .scaleAspectFit
+			logoView.heightAnchor.constraint(equalToConstant: 44).isActive = true
+			logoView.widthAnchor.constraint(equalToConstant: 44).isActive = true
+			logoView.image = headerImage
+			logoView.backgroundColor = headerImageBackground
+			logoView.accessibilityElementsHidden = true
+			return logoView
+		}
+	}
 }

Core/Core/Common/CommonModels/Router/Router.swift

@@ -257,7 +257,7 @@ open class Router {
 
         if view is UIAlertController { return from.present(view, animated: true, completion: completion) }
 
-        if let displayModeButton = from.splitDisplayModeButtonItem,
+		if let displayModeButton = from.splitDisplayModeButtonItem, #unavailable(iOS 26),
             from.splitViewController?.isCollapsed == false,
             options.isDetail || from.isInSplitViewDetail,
             !options.isModal {

Core/Core/Common/CommonUI/EmbeddedWebPage/View/EmbeddedWebPageContainerScreen.swift

@@ -40,22 +40,42 @@ public struct EmbeddedWebPageContainerScreen: View {
     }
 
     public var body: some View {
-        WebSession(url: viewModel.url) { sessionURL in
-            WebView(
-                url: sessionURL,
-                features: features,
-                canToggleTheme: true,
-                configuration: viewModel.webViewConfig
-            )
-            .onProvisionalNavigationStarted { webView, navigation in
-                viewModel.webView(webView, didStartProvisionalNavigation: navigation)
+        if #available(iOS 26, *) {
+            WebSession(url: viewModel.url) { sessionURL in
+                WebView(
+                    url: sessionURL,
+                    features: features,
+                    canToggleTheme: true,
+                    configuration: viewModel.webViewConfig
+                )
+                .onProvisionalNavigationStarted { webView, navigation in
+                    viewModel.webView(webView, didStartProvisionalNavigation: navigation)
+                }
+                .navBarItems(leading: viewModel.leadingNavigationButton)
+                .onAppear {
+                    viewModel.viewController = viewController.value
+                }
             }
-            .navBarItems(leading: viewModel.leadingNavigationButton)
-            .onAppear {
-                viewModel.viewController = viewController.value
+            .navigationTitle(viewModel.navTitle)
+            .optionalNavigationSubtitle(viewModel.subTitle)
+        } else {
+            WebSession(url: viewModel.url) { sessionURL in
+                WebView(
+                    url: sessionURL,
+                    features: features,
+                    canToggleTheme: true,
+                    configuration: viewModel.webViewConfig
+                )
+                .onProvisionalNavigationStarted { webView, navigation in
+                    viewModel.webView(webView, didStartProvisionalNavigation: navigation)
+                }
+                .navBarItems(leading: viewModel.leadingNavigationButton)
+                .onAppear {
+                    viewModel.viewController = viewController.value
+                }
             }
+            .navigationBarTitleView(title: viewModel.navTitle, subtitle: viewModel.subTitle)
+            .navigationBarStyle(.color(viewModel.contextColor))
         }
-        .navigationBarTitleView(title: viewModel.navTitle, subtitle: viewModel.subTitle)
-        .navigationBarStyle(.color(viewModel.contextColor))
     }
 }

Core/Core/Common/CommonUI/InstUI/Views/NavigationBarTitleView.swift

@@ -20,6 +20,7 @@ import SwiftUI
 
 extension InstUI {
 
+	@available(iOS, deprecated: 26)
     public struct NavigationBarTitleView: View {
         @Environment(\.dynamicTypeSize) private var dynamicTypeSize
         @Environment(\.navBarColors) private var navBarColors

Core/Core/Common/CommonUI/NavigationBar/SwiftUI/NavigationBarViewModifiers.swift

@@ -18,10 +18,12 @@
 
 import SwiftUI
 
+@available(iOS, deprecated: 26)
 protocol NavigationBarStyled: AnyObject {
     var navigationBarStyle: NavigationBarStyle { get set }
 }
 
+@available(iOS, deprecated: 26)
 struct NavigationBarStyleModifier: ViewModifier {
     let style: NavigationBarStyle
 
@@ -47,6 +49,7 @@ struct RightBarButtonItemModifier: ViewModifier {
     }
 }
 
+@available(iOS, deprecated: 26)
 struct GlobalNavigationBarModifier: ViewModifier {
     @Environment(\.viewController) var controller
 
@@ -56,6 +59,7 @@ struct GlobalNavigationBarModifier: ViewModifier {
     }
 }
 
+@available(iOS, deprecated: 26)
 struct NavBarBackButtonModifier: ViewModifier {
     @Environment(\.viewController) private var controller
 
@@ -67,6 +71,26 @@ struct NavBarBackButtonModifier: ViewModifier {
 }
 
 extension View {
+	@available(iOS, introduced: 26)
+	@ViewBuilder
+	public func optionalNavigationSubtitle(_ subtitle: String?) -> some View {
+		if let subtitle {
+			self.navigationSubtitle(subtitle)
+		} else {
+			self
+		}
+	}
+
+	@available(iOS, introduced: 26)
+	@ViewBuilder
+	public func optionalNavigationTitle(_ title: String?) -> some View {
+		if let title {
+			self.navigationTitle(title)
+		} else {
+			self
+		}
+	}
+
     /// Sets the navigation bar's background color, title color & font, button color & font.
     /// - Warning: Make sure to call this method AFTER calling `navigationBarTitleView()` to affect it.
     /// - Parameters:
@@ -75,6 +99,7 @@ extension View {
     ///       - `.modal` is primarily used on modal screens, but also on some screen which doesn't belong to a context, but not considered global.
     ///       - `.color()` is used on non-modal screens within a context (typically a course or group), and in some other cases.
     ///       - Use `.color(nil)` to keep the navigation bar's current context background color but ensure the proper title color is set.
+	@available(iOS, deprecated: 26)
     public func navigationBarStyle(_ style: NavigationBarStyle) -> some View {
         modifier(NavigationBarStyleModifier(style: style))
     }
@@ -84,6 +109,7 @@ extension View {
     /// - Parameters:
     ///     - title: The line is always displayed, even if this is empty. (This should not happen normally.)
     ///     - subtitle: The subtitle line is only displayed if this is not empty.
+	@available(iOS, deprecated: 26)
     public func navigationBarTitleView(title: String, subtitle: String?) -> some View {
         toolbar {
             ToolbarItem(placement: .principal) {
@@ -94,12 +120,14 @@ extension View {
 
     /// Sets the navigation bar's title, using the proper font. Please use this one instead of the native `navigationTitle()` method.
     /// - Warning: Make sure to call `navigationBarStyle()` _**AFTER**_ this method to set the proper text color.
+	@available(iOS, deprecated: 26)
     public func navigationBarTitleView(_ title: String) -> some View {
         navigationBarTitleView(title: title, subtitle: nil)
     }
 
     /// Sets the navigation bar's background color, button color to match the `Brand.shared` colors,
     /// sets the button font and sets the brand logo as the titleView.
+	@available(iOS, deprecated: 26)
     public func navigationBarGlobal() -> some View {
         modifier(GlobalNavigationBarModifier())
     }

Core/Core/Common/CommonUI/NavigationBar/UIKit/ColoredNavViewProtocol.swift

@@ -18,6 +18,7 @@
 
 import UIKit
 
+@available(iOS, deprecated: 26)
 public protocol ColoredNavViewProtocol: AnyObject {
     var color: UIColor? { get set }
     var navigationController: UINavigationController? { get }
@@ -28,13 +29,19 @@ public protocol ColoredNavViewProtocol: AnyObject {
 }
 
 extension ColoredNavViewProtocol {
+	@available(iOS, deprecated: 26)
     public func setupTitleViewInNavbar(title: String) {
+        guard #unavailable(iOS 26) else { return }
+
         navigationItem.titleView = titleSubtitleView
         titleSubtitleView.title = title
         titleSubtitleView.accessibilityTraits = .header
     }
 
+	@available(iOS, deprecated: 26)
     public func updateNavBar(subtitle: String?, color: UIColor?) {
+        guard #unavailable(iOS 26) else { return }
+
         self.color = color
         titleSubtitleView.subtitle = subtitle
         navigationController?.navigationBar.useContextColor(color)

Core/Core/Common/CommonUI/NavigationBar/UIKit/TitleSubtitleView.swift

@@ -18,6 +18,7 @@
 
 import UIKit
 
+@available(iOS, deprecated: 26)
 public class TitleSubtitleView: UIView {
     @IBOutlet public weak var titleLabel: UILabel!
     @IBOutlet public weak var subtitleLabel: UILabel!
@@ -51,27 +52,37 @@ public class TitleSubtitleView: UIView {
     }
 
     public static func create() -> Self {
-        let view = loadFromXib()
-        view.titleLabel.text = ""
-        view.subtitleLabel.text = ""
-        view.titleLabel.font = .scaledNamedFont(.semibold16)
-        view.subtitleLabel.font = .scaledNamedFont(.regular14)
-        view.titleLabel.accessibilityElementsHidden = true
-        view.subtitleLabel.accessibilityElementsHidden = true
-        view.accessibilityTraits = [.header]
-        view.showsLargeContentViewer = true
-        view.addInteraction(UILargeContentViewerInteraction())
-        return view
+		let view = loadFromXib()
+
+        if #available(iOS 26, *) {
+            view.tintColor = .textDarkest
+        }
+
+		view.titleLabel.text = ""
+		view.subtitleLabel.text = ""
+		view.titleLabel.font = .scaledNamedFont(.semibold16)
+		view.subtitleLabel.font = .scaledNamedFont(.regular14)
+		view.titleLabel.accessibilityElementsHidden = true
+		view.subtitleLabel.accessibilityElementsHidden = true
+		view.accessibilityTraits = [.header]
+		view.showsLargeContentViewer = true
+		view.addInteraction(UILargeContentViewerInteraction())
+		return view
     }
 
     public func recreate() -> TitleSubtitleView {
         let copy = TitleSubtitleView.create()
+
+        if #available(iOS 26, *) {
+            copy.tintColor = .textDarkest
+        }
         copy.title = title
         copy.subtitle = subtitle
         return copy
     }
 
     public override func tintColorDidChange() {
+		guard #available(iOS 26, *) else { return }
         let title = (superview?.superview as? UINavigationBar)?.titleTextAttributes?[.foregroundColor] as? UIColor
         let color = title ?? tintColor
         titleLabel.textColor = color

Core/Core/Common/CommonUI/NavigationBar/UIKit/UINavigationBarExtensions.swift

@@ -33,8 +33,9 @@ extension UINavigationBar {
         }
     }
 
+	@available(iOS, deprecated: 26)
     public func useContextColor(_ color: UIColor?) {
-        guard let color else { return }
+		guard let color, #unavailable(iOS 26) else { return }
         let foreground = UIColor.textLightest
         let background = color
         titleTextAttributes = [.foregroundColor: foreground]
@@ -45,7 +46,10 @@ extension UINavigationBar {
         applyAppearanceChanges(backgroundColor: background, foregroundColor: foreground)
     }
 
+	@available(iOS, deprecated: 26)
     public func useGlobalNavStyle(brand: Brand = Brand.shared) {
+		guard #unavailable(iOS 26) else { return }
+
         // TODO: Remove the isHorizon condition once horizon-specific logic is no longer needed.
         let isHorizon = AppEnvironment.shared.app == .horizon
         let background: UIColor = isHorizon ? .backgroundLightest : brand.navBackground

Core/Core/Common/CommonUI/UIViews/CoreSplitViewController.swift

@@ -98,6 +98,7 @@ public class CoreSplitViewController: UISplitViewController {
         }
     }
 
+    @available(iOS, deprecated: 26, message: "iOS26 has a default implementation")
     public func prettyDisplayModeButtonItem(_ displayMode: DisplayMode) -> UIBarButtonItem {
         let defaultButton = self.displayModeButtonItem
         let collapse = displayMode == .oneOverSecondary || displayMode == .secondaryOnly
@@ -121,9 +122,13 @@ extension CoreSplitViewController: UISplitViewControllerDelegate {
     public func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) {
         if svc.viewControllers.count == 2 {
             let top = (svc.viewControllers.last as? UINavigationController)?.topViewController
-            top?.navigationItem.leftItemsSupplementBackButton = true
+            if #unavailable(iOS 26) {
+                top?.navigationItem.leftItemsSupplementBackButton = true
+            }
             if top?.isKind(of: EmptyViewController.self) == false {
-                top?.navigationItem.leftBarButtonItem = prettyDisplayModeButtonItem(displayMode)
+                if #unavailable(iOS 26) {
+                    top?.navigationItem.leftBarButtonItem = prettyDisplayModeButtonItem(displayMode)
+                }
                 NotificationCenter.default.post(name: NSNotification.Name.SplitViewControllerWillChangeDisplayModeNotification, object: self)
             }
         }
@@ -179,9 +184,12 @@ extension CoreSplitViewController: UISplitViewControllerDelegate {
             }
 
             let viewControllers = (newDeets as? UINavigationController)?.viewControllers ?? [newDeets]
-            for vc in viewControllers {
-                vc.navigationItem.leftItemsSupplementBackButton = true
-                vc.navigationItem.leftBarButtonItem = prettyDisplayModeButtonItem(splitViewController.displayMode)
+
+            if #unavailable(iOS 26) {
+                for vc in viewControllers {
+                    vc.navigationItem.leftItemsSupplementBackButton = true
+                    vc.navigationItem.leftBarButtonItem = prettyDisplayModeButtonItem(splitViewController.displayMode)
+                }
             }
 
             if let nav = newDeets as? UINavigationController {

Core/Core/Common/CommonUI/UIViews/EmptyViewController.swift

@@ -30,9 +30,9 @@ public class EmptyViewController: UIViewController {
         logoImageView.tintColor = .textDark
         logoImageView.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
-            logoImageView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
-            logoImageView.centerYAnchor.constraint(equalTo: view.centerYAnchor),
-            logoImageView.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.1),
+            logoImageView.centerXAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerXAnchor),
+            logoImageView.centerYAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerYAnchor),
+            logoImageView.widthAnchor.constraint(equalTo: view.safeAreaLayoutGuide.widthAnchor, multiplier: 0.2),
             logoImageView.heightAnchor.constraint(equalTo: logoImageView.widthAnchor)
         ])
     }

Core/Core/Common/CommonUI/UIViews/HorizontalMenuViewController.swift

@@ -32,7 +32,7 @@ open class HorizontalMenuViewController: ScreenViewTrackerViewController {
     public weak var delegate: HorizontalPagedMenuDelegate?
     public private(set) var selectedIndexPath: IndexPath = IndexPath(item: 0, section: 0)
 
-    private var itemCount: Int {
+    public var itemCount: Int {
         return delegate?.numberOfMenuItems ?? 0
     }
 
@@ -78,8 +78,16 @@ open class HorizontalMenuViewController: ScreenViewTrackerViewController {
         } else {
             setupMenu()
             setupPages()
-            setupUnderline()
             setupBottomBorder()
+
+            // Only show the underline on iOS 26 if there are more than one tabs
+            if #available(iOS 26, *) {
+                if itemCount > 1 {
+                    setupUnderline()
+                }
+            } else {
+                setupUnderline()
+            }
         }
     }