Skip to content

Commit 07e6397

Browse files
fix: ios 26 compatability
1 parent f51a4cf commit 07e6397

5 files changed

Lines changed: 2 additions & 10 deletions

File tree

FlowCrypt/Controllers/Search/SearchViewController.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,7 @@ class SearchViewController: InboxViewController {
5151
$0.searchResultsUpdater = self
5252
$0.hidesNavigationBarDuringPresentation = false
5353
$0.searchBar.tintColor = .white
54-
$0.searchBar.setImage(UIImage(systemName: "magnifyingglass")?.tinted(.white), for: .search, state: .normal)
55-
$0.searchBar.setImage(UIImage(systemName: "xmark")?.tinted(.white), for: .clear, state: .normal)
5654
$0.searchBar.delegate = self
57-
$0.searchBar.searchTextField.textColor = .white
5855
}
5956
update(searchController: searchController)
6057
definesPresentationContext = true

FlowCrypt/Controllers/Setup/SetupManuallyEnterPassPhraseViewController.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ final class SetupManuallyEnterPassPhraseViewController: TableNodeViewController,
6868
override func viewWillAppear(_ animated: Bool) {
6969
super.viewWillAppear(animated)
7070
navigationController?.setNavigationBarHidden(false, animated: animated)
71-
navigationController?.navigationBar.barStyle = .black
7271
}
7372

7473
private func setupUI() {

FlowCrypt/Controllers/Setup/SetupManuallyImportKeyViewController.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ final class SetupManuallyImportKeyViewController: TableNodeViewController {
6060
override func viewWillAppear(_ animated: Bool) {
6161
super.viewWillAppear(animated)
6262
navigationController?.setNavigationBarHidden(false, animated: animated)
63-
navigationController?.navigationBar.barStyle = .black
6463
}
6564

6665
override func viewDidAppear(_ animated: Bool) {

FlowCrypt/Controllers/SideMenu/NavigationController/MainNavigationController.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,14 @@ extension UINavigationController {
6262
navigationBar.backItem?.title = ""
6363

6464
let appearance = UINavigationBarAppearance()
65-
appearance.configureWithOpaqueBackground()
66-
appearance.backgroundColor = .main
65+
appearance.configureWithDefaultBackground()
6766
appearance.titleTextAttributes = [.foregroundColor: UIColor.white]
6867
navigationBar.standardAppearance = appearance
6968
navigationBar.scrollEdgeAppearance = appearance
69+
navigationBar.compactAppearance = appearance
7070
navigationBar.compactScrollEdgeAppearance = appearance
7171

7272
navigationBar.do {
73-
$0.barTintColor = .main
7473
$0.tintColor = .white
7574
$0.titleTextAttributes = [.foregroundColor: UIColor.white]
7675
}

FlowCrypt/Info.plist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>UIDesignRequiresCompatibility</key>
6-
<true/>
75
<key>CFBundleDevelopmentRegion</key>
86
<string>en</string>
97
<key>CFBundleDisplayName</key>

0 commit comments

Comments
 (0)