Merge pull request #1022 from Infomaniak/menu-v3

feat: Menu v3
Infomaniak · Jan 30, 2024 · d04941a · d04941a
2 parents 573d1d0 + 135665c
commit d04941a
Show file tree

Hide file tree

Showing 25 changed files with 682 additions and 160 deletions.
diff --git a/kDrive/Resources/Assets.xcassets/gallery.fill.imageset/Contents.json b/kDrive/Resources/Assets.xcassets/gallery.fill.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "gallery.fill.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/kDrive/Resources/Assets.xcassets/gallery.fill.imageset/gallery.fill.svg b/kDrive/Resources/Assets.xcassets/gallery.fill.imageset/gallery.fill.svg
diff --git a/kDrive/Resources/Assets.xcassets/gallery.imageset/Contents.json b/kDrive/Resources/Assets.xcassets/gallery.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "gallery.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/kDrive/Resources/Assets.xcassets/gallery.imageset/gallery.svg b/kDrive/Resources/Assets.xcassets/gallery.imageset/gallery.svg
diff --git a/kDrive/Resources/de.lproj/Localizable.strings b/kDrive/Resources/de.lproj/Localizable.strings
@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: de, German
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Mon, 27 Nov 2023 13:37:54 +0100
+ * Exported by: Philippe Weidmann
+ * Exported at: Fri, 12 Jan 2024 15:27:42 +0100
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -1292,6 +1292,12 @@
 /* loco:6049df4d5c2c3a04bc3979fc */
 "lastEditsTitle" = "Letzte Änderungen";
 
+/* loco:65a13fff84b88c92410f5052 */
+"localizedFilenamePrivateSpace" = "Meine Dateien";
+
+/* loco:65a140c3cdbe107c5a025352 */
+"localizedFilenameTeamSpace" = "Akten der Organisation";
+
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Finden Sie";
 

diff --git a/kDrive/Resources/en.lproj/Localizable.strings b/kDrive/Resources/en.lproj/Localizable.strings
@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: en, English
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Mon, 27 Nov 2023 13:37:54 +0100
+ * Exported by: Philippe Weidmann
+ * Exported at: Fri, 12 Jan 2024 15:27:42 +0100
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -1292,6 +1292,12 @@
 /* loco:6049df4d5c2c3a04bc3979fc */
 "lastEditsTitle" = "Most recent changes";
 
+/* loco:65a13fff84b88c92410f5052 */
+"localizedFilenamePrivateSpace" = "My files";
+
+/* loco:65a140c3cdbe107c5a025352 */
+"localizedFilenameTeamSpace" = "Organisation's files";
+
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Locate";
 

diff --git a/kDrive/Resources/es.lproj/Localizable.strings b/kDrive/Resources/es.lproj/Localizable.strings
@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: es, Spanish
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Mon, 27 Nov 2023 13:37:55 +0100
+ * Exported by: Philippe Weidmann
+ * Exported at: Fri, 12 Jan 2024 15:27:42 +0100
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -1292,6 +1292,12 @@
 /* loco:6049df4d5c2c3a04bc3979fc */
 "lastEditsTitle" = "Últimas modificaciones";
 
+/* loco:65a13fff84b88c92410f5052 */
+"localizedFilenamePrivateSpace" = "Mis archivos";
+
+/* loco:65a140c3cdbe107c5a025352 */
+"localizedFilenameTeamSpace" = "Archivos de la organización";
+
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Localizar";
 

diff --git a/kDrive/Resources/fr.lproj/Localizable.strings b/kDrive/Resources/fr.lproj/Localizable.strings
@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: fr, French
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Mon, 27 Nov 2023 13:37:54 +0100
+ * Exported by: Philippe Weidmann
+ * Exported at: Fri, 12 Jan 2024 15:27:42 +0100
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -1292,6 +1292,12 @@
 /* loco:6049df4d5c2c3a04bc3979fc */
 "lastEditsTitle" = "Dernières modifications";
 
+/* loco:65a13fff84b88c92410f5052 */
+"localizedFilenamePrivateSpace" = "Mes fichiers";
+
+/* loco:65a140c3cdbe107c5a025352 */
+"localizedFilenameTeamSpace" = "Dossiers de l’organisation";
+
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Localiser";
 

diff --git a/kDrive/Resources/it.lproj/Localizable.strings b/kDrive/Resources/it.lproj/Localizable.strings
@@ -4,8 +4,8 @@
  * Release: Working copy
  * Locale: it, Italian
  * Tagged: ios
- * Exported by: Adrien Coye
- * Exported at: Mon, 27 Nov 2023 13:37:55 +0100
+ * Exported by: Philippe Weidmann
+ * Exported at: Fri, 12 Jan 2024 15:27:42 +0100
  */
 
 /* loco:610a8791fa12ab20713c09e4 */
@@ -1292,6 +1292,12 @@
 /* loco:6049df4d5c2c3a04bc3979fc */
 "lastEditsTitle" = "Ultime modifiche";
 
+/* loco:65a13fff84b88c92410f5052 */
+"localizedFilenamePrivateSpace" = "I miei file";
+
+/* loco:65a140c3cdbe107c5a025352 */
+"localizedFilenameTeamSpace" = "File dell'organizzazione";
+
 /* loco:60dc3d5b27c2f44e2f7a3c12 */
 "locateButton" = "Localizzare";
 

diff --git a/kDrive/UI/Controller/Files/File List/FileListViewController.swift b/kDrive/UI/Controller/Files/File List/FileListViewController.swift
@@ -586,6 +586,15 @@ class FileListViewController: UIViewController, UICollectionViewDataSource, Swip
     func setUpHeaderView(_ headerView: FilesHeaderView, isEmptyViewHidden: Bool) {
         headerView.delegate = self
 
+        if viewModel.currentDirectory.visibility == .isTeamSpace {
+            let driveName = KDriveResourcesStrings.Localizable.commonDocumentsDescription(viewModel.driveFileManager.drive.name)
+
+            headerView.commonDocumentsDescriptionLabel.text = driveName
+            headerView.commonDocumentsDescriptionLabel.isHidden = false
+        } else {
+            headerView.commonDocumentsDescriptionLabel.isHidden = true
+        }
+
         headerView.sortView.isHidden = !isEmptyViewHidden
 
         headerView.sortButton.isHidden = viewModel.configuration.sortingOptions.isEmpty

diff --git a/kDrive/UI/Controller/Files/File List/FileListViewModel.swift b/kDrive/UI/Controller/Files/File List/FileListViewModel.swift
@@ -196,7 +196,7 @@ class FileListViewModel: SelectDelegate {
                 title = driveFileManager.drive.name
             }
         } else {
-            title = self.currentDirectory.name
+            title = self.currentDirectory.formattedLocalizedName()
         }
 
         if configuration.showUploadingFiles {