coding

iOSClient/Favorites/NCFavorite.swift

@@ -210,7 +210,7 @@ class NCFavorite: UIViewController, UIGestureRecognizerDelegate, NCListCellDeleg
     func tapOrderHeader(sender: Any) {
         
         let sortMenu = NCSortMenu()
-        sortMenu.toggleMenu(viewController: self, layout: k_layout_view_favorite, sortButton: sender as? UIButton, serverUrl: serverUrl)
+        sortMenu.toggleMenu(viewController: self, key: k_layout_view_favorite, sortButton: sender as? UIButton, serverUrl: serverUrl)
     }
     
     func tapMoreHeader(sender: Any) {

iOSClient/Main/CCMain.m

@@ -1416,7 +1416,7 @@
     viewController.titleButtonDone1 = NSLocalizedString(@"_copy_", nil);
     viewController.isButtonDone1Hide = false;
     viewController.isOverwriteHide = false;
-    viewController.layoutViewSelect = k_layout_view_move;
+    viewController.keyLayout = k_layout_view_move;
     
     [navigationController setModalPresentationStyle:UIModalPresentationFullScreen];
     [self presentViewController:navigationController animated:YES completion:nil];
@@ -1584,8 +1584,7 @@
 - (void)toggleSortMenu
 {
     NCSortMenu *sortMenu = [NCSortMenu new];
-    [sortMenu toggleMenuWithViewController:self layout:k_layout_view_main sortButton:self.sortButton serverUrl:self.serverUrl hideDirectoryOnTop:false];
-    //[self toggleMenuWithViewController:self.navigationController];
+    [sortMenu toggleMenuWithViewController:self key:k_layout_view_main sortButton:self.sortButton serverUrl:self.serverUrl hideDirectoryOnTop:false];
 }
 
 - (void)toggleSelectMenu

iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift

@@ -397,7 +397,7 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
         viewController.hideButtonCreateFolder = false
         viewController.includeDirectoryE2EEncryption = true
         viewController.includeImages = false
-        viewController.layoutViewSelect = k_layout_view_move
+        viewController.keyLayout = k_layout_view_move
         viewController.selectFile = false
         viewController.titleButtonDone = NSLocalizedString("_select_", comment: "")
         viewController.type = ""

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -242,7 +242,7 @@ import NCCommunication
         viewController.hideButtonCreateFolder = false
         viewController.includeDirectoryE2EEncryption = false
         viewController.includeImages = false
-        viewController.layoutViewSelect = k_layout_view_move
+        viewController.keyLayout = k_layout_view_move
         viewController.selectFile = false
         viewController.titleButtonDone = NSLocalizedString("_select_", comment: "")
         viewController.type = ""

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -645,7 +645,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
         viewController.hideButtonCreateFolder = false
         viewController.includeDirectoryE2EEncryption = true
         viewController.includeImages = false
-        viewController.layoutViewSelect = k_layout_view_move
+        viewController.keyLayout = k_layout_view_move
         viewController.selectFile = false
         viewController.titleButtonDone = NSLocalizedString("_select_", comment: "")
         viewController.type = ""

iOSClient/Main/Create cloud/NCCreateFormUploadVoiceNote.swift

@@ -290,7 +290,7 @@ class NCCreateFormUploadVoiceNote: XLFormViewController, NCSelectDelegate, AVAud
         viewController.hideButtonCreateFolder = false
         viewController.includeDirectoryE2EEncryption = true
         viewController.includeImages = false
-        viewController.layoutViewSelect = k_layout_view_move
+        viewController.keyLayout = k_layout_view_move
         viewController.selectFile = false
         viewController.titleButtonDone = NSLocalizedString("_select_", comment: "")
         viewController.type = ""

iOSClient/Main/Menu/NCDetailNavigationController+Menu.swift

@@ -128,7 +128,7 @@ extension NCDetailNavigationController {
                     viewController.titleButtonDone1 = NSLocalizedString("_copy_", comment: "")
                     viewController.isButtonDone1Hide = false
                     viewController.isOverwriteHide = false
-                    viewController.layoutViewSelect = k_layout_view_move
+                    viewController.keyLayout = k_layout_view_move
                     
                     navigationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen
                     self.present(navigationController, animated: true, completion: nil)

iOSClient/Main/Menu/NCSortMenu.swift

@@ -30,23 +30,23 @@ class NCSortMenu: NSObject {
     private var serverUrl: String?
     private var hideDirectoryOnTop: Bool?
     
+    private var key = ""
     private var layout = ""
-    private var typeLayout = ""
-    private var datasourceSorted = ""
-    private var datasourceAscending = true
-    private var datasourceGroupBy = ""
-    private var datasourceDirectoryOnTop = false
-    private var datasourceTitleButton = ""
-    private var datasourceItemForLine: Int = 0
+    private var sort = ""
+    private var ascending = true
+    private var groupBy = ""
+    private var directoryOnTop = false
+    private var titleButton = ""
+    private var itemForLine: Int = 0
 
-    @objc func toggleMenu(viewController: UIViewController, layout: String, sortButton: UIButton?, serverUrl: String?, hideDirectoryOnTop: Bool = false) {
+    @objc func toggleMenu(viewController: UIViewController, key: String, sortButton: UIButton?, serverUrl: String?, hideDirectoryOnTop: Bool = false) {
         
-        self.layout = layout
+        self.key = key
         self.sortButton = sortButton
         self.serverUrl = serverUrl
         self.hideDirectoryOnTop = hideDirectoryOnTop
         
-        (typeLayout, datasourceSorted, datasourceAscending, datasourceGroupBy, datasourceDirectoryOnTop, datasourceTitleButton, datasourceItemForLine) = NCUtility.shared.getLayoutForView(key: layout)
+        (layout, sort, ascending, groupBy, directoryOnTop, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: key)
 
         let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
         mainMenuViewController.actions = self.initSortMenu()
@@ -62,20 +62,20 @@ class NCSortMenu: NSObject {
     
     @objc func actionMenu() {
                 
-        switch datasourceSorted {
+        switch sort {
         case "fileName":
-            self.datasourceTitleButton = datasourceAscending ? "_sorted_by_name_a_z_" : "_sorted_by_name_z_a_"
+            titleButton = ascending ? "_sorted_by_name_a_z_" : "_sorted_by_name_z_a_"
         case "date":
-            self.datasourceTitleButton = datasourceAscending ? "_sorted_by_date_less_recent_" : "_sorted_by_date_more_recent_"
+            titleButton = ascending ? "_sorted_by_date_less_recent_" : "_sorted_by_date_more_recent_"
         case "size":
-            self.datasourceTitleButton = datasourceAscending ? "_sorted_by_size_largest_" : "_sorted_by_size_smallest_"
+            titleButton = ascending ? "_sorted_by_size_largest_" : "_sorted_by_size_smallest_"
         default:
             break
         }
         
-        self.sortButton?.setTitle(NSLocalizedString(self.datasourceTitleButton, comment: ""), for: .normal)
+        self.sortButton?.setTitle(NSLocalizedString(titleButton, comment: ""), for: .normal)
         
-        NCUtility.shared.setLayoutForView(key: self.layout, layout: self.typeLayout, sort: self.datasourceSorted, ascending: self.datasourceAscending, groupBy: self.datasourceGroupBy, directoryOnTop: self.datasourceDirectoryOnTop, titleButton: self.datasourceTitleButton, itemForLine: self.datasourceItemForLine)
+        NCUtility.shared.setLayoutForView(key: key, layout: layout, sort: sort, ascending: ascending, groupBy: groupBy, directoryOnTop: directoryOnTop, titleButton: titleButton, itemForLine: itemForLine)
         
         NotificationCenter.default.postOnMainThread(name: k_notificationCenter_reloadDataSource, userInfo: ["serverUrl":self.serverUrl ?? ""])
     }
@@ -89,13 +89,13 @@ class NCSortMenu: NSObject {
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "sortFileNameAZ"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 onTitle: NSLocalizedString("_order_by_name_z_a_", comment: ""),
                 onIcon: CCGraphics.changeThemingColorImage(UIImage(named: "sortFileNameZA"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
-                selected: self.datasourceSorted == "fileName",
-                on: self.datasourceSorted == "fileName",
+                selected: self.sort == "fileName",
+                on: self.sort == "fileName",
                 action: { menuAction in
-                    if self.datasourceSorted == "fileName" {
-                        self.datasourceAscending = !self.datasourceAscending
+                    if self.sort == "fileName" {
+                        self.ascending = !self.ascending
                     } else {
-                        self.datasourceSorted = "fileName"
+                        self.sort = "fileName"
                     }
                     self.actionMenu()
                 }
@@ -108,13 +108,13 @@ class NCSortMenu: NSObject {
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "sortDateMoreRecent"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 onTitle: NSLocalizedString("_order_by_date_less_recent_", comment: ""),
                 onIcon: CCGraphics.changeThemingColorImage(UIImage(named: "sortDateLessRecent"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
-                selected: self.datasourceSorted == "date",
-                on: self.datasourceSorted == "date",
+                selected: self.sort == "date",
+                on: self.sort == "date",
                 action: { menuAction in
-                    if self.datasourceSorted == "date" {
-                        self.datasourceAscending = !self.datasourceAscending
+                    if self.sort == "date" {
+                        self.ascending = !self.ascending
                     } else {
-                        self.datasourceSorted = "date"
+                        self.sort = "date"
                     }
                     self.actionMenu()
                 }
@@ -127,13 +127,13 @@ class NCSortMenu: NSObject {
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "sortSmallest"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 onTitle: NSLocalizedString("_order_by_size_largest_", comment: ""),
                 onIcon: CCGraphics.changeThemingColorImage(UIImage(named: "sortLargest"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
-                selected: self.datasourceSorted == "size",
-                on: self.datasourceSorted == "size",
+                selected: self.sort == "size",
+                on: self.sort == "size",
                 action: { menuAction in
-                    if self.datasourceSorted == "size" {
-                        self.datasourceAscending = !self.datasourceAscending
+                    if self.sort == "size" {
+                        self.ascending = !self.ascending
                     } else {
-                        self.datasourceSorted = "size"
+                        self.sort = "size"
                     }
                     self.actionMenu()
                 }
@@ -145,10 +145,10 @@ class NCSortMenu: NSObject {
                 NCMenuAction(
                     title: NSLocalizedString("_directory_on_top_no_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "foldersOnTop"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
-                    selected: self.datasourceDirectoryOnTop,
-                    on: self.datasourceDirectoryOnTop,
+                    selected: self.directoryOnTop,
+                    on: self.directoryOnTop,
                     action: { menuAction in
-                        self.datasourceDirectoryOnTop = !self.datasourceDirectoryOnTop
+                        self.directoryOnTop = !self.directoryOnTop
                         self.actionMenu()
                     }
                 )

iOSClient/Media/NCMedia.swift

@@ -253,7 +253,7 @@ class NCMedia: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate,
                         viewController.hideButtonCreateFolder = true
                         viewController.includeDirectoryE2EEncryption = false
                         viewController.includeImages = false
-                        viewController.layoutViewSelect = k_layout_view_move
+                        viewController.keyLayout = k_layout_view_move
                         viewController.selectFile = false
                         viewController.titleButtonDone = NSLocalizedString("_select_", comment: "")
                         viewController.type = "mediaFolder"

iOSClient/Offline/NCOffline.swift

@@ -212,7 +212,7 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
     func tapOrderHeader(sender: Any) {
         
         let sortMenu = NCSortMenu()
-        sortMenu.toggleMenu(viewController: self, layout: k_layout_view_offline, sortButton: sender as? UIButton, serverUrl: serverUrl)
+        sortMenu.toggleMenu(viewController: self, key: k_layout_view_offline, sortButton: sender as? UIButton, serverUrl: serverUrl)
     }
     
     func tapMoreHeader(sender: Any) {

iOSClient/Select/NCSelect.swift

@@ -56,7 +56,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
     @objc var titleButtonDone1 = NSLocalizedString("_copy_", comment: "")
     @objc var isButtonDone1Hide = true
     @objc var isOverwriteHide = true
-    @objc var layoutViewSelect = k_layout_view_move
+    @objc var keyLayout = k_layout_view_move
     @objc var heightToolBarTop: CGFloat = 100
     
     var titleCurrentFolder = NCBrandOptions.sharedInstance.brand
@@ -178,7 +178,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
         autoUploadFileName = NCManageDatabase.sharedInstance.getAccountAutoUploadFileName()
         autoUploadDirectory = NCManageDatabase.sharedInstance.getAccountAutoUploadDirectory(urlBase: appDelegate.urlBase, account: appDelegate.account)
         
-        (typeLayout, _, _, datasourceGroupBy, _, datasourceTitleButton, datasourceItemForLine) = NCUtility.shared.getLayoutForView(key: layoutViewSelect)
+        (typeLayout, _, _, datasourceGroupBy, _, datasourceTitleButton, datasourceItemForLine) = NCUtility.shared.getLayoutForView(key: keyLayout)
         
         if typeLayout == k_layout_list {
             collectionView.collectionViewLayout = listLayout
@@ -301,7 +301,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
                 })
             })
             typeLayout = k_layout_list
-            NCUtility.shared.setLayoutForView(key: layoutViewSelect, layout: typeLayout)
+            NCUtility.shared.setLayoutForView(key: keyLayout, layout: typeLayout)
         } else {
             // grid layout
             UIView.animate(withDuration: 0.0, animations: {
@@ -312,14 +312,14 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
                 })
             })
             typeLayout = k_layout_grid
-            NCUtility.shared.setLayoutForView(key: layoutViewSelect, layout: typeLayout)
+            NCUtility.shared.setLayoutForView(key: keyLayout, layout: typeLayout)
         }
     }
     
     func tapOrderHeader(sender: Any) {
         
         let sortMenu = NCSortMenu()
-        sortMenu.toggleMenu(viewController: self, layout: layoutViewSelect, sortButton: sender as? UIButton, serverUrl: serverUrl)
+        sortMenu.toggleMenu(viewController: self, key: keyLayout, sortButton: sender as? UIButton, serverUrl: serverUrl)
     }
     
     func tapMoreHeader(sender: Any) {
@@ -371,7 +371,7 @@ extension NCSelect: UICollectionViewDelegate {
             visualController.type = type
             visualController.titleButtonDone = titleButtonDone
             visualController.titleButtonDone1 = titleButtonDone1
-            visualController.layoutViewSelect = layoutViewSelect
+            visualController.keyLayout = keyLayout
             visualController.isButtonDone1Hide = isButtonDone1Hide
             visualController.isOverwriteHide = isOverwriteHide
             visualController.overwrite = overwrite
@@ -534,7 +534,7 @@ extension NCSelect {
         var datasourceDirectoryOnTop: Bool
         
         sectionDatasource = CCSectionDataSourceMetadata()
-        (typeLayout, datasourceSorted, datasourceAscending, datasourceGroupBy, datasourceDirectoryOnTop, datasourceTitleButton, datasourceItemForLine) = NCUtility.shared.getLayoutForView(key: layoutViewSelect)
+        (typeLayout, datasourceSorted, datasourceAscending, datasourceGroupBy, datasourceDirectoryOnTop, datasourceTitleButton, datasourceItemForLine) = NCUtility.shared.getLayoutForView(key: keyLayout)
         
         if serverUrl == "" {
             

iOSClient/Settings/CCManageAutoUpload.m

@@ -509,7 +509,7 @@
      viewController.includeImages = false;
      viewController.type = @"";
      viewController.titleButtonDone = NSLocalizedString(@"_select_", nil);
-     viewController.layoutViewSelect = k_layout_view_move;
+     viewController.keyLayout = k_layout_view_move;
      viewController.heightToolBarTop = 50;
      
      [navigationController setModalPresentationStyle:UIModalPresentationFullScreen];

iOSClient/Trash/NCTrash.swift

@@ -183,7 +183,7 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
     func tapOrderHeaderMenu(sender: Any) {
         
         let sortMenu = NCSortMenu()
-        sortMenu.toggleMenu(viewController: self, layout: k_layout_view_trash, sortButton: sender as? UIButton, serverUrl: nil, hideDirectoryOnTop: true)
+        sortMenu.toggleMenu(viewController: self, key: k_layout_view_trash, sortButton: sender as? UIButton, serverUrl: nil, hideDirectoryOnTop: true)
     }
     
     func tapMoreHeaderMenu(sender: Any) {

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -160,7 +160,7 @@
     viewController.includeImages = false;
     viewController.type = @"";
     viewController.titleButtonDone = NSLocalizedString(@"_select_", nil);
-    viewController.layoutViewSelect = k_layout_view_move;
+    viewController.keyLayout = k_layout_view_move;
     
     [navigationController setModalPresentationStyle:UIModalPresentationFullScreen];
     [self presentViewController:navigationController animated:YES completion:nil];

iOSClient/Utility/NCUtility.swift

@@ -156,30 +156,30 @@ class NCUtility: NSObject {
     
     func setLayoutForView(key: String, layout: String) {
         
-        var datasourceSorted: String
-        var datasourceAscending: Bool
-        var datasourceGroupBy: String
-        var datasourceDirectoryOnTop: Bool
-        var datasourceTitleButton: String
+        var sort: String
+        var ascending: Bool
+        var groupBy: String
+        var directoryOnTop: Bool
+        var titleButton: String
         var itemForLine: Int
 
-        (_, datasourceSorted, datasourceAscending, datasourceGroupBy, datasourceDirectoryOnTop, datasourceTitleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: k_layout_view_favorite)
+        (_, sort, ascending, groupBy, directoryOnTop, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: k_layout_view_favorite)
 
-        setLayoutForView(key: key, layout: layout, sort: datasourceSorted, ascending: datasourceAscending, groupBy: datasourceGroupBy, directoryOnTop: datasourceDirectoryOnTop, titleButton: datasourceTitleButton, itemForLine: itemForLine)
+        setLayoutForView(key: key, layout: layout, sort: sort, ascending: ascending, groupBy: groupBy, directoryOnTop: directoryOnTop, titleButton: titleButton, itemForLine: itemForLine)
     }
     
     @objc func getLayoutForView(key: String) -> (String) {
         
-        var typeLayout = ""
-        (typeLayout, _, _, _, _, _, _) = NCUtility.shared.getLayoutForView(key: key)
-        return typeLayout
+        var layout: String
+        (layout, _, _, _, _, _, _) = NCUtility.shared.getLayoutForView(key: key)
+        return layout
     }
     
     @objc func getSortedForView(key: String) -> (String) {
         
-        var sorted = ""
-        (_, sorted, _, _, _, _, _) = NCUtility.shared.getLayoutForView(key: key)
-        return sorted
+        var sort: String
+        (_, sort, _, _, _, _, _) = NCUtility.shared.getLayoutForView(key: key)
+        return sort
     }
     
     @objc func getAscendingForView(key: String) -> (Bool) {
@@ -205,12 +205,12 @@ class NCUtility: NSObject {
     
     @objc func getTitleButtonForView(key: String) -> (String) {
         
-        var title: String
-        (_, _, _, _, _, title, _) = NCUtility.shared.getLayoutForView(key: key)
-        return title
+        var titleButton: String
+        (_, _, _, _, _, titleButton, _) = NCUtility.shared.getLayoutForView(key: key)
+        return titleButton
     }
     
-    func getLayoutForView(key: String) -> (String, String, Bool, String, Bool, String, Int) {
+    func getLayoutForView(key: String) -> (layout: String, sort: String, ascending: Bool, groupBy: String, directoryOnTop: Bool, titleButton: String, itemForLine: Int) {
         
         guard let string = UICKeyChainStore.string(forKey: key, service: k_serviceShareKeyChain) else {
             setLayoutForView(key: key, layout: k_layout_list, sort: "fileName", ascending: true, groupBy: "none", directoryOnTop: true, titleButton: "_sorted_by_name_a_z_", itemForLine: 3)

iOSClient/Viewer/NCViewerRichdocument.swift

@@ -112,7 +112,7 @@ class NCViewerRichdocument: WKWebView, WKNavigationDelegate, WKScriptMessageHand
                 viewController.includeDirectoryE2EEncryption = false
                 viewController.includeImages = true
                 viewController.type = ""
-                viewController.layoutViewSelect = k_layout_view_richdocument
+                viewController.keyLayout = k_layout_view_richdocument
                 
                 navigationController.modalPresentationStyle = UIModalPresentationStyle.fullScreen
                 self.viewController.present(navigationController, animated: true, completion: nil)