Browse Source

Small dark mode improvements

Signed-off-by: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Philippe Weidmann 4 years ago
parent
commit
8ee4c7925a

+ 1 - 1
iOSClient/Main/AppDelegate+Swift.swift

@@ -27,7 +27,7 @@ extension AppDelegate {
             navBarAppearance.configureWithOpaqueBackground()
             
             navBarAppearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
-            navBarAppearance.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+            navBarAppearance.backgroundColor = NCBrandColor.sharedInstance.tabBar
 
             viewController.navigationController?.navigationBar.standardAppearance = navBarAppearance
         } else {

+ 5 - 2
iOSClient/Main/CCMain+Swift.swift

@@ -18,8 +18,10 @@ extension CCMain {
                 navBarAppearance.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
                 navBarAppearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
                 navBarAppearance.backgroundColor = NCBrandColor.sharedInstance.backgroundView
-                self.navigationController?.navigationBar.standardAppearance = navBarAppearance
                 self.navigationController?.navigationBar.scrollEdgeAppearance = navBarAppearance
+                navBarAppearance.backgroundColor = NCBrandColor.sharedInstance.tabBar
+                self.navigationController?.navigationBar.standardAppearance = navBarAppearance
+
             } else {
                 self.navigationController?.navigationBar.barStyle = .default
                 self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
@@ -40,8 +42,9 @@ extension CCMain {
                 navBarAppearance.backgroundColor = NCBrandColor.sharedInstance.backgroundView
                 navBarAppearance.shadowColor = .clear
                 navBarAppearance.shadowImage = UIImage()
-                self.navigationController?.navigationBar.standardAppearance = navBarAppearance
                 self.navigationController?.navigationBar.scrollEdgeAppearance = navBarAppearance
+                navBarAppearance.backgroundColor = NCBrandColor.sharedInstance.tabBar
+                self.navigationController?.navigationBar.standardAppearance = navBarAppearance
             } else {
                 self.navigationController?.navigationBar.barStyle = .default
                 self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]

+ 3 - 3
iOSClient/Main/CCMore.swift

@@ -183,9 +183,9 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
     }
 
     @objc func changeTheming() {
-        appDelegate.changeTheming(self, tableView: tableView, collectionView: nil, form: false)
+        appDelegate.changeTheming(self, tableView: tableView, collectionView: nil, form: true)
 
-        viewQuota.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+        viewQuota.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
         progressQuota.progressTintColor = NCBrandColor.sharedInstance.brandElement
     }
 
@@ -271,7 +271,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         let selectionColor: UIView = UIView()
         selectionColor.backgroundColor = NCBrandColor.sharedInstance.select
         cell.selectedBackgroundView = selectionColor
-        cell.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+        cell.backgroundColor = NCBrandColor.sharedInstance.backgroundCell
         cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
 
         if (indexPath.section == 0) {