Order Trash

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -299,10 +299,13 @@
 "_file_unpacked_"               = "File unpacked on local storage";
 "_file_saved_local_"            = "File saved on local storage.";
 "_file_not_present_"            = "Error: File not present, please reload.";
+"_order_by_"                    = "Sort by";
 "_order_by_date_"               = "Sort by date";
-"_current_order_name_"          = "(currently sorted by name)";
-"_order_by_name_"               = "Sort by name";
 "_current_order_date_"          = "(currently sorted by date)";
+"_order_by_name_"               = "Sort by name";
+"_current_order_name_"          = "(currently sorted by name)";
+"_order_by_size_"               = "Sort by size";
+"_current_order_size_"          = "(currently sorted by size)";
 "_sort_descending_"             = "Sort descending";
 "_current_sort_ascending_"      = "(currently sorted ascending)";
 "_sort_ascending_"              = "Sort ascending";

iOSClient/Trash/NCTrash.storyboard

@@ -63,7 +63,7 @@
                                             </connections>
                                         </button>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0q4-Qd-ic4" userLabel="buttonOrder">
-                                            <rect key="frame" x="47" y="11" width="191" height="28"/>
+                                            <rect key="frame" x="55" y="11" width="183" height="28"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <state key="normal" title="Order">
                                                 <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -75,7 +75,7 @@
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
-                                        <constraint firstItem="0q4-Qd-ic4" firstAttribute="leading" secondItem="gBv-v2-Zec" secondAttribute="trailing" constant="10" id="86t-HS-JzM"/>
+                                        <constraint firstItem="0q4-Qd-ic4" firstAttribute="leading" secondItem="gBv-v2-Zec" secondAttribute="trailing" constant="18" id="86t-HS-JzM"/>
                                         <constraint firstItem="0q4-Qd-ic4" firstAttribute="centerY" secondItem="AQ6-rS-Wxb" secondAttribute="centerY" id="APZ-gg-uLs"/>
                                         <constraint firstItem="Qqn-cs-A3P" firstAttribute="centerY" secondItem="AQ6-rS-Wxb" secondAttribute="centerY" id="Cgb-zq-vQE"/>
                                         <constraint firstAttribute="trailing" secondItem="Qqn-cs-A3P" secondAttribute="trailing" constant="12" id="FJp-2Z-jvg"/>

iOSClient/Trash/NCTrash.swift

@@ -16,8 +16,8 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
     var path = ""
     var titleCurrentFolder = NSLocalizedString("_trash_view_", comment: "")
     var datasource = [tableTrash]()
-    var datasourceSorted = CCUtility.getOrderSettings()
-    var datasourceAscending = CCUtility.getAscendingSettings()
+    var datasourceSorted = ""
+    var datasourceAscending = true
     
     var listLayout: ListLayout!
     var gridLayout: GridLayout!
@@ -70,7 +70,10 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             path = k_dav + "/trashbin/" + userID! + "/trash/"
         }
         
-        guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: path, sorted: datasourceSorted!, ascending: datasourceAscending) else {
+        datasourceSorted = CCUtility.getOrderSettings()
+        datasourceAscending = CCUtility.getAscendingSettings()
+        
+        guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: path, sorted: datasourceSorted, ascending: datasourceAscending) else {
             return
         }
         
@@ -214,7 +217,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             NCManageDatabase.sharedInstance.deleteTrash(filePath: self.path)
             NCManageDatabase.sharedInstance.addTrashs(item as! [tableTrash])
             
-            let results = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted!, ascending: self.datasourceAscending)
+            let results = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted, ascending: self.datasourceAscending)
             if (results != nil) {
                 self.datasource = results!
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
@@ -243,7 +246,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
         ocNetworking?.moveFileOrFolder(fileName, fileNameTo: fileNameTo, success: {
             
             NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID)
-            guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted!, ascending: self.datasourceAscending) else {
+            guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted, ascending: self.datasourceAscending) else {
                 return
             }
             self.datasource = datasource
@@ -270,7 +273,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             if errorCode == 0 {
                 
                 NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID)
-                guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted!, ascending: self.datasourceAscending) else {
+                guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted, ascending: self.datasourceAscending) else {
                     return
                 }
                 self.datasource = datasource
@@ -319,6 +322,21 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
                 trashHeader.buttonMore.isEnabled = true
             }
             
+            // Order
+            var ascending = "  ▽" // da A a Z (∨∧) 
+            if datasourceAscending == false { ascending = "  △" }
+            
+            switch datasourceSorted {
+            case "fileName":
+                trashHeader.buttonOrder.setTitle(NSLocalizedString("_order_by_name_", comment: "") + ascending, for: .normal)
+            case "date":
+                trashHeader.buttonOrder.setTitle(NSLocalizedString("_order_by_date_", comment: "") + ascending, for: .normal)
+            case "size":
+                trashHeader.buttonOrder.setTitle(NSLocalizedString("_order_by_size_", comment: "") + ascending, for: .normal)
+            default:
+                trashHeader.buttonOrder.setTitle(NSLocalizedString("_order_by_", comment: "") + " " + datasourceSorted + ascending, for: .normal)
+            }
+            
             return trashHeader
             
         } else {