Merge pull request #1133 from Infomaniak/newdrawer-fix

Fix sorting + Fix background in darkmode

iOSClient/Main/Menu/CCMain+Menu.swift

@@ -39,11 +39,10 @@ extension CCMain {
                 selected: CCUtility.getOrderSettings() == "fileName",
                 on: CCUtility.getAscendingSettings(),
                 action: { menuAction in
-                    if (CCUtility.getOrderSettings() == "fileName" && CCUtility.getAscendingSettings()) {
+                    if(CCUtility.getOrderSettings() == "fileName") {
                         CCUtility.setAscendingSettings(!CCUtility.getAscendingSettings())
                     } else {
                         CCUtility.setOrderSettings("fileName")
-                        CCUtility.setAscendingSettings(true)
                     }
 
                     NotificationCenter.default.post(name: Notification.Name.init(rawValue: "clearDateReadDataSource"), object: nil)
@@ -60,11 +59,10 @@ extension CCMain {
                 selected: CCUtility.getOrderSettings() == "date",
                 on: CCUtility.getAscendingSettings(),
                 action: { menuAction in
-                    if(CCUtility.getOrderSettings() == "date" && CCUtility.getAscendingSettings()) {
+                    if(CCUtility.getOrderSettings() == "date") {
                         CCUtility.setAscendingSettings(!CCUtility.getAscendingSettings())
                     } else {
                         CCUtility.setOrderSettings("date")
-                        CCUtility.setAscendingSettings(true)
                     }
 
                     NotificationCenter.default.post(name: Notification.Name.init(rawValue: "clearDateReadDataSource"), object: nil)
@@ -81,13 +79,12 @@ extension CCMain {
                 selected: CCUtility.getOrderSettings() == "size",
                 on: CCUtility.getAscendingSettings(),
                 action: { menuAction in
-                    if(CCUtility.getOrderSettings() == "size" && CCUtility.getAscendingSettings()) {
+                    if(CCUtility.getOrderSettings() == "size") {
                         CCUtility.setAscendingSettings(!CCUtility.getAscendingSettings())
                     } else {
                         CCUtility.setOrderSettings("size")
-                        CCUtility.setAscendingSettings(true)
                     }
-
+                    
                     NotificationCenter.default.post(name: Notification.Name.init(rawValue: "clearDateReadDataSource"), object: nil)
                 }
             )

iOSClient/Main/Menu/NCMenuPanelController.swift

@@ -32,6 +32,9 @@ class NCMenuPanelController: FloatingPanelController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        if #available(iOS 13.0, *) {
+            self.surfaceView.backgroundColor = .systemBackground
+        }
         self.isRemovalInteractionEnabled = true
         if #available(iOS 11, *) {
             self.surfaceView.cornerRadius = 16
@@ -39,5 +42,5 @@ class NCMenuPanelController: FloatingPanelController {
             self.surfaceView.cornerRadius = 0
         }
     }
-    
+
 }