#2705 Fix UI elements to be compatible with iOS 26 (#2706)

ioanatflowcrypt · web-flow · commit 40cc2679f766 · 2026-04-16T16:32:17.000+03:00
* add ios 26 compatibility * Revert "add ios 26 compatibility" This reverts commit 0400c59. * fix: ios 26 compatability * fix: ios26 * fix: pr reviews
diff --git a/FlowCrypt.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/FlowCrypt.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/FlowCrypt/Controllers/Search/SearchViewController.swift b/FlowCrypt/Controllers/Search/SearchViewController.swift
@@ -38,37 +38,51 @@ class SearchViewController: InboxViewController {
 
     override func setupNavigationBar() {
         title = "search_title".localized
-        navigationItem.titleView = searchController.searchBar
         navigationItem.rightBarButtonItems = nil
         navigationItem.leftBarButtonItem = .defaultBackButton {
             self.navigationController?.popViewController(animated: true)
         }
+
+        if #available(iOS 26.0, *) {
+            navigationItem.searchController = searchController
+            navigationItem.hidesSearchBarWhenScrolling = false
+        } else {
+            navigationItem.titleView = searchController.searchBar
+        }
     }
 
     private func setupSearch() {
         searchController.do {
             $0.delegate = self
             $0.searchResultsUpdater = self
             $0.hidesNavigationBarDuringPresentation = false
-            $0.searchBar.tintColor = .white
-            $0.searchBar.setImage(UIImage(systemName: "magnifyingglass")?.tinted(.white), for: .search, state: .normal)
-            $0.searchBar.setImage(UIImage(systemName: "xmark")?.tinted(.white), for: .clear, state: .normal)
             $0.searchBar.delegate = self
-            $0.searchBar.searchTextField.textColor = .white
         }
+
+        if #unavailable(iOS 26.0) {
+            searchController.do {
+                $0.searchBar.tintColor = .white
+                $0.searchBar.setImage(UIImage(systemName: "magnifyingglass")?.tinted(.white), for: .search, state: .normal)
+                $0.searchBar.setImage(UIImage(systemName: "xmark")?.tinted(.white), for: .clear, state: .normal)
+                $0.searchBar.searchTextField.textColor = .white
+            }
+        }
+
         update(searchController: searchController)
         definesPresentationContext = true
     }
 
     private func update(searchController: UISearchController) {
-        searchController.searchBar.searchTextField.attributedPlaceholder = "search_placeholder"
-            .localized
-            .attributed(
-                .regular(14),
-                color: UIColor.white.withAlphaComponent(0.7),
-                alignment: .left
-            )
-        searchController.searchBar.searchTextField.textColor = .white
+        if #unavailable(iOS 26.0) {
+            searchController.searchBar.searchTextField.attributedPlaceholder = "search_placeholder"
+                .localized
+                .attributed(
+                    .regular(14),
+                    color: UIColor.white.withAlphaComponent(0.7),
+                    alignment: .left
+                )
+            searchController.searchBar.searchTextField.textColor = .white
+        }
         searchController.searchBar.searchTextField.accessibilityIdentifier = "aid-search-all-emails-field"
     }
 }
diff --git a/FlowCrypt/Controllers/Setup/SetupManuallyEnterPassPhraseViewController.swift b/FlowCrypt/Controllers/Setup/SetupManuallyEnterPassPhraseViewController.swift
@@ -68,7 +68,6 @@ final class SetupManuallyEnterPassPhraseViewController: TableNodeViewController,
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         navigationController?.setNavigationBarHidden(false, animated: animated)
-        navigationController?.navigationBar.barStyle = .black
     }
 
     private func setupUI() {
diff --git a/FlowCrypt/Controllers/Setup/SetupManuallyImportKeyViewController.swift b/FlowCrypt/Controllers/Setup/SetupManuallyImportKeyViewController.swift
@@ -60,7 +60,6 @@ final class SetupManuallyImportKeyViewController: TableNodeViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         navigationController?.setNavigationBarHidden(false, animated: animated)
-        navigationController?.navigationBar.barStyle = .black
     }
 
     override func viewDidAppear(_ animated: Bool) {
diff --git a/FlowCrypt/Controllers/SideMenu/Main/SideMenuNavigationController.swift b/FlowCrypt/Controllers/SideMenu/Main/SideMenuNavigationController.swift
@@ -24,7 +24,10 @@ final class SideMenuNavigationController: ENSideMenuNavigationController {
     }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        .lightContent
+        if #available(iOS 26.0, *) {
+            return .default
+        }
+        return .lightContent
     }
 
     override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
diff --git a/FlowCrypt/Controllers/SideMenu/NavigationController/MainNavigationController.swift b/FlowCrypt/Controllers/SideMenu/NavigationController/MainNavigationController.swift
@@ -61,18 +61,30 @@ extension UINavigationController {
             .then { $0.title = "" }
         navigationBar.backItem?.title = ""
 
-        let appearance = UINavigationBarAppearance()
-        appearance.configureWithOpaqueBackground()
-        appearance.backgroundColor = .main
-        appearance.titleTextAttributes = [.foregroundColor: UIColor.white]
-        navigationBar.standardAppearance = appearance
-        navigationBar.scrollEdgeAppearance = appearance
-        navigationBar.compactScrollEdgeAppearance = appearance
+        if #available(iOS 26.0, *) {
+            let appearance = UINavigationBarAppearance()
+            appearance.configureWithTransparentBackground()
+            navigationBar.standardAppearance = appearance
+            navigationBar.scrollEdgeAppearance = appearance
+            navigationBar.compactAppearance = appearance
+            navigationBar.compactScrollEdgeAppearance = appearance
 
-        navigationBar.do {
-            $0.barTintColor = .main
-            $0.tintColor = .white
-            $0.titleTextAttributes = [.foregroundColor: UIColor.white]
+            navigationBar.tintColor = .main
+        } else {
+            let appearance = UINavigationBarAppearance()
+            appearance.configureWithOpaqueBackground()
+            appearance.backgroundColor = .main
+            appearance.titleTextAttributes = [.foregroundColor: UIColor.white]
+            navigationBar.standardAppearance = appearance
+            navigationBar.scrollEdgeAppearance = appearance
+            navigationBar.compactAppearance = appearance
+            navigationBar.compactScrollEdgeAppearance = appearance
+
+            navigationBar.do {
+                $0.barTintColor = .main
+                $0.tintColor = .white
+                $0.titleTextAttributes = [.foregroundColor: UIColor.white]
+            }
         }
     }
 }
diff --git a/FlowCrypt/Info.plist b/FlowCrypt/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>UIDesignRequiresCompatibility</key>
-    <true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
diff --git a/FlowCryptUI/Nodes/TableViewController.swift b/FlowCryptUI/Nodes/TableViewController.swift
@@ -52,10 +52,16 @@ open class TableNodeViewController: ASDKViewController<TableNode> {
 
 public extension UINavigationItem {
     func setAccessibility(id: String?) {
+        let titleColor: UIColor
+        if #available(iOS 26.0, *) {
+            titleColor = .main
+        } else {
+            titleColor = .white
+        }
         let titleLabel = UILabel()
         titleLabel.attributedText = id?.attributed(
             .medium(16),
-            color: .white,
+            color: titleColor,
             alignment: .center
         )
         titleLabel.sizeToFit()
diff --git a/FlowCryptUI/Views/NavigationBarActionButton.swift b/FlowCryptUI/Views/NavigationBarActionButton.swift
@@ -18,13 +18,22 @@ public final class NavigationBarActionButton: UIBarButtonItem {
     public convenience init(imageSystemName: String, action: (() -> Void)?, accessibilityIdentifier: String? = nil) {
         self.init()
         onAction = action
-        customView = UIButton(type: .system).with {
-            $0.contentHorizontalAlignment = .left
-            $0.setImage(UIImage(systemName: imageSystemName), for: .normal)
-            $0.frame.size = Constants.buttonSize
-            $0.addTarget(self, action: #selector(tap), for: .touchUpInside)
-            $0.accessibilityIdentifier = accessibilityIdentifier
-            $0.isAccessibilityElement = true
+        if #available(iOS 26.0, *) {
+            image = UIImage(systemName: imageSystemName)
+            tintColor = .main
+            target = self
+            self.action = #selector(tap)
+            self.accessibilityIdentifier = accessibilityIdentifier
+            isAccessibilityElement = true
+        } else {
+            customView = UIButton(type: .system).with {
+                $0.contentHorizontalAlignment = .left
+                $0.setImage(UIImage(systemName: imageSystemName), for: .normal)
+                $0.frame.size = Constants.buttonSize
+                $0.addTarget(self, action: #selector(tap), for: .touchUpInside)
+                $0.accessibilityIdentifier = accessibilityIdentifier
+                $0.isAccessibilityElement = true
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ final class SetupManuallyEnterPassPhraseViewController: TableNodeViewController,`
`68`	`68`	`override func viewWillAppear(_ animated: Bool) {`
`69`	`69`	`super.viewWillAppear(animated)`
`70`	`70`	`navigationController?.setNavigationBarHidden(false, animated: animated)`
`71`		`- navigationController?.navigationBar.barStyle = .black`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`private func setupUI() {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ final class SetupManuallyImportKeyViewController: TableNodeViewController {`
`60`	`60`	`override func viewWillAppear(_ animated: Bool) {`
`61`	`61`	`super.viewWillAppear(animated)`
`62`	`62`	`navigationController?.setNavigationBarHidden(false, animated: animated)`
`63`		`- navigationController?.navigationBar.barStyle = .black`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`override func viewDidAppear(_ animated: Bool) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,10 @@ final class SideMenuNavigationController: ENSideMenuNavigationController {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`override var preferredStatusBarStyle: UIStatusBarStyle {`
`27`		`- .lightContent`
	`27`	`+ if #available(iOS 26.0, *) {`
	`28`	`+ return .default`
	`29`	`+ }`
	`30`	`+ return .lightContent`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {`