NMC 2172 - Dashboard sort menu icon color change

nextmcloud · Dec 26, 2023 · 5ceefe8 · 5ceefe8
1 parent b919b8c
commit 5ceefe8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/iOSClient/Main/Section Header Footer/NCSectionHeaderMenu.swift b/iOSClient/Main/Section Header Footer/NCSectionHeaderMenu.swift
@@ -61,11 +61,11 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
 
         backgroundColor = .clear
 
-        buttonSwitch.setImage(UIImage(systemName: "list.bullet")!.image(color: .systemGray, size: 25), for: .normal)
+        buttonSwitch.setImage(UIImage(systemName: "list.bullet")!.image(color: NCBrandColor.shared.iconColor, size: 25), for: .normal)
 
         buttonOrder.setTitle("", for: .normal)
         buttonOrder.setTitleColor(NCBrandColor.shared.brand, for: .normal)
-        buttonMore.setImage(UIImage(named: "more")!.image(color: .systemGray, size: 25), for: .normal)
+        buttonMore.setImage(UIImage(named: "more")!.image(color: NCBrandColor.shared.iconColor, size: 25), for: .normal)
 
         // Gradient
         gradient.startPoint = CGPoint(x: 0, y: 0.50)
@@ -132,12 +132,12 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
 
     func setImageSwitchList() {
 
-        buttonSwitch.setImage(UIImage(systemName: "list.bullet")!.image(color: .systemGray, width: 20, height: 15), for: .normal)
+        buttonSwitch.setImage(UIImage(systemName: "list.bullet")!.image(color: NCBrandColor.shared.iconColor, width: 20, height: 15), for: .normal)
     }
 
     func setImageSwitchGrid() {
 
-        buttonSwitch.setImage(UIImage(systemName: "square.grid.2x2")!.image(color: .systemGray, size: 20), for: .normal)
+        buttonSwitch.setImage(UIImage(systemName: "square.grid.2x2")!.image(color: NCBrandColor.shared.iconColor, size: 20), for: .normal)
     }
 
     func setButtonsView(height: CGFloat) {
@@ -297,7 +297,7 @@ class NCSectionFooter: UICollectionReusableView, NCSectionFooterDelegate {
         super.awakeFromNib()
 
         self.backgroundColor = UIColor.clear
-        labelSection.textColor = UIColor.systemGray
+        labelSection.textColor = UIColorNCBrandColor.shared.iconColor
         labelSection.text = ""
 
         separator.backgroundColor = .separator

diff --git a/iOSClient/Menu/NCSortMenu.swift b/iOSClient/Menu/NCSortMenu.swift
@@ -47,10 +47,10 @@ class NCSortMenu: NSObject {
 
         if layoutForView.ascending {
             title = NSLocalizedString("_order_by_name_z_a_", comment: "")
-            icon = UIImage(named: "sortFileNameZA")!.image(color: UIColor.systemGray, size: 50)
+            icon = UIImage(named: "sortFileNameZA")!.image(color: NCBrandColor.shared.iconColor, size: 50)
         } else {
             title = NSLocalizedString("_order_by_name_a_z_", comment: "")
-            icon = UIImage(named: "sortFileNameAZ")!.image(color: UIColor.systemGray, size: 50)
+            icon = UIImage(named: "sortFileNameAZ")!.image(color: NCBrandColor.shared.iconColor, size: 50)
         }
 
         actions.append(
@@ -69,10 +69,10 @@ class NCSortMenu: NSObject {
 
         if layoutForView.ascending {
             title = NSLocalizedString("_order_by_date_more_recent_", comment: "")
-            icon = UIImage(named: "sortDateMoreRecent")!.image(color: UIColor.systemGray, size: 50)
+            icon = UIImage(named: "sortDateMoreRecent")!.image(color: NCBrandColor.shared.iconColor, size: 50)
         } else {
             title = NSLocalizedString("_order_by_date_less_recent_", comment: "")
-            icon = UIImage(named: "sortDateLessRecent")!.image(color: UIColor.systemGray, size: 50)
+            icon = UIImage(named: "sortDateLessRecent")!.image(color: NCBrandColor.shared.iconColor, size: 50)
         }
 
         actions.append(
@@ -91,10 +91,10 @@ class NCSortMenu: NSObject {
 
         if layoutForView.ascending {
             title = NSLocalizedString("_order_by_size_largest_", comment: "")
-            icon = UIImage(named: "sortLargest")!.image(color: UIColor.systemGray, size: 50)
+            icon = UIImage(named: "sortLargest")!.image(color: NCBrandColor.shared.iconColor, size: 50)
         } else {
             title = NSLocalizedString("_order_by_size_smallest_", comment: "")
-            icon = UIImage(named: "sortSmallest")!.image(color: UIColor.systemGray, size: 50)
+            icon = UIImage(named: "sortSmallest")!.image(color: NCBrandColor.shared.iconColor, size: 50)
         }
 
         actions.append(
@@ -115,7 +115,7 @@ class NCSortMenu: NSObject {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_directory_on_top_no_", comment: ""),
-                    icon: UIImage(named: "foldersOnTop")!.image(color: UIColor.systemGray, size: 50),
+                    icon: UIImage(named: "foldersOnTop")!.image(color: NCBrandColor.shared.iconColor, size: 50),
                     selected: layoutForView.directoryOnTop,
                     on: layoutForView.directoryOnTop,
                     action: { _ in