Improvements menu (#3284)

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Author: marinofaggiana

iOSClient/Favorites/NCFavoriteNavigationController.swift

@@ -10,15 +10,18 @@ class NCFavoriteNavigationController: NCMainNavigationController {
             return
         }
 
-        func createMenu() -> [UIMenuElement] {
+        func createMenu() -> UIMenu? {
             guard let items = self.createMenuActions()
             else {
-                return []
+                return nil
             }
 
-            let additionalSubmenu = UIMenu(title: "", options: .displayInline, children: [items.foldersOnTop])
-
-            return [items.select, items.viewStyleSubmenu, items.sortSubmenu, additionalSubmenu]
+            if collectionViewCommon.layoutKey == global.layoutViewFavorite {
+                return UIMenu(children: [items.select, items.viewStyleSubmenu, items.sortSubmenu])
+            } else {
+                let additionalSubmenu = UIMenu(title: "", options: .displayInline, children: [items.foldersOnTop, items.personalFilesOnlyAction, items.showDescription])
+                return UIMenu(children: [items.select, items.viewStyleSubmenu, items.sortSubmenu, additionalSubmenu])
+            }
         }
 
         if collectionViewCommon.isEditMode {
@@ -35,15 +38,18 @@ class NCFavoriteNavigationController: NCMainNavigationController {
         } else if self.collectionViewCommon?.navigationItem.rightBarButtonItems == nil || (!collectionViewCommon.isEditMode && !(collectionViewCommon.tabBarSelect?.isHidden() ?? true)) {
             collectionViewCommon.tabBarSelect?.hide()
 
-            let menuButton = UIBarButtonItem(image: utility.loadImage(named: "ellipsis.circle"), menu: UIMenu(children: createMenu()))
+            let menuButton = UIBarButtonItem(image: utility.loadImage(named: "ellipsis.circle"), menu: createMenu())
             menuButton.tag = menuButtonTag
             menuButton.tintColor = NCBrandColor.shared.iconImageColor
 
             self.collectionViewCommon?.navigationItem.rightBarButtonItems = [menuButton]
 
         } else {
 
-            self.collectionViewCommon?.navigationItem.rightBarButtonItems?.first?.menu = self.collectionViewCommon?.navigationItem.rightBarButtonItems?.first?.menu?.replacingChildren(createMenu())
+            if let rightBarButtonItems = self.collectionViewCommon?.navigationItem.rightBarButtonItems,
+               let menuBarButtonItem = rightBarButtonItems.first(where: { $0.tag == menuButtonTag }) {
+                menuBarButtonItem.menu = createMenu()
+            }
         }
 
         // fix, if the tabbar was hidden before the update, set it in hidden

iOSClient/More/NCMoreNavigationController.swift

@@ -10,19 +10,21 @@ class NCMoreNavigationController: NCMainNavigationController {
             return
         }
 
-        func createMenu() -> [UIMenuElement] {
+        func createMenu() -> UIMenu? {
             guard let items = self.createMenuActions()
             else {
-                return []
+                return nil
             }
 
             if collectionViewCommon.layoutKey == global.layoutViewRecent {
-                return [items.select, items.viewStyleSubmenu]
+                return UIMenu(children: [items.select, items.viewStyleSubmenu])
             } else if collectionViewCommon.layoutKey == global.layoutViewOffline {
-                return [items.select, items.viewStyleSubmenu]
+                return UIMenu(children: [items.select, items.viewStyleSubmenu, items.sortSubmenu])
+            } else if collectionViewCommon.layoutKey == global.layoutViewShares {
+                return UIMenu(children: [items.select, items.viewStyleSubmenu, items.sortSubmenu])
             } else {
                 let additionalSubmenu = UIMenu(title: "", options: .displayInline, children: [items.foldersOnTop, items.personalFilesOnlyAction, items.showDescription])
-                return [items.select, items.viewStyleSubmenu, items.sortSubmenu, additionalSubmenu]
+                return UIMenu(children: [items.select, items.viewStyleSubmenu, items.sortSubmenu, additionalSubmenu])
             }
         }
 
@@ -40,15 +42,18 @@ class NCMoreNavigationController: NCMainNavigationController {
         } else if self.collectionViewCommon?.navigationItem.rightBarButtonItems == nil || (!collectionViewCommon.isEditMode && !(collectionViewCommon.tabBarSelect?.isHidden() ?? true)) {
             collectionViewCommon.tabBarSelect?.hide()
 
-            let menuButton = UIBarButtonItem(image: utility.loadImage(named: "ellipsis.circle"), menu: UIMenu(children: createMenu()))
+            let menuButton = UIBarButtonItem(image: utility.loadImage(named: "ellipsis.circle"), menu: createMenu())
             menuButton.tag = menuButtonTag
             menuButton.tintColor = NCBrandColor.shared.iconImageColor
 
             self.collectionViewCommon?.navigationItem.rightBarButtonItems = [menuButton]
 
         } else {
 
-            self.collectionViewCommon?.navigationItem.rightBarButtonItems?.first?.menu = self.collectionViewCommon?.navigationItem.rightBarButtonItems?.first?.menu?.replacingChildren(createMenu())
+            if let rightBarButtonItems = self.collectionViewCommon?.navigationItem.rightBarButtonItems,
+               let menuBarButtonItem = rightBarButtonItems.first(where: { $0.tag == menuButtonTag }) {
+                menuBarButtonItem.menu = createMenu()
+            }
         }
 
         // fix, if the tabbar was hidden before the update, set it in hidden