fix: Add onDismiss

Infomaniak · May 8, 2024 · d7955d3 · d7955d3
1 parent 61d4795
commit d7955d3
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/Mail/Views/Menu Drawer/Actions/HelpView.swift b/Mail/Views/Menu Drawer/Actions/HelpView.swift
@@ -30,17 +30,17 @@ struct HelpView: View {
 
         let title: String
         let destination: URL
-        let openUpdateVersionAlert: Bool
+        let shouldOpenUpdateVersionAlert: Bool
 
         static let faq = HelpAction(
             title: MailResourcesStrings.Localizable.helpFAQ,
             destination: URLConstants.faq.url,
-            openUpdateVersionAlert: false
+            shouldOpenUpdateVersionAlert: false
         )
         static let chatbot = HelpAction(
             title: MailResourcesStrings.Localizable.helpChatbot,
             destination: URLConstants.chatbot.url,
-            openUpdateVersionAlert: true
+            shouldOpenUpdateVersionAlert: true
         )
     }
 
@@ -56,7 +56,7 @@ struct HelpView: View {
                 ForEach(actions) { action in
                     VStack(alignment: .leading, spacing: 0) {
                         Button {
-                            if action.openUpdateVersionAlert && Constants.canOSBeUpdated {
+                            if action.shouldOpenUpdateVersionAlert && Constants.isUsingABreakableOSVersion {
                                 updateVersionAlert = action
                             } else {
                                 openURL(action.destination)
@@ -87,9 +87,9 @@ struct HelpView: View {
         .background(MailResourcesAsset.backgroundColor.swiftUIColor)
         .navigationBarTitle(MailResourcesStrings.Localizable.buttonHelp, displayMode: .inline)
         .customAlert(item: $updateVersionAlert) { action in
-            UpdateVersionAlertView {
+            UpdateVersionAlertView(onLaterPressed: {
                 openURL(action.destination)
-            }
+            })
         }
     }
 }

diff --git a/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift b/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift
@@ -81,7 +81,7 @@ struct MenuDrawerItemsHelpListView: View {
             MenuDrawerItemCell(icon: MailResourcesAsset.feedback,
                                label: MailResourcesStrings.Localizable.buttonFeedback,
                                matomoName: "feedback") {
-                if Constants.canOSBeUpdated {
+                if Constants.isUsingABreakableOSVersion {
                     isShowingUpdateVersionAlert = true
                 } else {
                     sendFeedback()
@@ -101,9 +101,9 @@ struct MenuDrawerItemsHelpListView: View {
             BugTrackerView(isPresented: $isShowingBugTracker)
         }
         .customAlert(isPresented: $isShowingUpdateVersionAlert) {
-            UpdateVersionAlertView {
+            UpdateVersionAlertView(onLaterPressed: {
                 sendFeedback()
-            }
+            })
         }
     }
 

diff --git a/Mail/Views/Thread List/FlushFolderView.swift b/Mail/Views/Thread List/FlushFolderView.swift
@@ -70,6 +70,7 @@ struct FlushFolderView: View {
                     }
                     .textStyle(.bodySmallAccent)
                 }
+                .controlSize(.small)
                 .buttonStyle(.borderless)
             }
             .padding(value: .regular)

diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
@@ -101,7 +101,8 @@ struct ThreadListView: View {
                         ListVerticalInsetView(height: UIPadding.verySmall)
                     }
 
-                    if Constants.canOSBeUpdated && !hasDismissedUpdateVersionView && viewModel.frozenFolder.role == .inbox {
+                    if Constants.isUsingABreakableOSVersion && !hasDismissedUpdateVersionView && viewModel.frozenFolder
+                        .role == .inbox {
                         UpdateVersionView(isShowingUpdateAlert: $isShowingUpdateAlert)
                             .threadListCellAppearance()
                     }
@@ -201,7 +202,9 @@ struct ThreadListView: View {
             FlushFolderAlertView(flushAlert: item, folder: viewModel.frozenFolder)
         }
         .customAlert(isPresented: $isShowingUpdateAlert) {
-            UpdateVersionAlertView()
+            UpdateVersionAlertView(onDismiss: {
+                hasDismissedUpdateVersionView = true
+            })
         }
         .matomoView(view: [MatomoUtils.View.threadListView.displayName, "Main"])
     }

diff --git a/Mail/Views/Thread List/UpdateVersionAlertView.swift b/Mail/Views/Thread List/UpdateVersionAlertView.swift
@@ -32,6 +32,7 @@ struct UpdateVersionAlertView: View {
             .hasDismissedUpdateVersionView
 
     var onLaterPressed: (() -> Void)?
+    var onDismiss: (() -> Void)?
 
     var body: some View {
         VStack(alignment: .leading, spacing: UIPadding.medium) {
@@ -43,22 +44,21 @@ struct UpdateVersionAlertView: View {
             ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonUpdate,
                              secondaryButtonTitle: MailResourcesStrings.Localizable.buttonLater,
                              primaryButtonAction: updateVersion,
-                             secondaryButtonAction: dismissUpdateVersionView)
+                             secondaryButtonAction: laterButton)
+        }
+        .onDisappear {
+            onDismiss?()
         }
     }
 
     private func updateVersion() {
         matomo.track(eventWithCategory: .updateVersion, name: "update")
         openURL(DeeplinkConstants.iosPreferences)
-        dismissUpdateVersionView()
     }
 
-    private func dismissUpdateVersionView() {
+    private func laterButton() {
         matomo.track(eventWithCategory: .updateVersion, name: "later")
         onLaterPressed?()
-        withAnimation {
-            hasDismissedUpdateVersionView = true
-        }
     }
 }
 

diff --git a/Mail/Views/Thread List/UpdateVersionView.swift b/Mail/Views/Thread List/UpdateVersionView.swift
@@ -31,7 +31,6 @@ struct UpdateVersionView: View {
         VStack(alignment: .leading, spacing: 0) {
             HStack(alignment: .iconAndMultilineTextAlignment, spacing: UIPadding.small) {
                 IKIcon(MailResourcesAsset.warning)
-                    .foregroundStyle(MailResourcesAsset.orangeColor)
                     .alignmentGuide(.iconAndMultilineTextAlignment) { d in
                         d[VerticalAlignment.center]
                     }
@@ -51,9 +50,9 @@ struct UpdateVersionView: View {
                 isShowingUpdateAlert = true
             } label: {
                 Text(MailResourcesStrings.Localizable.moreInfo)
-                    .textStyle(.bodySmallAccent)
             }
             .buttonStyle(.ikLink())
+            .controlSize(.small)
             .padding(.leading, value: .regular)
 
             IKDivider(type: .full)

diff --git a/MailCore/Utils/Constants.swift b/MailCore/Utils/Constants.swift
@@ -225,7 +225,7 @@ public enum Constants {
         }
     }
 
-    public static var canOSBeUpdated: Bool {
+    public static var isUsingABreakableOSVersion: Bool {
         @InjectService var platformDetector: PlatformDetectable
 
         guard !platformDetector.isMac else { return false }