Эх сурвалжийг харах

hidesSearchBarWhenScrolling true

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 жил өмнө
parent
commit
6e9dcd9651

+ 6 - 0
iOSClient/Brand/NCBrand.swift

@@ -189,6 +189,12 @@ class NCBrandColor: NSObject {
         }
     }
 
+    public var defaultNavigationBar: UIColor {
+        get {
+            return UIColor(red: (247 / 255), green: (247 / 255), blue: (247 / 255), alpha: 1)
+        }
+    }
+
     override init() {
         brand = customer
         brandElement = customer

+ 14 - 11
iOSClient/Main/NCMainNavigationController.swift

@@ -30,19 +30,22 @@ class NCMainNavigationController: UINavigationController {
     required init?(coder: NSCoder) {
         super.init(coder: coder)
 
-        let appearance = UINavigationBarAppearance()
+        navigationBar.tintColor = .systemBlue
 
-        appearance.configureWithOpaqueBackground()
-        appearance.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.label]
-        appearance.configureWithOpaqueBackground()
-        appearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.label]
-        appearance.backgroundColor = .systemBackground
+        let standardAppearance = UINavigationBarAppearance()
 
-        appearance.shadowColor = .clear
-        appearance.shadowImage = UIImage()
+        standardAppearance.configureWithOpaqueBackground()
+        standardAppearance.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.label]
+        standardAppearance.configureWithOpaqueBackground()
+        standardAppearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.label]
+        standardAppearance.backgroundColor = .systemGroupedBackground
+        navigationBar.standardAppearance = standardAppearance
 
-        navigationBar.scrollEdgeAppearance = appearance
-        navigationBar.standardAppearance = appearance
-        navigationBar.tintColor = .systemBlue
+        let scrollEdgeAppearance = UINavigationBarAppearance()
+
+        scrollEdgeAppearance.backgroundColor = .systemBackground
+        scrollEdgeAppearance.shadowColor = .clear
+        scrollEdgeAppearance.shadowImage = UIImage()
+        navigationBar.scrollEdgeAppearance = scrollEdgeAppearance
     }
 }

+ 9 - 10
iOSClient/More/NCMoreNavigationController.swift

@@ -30,23 +30,22 @@ class NCMoreNavigationController: UINavigationController {
     required init?(coder: NSCoder) {
         super.init(coder: coder)
 
+        navigationBar.tintColor = .systemBlue
+
         let standardAppearance = UINavigationBarAppearance()
+        standardAppearance.configureWithDefaultBackground()
 
-        standardAppearance.configureWithOpaqueBackground()
         standardAppearance.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.label]
-        standardAppearance.configureWithOpaqueBackground()
         standardAppearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.label]
-        standardAppearance.backgroundColor = .systemGroupedBackground
-
-        standardAppearance.shadowColor = .clear
-        standardAppearance.shadowImage = UIImage()
+        standardAppearance.backgroundColor = NCBrandColor.shared.defaultNavigationBar
+        navigationBar.standardAppearance = standardAppearance
 
         let scrollEdgeAppearance = UINavigationBarAppearance()
+        scrollEdgeAppearance.configureWithDefaultBackground()
 
         scrollEdgeAppearance.backgroundColor = .systemGroupedBackground
-
-        navigationBar.scrollEdgeAppearance = standardAppearance
-        navigationBar.standardAppearance = scrollEdgeAppearance
-        navigationBar.tintColor = .systemBlue
+        scrollEdgeAppearance.shadowColor = .clear
+        scrollEdgeAppearance.shadowImage = UIImage()
+        navigationBar.scrollEdgeAppearance = scrollEdgeAppearance
     }
 }