浏览代码

add ViewerQuickLook

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 年之前
父节点
当前提交
11734bb536

+ 7 - 9
iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -84,18 +84,16 @@ class NCUploadAssets: NSObject, ObservableObject, NCCreateFormUploadConflictDele
     func startTimer(navigationItem: UINavigationItem) {
         self.timer = Timer.scheduledTimer(withTimeInterval: 0.3, repeats: true, block: { _ in
             let numItemsRight = navigationItem.rightBarButtonItems?.count ?? 0
-            if let buttonCrop = navigationItem.leftBarButtonItems?.first {
-                if numItemsRight > 1 && buttonCrop.isEnabled {
+            if let buttonDone = navigationItem.leftBarButtonItems?.first, let buttonCrop = navigationItem.leftBarButtonItems?.last {
+
+                if numItemsRight > 2 && buttonCrop.isEnabled {
                     buttonCrop.isEnabled = false
-                    if let buttonDone = navigationItem.rightBarButtonItems?.last {
-                        buttonDone.isEnabled = false
-                    }
+                    buttonDone.isEnabled = false
                 }
-                if numItemsRight == 1 && !buttonCrop.isEnabled {
+
+                if numItemsRight < 3 && !buttonCrop.isEnabled {
                     buttonCrop.isEnabled = true
-                    if let buttonDone = navigationItem.rightBarButtonItems?.first {
-                        buttonDone.isEnabled = true
-                    }
+                    buttonDone.isEnabled = true
                 }
             }
         })

+ 4 - 9
iOSClient/Viewer/NCViewerQuickLook/ViewerQuickLook.swift

@@ -26,15 +26,10 @@ struct ViewerQuickLook: UIViewControllerRepresentable {
         controller.delegate = context.coordinator
         context.coordinator.viewController = controller
 
-        controller.navigationItem.rightBarButtonItem = UIBarButtonItem(
-            barButtonSystemItem: .done, target: context.coordinator,
-            action: #selector(context.coordinator.dismiss)
-        )
-
-        controller.navigationItem.leftBarButtonItem = UIBarButtonItem(
-            title: NSLocalizedString("_crop_", comment: ""), style: UIBarButtonItem.Style.plain, target: context.coordinator,
-            action: #selector(context.coordinator.crop)
-        )
+        let buttonDone = UIBarButtonItem(barButtonSystemItem: .done, target: context.coordinator, action: #selector(context.coordinator.dismiss))
+        let buttonCrop = UIBarButtonItem(title: NSLocalizedString("_crop_", comment: ""), style: UIBarButtonItem.Style.plain, target: context.coordinator,
+            action: #selector(context.coordinator.crop))
+        controller.navigationItem.leftBarButtonItems = [buttonDone, buttonCrop]
 
         uploadAssets.startTimer(navigationItem: controller.navigationItem)