feat: Multiselect behaviour

kDrive/AppRouter.swift

@@ -614,12 +614,27 @@ public struct AppRouter: AppNavigable {
                 return
             }
 
+            // TODO: i18n
+            let configuration = FileListViewModel.Configuration(selectAllSupported: true,
+                                                                rootTitle: "public share",
+                                                                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.viewControllerDismissable = viewController
+
             let publicShareNavigationController = UINavigationController(rootViewController: viewController)
             publicShareNavigationController.modalPresentationStyle = .fullScreen
             publicShareNavigationController.modalTransitionStyle = .coverVertical

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

@@ -49,7 +49,7 @@ extension SortType: Selectable {
 }
 
 class FileListViewController: UICollectionViewController, SwipeActionCollectionViewDelegate,
-    SwipeActionCollectionViewDataSource, FilesHeaderViewDelegate, SceneStateRestorable {
+    SwipeActionCollectionViewDataSource, FilesHeaderViewDelegate, SceneStateRestorable, ViewControllerDismissable {
     @LazyInjectService var accountManager: AccountManageable
 
     // MARK: - Constants
@@ -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)
@@ -614,6 +612,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 ?? [])
@@ -623,6 +622,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

@@ -93,6 +93,9 @@ class FileListViewModel: SelectDelegate {
         var matomoViewPath = ["FileList"]
     }
 
+    /// Tracking a way to dismiss the current stack
+    weak var viewControllerDismissable: ViewControllerDismissable?
+
     var realmObservationToken: NotificationToken?
     var currentDirectoryObservationToken: NotificationToken?
 

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

@@ -67,6 +67,8 @@ class MultipleSelectionFileListViewModel {
                 leftBarButtons = [.cancel]
                 if configuration.selectAllSupported {
                     rightBarButtons = [.selectAll]
+                } else {
+                    rightBarButtons = []
                 }
             } else {
                 leftBarButtons = nil

kDrive/UI/Controller/Files/FilePresenter.swift

@@ -146,11 +146,23 @@ final class FilePresenter {
         if driveFileManager.drive.sharedWithMe {
             viewModel = SharedWithMeViewModel(driveFileManager: driveFileManager, currentDirectory: file)
         } else if let publicShareProxy = driveFileManager.publicShareProxy {
+            // TODO: i18n
+            let configuration = FileListViewModel.Configuration(selectAllSupported: true,
+                                                                rootTitle: "public share",
+                                                                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/FloatingPanelSelectOptionViewController.swift

@@ -37,6 +37,12 @@ protocol SelectDelegate: AnyObject {
     func didSelect(option: Selectable)
 }
 
+/// Something that can dismiss the current VC if presented
+@MainActor
+public protocol ViewControllerDismissable: AnyObject {
+    func dismiss(animated flag: Bool, completion: (() -> Void)?)
+}
+
 class FloatingPanelSelectOptionViewController<T: Selectable & Equatable>: UITableViewController {
     var headerTitle = ""
     var selectedOption: T?

kDrive/UI/Controller/Menu/Share/PublicShareViewModel.swift

@@ -30,18 +30,7 @@ final class PublicShareViewModel: InMemoryFileListViewModel {
     let rootProxy: ProxyFile
     var publicShareApiFetcher: PublicShareApiFetcher?
 
-    required init(driveFileManager: DriveFileManager, currentDirectory: File? = nil) {
-        guard let currentDirectory else {
-            fatalError("PublicShareViewModel requires a currentDirectory to work")
-        }
-
-        let configuration = Configuration(selectAllSupported: false,
-                                          rootTitle: KDriveCoreStrings.Localizable.sharedWithMeTitle,
-                                          emptyViewType: .emptyFolder,
-                                          supportsDrop: false,
-                                          rightBarButtons: [.downloadAll],
-                                          matomoViewPath: [MatomoUtils.Views.menu.displayName, "publicShare"])
-
+    override init(configuration: Configuration, driveFileManager: DriveFileManager, currentDirectory: File) {
         rootProxy = currentDirectory.proxify()
         super.init(configuration: configuration, driveFileManager: driveFileManager, currentDirectory: currentDirectory)
         observedFiles = AnyRealmCollection(currentDirectory.children)
@@ -52,14 +41,20 @@ final class PublicShareViewModel: InMemoryFileListViewModel {
         sortType: SortType,
         driveFileManager: DriveFileManager,
         currentDirectory: File,
-        apiFetcher: PublicShareApiFetcher
+        apiFetcher: PublicShareApiFetcher,
+        configuration: Configuration
     ) {
-        self.init(driveFileManager: driveFileManager, currentDirectory: currentDirectory)
+        self.init(configuration: configuration, driveFileManager: driveFileManager, currentDirectory: currentDirectory)
+
         self.publicShareProxy = publicShareProxy
         self.sortType = sortType
         publicShareApiFetcher = apiFetcher
     }
 
+    required init(driveFileManager: DriveFileManager, currentDirectory: File?) {
+        fatalError("Use init(publicShareProxy:… ) instead")
+    }
+
     override func loadFiles(cursor: String? = nil, forceRefresh: Bool = false) async throws {
         guard !isLoading || cursor != nil,
               let publicShareProxy,
@@ -84,14 +79,25 @@ final class PublicShareViewModel: InMemoryFileListViewModel {
         }
     }
 
-    // TODO: Move away from view model
     override func barButtonPressed(sender: Any?, type: FileListBarButtonType) {
+        guard type == .downloadAll else {
+            // We try to close the "Public Share screen"
+            if type == .cancel,
+               !(multipleSelectionViewModel?.isMultipleSelectionEnabled ?? true),
+               let viewControllerDismissable = viewControllerDismissable {
+                viewControllerDismissable.dismiss(animated: true, completion: nil)
+                return
+            }
+
+            super.barButtonPressed(sender: sender, type: type)
+            return
+        }
+
         guard downloadObserver == nil else {
             return
         }
 
-        guard type == .downloadAll,
-              let publicShareProxy = publicShareProxy else {
+        guard let publicShareProxy = publicShareProxy else {
             return
         }