coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -770,7 +770,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         appDelegate.openLogin(viewController: self, selector: NCGlobal.shared.introLogin, openLoginWeb: false)
     }
 
-    func tapButtonSwitch(sender: Any) {
+    func tapButtonSwitch(_ sender: Any) {
 
         if collectionView.collectionViewLayout == gridLayout {
             // list layout
@@ -797,13 +797,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         }
     }
 
-    func tapButtonOrder(sender: Any) {
+    func tapButtonOrder(_ sender: Any) {
 
         let sortMenu = NCSortMenu()
         sortMenu.toggleMenu(viewController: self, key: layoutKey, sortButton: sender as? UIButton, serverUrl: serverUrl)
     }
 
-    func tapButtonUpload(sender: Any) {
+    func tapButtonUpload(_ sender: Any) {
         NCAskAuthorization.shared.askAuthorizationPhotoLibrary(viewController: self) { hasPermission in
             if hasPermission {
                 NCPhotosPickerViewController.init(viewController: self, maxSelectedAssets: 0, singleSelectedMode: false)
@@ -811,13 +811,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         }
     }
 
-    func tapButtonCreateFolder(sender: Any) {
+    func tapButtonCreateFolder(_ sender: Any) {
         guard !appDelegate.activeServerUrl.isEmpty else { return }
         let alertController = UIAlertController.createFolder(serverUrl: appDelegate.activeServerUrl, urlBase: appDelegate)
         appDelegate.window?.rootViewController?.present(alertController, animated: true, completion: nil)
     }
 
-    func tapButtonScanDocument(sender: Any) {
+    func tapButtonScanDocument(_ sender: Any) {
         if #available(iOS 13.0, *) {
             if let viewController = appDelegate.window?.rootViewController {
                 NCCreateScanDocument.shared.openScannerDocument(viewController: viewController)
@@ -851,7 +851,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         }
     }
 
-    func tapRichWorkspace(sender: Any) {
+    func tapRichWorkspace(_ sender: Any) {
 
         if let navigationController = UIStoryboard(name: "NCViewerRichWorkspace", bundle: nil).instantiateInitialViewController() as? UINavigationController {
             if let viewerRichWorkspace = navigationController.topViewController as? NCViewerRichWorkspace {

iOSClient/Main/Section Header Footer/NCSectionHeaderFooter.swift

@@ -222,54 +222,54 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
         }
     }
 
-    @IBAction func touchUpInsideMore(_ sender: Any) {
-        delegate?.tapButtonMore(sender: sender)
-    }
-
     @IBAction func touchUpInsideSwitch(_ sender: Any) {
-        delegate?.tapButtonSwitch(sender: sender)
+        delegate?.tapButtonSwitch(sender)
     }
 
     @IBAction func touchUpInsideOrder(_ sender: Any) {
-        delegate?.tapButtonOrder(sender: sender)
+        delegate?.tapButtonOrder(sender)
+    }
+
+    @IBAction func touchUpInsideMore(_ sender: Any) {
+        delegate?.tapButtonMore(sender)
     }
 
     @IBAction func touchUpInsideButtonUpload(_ sender: Any) {
-       delegate?.tapButtonUpload(sender: sender)
+       delegate?.tapButtonUpload(sender)
     }
 
     @IBAction func touchUpInsideButtonCreateFolder(_ sender: Any) {
-        delegate?.tapButtonCreateFolder(sender: sender)
+        delegate?.tapButtonCreateFolder(sender)
     }
 
     @IBAction func touchUpInsideButtonScanDocument(_ sender: Any) {
-
+        delegate?.tapButtonScanDocument(sender)
     }
 
     @objc func touchUpInsideViewRichWorkspace(_ sender: Any) {
-        delegate?.tapRichWorkspace(sender: sender)
+        delegate?.tapRichWorkspace(sender)
     }
 }
 
 protocol NCSectionHeaderMenuDelegate: AnyObject {
-    func tapButtonSwitch(sender: Any)
-    func tapButtonOrder(sender: Any)
-    func tapButtonMore(sender: Any)
-    func tapButtonUpload(sender: Any)
-    func tapButtonCreateFolder(sender: Any)
-    func tapButtonScanDocument(sender: Any)
-    func tapRichWorkspace(sender: Any)
+    func tapButtonSwitch(_ sender: Any)
+    func tapButtonOrder(_ sender: Any)
+    func tapButtonMore(_ sender: Any)
+    func tapButtonUpload(_ sender: Any)
+    func tapButtonCreateFolder(_ sender: Any)
+    func tapButtonScanDocument(_ sender: Any)
+    func tapRichWorkspace(_ sender: Any)
 }
 
 // optional func
 extension NCSectionHeaderMenuDelegate {
-    func tapButtonSwitch(sender: Any) {}
-    func tapButtonOrder(sender: Any) {}
-    func tapButtonMore(sender: Any) {}
-    func tapButtonUpload(sender: Any) {}
-    func tapButtonCreateFolder(sender: Any) {}
-    func tapButtonScanDocument(sender: Any) {}
-    func tapRichWorkspace(sender: Any) {}
+    func tapButtonSwitch(_ sender: Any) {}
+    func tapButtonOrder(_ sender: Any) {}
+    func tapButtonMore(_ sender: Any) {}
+    func tapButtonUpload(_ sender: Any) {}
+    func tapButtonCreateFolder(_ sender: Any) {}
+    func tapButtonScanDocument(_ sender: Any) {}
+    func tapRichWorkspace(_ sender: Any) {}
 }
 
 class NCSectionHeader: UICollectionReusableView {

iOSClient/Main/Section Header Footer/NCSectionHeaderMenu.xib

@@ -52,7 +52,7 @@
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="8" maxY="0.0"/>
                             <inset key="imageEdgeInsets" minX="-8" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" title="Button 2" image="buttonCreateFolder"/>
+                            <state key="normal" title="Button 3" image="buttonCreateFolder"/>
                             <connections>
                                 <action selector="touchUpInsideButtonScanDocument:" destination="tys-A2-nDX" eventType="touchUpInside" id="chM-32-kSs"/>
                             </connections>

iOSClient/Select/NCSelect.swift

@@ -279,7 +279,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
 
     // MARK: TAP EVENT
 
-    func tapButtonSwitch(sender: Any) {
+    func tapButtonSwitch(_ sender: Any) {
 
         if collectionView.collectionViewLayout == gridLayout {
             // list layout
@@ -304,7 +304,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         }
     }
 
-    func tapButtonOrder(sender: Any) {
+    func tapButtonOrder(_ sender: Any) {
 
         let sortMenu = NCSortMenu()
         sortMenu.toggleMenu(viewController: self, key: keyLayout, sortButton: sender as? UIButton, serverUrl: serverUrl)

iOSClient/Trash/NCTrash.swift

@@ -137,7 +137,7 @@ class NCTrash: UIViewController, NCSelectableNavigationView, NCTrashListCellDele
 
     // MARK: TAP EVENT
 
-    func tapButtonSwitch(sender: Any) {
+    func tapButtonSwitch(_ sender: Any) {
 
         if collectionView.collectionViewLayout == gridLayout {
             // list layout
@@ -162,7 +162,7 @@ class NCTrash: UIViewController, NCSelectableNavigationView, NCTrashListCellDele
         }
     }
 
-    func tapButtonOrder(sender: Any) {
+    func tapButtonOrder(_ sender: Any) {
         let sortMenu = NCSortMenu()
         sortMenu.toggleMenu(viewController: self, key: NCGlobal.shared.layoutViewTrash, sortButton: sender as? UIButton, serverUrl: "", hideDirectoryOnTop: true)
     }