chore: Merge branch 'master' into bump_dependency_

Infomaniak · Aug 13, 2024 · c0aaa69 · c0aaa69
2 parents 9cf93bd + 42fa9a7
commit c0aaa69
Show file tree

Hide file tree

Showing 80 changed files with 2,117 additions and 1,676 deletions.
diff --git a/Tuist/Package.resolved b/Tuist/Package.resolved
@@ -59,17 +59,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SCENEE/FloatingPanel",
       "state" : {
-        "revision" : "29185a47bd9f062c060e097641b863ef07f60ba7",
-        "version" : "2.8.4"
+        "revision" : "71f419a3cd212afc7615e2179c2fec1df1aa74da",
+        "version" : "2.8.5"
       }
     },
     {
       "identity" : "highlightr",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/raspu/Highlightr",
       "state" : {
-        "revision" : "fa483d37c692961ecc2391eac568ba3d3935e663",
-        "version" : "2.2.0"
+        "revision" : "bcf2d0590f32ac2528feb72d7e34f5b463801a47",
+        "version" : "2.2.1"
       }
     },
     {
@@ -95,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Infomaniak/ios-core-ui",
       "state" : {
-        "revision" : "f6aa4a07a6668c86e9665be93cc6199c1dd64895",
-        "version" : "10.0.0"
+        "revision" : "f45301c68bd9421a8f29f676bab658933e8a6807",
+        "version" : "10.1.0"
       }
     },
     {
@@ -230,8 +230,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa",
       "state" : {
-        "revision" : "7339fcbab2ded21fe5753687022f2b673a1a1865",
-        "version" : "8.31.1"
+        "revision" : "5421f94cc859eb65f5ae3866165a053aa634431e",
+        "version" : "8.32.0"
       }
     },
     {
@@ -302,8 +302,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "fc79798d5a150d61361a27ce0c51169b889e23de",
-        "version" : "2.68.0"
+        "revision" : "4c4453b489cf76e6b3b0f300aba663eb78182fad",
+        "version" : "2.70.0"
       }
     },
     {
@@ -329,8 +329,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-system.git",
       "state" : {
-        "revision" : "6a9e38e7bd22a3b8ba80bddf395623cf68f57807",
-        "version" : "1.3.1"
+        "revision" : "d2ba781702a1d8285419c15ee62fd734a9437ff5",
+        "version" : "1.3.2"
       }
     },
     {

diff --git a/Tuist/Package.swift b/Tuist/Package.swift
@@ -26,7 +26,7 @@ let package = Package(
         .package(url: "https://github.com/Infomaniak/swift-concurrency", .upToNextMajor(from: "0.0.4")),
         .package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "6.0.0")),
         .package(url: "https://github.com/Infomaniak/LocalizeKit", .upToNextMajor(from: "1.0.2")),
-        .package(url: "https://github.com/realm/realm-swift", .upToNextMajor(from: "10.43.0")),
+        .package(url: "https://github.com/realm/realm-swift", .upToNextMajor(from: "10.52.0")),
         .package(url: "https://github.com/SCENEE/FloatingPanel", .upToNextMajor(from: "2.0.0")),
         .package(url: "https://github.com/onevcat/Kingfisher", .upToNextMajor(from: "7.6.2")),
         .package(url: "https://github.com/flowbe/MaterialOutlinedTextField", .upToNextMajor(from: "0.1.0")),

diff --git a/Tuist/ProjectDescriptionHelpers/ExtensionTarget.swift b/Tuist/ProjectDescriptionHelpers/ExtensionTarget.swift
@@ -90,6 +90,7 @@ public extension Target {
                            "kDrive/UI/View/Files/FileGridCollectionViewCell.swift",
                            "kDrive/UI/View/Files/SwipableCell.swift",
                            "kDrive/UI/View/Files/SwipableCollectionView.swift",
+                           "kDrive/UI/View/Files/FileListBarButton.swift",
                            "kDrive/UI/View/Files/FloatingPanel/FloatingPanelSortOptionTableViewCell.swift",
                            "kDrive/UI/View/Files/FloatingPanel/FloatingPanelQuickActionCollectionViewCell.swift",
                            "kDrive/UI/View/Files/FloatingPanel/FloatingPanelTableViewCell.swift",

diff --git a/kDrive/AppRouter.swift b/kDrive/AppRouter.swift
@@ -397,7 +397,7 @@ public struct AppRouter: AppNavigable {
             return
         }
 
-        let photoSyncSettingsViewController = PhotoSyncSettingsViewController.instantiate()
+        let photoSyncSettingsViewController = PhotoSyncSettingsViewController()
         navController.popToRootViewController(animated: false)
         navController.pushViewController(photoSyncSettingsViewController, animated: true)
     }
@@ -549,27 +549,30 @@ public struct AppRouter: AppNavigable {
         rootViewController.dismiss(animated: false) {
             rootViewController.selectedIndex = MainTabBarIndex.files.rawValue
 
-            guard let navController = rootViewController.selectedViewController as? UINavigationController,
-                  let viewController = navController.topViewController as? FileListViewController else {
+            guard let navController = rootViewController.selectedViewController as? UINavigationController else {
                 return
             }
 
-            guard !file.isRoot && viewController.viewModel.currentDirectory.id != file.id else {
-                return
-            }
+            guard !file.isRoot else { return }
+
+            if let fileListViewController = navController.topViewController as? FileListViewController {
+                guard fileListViewController.viewModel.currentDirectory.id != file.id else {
+                    return
+                }
 
-            navController.popToRootViewController(animated: false)
+                navController.popToRootViewController(animated: false)
+            }
 
-            guard let fileListViewController = navController.topViewController as? FileListViewController else {
+            guard let rootMenuViewController = navController.topViewController as? RootMenuViewController else {
                 return
             }
 
             if office {
                 OnlyOfficeViewController.open(driveFileManager: driveFileManager,
                                               file: file,
-                                              viewController: fileListViewController)
+                                              viewController: rootMenuViewController)
             } else {
-                let filePresenter = FilePresenter(viewController: fileListViewController)
+                let filePresenter = FilePresenter(viewController: rootMenuViewController)
                 filePresenter.present(for: file,
                                       files: [file],
                                       driveFileManager: driveFileManager,
@@ -607,6 +610,11 @@ public struct AppRouter: AppNavigable {
         navigationController: UINavigationController,
         animated: Bool
     ) {
+        guard index <= frozenFiles.count else {
+            Log.sceneDelegate("unable to presentPreviewViewController, invalid data", level: .error)
+            return
+        }
+
         let previewViewController = PreviewViewController.instantiate(files: frozenFiles,
                                                                       index: index,
                                                                       driveFileManager: driveFileManager,

diff --git a/kDrive/Resources/de.lproj/Localizable.strings b/kDrive/Resources/de.lproj/Localizable.strings
@@ -3,8 +3,8 @@
  * Project: kDrive
  * Locale: de, German
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Wed, 05 Jun 2024 08:48:02 +0200
+ * Exported by: Valentin Perignon
+ * Exported at: Fri, 26 Jul 2024 13:09:12 +0200
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -232,6 +232,9 @@
 /* loco:6049df4d5c2c3a04bc397937 */
 "buttonAddFavorites" = "Zu Favoriten hinzufügen";
 
+/* loco:668e92d227a71514a808d485 */
+"buttonAddToKDrive" = "Zu kDrive hinzufügen";
+
 /* loco:6049df4d5c2c3a04bc397938 */
 "buttonAddUser" = "Benutzer hinzufügen";
 
@@ -413,7 +416,7 @@
 "buttonRetry" = "Erneut versuchen";
 
 /* loco:6049df4d5c2c3a04bc397961 */
-"buttonSave" = "Aufnehmen";
+"buttonSave" = "Speichern";
 
 /* loco:606f1b035b651445ab137732 */
 "buttonSeeFolder" = "Ordner anzeigen";
@@ -1099,6 +1102,9 @@
 /* loco:6049df4d5c2c3a04bc3979de */
 "fileDetailsNoComments" = "Derzeit kein Kommentar";
 
+/* loco:66a369b1a84f9b44440e2423 */
+"fileExtesionFilterPlaceholder" = ".jpg, .mov, usw.";
+
 /* loco:6049df4d5c2c3a04bc3979df */
 "fileInfoInputDuplicateFile" = "Bezeichnung der Kopie";
 
@@ -1307,7 +1313,7 @@
 "localizedFilenamePrivateTeamSpace" = "Mein persönlicher Ordner";
 
 /* loco:65a140c3cdbe107c5a025352 */
-"localizedFilenameTeamSpace" = "Akten der Organisation";
+"localizedFilenameTeamSpace" = "Gemeinsame Ordner";
 
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Finden Sie";
@@ -1600,6 +1606,9 @@
 /* loco:61696114b9fa15412d6a2fb6 */
 "searchFiltersSelectType" = "Dateityp wählen";
 
+/* loco:668feca6092b456442086012 */
+"searchForAnExtension" = "Suche nach einer Erweiterung";
+
 /* loco:6049df4d5c2c3a04bc397a30 */
 "searchLastTitle" = "Letzte Suchen";
 
@@ -1937,7 +1946,7 @@
 "syncSettingsButtonActiveSync" = "Automatische Sicherung aktivieren";
 
 /* loco:6049df4d5c2c3a04bc397a67 */
-"syncSettingsButtonSaveDate" = "Aufnehmen";
+"syncSettingsButtonSaveDate" = "Speichern";
 
 /* loco:6049df4d5c2c3a04bc397a68 */
 "syncSettingsButtonSyncPeriodicity" = "Synchronisierung";
@@ -1976,7 +1985,7 @@
 "syncSettingsSaveDateNowValue2" = "Nur neue Fotos (ab jetzt)";
 
 /* loco:6049df4d5c2c3a04bc397a70 */
-"syncSettingsSaveOn" = "Aufnehmen auf";
+"syncSettingsSaveOn" = "Speichern auf";
 
 /* loco:6049df4d5c2c3a04bc397a71 */
 "syncSettingsSyncPeriodicityFourHoursValue" = "Alle 4 Stunden";

diff --git a/kDrive/Resources/en.lproj/Localizable.strings b/kDrive/Resources/en.lproj/Localizable.strings
@@ -3,8 +3,8 @@
  * Project: kDrive
  * Locale: en, English
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Wed, 05 Jun 2024 08:48:02 +0200
+ * Exported by: Valentin Perignon
+ * Exported at: Fri, 26 Jul 2024 13:09:12 +0200
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -232,6 +232,9 @@
 /* loco:6049df4d5c2c3a04bc397937 */
 "buttonAddFavorites" = "Add to favorites";
 
+/* loco:668e92d227a71514a808d485 */
+"buttonAddToKDrive" = "Add to my kDrive";
+
 /* loco:6049df4d5c2c3a04bc397938 */
 "buttonAddUser" = "Add a user";
 
@@ -1099,6 +1102,9 @@
 /* loco:6049df4d5c2c3a04bc3979de */
 "fileDetailsNoComments" = "No comments at this time";
 
+/* loco:66a369b1a84f9b44440e2423 */
+"fileExtesionFilterPlaceholder" = ".jpg, .mov, etc.";
+
 /* loco:6049df4d5c2c3a04bc3979df */
 "fileInfoInputDuplicateFile" = "Copy name";
 
@@ -1304,10 +1310,10 @@
 "localizedFilenamePrivateSpace" = "My files";
 
 /* loco:668cfa288f78f439cc044b92 */
-"localizedFilenamePrivateTeamSpace" = "My personnal folder";
+"localizedFilenamePrivateTeamSpace" = "My personal folder";
 
 /* loco:65a140c3cdbe107c5a025352 */
-"localizedFilenameTeamSpace" = "Organisation’s files";
+"localizedFilenameTeamSpace" = "Common folders";
 
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Locate";
@@ -1600,6 +1606,9 @@
 /* loco:61696114b9fa15412d6a2fb6 */
 "searchFiltersSelectType" = "Select a file type";
 
+/* loco:668feca6092b456442086012 */
+"searchForAnExtension" = "Search for an extension";
+
 /* loco:6049df4d5c2c3a04bc397a30 */
 "searchLastTitle" = "Most recent searches";
 

diff --git a/kDrive/Resources/es.lproj/Localizable.strings b/kDrive/Resources/es.lproj/Localizable.strings
@@ -3,8 +3,8 @@
  * Project: kDrive
  * Locale: es, Spanish
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Wed, 05 Jun 2024 08:48:02 +0200
+ * Exported by: Valentin Perignon
+ * Exported at: Fri, 26 Jul 2024 13:09:12 +0200
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -232,6 +232,9 @@
 /* loco:6049df4d5c2c3a04bc397937 */
 "buttonAddFavorites" = "Añadir a favoritos";
 
+/* loco:668e92d227a71514a808d485 */
+"buttonAddToKDrive" = "Añadir a mi kDrive";
+
 /* loco:6049df4d5c2c3a04bc397938 */
 "buttonAddUser" = "Añadir un usuario";
 
@@ -1099,6 +1102,9 @@
 /* loco:6049df4d5c2c3a04bc3979de */
 "fileDetailsNoComments" = "Todavía no hay comentarios";
 
+/* loco:66a369b1a84f9b44440e2423 */
+"fileExtesionFilterPlaceholder" = ".jpg, .mov, etc.";
+
 /* loco:6049df4d5c2c3a04bc3979df */
 "fileInfoInputDuplicateFile" = "Nombre de la copia";
 
@@ -1307,7 +1313,7 @@
 "localizedFilenamePrivateTeamSpace" = "Mi carpeta personal";
 
 /* loco:65a140c3cdbe107c5a025352 */
-"localizedFilenameTeamSpace" = "Archivos de la organización";
+"localizedFilenameTeamSpace" = "Carpetas comunes";
 
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Localizar";
@@ -1600,6 +1606,9 @@
 /* loco:61696114b9fa15412d6a2fb6 */
 "searchFiltersSelectType" = "Seleccionar un tipo de archivo";
 
+/* loco:668feca6092b456442086012 */
+"searchForAnExtension" = "Buscar una extensión";
+
 /* loco:6049df4d5c2c3a04bc397a30 */
 "searchLastTitle" = "Últimas búsquedas";
 

diff --git a/kDrive/Resources/fr.lproj/Localizable.strings b/kDrive/Resources/fr.lproj/Localizable.strings
@@ -3,8 +3,8 @@
  * Project: kDrive
  * Locale: fr, French
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Wed, 05 Jun 2024 08:48:02 +0200
+ * Exported by: Valentin Perignon
+ * Exported at: Fri, 26 Jul 2024 13:09:12 +0200
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -232,6 +232,9 @@
 /* loco:6049df4d5c2c3a04bc397937 */
 "buttonAddFavorites" = "Ajouter aux favoris";
 
+/* loco:668e92d227a71514a808d485 */
+"buttonAddToKDrive" = "Ajouter à mon kDrive";
+
 /* loco:6049df4d5c2c3a04bc397938 */
 "buttonAddUser" = "Ajouter un utilisateur";
 
@@ -1099,6 +1102,9 @@
 /* loco:6049df4d5c2c3a04bc3979de */
 "fileDetailsNoComments" = "Aucun commentaire pour le moment";
 
+/* loco:66a369b1a84f9b44440e2423 */
+"fileExtesionFilterPlaceholder" = ".jpg, .mov, etc.";
+
 /* loco:6049df4d5c2c3a04bc3979df */
 "fileInfoInputDuplicateFile" = "Nom de la copie";
 
@@ -1280,7 +1286,7 @@
 "homeTitle" = "Accueil";
 
 /* loco:665f25aff2cdb8afe902d122 */
-"imageCache" = "Cache d'images";
+"imageCache" = "Cache d’images";
 
 /* loco:614c87900f32e257ec7c34b5 */
 "importDirectory" = "Importations";
@@ -1307,7 +1313,7 @@
 "localizedFilenamePrivateTeamSpace" = "Mon dossier personnel";
 
 /* loco:65a140c3cdbe107c5a025352 */
-"localizedFilenameTeamSpace" = "Dossiers de l’organisation";
+"localizedFilenameTeamSpace" = "Dossiers communs";
 
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Localiser";
@@ -1600,6 +1606,9 @@
 /* loco:61696114b9fa15412d6a2fb6 */
 "searchFiltersSelectType" = "Sélectionner un type de fichier";
 
+/* loco:668feca6092b456442086012 */
+"searchForAnExtension" = "Rechercher une extension";
+
 /* loco:6049df4d5c2c3a04bc397a30 */
 "searchLastTitle" = "Dernières recherches";