Merge branch 'converstion-quota-dropbox-view' into converstion-quota-…

…dropbox-view-dashboard
Infomaniak · Feb 13, 2025 · 791a863 · 791a863
2 parents 5633fcb + e7da516
commit 791a863
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 32 deletions.
diff --git a/kDrive/AppRouter.swift b/kDrive/AppRouter.swift
@@ -146,7 +146,6 @@ public struct AppRouter: AppNavigable {
             restoreMainUIStackIfPossible(driveFileManager: driveFileManager, restoration: restoration)
 
             showLaunchFloatingPanel()
-            askToUpSaleIfQuotaReached()
 
             Task {
                 await askForReview()
@@ -514,11 +513,6 @@ public struct AppRouter: AppNavigable {
         }
     }
 
-    @MainActor public func askToUpSaleIfQuotaReached() {
-        // TODO: Check quota
-        presentUpSaleSheet()
-    }
-
     @MainActor public func presentUpSaleSheet() {
         guard let window,
               let rootViewController = window.rootViewController else {

diff --git a/kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController+Actions.swift b/kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController+Actions.swift
@@ -283,7 +283,7 @@ extension FileActionsFloatingPanelViewController {
     }
 
     private func convertToDropboxAction() {
-        if !file.capabilities.canBecomeDropbox {
+        guard file.capabilities.canBecomeDropbox else {
             let driveFloatingPanelController = DropBoxFloatingPanelViewController.instantiatePanel()
             let floatingPanelViewController = driveFloatingPanelController
                 .contentViewController as? DropBoxFloatingPanelViewController
@@ -295,15 +295,22 @@ extension FileActionsFloatingPanelViewController {
                 }
             }
             present(driveFloatingPanelController, animated: true)
-        } else {
-            let viewController = ManageDropBoxViewController.instantiate(
-                driveFileManager: driveFileManager,
-                convertingFolder: true,
-                folder: file
-            )
-            presentingParent?.navigationController?.pushViewController(viewController, animated: true)
-            dismiss(animated: true)
+            return
+        }
+
+        if packId == .myKSuite, driveFileManager.drive.dropboxQuotaExceeded {
+            router.presentUpSaleSheet()
+            return
         }
+
+        let viewController = ManageDropBoxViewController.instantiate(
+            driveFileManager: driveFileManager,
+            convertingFolder: true,
+            folder: file
+        )
+
+        presentingParent?.navigationController?.pushViewController(viewController, animated: true)
+        dismiss(animated: true)
     }
 
     private func manageDropboxAction() {

diff --git a/kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController.swift b/kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController.swift
@@ -255,7 +255,13 @@ final class FileActionsFloatingPanelViewController: UICollectionViewController {
         case .actions:
             let cell = collectionView.dequeueReusableCell(type: FloatingPanelActionCollectionViewCell.self, for: indexPath)
             let action = actions[indexPath.item]
-            cell.configure(with: action, file: file, showProgress: downloadAction == action, currentPackId: packId)
+            cell.configure(
+                with: action,
+                file: file,
+                showProgress: downloadAction == action,
+                driveFileManager: driveFileManager,
+                currentPackId: packId
+            )
             return cell
         }
     }

diff --git a/kDrive/UI/Controller/Files/MultipleSelectionFloatingPanelViewController.swift b/kDrive/UI/Controller/Files/MultipleSelectionFloatingPanelViewController.swift
@@ -252,7 +252,13 @@ final class MultipleSelectionFloatingPanelViewController: UICollectionViewContro
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(type: FloatingPanelActionCollectionViewCell.self, for: indexPath)
         let action = actions[indexPath.item]
-        cell.configure(with: action, files: files, showProgress: downloadInProgress, archiveId: currentArchiveId)
+        cell.configure(
+            with: action,
+            files: files,
+            driveFileManager: driveFileManager,
+            showProgress: downloadInProgress,
+            archiveId: currentArchiveId
+        )
         return cell
     }
 

diff --git a/kDrive/UI/Controller/LoginDelegateHandler.swift b/kDrive/UI/Controller/LoginDelegateHandler.swift
@@ -66,7 +66,6 @@ public final class LoginDelegateHandler: InfomaniakLoginDelegate {
         UserDefaults.shared.numberOfConnections = 1
         _ = router.showMainViewController(driveFileManager: driveFileManager, selectedIndex: nil)
         deeplinkService.processDeeplinksPostAuthentication()
-        router.askToUpSaleIfQuotaReached()
     }
 
     private func didCompleteLoginWithError(_ error: Error,

diff --git a/kDrive/UI/Controller/NewFolder/NewFolderTypeTableViewController.swift b/kDrive/UI/Controller/NewFolder/NewFolderTypeTableViewController.swift
@@ -105,7 +105,7 @@ class NewFolderTypeTableViewController: UITableViewController {
             cell.titleLabel.text = KDriveResourcesStrings.Localizable.dropBoxTitle
             cell.accessoryImageView.image = KDriveResourcesAsset.folderDropBox.image
             cell.descriptionLabel.text = KDriveResourcesStrings.Localizable.dropBoxDescription
-            if packId == .myKSuite {
+            if packId == .myKSuite, driveFileManager.drive.dropboxQuotaExceeded {
                 cell.setMykSuiteChip()
             }
         }
@@ -114,7 +114,7 @@ class NewFolderTypeTableViewController: UITableViewController {
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if content[indexPath.row] == .dropbox {
-            if packId == .myKSuite {
+            if packId == .myKSuite, driveFileManager.drive.dropboxQuotaExceeded {
                 router.presentUpSaleSheet()
             } else if !driveFileManager.drive.pack.capabilities.useDropbox {
                 let driveFloatingPanelController = DropBoxFloatingPanelViewController.instantiatePanel()
@@ -128,8 +128,9 @@ class NewFolderTypeTableViewController: UITableViewController {
                     }
                 }
                 present(driveFloatingPanelController, animated: true)
+            } else {
+                performSegue(withIdentifier: "toNewFolderSegue", sender: indexPath.row)
             }
-            return
         } else {
             performSegue(withIdentifier: "toNewFolderSegue", sender: indexPath.row)
         }

diff --git a/kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.swift b/kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.swift
@@ -58,6 +58,7 @@ class FloatingPanelActionCollectionViewCell: UICollectionViewCell {
 
     func configure(with action: FloatingPanelAction,
                    file: File?, showProgress: Bool,
+                   driveFileManager: DriveFileManager,
                    currentPackId: DrivePackId? = nil) {
         titleLabel.text = action.name
         iconImageView.image = action.image
@@ -76,16 +77,23 @@ class FloatingPanelActionCollectionViewCell: UICollectionViewCell {
         }
 
         switch action {
-        case .upsaleColor, .convertToDropbox:
+        case .upsaleColor:
             guard currentPackId == .myKSuite else { return }
             configureChip()
+        case .convertToDropbox:
+            guard currentPackId == .myKSuite, driveFileManager.drive.dropboxQuotaExceeded else { return }
+            configureChip()
         default:
             break
         }
     }
 
-    func configure(with action: FloatingPanelAction, files: [File], showProgress: Bool, archiveId: String?) {
-        configure(with: action, file: nil, showProgress: false)
+    func configure(with action: FloatingPanelAction,
+                   files: [File],
+                   driveFileManager: DriveFileManager,
+                   showProgress: Bool,
+                   archiveId: String?) {
+        configure(with: action, file: nil, showProgress: false, driveFileManager: driveFileManager)
 
         switch action {
         case .favorite:

diff --git a/kDriveCore/Utils/AppNavigable.swift b/kDriveCore/Utils/AppNavigable.swift
@@ -185,8 +185,6 @@ public protocol RouterActionable {
     /// Ask the user to remove pictures if configured
     func askUserToRemovePicturesIfNecessary() async
 
-    @MainActor func askToUpSaleIfQuotaReached()
-
     @MainActor func presentUpSaleSheet()
 
     func refreshCacheScanLibraryAndUpload(preload: Bool, isSwitching: Bool) async

diff --git a/kDriveCore/Utils/InExtensionRouter.swift b/kDriveCore/Utils/InExtensionRouter.swift
@@ -31,8 +31,6 @@ public struct InExtensionRouter: AppNavigable {
 
     public func askUserToRemovePicturesIfNecessary() async {}
 
-    public func askToUpSaleIfQuotaReached() {}
-
     public func presentUpSaleSheet() {}
 
     public func refreshCacheScanLibraryAndUpload(preload: Bool, isSwitching: Bool) async {}

diff --git a/kDriveTestShared/MCKRouter.swift b/kDriveTestShared/MCKRouter.swift
@@ -49,10 +49,6 @@ public final class MCKRouter: AppNavigable {
         logNoop()
     }
 
-    public func askToUpSaleIfQuotaReached() {
-        logNoop()
-    }
-
     public func presentUpSaleSheet() {
         logNoop()
     }