dev

iOSClient/Main/Menu/NCDetailNavigationController+Menu.swift

@@ -239,18 +239,18 @@ extension NCDetailNavigationController {
     }
 
     @objc func toggleMoreMenu(viewController: UIViewController, metadata: tableMetadata) {
-        if appDelegate.activeDetail.subViewActive() != nil {
-            let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
+        
+        let mainMenuViewController = UIStoryboard.init(name: "NCMenu", bundle: nil).instantiateViewController(withIdentifier: "NCMainMenuTableViewController") as! NCMainMenuTableViewController
             mainMenuViewController.actions = self.initMoreMenu(viewController: viewController, metadata: metadata)
 
-            let menuPanelController = NCMenuPanelController()
-            menuPanelController.parentPresenter = viewController
-            menuPanelController.delegate = mainMenuViewController
-            menuPanelController.set(contentViewController: mainMenuViewController)
-            menuPanelController.track(scrollView: mainMenuViewController.tableView)
+        let menuPanelController = NCMenuPanelController()
+        menuPanelController.parentPresenter = viewController
+        menuPanelController.delegate = mainMenuViewController
+        menuPanelController.set(contentViewController: mainMenuViewController)
+        menuPanelController.track(scrollView: mainMenuViewController.tableView)
+
+        viewController.present(menuPanelController, animated: true, completion: nil)
 
-            viewController.present(menuPanelController, animated: true, completion: nil)
-        }
     }
 }
 

iOSClient/Main/NCDetailViewController.swift

@@ -401,6 +401,10 @@ class NCDetailViewController: UIViewController {
                         view.removeFromSuperview()
                     }
                 }
+                viewerImageViewController?.willMove(toParent: nil)
+                viewerImageViewController?.view.removeFromSuperview()
+                viewerImageViewController?.removeFromParent()
+                
                 self.navigationController?.navigationBar.topItem?.title = ""
             }
         }
@@ -598,9 +602,9 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                 viewerImageViewController!.enableInteractiveDismissal = true
                 
                 addChild(viewerImageViewController!)
-                backgroundView.addSubview(viewerImageViewController!.view)
+                view.addSubview(viewerImageViewController!.view)
                 
-                viewerImageViewController!.view.frame = CGRect(x: 0, y: 0, width: backgroundView.frame.width, height: backgroundView.frame.height)
+                viewerImageViewController!.view.frame = CGRect(x: 0, y: 0, width: view.frame.width, height: view.frame.height)
                 viewerImageViewController!.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
                 
                 viewerImageViewController!.didMove(toParent: self)