Modify class name with NC suffix

Nextcloud.xcodeproj/project.pbxproj

@@ -7,10 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3704EB2A23D5A58400455C5B /* Menu.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3704EB2923D5A58400455C5B /* Menu.storyboard */; };
-		371B5A2E23D0B04500FAFAE9 /* MainMenuTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* MainMenuTableViewController.swift */; };
+		3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3704EB2923D5A58400455C5B /* NCMenu.storyboard */; };
+		371B5A2E23D0B04500FAFAE9 /* NCMainMenuTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMainMenuTableViewController.swift */; };
 		371B5A3323D0BD5500FAFAE9 /* FloatingPanel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */; };
-		3757A35523D9D76300EC369E /* MenuPanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3757A35423D9D76300EC369E /* MenuPanelController.swift */; };
+		3757A35523D9D76300EC369E /* NCMenuPanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3757A35423D9D76300EC369E /* NCMenuPanelController.swift */; };
 		3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; };
 		3781B9B223DB2B9F006B4B1D /* CCMain+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9B123DB2B9F006B4B1D /* CCMain+Menu.swift */; };
 		3781B9B423DB2BC9006B4B1D /* CCFavorites+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9B323DB2BC9006B4B1D /* CCFavorites+Menu.swift */; };
@@ -671,10 +671,10 @@
 		08EA97451E6554FC004C83FA /* FirebaseCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseCore.framework; sourceTree = "<group>"; };
 		08EA97461E6554FC004C83FA /* FirebaseInstanceID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseInstanceID.framework; sourceTree = "<group>"; };
 		08EA97471E6554FC004C83FA /* GoogleToolboxForMac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleToolboxForMac.framework; sourceTree = "<group>"; };
-		3704EB2923D5A58400455C5B /* Menu.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Menu.storyboard; sourceTree = "<group>"; };
-		371B5A2D23D0B04500FAFAE9 /* MainMenuTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuTableViewController.swift; sourceTree = "<group>"; };
+		3704EB2923D5A58400455C5B /* NCMenu.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCMenu.storyboard; sourceTree = "<group>"; };
+		371B5A2D23D0B04500FAFAE9 /* NCMainMenuTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMainMenuTableViewController.swift; sourceTree = "<group>"; };
 		371B5A3223D0BD5500FAFAE9 /* FloatingPanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FloatingPanel.framework; path = Carthage/Build/iOS/FloatingPanel.framework; sourceTree = "<group>"; };
-		3757A35423D9D76300EC369E /* MenuPanelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuPanelController.swift; sourceTree = "<group>"; };
+		3757A35423D9D76300EC369E /* NCMenuPanelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenuPanelController.swift; sourceTree = "<group>"; };
 		3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = "<group>"; };
 		3781B9B123DB2B9F006B4B1D /* CCMain+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CCMain+Menu.swift"; sourceTree = "<group>"; };
 		3781B9B323DB2BC9006B4B1D /* CCFavorites+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CCFavorites+Menu.swift"; sourceTree = "<group>"; };
@@ -1518,13 +1518,13 @@
 		371B5A2F23D0B04B00FAFAE9 /* Menu */ = {
 			isa = PBXGroup;
 			children = (
-				371B5A2D23D0B04500FAFAE9 /* MainMenuTableViewController.swift */,
+				371B5A2D23D0B04500FAFAE9 /* NCMainMenuTableViewController.swift */,
 				3781B9B323DB2BC9006B4B1D /* CCFavorites+Menu.swift */,
 				3781B9B123DB2B9F006B4B1D /* CCMain+Menu.swift */,
 				3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */,
-				3757A35423D9D76300EC369E /* MenuPanelController.swift */,
+				3757A35423D9D76300EC369E /* NCMenuPanelController.swift */,
 				37ECC83A23D0C7400082EFA2 /* MenuAction.swift */,
-				3704EB2923D5A58400455C5B /* Menu.storyboard */,
+				3704EB2923D5A58400455C5B /* NCMenu.storyboard */,
 			);
 			path = Menu;
 			sourceTree = "<group>";
@@ -3207,7 +3207,7 @@
 				F7D4233E1F0596AC009C9782 /* Reader-Email.png in Resources */,
 				F7D423361F0596AC009C9782 /* AppIcon-167.png in Resources */,
 				F7F54CF71E5B14C700E19C62 /* PlayButtonOverlayLargeTap.png in Resources */,
-				3704EB2A23D5A58400455C5B /* Menu.storyboard in Resources */,
+				3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */,
 				F7E0E1DE22327DBA006B0911 /* NCAudioRecorderViewController.storyboard in Resources */,
 				F710E8111EF95C9C00DC2427 /* ImagesIntro.xcassets in Resources */,
 				F7F54D021E5B14C700E19C62 /* UIBarButtonItemGrid@3x.png in Resources */,
@@ -3554,7 +3554,7 @@
 				F762CB0C1EACB66200B38484 /* XLFormSectionDescriptor.m in Sources */,
 				F760F79421F21F61006B1A73 /* ResizeControl.swift in Sources */,
 				F7DFB7F2219C5C0000680748 /* NCCreateFormUploadFileText.swift in Sources */,
-				371B5A2E23D0B04500FAFAE9 /* MainMenuTableViewController.swift in Sources */,
+				371B5A2E23D0B04500FAFAE9 /* NCMainMenuTableViewController.swift in Sources */,
 				F762CB861EACB81000B38484 /* RECommonFunctions.m in Sources */,
 				F76C6F8E21943C8C0063591B /* NCActionSheetHeader.swift in Sources */,
 				F760F79121F21F61006B1A73 /* EmojiCollectionViewCell.swift in Sources */,
@@ -3580,7 +3580,7 @@
 				F749C10C23C4A5340027D966 /* IntroViewController.swift in Sources */,
 				F77B0E1B1D118A16002130FE /* CCGraphics.m in Sources */,
 				F70022CB1EC4C9100080073F /* OCSharedDto.m in Sources */,
-				3757A35523D9D76300EC369E /* MenuPanelController.swift in Sources */,
+				3757A35523D9D76300EC369E /* NCMenuPanelController.swift in Sources */,
 				F7CA1ED320E7E3FE002CC65E /* PKStopDownloadButton.m in Sources */,
 				F762CB111EACB66200B38484 /* NSString+XLFormAdditions.m in Sources */,
 				F7D423871F0596C6009C9782 /* ReaderThumbsView.m in Sources */,

iOSClient/Main/Menu/AppDelegate+Menu.swift

@@ -27,8 +27,8 @@ import FloatingPanel
 
 extension AppDelegate {
 
-    private func initMenu() -> [MenuAction] {
-        var actions = [MenuAction]()
+    private func initMenu() -> [NCMenuAction] {
+        var actions = [NCMenuAction]()
         let appDelegate = UIApplication.shared.delegate as! AppDelegate
         var isNextcloudTextAvailable = false
 
@@ -37,7 +37,7 @@ extension AppDelegate {
         }
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_upload_photos_videos_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "file_photo"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -47,7 +47,7 @@ extension AppDelegate {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_upload_file_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "file"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -58,7 +58,7 @@ extension AppDelegate {
 
         if NCBrandOptions.sharedInstance.use_imi_viewer {
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: NSLocalizedString("_im_create_new_file", tableName: "IMLocalizable", bundle: Bundle.main, value: "", comment: ""),
                     icon: CCGraphics.scale(UIImage(named: "imagemeter"), to: CGSize(width: 25, height: 25), isAspectRation: true),
                     action: { menuAction in
@@ -70,7 +70,7 @@ extension AppDelegate {
 
         if isNextcloudTextAvailable {
             actions.append(
-                MenuAction(title: NSLocalizedString("_create_nextcloudtext_document_", comment: ""),
+                NCMenuAction(title: NSLocalizedString("_create_nextcloudtext_document_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "file_txt"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                     action: { menuAction in
                         guard let navigationController = UIStoryboard(name: "NCCreateFormUploadDocuments", bundle: nil).instantiateInitialViewController() else {
@@ -89,7 +89,7 @@ extension AppDelegate {
             )
         } else {
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: NSLocalizedString("_upload_file_text_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "file_txt"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                     action: { menuAction in
@@ -117,7 +117,7 @@ extension AppDelegate {
         #endif
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_create_voice_memo_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "microphone"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -127,7 +127,7 @@ extension AppDelegate {
         )
 
         actions.append(
-            MenuAction(title: NSLocalizedString("_create_folder_", comment: ""),
+            NCMenuAction(title: NSLocalizedString("_create_folder_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "folder"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
                     appDelegate.activeMain.createFolder()
@@ -138,7 +138,7 @@ extension AppDelegate {
         if let capabilities = NCManageDatabase.sharedInstance.getCapabilites(account: appDelegate.activeAccount) {
             if (capabilities.versionMajor >= k_nextcloud_version_18_0 && (self.activeMain.richWorkspaceText == nil || self.activeMain.richWorkspaceText.count == 0)) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_add_folder_info_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "addFolderInfo"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -152,7 +152,7 @@ extension AppDelegate {
         if let richdocumentsMimetypes = NCManageDatabase.sharedInstance.getRichdocumentsMimetypes(account: appDelegate.activeAccount) {
             if richdocumentsMimetypes.count > 0 {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_create_new_document_", comment: ""),
                         icon: UIImage(named: "create_file_document")!,
                         action: { menuAction in
@@ -172,7 +172,7 @@ extension AppDelegate {
                 )
 
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_create_new_spreadsheet_", comment: ""),
                         icon: UIImage(named: "create_file_xls")!,
                         action: { menuAction in
@@ -192,7 +192,7 @@ extension AppDelegate {
                 )
                 
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_create_new_presentation_", comment: ""),
                         icon: UIImage(named: "create_file_ppt")!,
                         action: { menuAction in
@@ -217,10 +217,10 @@ extension AppDelegate {
     }
 
     @objc public func showMenuIn(viewController: UIViewController) {
-        let mainMenuViewController = UIStoryboard.init(name: "Menu", bundle: nil).instantiateViewController(withIdentifier: "MainMenuTableViewController") as! MainMenuTableViewController
+        let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
         mainMenuViewController.actions = self.initMenu()
 
-        let menuPanelController = MenuPanelController()
+        let menuPanelController = NCMenuPanelController()
         menuPanelController.panelWidth = Int(viewController.view.frame.width)
         menuPanelController.delegate = mainMenuViewController
         menuPanelController.set(contentViewController: mainMenuViewController)

iOSClient/Main/Menu/CCFavorites+Menu.swift

@@ -27,8 +27,8 @@ import FloatingPanel
 
 extension CCFavorites {
 
-    private func initMoreMenu(indexPath: IndexPath, metadata: tableMetadata) -> [MenuAction] {
-        var actions = [MenuAction]()
+    private func initMoreMenu(indexPath: IndexPath, metadata: tableMetadata) -> [NCMenuAction] {
+        var actions = [NCMenuAction]()
 
         var iconHeader: UIImage!
         if let icon = UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, fileNameView: metadata.fileNameView)) {
@@ -41,12 +41,12 @@ extension CCFavorites {
             }
         }
 
-        actions.append(MenuAction(title: metadata.fileNameView, icon: iconHeader, action: { menuAction in
+        actions.append(NCMenuAction(title: metadata.fileNameView, icon: iconHeader, action: { menuAction in
         }))
 
         if(self.serverUrl == nil) {
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: NSLocalizedString("_remove_favorites_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "favorite"), width: 50, height: 50, color: NCBrandColor.sharedInstance.yellowFavorite),
                     action: { menuAction in
@@ -57,7 +57,7 @@ extension CCFavorites {
         }
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_details_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "details"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -68,7 +68,7 @@ extension CCFavorites {
 
         if(!metadata.directory && !NCBrandOptions.sharedInstance.disable_openin_file) {
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: NSLocalizedString("_open_in_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "openFile"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                     action: { menuAction in
@@ -80,7 +80,7 @@ extension CCFavorites {
         }
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_delete_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "trash"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -93,10 +93,10 @@ extension CCFavorites {
     }
 
     @objc func toggleMoreMenu(viewController: UIViewController, indexPath: IndexPath, metadata: tableMetadata) {
-        let mainMenuViewController = UIStoryboard.init(name: "Menu", bundle: nil).instantiateViewController(withIdentifier: "MainMenuTableViewController") as! MainMenuTableViewController
+        let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
         mainMenuViewController.actions = self.initMoreMenu(indexPath: indexPath, metadata: metadata)
 
-        let menuPanelController = MenuPanelController()
+        let menuPanelController = NCMenuPanelController()
         menuPanelController.panelWidth = Int(viewController.view.frame.width)
         menuPanelController.delegate = mainMenuViewController
         menuPanelController.set(contentViewController: mainMenuViewController)

iOSClient/Main/Menu/CCMain+Menu.swift

@@ -27,11 +27,11 @@ import FloatingPanel
 
 extension CCMain {
 
-    private func initSortMenu() -> [MenuAction] {
-        var actions = [MenuAction]()
+    private func initSortMenu() -> [NCMenuAction] {
+        var actions = [NCMenuAction]()
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_order_by_name_a_z_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "sortFileNameAZ"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 onTitle: NSLocalizedString("_order_by_name_z_a_", comment: ""),
@@ -52,7 +52,7 @@ extension CCMain {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_order_by_date_more_recent_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "sortDateMoreRecent"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 onTitle: NSLocalizedString("_order_by_date_less_recent_", comment: ""),
@@ -73,7 +73,7 @@ extension CCMain {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_order_by_size_smallest_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "sortSmallest"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 onTitle: NSLocalizedString("_order_by_size_largest_", comment: ""),
@@ -94,7 +94,7 @@ extension CCMain {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_directory_on_top_no_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "foldersOnTop"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 selected: CCUtility.getDirectoryOnTop(),
@@ -110,10 +110,10 @@ extension CCMain {
     }
 
     @objc func toggleMenu(viewController: UIViewController) {
-        let mainMenuViewController = UIStoryboard.init(name: "Menu", bundle: nil).instantiateViewController(withIdentifier: "MainMenuTableViewController") as! MainMenuTableViewController
+        let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
         mainMenuViewController.actions = self.initSortMenu()
 
-        let menuPanelController = MenuPanelController()
+        let menuPanelController = NCMenuPanelController()
         menuPanelController.panelWidth = Int(viewController.view.frame.width)
         menuPanelController.delegate = mainMenuViewController
         menuPanelController.set(contentViewController: mainMenuViewController)
@@ -123,10 +123,10 @@ extension CCMain {
     }
 
     @objc func toggleSelectMenu(viewController: UIViewController) {
-        let mainMenuViewController = UIStoryboard.init(name: "Menu", bundle: nil).instantiateViewController(withIdentifier: "MainMenuTableViewController") as! MainMenuTableViewController
+        let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
         mainMenuViewController.actions = self.initSelectMenu()
 
-        let menuPanelController = MenuPanelController()
+        let menuPanelController = NCMenuPanelController()
         menuPanelController.panelWidth = Int(viewController.view.frame.width)
         menuPanelController.delegate = mainMenuViewController
         menuPanelController.set(contentViewController: mainMenuViewController)
@@ -136,11 +136,11 @@ extension CCMain {
     }
 
 
-    private func initSelectMenu() -> [MenuAction] {
-        var actions = [MenuAction]()
+    private func initSelectMenu() -> [NCMenuAction] {
+        var actions = [NCMenuAction]()
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_select_all_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "selectFull"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -150,7 +150,7 @@ extension CCMain {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_move_selected_files_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "move"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -160,7 +160,7 @@ extension CCMain {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_download_selected_files_folders_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "downloadSelectedFiles"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -170,7 +170,7 @@ extension CCMain {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_save_selected_files_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "saveSelectedFiles"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -180,7 +180,7 @@ extension CCMain {
         )
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_delete_selected_files_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "trash"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                 action: { menuAction in
@@ -192,12 +192,12 @@ extension CCMain {
         return actions
     }
 
-    private func initMoreMenu(indexPath: IndexPath, metadata: tableMetadata, metadataFolder: tableMetadata) -> [MenuAction] {
+    private func initMoreMenu(indexPath: IndexPath, metadata: tableMetadata, metadataFolder: tableMetadata) -> [NCMenuAction] {
         let appDelegate = UIApplication.shared.delegate as! AppDelegate
         let autoUploadFileName = NCManageDatabase.sharedInstance.getAccountAutoUploadFileName()
         let autoUploadDirectory = NCManageDatabase.sharedInstance.getAccountAutoUploadDirectory(appDelegate.activeUrl)
 
-        var actions = [MenuAction]()
+        var actions = [NCMenuAction]()
 
         if (metadata.directory) {
             var lockDirectory = false
@@ -220,7 +220,7 @@ extension CCMain {
             }
 
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: metadata.fileNameView,
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "folder"), width: 50, height: 50, color: NCBrandColor.sharedInstance.brandElement),
                     action: { menuAction in
@@ -229,7 +229,7 @@ extension CCMain {
             )
 
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: metadata.favorite ? NSLocalizedString("_remove_favorites_", comment: "") : NSLocalizedString("_add_favorites_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "favorite"), width: 50, height: 50, color: NCBrandColor.sharedInstance.yellowFavorite),
                     action: { menuAction in
@@ -240,7 +240,7 @@ extension CCMain {
 
             if (!lockDirectory && !isFolderEncrypted) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_details_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "details"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -252,7 +252,7 @@ extension CCMain {
 
             if(!(metadata.fileName == autoUploadFileName && metadata.serverUrl == autoUploadDirectory) && !lockDirectory && !metadata.e2eEncrypted) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_rename_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "rename"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -284,7 +284,7 @@ extension CCMain {
 
             if (!(metadata.fileName == autoUploadFileName && metadata.serverUrl == autoUploadDirectory) && !lockDirectory && !isFolderEncrypted) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_move_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "move"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -296,7 +296,7 @@ extension CCMain {
 
             if (!isFolderEncrypted) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: isOffline ? NSLocalizedString("_remove_available_offline_", comment: "") : NSLocalizedString("_set_available_offline_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "offline"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -313,7 +313,7 @@ extension CCMain {
             }
 
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: passcodeTitle,
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "settingsPasscodeYES"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                     action: { menuAction in
@@ -324,7 +324,7 @@ extension CCMain {
 
             if (!metadata.e2eEncrypted && CCUtility.isEnd(toEndEnabled: appDelegate.activeAccount)) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_remove_available_offline_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "lock"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -346,7 +346,7 @@ extension CCMain {
 
             if (metadata.e2eEncrypted && !metadataFolder.e2eEncrypted && CCUtility.isEnd(toEndEnabled: appDelegate.activeAccount)) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_e2e_remove_folder_encrypted_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "lock"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -374,7 +374,7 @@ extension CCMain {
             }
 
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: metadata.fileNameView,
                     icon: iconHeader, action: { menuAction in
 
@@ -383,7 +383,7 @@ extension CCMain {
             )
 
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: metadata.favorite ? NSLocalizedString("_remove_favorites_", comment: "") : NSLocalizedString("_add_favorites_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "favorite"), width: 50, height: 50, color: NCBrandColor.sharedInstance.yellowFavorite),
                     action: { menuAction in
@@ -394,7 +394,7 @@ extension CCMain {
 
             if (!metadataFolder.e2eEncrypted) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_details_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "details"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -406,7 +406,7 @@ extension CCMain {
 
             if(!NCBrandOptions.sharedInstance.disable_openin_file) {
                 actions.append(
-                    MenuAction(title: NSLocalizedString("_open_in_", comment: ""),
+                    NCMenuAction(title: NSLocalizedString("_open_in_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "openFile"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
                             self.perform(#selector(self.openinFile(_:)))
@@ -416,7 +416,7 @@ extension CCMain {
             }
 
             actions.append(
-                MenuAction(
+                NCMenuAction(
                     title: NSLocalizedString("_rename_", comment: ""),
                     icon: CCGraphics.changeThemingColorImage(UIImage(named: "rename"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                     action: { menuAction in
@@ -447,7 +447,7 @@ extension CCMain {
 
             if (!metadataFolder.e2eEncrypted) {
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: NSLocalizedString("_move_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "move"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -459,7 +459,7 @@ extension CCMain {
 
             if(NCUtility.sharedInstance.isEditImage(metadata.fileNameView as NSString) != nil && !metadataFolder.e2eEncrypted && metadata.status == k_metadataStatusNormal) {
                 actions.append(
-                    MenuAction(title: NSLocalizedString("_modify_photo_", comment: ""),
+                    NCMenuAction(title: NSLocalizedString("_modify_photo_", comment: ""),
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "modifyPhoto"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
                             metadata.session = k_download_session
@@ -484,7 +484,7 @@ extension CCMain {
                 }
 
                 actions.append(
-                    MenuAction(
+                    NCMenuAction(
                         title: title,
                         icon: CCGraphics.changeThemingColorImage(UIImage(named: "offline"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
                         action: { menuAction in
@@ -510,7 +510,7 @@ extension CCMain {
         }
 
         actions.append(
-            MenuAction(
+            NCMenuAction(
                 title: NSLocalizedString("_delete_", comment: ""),
                 icon: CCGraphics.changeThemingColorImage(UIImage(named: "trash"), width: 50, height: 50, color: .red),
                 action: { menuAction in
@@ -523,10 +523,10 @@ extension CCMain {
     }
 
     @objc func toggleMoreMenu(viewController: UIViewController, indexPath: IndexPath, metadata: tableMetadata, metadataFolder: tableMetadata) {
-        let mainMenuViewController = UIStoryboard.init(name: "Menu", bundle: nil).instantiateViewController(withIdentifier: "MainMenuTableViewController") as! MainMenuTableViewController
+        let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
         mainMenuViewController.actions = self.initMoreMenu(indexPath: indexPath, metadata: metadata, metadataFolder: metadataFolder)
 
-        let menuPanelController = MenuPanelController()
+        let menuPanelController = NCMenuPanelController()
         menuPanelController.panelWidth = Int(viewController.view.frame.width)
         menuPanelController.delegate = mainMenuViewController
         menuPanelController.set(contentViewController: mainMenuViewController)

iOSClient/Main/Menu/MenuAction.swift

@@ -1,5 +1,5 @@
 //
-//  MainMenuAction.swift
+//  NCMenuAction.swift
 //  Nextcloud
 //
 //  Created by Philippe Weidmann on 16.01.20.
@@ -25,7 +25,7 @@
 
 import Foundation
 
-class MenuAction {
+class NCMenuAction {
 
     let title: String
     let icon: UIImage
@@ -34,16 +34,16 @@ class MenuAction {
     var onIcon: UIImage?
     var selected: Bool = false
     var isOn: Bool = false
-    var action: ((_ menuAction: MenuAction) -> Void)?
+    var action: ((_ menuAction: NCMenuAction) -> Void)?
 
-    init(title: String, icon: UIImage, action: ((_ menuAction: MenuAction) -> Void)?) {
+    init(title: String, icon: UIImage, action: ((_ menuAction: NCMenuAction) -> Void)?) {
         self.title = title
         self.icon = icon
         self.action = action
         self.selectable = false
     }
 
-    init(title: String, icon: UIImage, onTitle: String? = nil, onIcon: UIImage? = nil, selected: Bool, on: Bool, action: ((_ menuAction: MenuAction) -> Void)?) {
+    init(title: String, icon: UIImage, onTitle: String? = nil, onIcon: UIImage? = nil, selected: Bool, on: Bool, action: ((_ menuAction: NCMenuAction) -> Void)?) {
         self.title = title
         self.icon = icon
         self.onTitle = onTitle ?? title

iOSClient/Main/Menu/MainMenuTableViewController.swift → iOSClient/Main/Menu/NCMainMenuTableViewController.swift

@@ -1,5 +1,5 @@
 //
-//  MainMenuTableViewController.swift
+//  NCMainMenuTableViewController.swift
 //  Nextcloud
 //
 //  Created by Philippe Weidmann on 16.01.20.
@@ -27,9 +27,9 @@
 import UIKit
 import FloatingPanel
 
-class MainMenuTableViewController: UITableViewController {
+class NCMainMenuTableViewController: UITableViewController {
 
-    var actions = [MenuAction]()
+    var actions = [NCMenuAction]()
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -72,19 +72,19 @@ class MainMenuTableViewController: UITableViewController {
     }
 
 }
-extension MainMenuTableViewController: FloatingPanelControllerDelegate {
+extension NCMainMenuTableViewController: FloatingPanelControllerDelegate {
 
     func floatingPanel(_ vc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout? {
-        return MainMenuFloatingPanelLayout(height: min(self.actions.count * 60, Int(self.view.frame.height) - 48))
+        return NCMainMenuFloatingPanelLayout(height: min(self.actions.count * 60, Int(self.view.frame.height) - 48))
     }
 
     func floatingPanel(_ vc: FloatingPanelController, behaviorFor newCollection: UITraitCollection) -> FloatingPanelBehavior? {
-        return MainMenuFloatingPanelBehavior()
+        return NCMainMenuFloatingPanelBehavior()
     }
 
 }
 
-class MainMenuFloatingPanelLayout: FloatingPanelLayout {
+class NCMainMenuFloatingPanelLayout: FloatingPanelLayout {
 
     let height: CGFloat
 
@@ -112,7 +112,7 @@ class MainMenuFloatingPanelLayout: FloatingPanelLayout {
     }
 }
 
-public class MainMenuFloatingPanelBehavior: FloatingPanelBehavior {
+public class NCMainMenuFloatingPanelBehavior: FloatingPanelBehavior {
 
     public func addAnimator(_ fpc: FloatingPanelController, to: FloatingPanelPosition) -> UIViewPropertyAnimator {
         return UIViewPropertyAnimator(duration: 0.3, curve: .easeInOut)

iOSClient/Main/Menu/Menu.storyboard → iOSClient/Main/Menu/NCMenu.storyboard

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Main Menu Table View Controller-->
         <scene sceneID="ibU-BJ-tlj">
             <objects>
-                <tableViewController storyboardIdentifier="MainMenuTableViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="dbT-V0-aXb" customClass="MainMenuTableViewController" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController storyboardIdentifier="NCMainMenuTableViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="dbT-V0-aXb" customClass="NCMainMenuTableViewController" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="60" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="pvY-CD-sI6">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

iOSClient/Main/Menu/MenuPanelController.swift → iOSClient/Main/Menu/NCMenuPanelController.swift

@@ -1,5 +1,5 @@
 //
-//  MenuPanelController.swift
+//  NCMenuPanelController.swift
 //  Nextcloud
 //
 //  Created by Philippe Weidmann on 23.01.20.
@@ -25,7 +25,7 @@
 
 import FloatingPanel
 
-class MenuPanelController: FloatingPanelController {
+class NCMenuPanelController: FloatingPanelController {
 
     var panelWidth: Int? = 0