feat: New view iPadOS

Tuist/ProjectDescriptionHelpers/ExtensionTarget.swift

@@ -77,7 +77,7 @@ public extension Target {
                            "kDrive/UI/Controller/Files/Search/**",
                            "kDrive/UI/Controller/Files/MultipleSelectionViewController.swift",
                            "kDrive/UI/Controller/Files/File List/**",
-                           "kDrive/UI/Controller/Files/RootMenuViewController.swift",
+                           "kDrive/UI/Controller/Files/SidebarViewController.swift",
                            "kDrive/UI/Controller/Files/FloatingPanelSortOptionTableViewController.swift",
                            "kDrive/UI/Controller/Floating Panel Information/**",
                            "kDrive/UI/Controller/Favorite/FavoritesViewModel.swift",

kDrive/AppRouter.swift

@@ -119,6 +119,14 @@ public struct AppRouter: AppNavigable {
         return topViewController
     }
 
+    @MainActor public var rootViewController: UIViewController? {
+        guard let rootViewController = window?.rootViewController as? UIViewController else {
+            return nil
+        }
+
+        return rootViewController
+    }
+
     // MARK: RouterRootNavigable
 
     @MainActor public func setRootViewController(_ viewController: UIViewController,
@@ -165,6 +173,23 @@ public struct AppRouter: AppNavigable {
         }
     }
 
+    @MainActor private func getControllerForRestoration(tabBarViewController: UISplitViewController?) -> UIViewController? {
+        guard let rootViewController = window?.rootViewController else { return nil }
+        let rootHorizontalSizeClass = rootViewController.traitCollection.horizontalSizeClass
+        if rootHorizontalSizeClass == .compact {
+            guard let mainTabViewController = tabBarViewController?.viewControllers.first as? UITabBarController else {
+                Log.sceneDelegate("unable to access tabBarViewController", level: .error)
+                return nil
+            }
+
+            let selectedIndex = mainTabViewController.selectedIndex
+            let viewControllers = mainTabViewController.viewControllers
+            return viewControllers?[safe: selectedIndex]
+        } else {
+            return tabBarViewController?.viewControllers.last
+        }
+    }
+
     /// Entry point for scene restoration
     @MainActor func restoreMainUIStackIfPossible(driveFileManager: DriveFileManager, restoration: Bool) {
         let shouldRestoreApplicationState = appRestorationService.shouldRestoreApplicationState
@@ -184,7 +209,7 @@ public struct AppRouter: AppNavigable {
         }
 
         Task { @MainActor in
-            guard restoration, let tabBarViewController else {
+            guard restoration else {
                 return
             }
 
@@ -193,16 +218,17 @@ public struct AppRouter: AppNavigable {
                   let lastViewController = SceneRestorationScreens(rawValue: lastViewControllerString) else {
                 return
             }
-
             guard let previousDriveId = sceneUserInfo[SceneRestorationValues.driveId.rawValue] as? Int,
-                  previousDriveId == driveFileManager.drive.id else {
+                  previousDriveId == driveFileManager.driveId else {
                 Log.sceneDelegate("driveId do not match for restore :\(sceneUserInfo)", level: .error)
                 return
             }
 
-            let selectedIndex = tabBarViewController.selectedIndex
-            let viewControllers = tabBarViewController.viewControllers
-            guard let rootNavigationController = viewControllers?[safe: selectedIndex] as? UINavigationController else {
+            guard let viewController = getControllerForRestoration(tabBarViewController: tabBarViewController) else {
+                Log.sceneDelegate("unable to access viewControllers", level: .error)
+                return
+            }
+            guard let rootNavigationController = viewController as? UINavigationController else {
                 Log.sceneDelegate("unable to access navigationController", level: .error)
                 return
             }
@@ -363,19 +389,18 @@ public struct AppRouter: AppNavigable {
 
     @discardableResult
     @MainActor public func showMainViewController(driveFileManager: DriveFileManager,
-                                                  selectedIndex: Int?) -> UITabBarController? {
+                                                  selectedIndex: Int?) -> UISplitViewController? {
         guard let window else {
             SentryDebug.captureNoWindow()
             return nil
         }
 
-        let currentDriveObjectId = (window.rootViewController as? MainTabViewController)?.driveFileManager.drive.objectId
+        let currentDriveObjectId = (window.rootViewController as? RootSplitViewController)?.driveFileManager.drive.objectId
         guard currentDriveObjectId != driveFileManager.drive.objectId else {
             return nil
         }
 
-        let tabBarViewController = MainTabViewController(driveFileManager: driveFileManager,
-                                                         selectedIndex: selectedIndex)
+        let tabBarViewController = RootSplitViewController(driveFileManager: driveFileManager, selectedIndex: selectedIndex)
 
         window.rootViewController = tabBarViewController
         window.makeKeyAndVisible()
@@ -641,8 +666,8 @@ public struct AppRouter: AppNavigable {
         }
 
         let account = try await accountManager.updateUser(for: currentAccount, registerToken: true)
-        let rootViewController = window?.rootViewController as? UpdateAccountDelegate
-        rootViewController?.didUpdateCurrentAccountInformations(account)
+        let viewController = window?.rootViewController as? UpdateAccountDelegate
+        viewController?.didUpdateCurrentAccountInformations(account)
 
         if let oldDriveId,
            let newDrive = driveInfosManager.getDrive(primaryKey: oldDriveId),
@@ -795,14 +820,11 @@ public struct AppRouter: AppNavigable {
     }
 
     @MainActor public func present(file: File, driveFileManager: DriveFileManager, office: Bool) {
-        guard let rootViewController = window?.rootViewController as? MainTabViewController else {
-            return
-        }
-
-        rootViewController.dismiss(animated: false) {
-            rootViewController.selectedIndex = MainTabBarIndex.files.rawValue
+        guard let rootViewController = window?.rootViewController as? UISplitViewController else { return }
+        guard let viewController = getControllerForRestoration(tabBarViewController: rootViewController) else { return }
 
-            guard let navController = rootViewController.selectedViewController as? UINavigationController else {
+        viewController.dismiss(animated: false) {
+            guard let navController = viewController as? UINavigationController else {
                 return
             }
 
@@ -816,7 +838,7 @@ public struct AppRouter: AppNavigable {
                 navController.popToRootViewController(animated: false)
             }
 
-            guard let rootMenuViewController = navController.topViewController as? RootMenuViewController else {
+            guard let rootMenuViewController = navController.topViewController else {
                 return
             }
 

kDrive/OpenMediaHelper.swift

@@ -19,23 +19,36 @@
 import CocoaLumberjackSwift
 import Foundation
 import InfomaniakCore
+import InfomaniakDI
 import kDriveCore
 import kDriveResources
 import PhotosUI
 import Vision
 import VisionKit
 
-struct OpenMediaHelper {
-    var currentDirectory: File?
-    var driveFileManager: DriveFileManager
+class OpenMediaHelper: NSObject {
+    @LazyInjectService var accountManager: AccountManageable
+    @LazyInjectService var uploadDatasource: UploadServiceDataSourceable
+    @LazyInjectService var fileImportHelper: FileImportHelper
+
+    let currentDirectory: File?
+    let driveFileManager: DriveFileManager
+    let photoPickerDelegate = PhotoPickerDelegate()
 
     enum Media {
         case library, camera
     }
 
-    func openMedia(_ mainTabViewController: MainTabViewController, _ media: Media) {
-        mainTabViewController.photoPickerDelegate.driveFileManager = driveFileManager
-        mainTabViewController.photoPickerDelegate.currentDirectory = currentDirectory?.freezeIfNeeded()
+    init(currentDirectory: File? = nil, driveFileManager: DriveFileManager) {
+        self.currentDirectory = currentDirectory
+        self.driveFileManager = driveFileManager
+        super.init()
+    }
+
+    func openMedia(_ mainTabViewController: UIViewController, _ media: Media) {
+        photoPickerDelegate.viewController = mainTabViewController
+        photoPickerDelegate.driveFileManager = driveFileManager
+        photoPickerDelegate.currentDirectory = currentDirectory?.freezeIfNeeded()
 
         if media == .library {
             // Check permission
@@ -46,7 +59,7 @@ struct OpenMediaHelper {
                         configuration.selectionLimit = 0
 
                         let picker = PHPickerViewController(configuration: configuration)
-                        picker.delegate = mainTabViewController.photoPickerDelegate
+                        picker.delegate = self.photoPickerDelegate
                         mainTabViewController.present(picker, animated: true)
                     }
                 } else {
@@ -85,14 +98,14 @@ struct OpenMediaHelper {
 
             let picker = UIImagePickerController()
             picker.sourceType = sourceType
-            picker.delegate = mainTabViewController.photoPickerDelegate
+            picker.delegate = photoPickerDelegate
             picker.mediaTypes = UIImagePickerController
                 .availableMediaTypes(for: sourceType) ?? [UTI.image.identifier, UTI.movie.identifier]
             mainTabViewController.present(picker, animated: true)
         }
     }
 
-    func openScan(_ mainTabViewController: MainTabViewController, _ presentedAboveFileList: Bool) {
+    func openScan(_ mainTabViewController: UIViewController, _ presentedAboveFileList: Bool) {
         guard VNDocumentCameraViewController.isSupported else {
             DDLogError("VNDocumentCameraViewController is not supported on this device")
             return
@@ -109,3 +122,30 @@ struct OpenMediaHelper {
         mainTabViewController.present(navigationViewController, animated: true)
     }
 }
+
+extension OpenMediaHelper: UIDocumentPickerDelegate {
+    func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+        guard let documentPicker = controller as? DriveImportDocumentPickerViewController else { return }
+        for url in urls {
+            let targetURL = fileImportHelper.generateImportURL(for: url.uti)
+
+            do {
+                if FileManager.default.fileExists(atPath: targetURL.path) {
+                    try FileManager.default.removeItem(at: targetURL)
+                }
+
+                try FileManager.default.moveItem(at: url, to: targetURL)
+                let uploadFile = UploadFile(
+                    parentDirectoryId: documentPicker.importDriveDirectory.id,
+                    userId: accountManager.currentUserId,
+                    driveId: documentPicker.importDriveDirectory.driveId,
+                    url: targetURL,
+                    name: url.lastPathComponent
+                )
+                uploadDatasource.saveToRealm(uploadFile, itemIdentifier: nil, addToQueue: true)
+            } catch {
+                UIConstants.showSnackBarIfNeeded(error: DriveError.unknownError)
+            }
+        }
+    }
+}

kDrive/UI/Controller/Create File/PlusButtonFloatingPanelViewController.swift

@@ -29,14 +29,15 @@ import UIKit
 import Vision
 import VisionKit
 
-class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPanelControllerDelegate {
+public class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPanelControllerDelegate {
     @LazyInjectService private var matomo: MatomoUtils
 
     let currentDirectory: File
     let driveFileManager: DriveFileManager
 
     let presentedFromPlusButton: Bool
     let presentedAboveFileList: Bool
+    let mediaHelper: OpenMediaHelper
 
     private struct PlusButtonMenuAction: Equatable {
         let name: String
@@ -120,6 +121,7 @@ class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPane
         currentDirectory = folder
         self.presentedFromPlusButton = presentedFromPlusButton
         self.presentedAboveFileList = presentedAboveFileList
+        mediaHelper = OpenMediaHelper(currentDirectory: folder, driveFileManager: driveFileManager)
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -128,7 +130,7 @@ class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPane
         fatalError("init(coder:) has not been implemented")
     }
 
-    override func viewDidLoad() {
+    override public func viewDidLoad() {
         super.viewDidLoad()
         tableView.separatorColor = .clear
         tableView.alwaysBounceVertical = false
@@ -149,26 +151,26 @@ class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPane
         #endif
     }
 
-    override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+    override public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.row == 0 && indexPath.section == 0 {
             return UIConstants.FloatingPanel.headerHeight
         } else {
             return UITableView.automaticDimension
         }
     }
 
-    override func numberOfSections(in tableView: UITableView) -> Int {
+    override public func numberOfSections(in tableView: UITableView) -> Int {
         return content.count
     }
 
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if section == 0 {
             return 1
         }
         return content[section].count
     }
 
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    override public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(type: FloatingPanelTableViewCell.self, for: indexPath)
         if indexPath.section == 0 {
             cell.titleLabel.text = currentDirectory.formattedLocalizedName(drive: driveFileManager.drive)
@@ -199,13 +201,13 @@ class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPane
         return cell
     }
 
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+    override public func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 0 {
             return
         }
         dismiss(animated: true)
 
-        guard let mainTabViewController = parent?.presentingViewController as? MainTabViewController else {
+        guard let mainTabViewController = presentingViewController else {
             return
         }
 
@@ -237,30 +239,29 @@ class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPane
         return true
     }
 
-    func floatingPanel(_ fpc: FloatingPanelController, shouldRemoveAt location: CGPoint, with velocity: CGVector) -> Bool {
+    public func floatingPanel(_ fpc: FloatingPanelController, shouldRemoveAt location: CGPoint, with velocity: CGVector) -> Bool {
         // Remove the panel when it's pushed one third down
         return location.y > fpc.backdropView.frame.height * 1 / 3
     }
 
     // MARK: Actions
 
-    private func importAction(_ mainTabViewController: MainTabViewController) {
+    private func importAction(_ mainTabViewController: UIViewController) {
         let documentPicker = DriveImportDocumentPickerViewController(forOpeningContentTypes: [UTType.data], asCopy: true)
         documentPicker.importDrive = driveFileManager.drive
         documentPicker.importDriveDirectory = currentDirectory.freezeIfNeeded()
-        documentPicker.delegate = mainTabViewController
         mainTabViewController.present(documentPicker, animated: true)
     }
 
-    private func folderAction(_ mainTabViewController: MainTabViewController) {
+    private func folderAction(_ mainTabViewController: UIViewController) {
         let newFolderViewController = NewFolderTypeTableViewController.instantiateInNavigationController(
             parentDirectory: currentDirectory,
             driveFileManager: driveFileManager
         )
         mainTabViewController.present(newFolderViewController, animated: true)
     }
 
-    private func scanAction(_ mainTabViewController: MainTabViewController) {
+    private func scanAction(_ mainTabViewController: UIViewController) {
         guard VNDocumentCameraViewController.isSupported else {
             DDLogError("VNDocumentCameraViewController is not supported on this device")
             return
@@ -277,12 +278,11 @@ class PlusButtonFloatingPanelViewController: UITableViewController, FloatingPane
         mainTabViewController.present(navigationViewController, animated: true)
     }
 
-    private func mediaAction(_ mainTabViewController: MainTabViewController, action: PlusButtonMenuAction) {
-        let openMediaHelper = OpenMediaHelper(currentDirectory: currentDirectory, driveFileManager: driveFileManager)
-        openMediaHelper.openMedia(mainTabViewController, action == .importMediaAction ? .library : .camera)
+    private func mediaAction(_ mainTabViewController: UIViewController, action: PlusButtonMenuAction) {
+        mediaHelper.openMedia(mainTabViewController, action == .importMediaAction ? .library : .camera)
     }
 
-    private func documentAction(_ mainTabViewController: MainTabViewController, action: PlusButtonMenuAction) {
+    private func documentAction(_ mainTabViewController: UIViewController, action: PlusButtonMenuAction) {
         let alertViewController = AlertDocViewController(fileType: action.docType,
                                                          directory: currentDirectory.freezeIfNeeded(),
                                                          driveFileManager: driveFileManager)