feat: Multiselect behaviour

kDrive/AppDelegate.swift

@@ -107,22 +107,27 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         Task {
             try! await Task.sleep(nanoseconds: 5_000_000_000)
 
-            @InjectService var router: AppNavigable
-            //let upsaleViewController = UpsaleViewController()
-            let noDriveViewController = NoDriveUpsaleViewController()
-            let floatingPanel = UpsaleFloatingPanelController(upsaleViewController: noDriveViewController)
-            router.topMostViewController?.present(floatingPanel, animated: true, completion: nil)
-
-            /* Temp code to test out the feature. TODO: Remove later
-                         // a public share expired
-                         let somePublicShare =
-                             URL(string: "https://kdrive.infomaniak.com/app/share/140946/81de098a-3156-4ae6-93df-be7f9ae78ddd")
-                         // a public share password protected
-             //            let somePublicShare = URL(string:
-             //            "https://kdrive.infomaniak.com/app/share/140946/34844cea-db8d-4d87-b66f-e944e9759a2e")
-
-                         await UniversalLinksHelper.handleURL(somePublicShare!)
+            /* TODO: Remove later
+             @InjectService var router: AppNavigable
+             let upsaleViewController = UpsaleViewController()
+             let noDriveViewController = NoDriveUpsaleViewController()
+             let floatingPanel = UpsaleFloatingPanelController(upsaleViewController: noDriveViewController)
+             router.topMostViewController?.present(floatingPanel, animated: true, completion: nil)
               */
+
+            /* TODO: Remove later
+             // a public share expired
+             let somePublicShareExpired =
+                 URL(string: "https://kdrive.infomaniak.com/app/share/140946/81de098a-3156-4ae6-93df-be7f9ae78ddd")
+             // a public share password protected
+             let somePublicShareProtected =
+                 URL(string: "https://kdrive.infomaniak.com/app/share/140946/34844cea-db8d-4d87-b66f-e944e9759a2e")
+              */
+
+            // a valid public share
+            let somePublicShare =
+                URL(string: "https://kdrive.infomaniak.com/app/share/140946/01953831-16d3-4df6-8b48-33c8001c7981")
+            await UniversalLinksHelper.handleURL(somePublicShare!)
         }
 
         return true

kDrive/AppRouter.swift

@@ -657,12 +657,28 @@ public struct AppRouter: AppNavigable {
                 return
             }
 
+            let configuration = FileListViewModel.Configuration(selectAllSupported: true,
+                                                                rootTitle: nil,
+                                                                emptyViewType: .emptyFolder,
+                                                                supportsDrop: false,
+                                                                leftBarButtons: [.cancel],
+                                                                rightBarButtons: [.downloadAll],
+                                                                matomoViewPath: [
+                                                                    MatomoUtils.Views.menu.displayName,
+                                                                    "publicShare"
+                                                                ])
+
             let viewModel = PublicShareViewModel(publicShareProxy: publicShareProxy,
                                                  sortType: .nameAZ,
                                                  driveFileManager: driveFileManager,
                                                  currentDirectory: frozenRootFolder,
-                                                 apiFetcher: apiFetcher)
+                                                 apiFetcher: apiFetcher,
+                                                 configuration: configuration)
             let viewController = FileListViewController(viewModel: viewModel)
+            viewModel.dismissClosure = { [weak viewController] in
+                viewController?.dismiss(animated: true)
+            }
+
             let publicShareNavigationController = UINavigationController(rootViewController: viewController)
             publicShareNavigationController.modalPresentationStyle = .fullScreen
             publicShareNavigationController.modalTransitionStyle = .coverVertical

kDrive/UI/Controller/Files/File List/FileListViewController.swift

@@ -261,9 +261,7 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
     }
 
     func setupFooterIfNeeded() {
-        guard driveFileManager.isPublicShare else {
-            return
-        }
+        guard driveFileManager.isPublicShare else { return }
 
         view.addSubview(addToKDriveButton)
         view.bringSubviewToFront(addToKDriveButton)
@@ -447,7 +445,7 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
             floatingPanelViewController.set(contentViewController: trashFloatingPanelTableViewController)
             (floatingPanelViewController as? AdaptiveDriveFloatingPanelController)?
                 .trackAndObserve(scrollView: trashFloatingPanelTableViewController.tableView)
-        case .multipleSelection:
+        case .multipleSelection(let downloadOnly):
             let allItemsSelected: Bool
             let exceptFileIds: [Int]?
             let selectedFiles: [File]
@@ -473,6 +471,10 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
                 presentingParent: self
             )
 
+            if downloadOnly {
+                selectViewController.actions = [.download]
+            }
+
             floatingPanelViewController = AdaptiveDriveFloatingPanelController()
             floatingPanelViewController.set(contentViewController: selectViewController)
             (floatingPanelViewController as? AdaptiveDriveFloatingPanelController)?
@@ -618,6 +620,7 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
 
     func toggleMultipleSelection(_ on: Bool) {
         if on {
+            addToKDriveButton.isHidden = true
             navigationItem.title = nil
             headerView?.selectView.isHidden = false
             headerView?.selectView.setActions(viewModel.multipleSelectionViewModel?.multipleSelectionActions ?? [])
@@ -627,6 +630,7 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
             generator.prepare()
             generator.impactOccurred()
         } else {
+            addToKDriveButton.isHidden = false
             headerView?.selectView.isHidden = true
             collectionView.allowsMultipleSelection = false
             navigationController?.navigationBar.prefersLargeTitles = true

kDrive/UI/Controller/Files/File List/FileListViewModel.swift

@@ -40,7 +40,7 @@ enum FileListBarButtonType {
 enum FileListQuickActionType {
     case file
     case trash
-    case multipleSelection
+    case multipleSelection(onlyDownload: Bool)
 }
 
 enum ControllerPresentationType {
@@ -93,6 +93,7 @@ class FileListViewModel: SelectDelegate {
         var matomoViewPath = ["FileList"]
     }
 
+    var dismissClosure: (() -> Void)?
     var realmObservationToken: NotificationToken?
     var currentDirectoryObservationToken: NotificationToken?
 

kDrive/UI/Controller/Files/File List/MultipleSelectionFileListViewModel.swift

@@ -23,35 +23,48 @@ import kDriveCore
 import kDriveResources
 
 struct MultipleSelectionAction: Equatable {
-    let id: Int
+    private let id: MultipleSelectionActionId
     let name: String
     let icon: KDriveResourcesImages
     var enabled = true
 
+    private enum MultipleSelectionActionId: Equatable {
+        case move
+        case delete
+        case more
+        case deletePermanently
+        case download
+    }
+
     static func == (lhs: MultipleSelectionAction, rhs: MultipleSelectionAction) -> Bool {
         return lhs.id == rhs.id
     }
 
     static let move = MultipleSelectionAction(
-        id: 0,
+        id: MultipleSelectionActionId.move,
         name: KDriveResourcesStrings.Localizable.buttonMove,
         icon: KDriveResourcesAsset.folderSelect
     )
     static let delete = MultipleSelectionAction(
-        id: 1,
+        id: MultipleSelectionActionId.delete,
         name: KDriveResourcesStrings.Localizable.buttonDelete,
         icon: KDriveResourcesAsset.delete
     )
     static let more = MultipleSelectionAction(
-        id: 2,
+        id: MultipleSelectionActionId.more,
         name: KDriveResourcesStrings.Localizable.buttonMenu,
         icon: KDriveResourcesAsset.menu
     )
     static let deletePermanently = MultipleSelectionAction(
-        id: 3,
+        id: MultipleSelectionActionId.deletePermanently,
         name: KDriveResourcesStrings.Localizable.buttonDelete,
         icon: KDriveResourcesAsset.delete
     )
+    static let download = MultipleSelectionAction(
+        id: MultipleSelectionActionId.download,
+        name: KDriveResourcesStrings.Localizable.buttonDownload,
+        icon: KDriveResourcesAsset.menu
+    )
 }
 
 @MainActor
@@ -67,6 +80,8 @@ class MultipleSelectionFileListViewModel {
                 leftBarButtons = [.cancel]
                 if configuration.selectAllSupported {
                     rightBarButtons = [.selectAll]
+                } else {
+                    rightBarButtons = []
                 }
             } else {
                 leftBarButtons = nil
@@ -108,14 +123,13 @@ class MultipleSelectionFileListViewModel {
         isMultipleSelectionEnabled = false
         selectedCount = 0
 
-        self.driveFileManager = driveFileManager
-
         if driveFileManager.isPublicShare {
-            multipleSelectionActions = []
+            multipleSelectionActions = [.more]
         } else {
             multipleSelectionActions = [.move, .delete, .more]
         }
 
+        self.driveFileManager = driveFileManager
         self.currentDirectory = currentDirectory
         self.configuration = configuration
     }
@@ -168,7 +182,9 @@ class MultipleSelectionFileListViewModel {
             }
             onPresentViewController?(.modal, alert, true)
         case .more:
-            onPresentQuickActionPanel?(Array(selectedItems), .multipleSelection)
+            onPresentQuickActionPanel?(Array(selectedItems), .multipleSelection(onlyDownload: false))
+        case .download:
+            onPresentQuickActionPanel?(Array(selectedItems), .multipleSelection(onlyDownload: true))
         default:
             break
         }
@@ -208,7 +224,16 @@ class MultipleSelectionFileListViewModel {
         onSelectAll?()
         Task { [proxyCurrentDirectory = currentDirectory.proxify()] in
             do {
-                let directoryCount = try await driveFileManager.apiFetcher.count(of: proxyCurrentDirectory)
+                let directoryCount: FileCount
+                if let publicShareProxy = driveFileManager.publicShareProxy {
+                    directoryCount = try await PublicShareApiFetcher()
+                        .countPublicShare(drive: publicShareProxy.proxyDrive,
+                                          linkUuid: publicShareProxy.shareLinkUid,
+                                          fileId: publicShareProxy.fileId)
+                } else {
+                    directoryCount = try await driveFileManager.apiFetcher.count(of: proxyCurrentDirectory)
+                }
+
                 selectedCount = directoryCount.count
                 rightBarButtons = [.deselectAll]
             } catch {

kDrive/UI/Controller/Files/FilePresenter.swift

@@ -146,11 +146,22 @@ final class FilePresenter {
         if driveFileManager.drive.sharedWithMe {
             viewModel = SharedWithMeViewModel(driveFileManager: driveFileManager, currentDirectory: file)
         } else if let publicShareProxy = driveFileManager.publicShareProxy {
+            let configuration = FileListViewModel.Configuration(selectAllSupported: true,
+                                                                rootTitle: nil,
+                                                                emptyViewType: .emptyFolder,
+                                                                supportsDrop: false,
+                                                                rightBarButtons: [.downloadAll],
+                                                                matomoViewPath: [
+                                                                    MatomoUtils.Views.menu.displayName,
+                                                                    "publicShare"
+                                                                ])
+
             viewModel = PublicShareViewModel(publicShareProxy: publicShareProxy,
                                              sortType: .nameAZ,
                                              driveFileManager: driveFileManager,
                                              currentDirectory: file,
-                                             apiFetcher: PublicShareApiFetcher())
+                                             apiFetcher: PublicShareApiFetcher(),
+                                             configuration: configuration)
         } else if file.isTrashed || file.deletedAt != nil {
             viewModel = TrashListViewModel(driveFileManager: driveFileManager, currentDirectory: file)
         } else {

kDrive/UI/Controller/Files/FloatingPanelAction.swift

@@ -233,6 +233,10 @@ public class FloatingPanelAction: Equatable {
         return [download].map { $0.reset() }
     }
 
+    static var multipleSelectionPublicShareActions: [FloatingPanelAction] {
+        return [download].map { $0.reset() }
+    }
+
     static var quickActions: [FloatingPanelAction] {
         return [informations, sendCopy, shareAndRights, shareLink].map { $0.reset() }
     }