Merge pull request #777 from Infomaniak/frelatedMailbox

fix: Error if click on frelated mailbox
Infomaniak · Jun 7, 2023 · df6b791 · df6b791
2 parents cfd23c9 + 92789b0
commit df6b791
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 14 deletions.
diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift
@@ -63,9 +63,14 @@ struct MailboxCell: View {
             icon: MailResourcesAsset.envelope,
             text: mailbox.email,
             detailNumber: detailNumber,
-            isSelected: isSelected
+            isSelected: isSelected,
+            isPasswordValid: mailbox.isPasswordValid
         ) {
             guard !isSelected else { return }
+            guard mailbox.isPasswordValid else {
+                IKSnackBar.showSnackBar(message: MailResourcesStrings.Localizable.frelatedMailbox)
+                return
+            }
             @InjectService var matomo: MatomoUtils
             switch style {
             case .menuDrawer:

diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift
@@ -29,18 +29,21 @@ struct MailboxesManagementButtonView: View {
     let detailNumber: Int?
     let handleAction: () -> Void
     let isSelected: Bool
+    let isPasswordValid: Bool
 
     init(
         icon: MailResourcesImages,
         text: String,
         detailNumber: Int? = nil,
         isSelected: Bool,
+        isPasswordValid: Bool,
         handleAction: @escaping () -> Void
     ) {
         self.icon = icon.swiftUIImage
         self.text = text
         self.detailNumber = detailNumber
         self.isSelected = isSelected
+        self.isPasswordValid = isPasswordValid
         self.handleAction = handleAction
     }
 
@@ -59,17 +62,21 @@ struct MailboxesManagementButtonView: View {
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
 
-                switch style {
-                case .menuDrawer:
-                    if let detailNumber {
-                        Text(detailNumber < 100 ? "\(detailNumber)" : "99+")
-                            .textStyle(.bodySmallMediumAccent)
-                    }
-                case .account:
-                    if isSelected {
-                        MailResourcesAsset.check.swiftUIImage
-                            .frame(width: 16, height: 16)
-                            .foregroundColor(.accentColor)
+                if !isPasswordValid {
+                    MailResourcesAsset.warning.swiftUIImage
+                } else {
+                    switch style {
+                    case .menuDrawer:
+                        if let detailNumber {
+                            Text(detailNumber < 100 ? "\(detailNumber)" : "99+")
+                                .textStyle(.bodySmallMediumAccent)
+                        }
+                    case .account:
+                        if isSelected {
+                            MailResourcesAsset.check.swiftUIImage
+                                .frame(width: 16, height: 16)
+                                .foregroundColor(.accentColor)
+                        }
                     }
                 }
             }
@@ -80,14 +87,15 @@ struct MailboxesManagementButtonView: View {
 
 struct MailboxesManagementButtonView_Previews: PreviewProvider {
     static var previews: some View {
-        MailboxesManagementButtonView(icon: MailResourcesAsset.folder, text: "Hello", isSelected: false) {
+        MailboxesManagementButtonView(icon: MailResourcesAsset.folder, text: "Hello", isSelected: false, isPasswordValid: true) {
             /* Empty for test */
         }
         MailboxesManagementButtonView(
             icon: MailResourcesAsset.folder,
             text: "Hello",
             detailNumber: 10,
-            isSelected: false
+            isSelected: false,
+            isPasswordValid: true
         ) {
             /* Empty for test */
         }

diff --git a/MailResources/Assets.xcassets/warning.imageset/Contents.json b/MailResources/Assets.xcassets/warning.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "warning.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
+  }
+}
diff --git a/MailResources/Assets.xcassets/warning.imageset/warning.svg b/MailResources/Assets.xcassets/warning.imageset/warning.svg
diff --git a/MailResources/Localizable/de.lproj/Localizable.strings b/MailResources/Localizable/de.lproj/Localizable.strings
diff --git a/MailResources/Localizable/en.lproj/Localizable.strings b/MailResources/Localizable/en.lproj/Localizable.strings
diff --git a/MailResources/Localizable/es.lproj/Localizable.strings b/MailResources/Localizable/es.lproj/Localizable.strings
diff --git a/MailResources/Localizable/fr.lproj/Localizable.strings b/MailResources/Localizable/fr.lproj/Localizable.strings
diff --git a/MailResources/Localizable/it.lproj/Localizable.strings b/MailResources/Localizable/it.lproj/Localizable.strings