refactor: Clean code

Infomaniak · Oct 9, 2023 · f62ca87 · f62ca87
1 parent d3f071a
commit f62ca87
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/Mail/Views/AI Writer/AIPromptView.swift b/Mail/Views/AI Writer/AIPromptView.swift
@@ -90,7 +90,7 @@ struct AIPromptView: View {
             aiModel.resetConversation()
         }
         .onDisappear {
-            if !aiModel.isShowingProposition {
+            if aiModel.conversation.isEmpty {
                 matomo.track(eventWithCategory: .aiWriter, name: "dismissPromptWithoutGenerating")
             }
         }

diff --git a/Mail/Views/AI Writer/AIPropositionMenu.swift b/Mail/Views/AI Writer/AIPropositionMenu.swift
@@ -59,10 +59,10 @@ struct AIPropositionMenu: View {
                 Text(MailResourcesStrings.Localizable.aiButtonRefine)
             }
             .frame(height: UIConstants.buttonMediumHeight)
-            .simultaneousGesture(TapGesture().onEnded {
-                matomo.track(eventWithCategory: .aiWriter, name: "refine")
-            })
         }
+        .simultaneousGesture(TapGesture().onEnded {
+            matomo.track(eventWithCategory: .aiWriter, name: "refine")
+        })
         .tint(MailResourcesAsset.textSecondaryColor.swiftUIColor)
         .modifier(FixedMenuOrderModifier())
     }

diff --git a/Mail/Views/AI Writer/AIPropositionView.swift b/Mail/Views/AI Writer/AIPropositionView.swift
@@ -99,13 +99,11 @@ struct AIPropositionView: View {
                         } else {
                             MailButton(icon: MailResourcesAsset.plus, label: MailResourcesStrings.Localizable.aiButtonInsert) {
                                 let shouldReplaceContent = !draft.isBodyEmpty
-                                guard !shouldReplaceContent || shouldReplaceContent && UserDefaults.shared
-                                    .doNotShowAIReplaceMessageAgain else {
-                                    matomo.track(eventWithCategory: .aiWriter, name: "replacePropositionDialog")
+                                guard !shouldReplaceContent || UserDefaults.shared.doNotShowAIReplaceMessageAgain else {
                                     isShowingReplaceContentAlert = true
                                     return
                                 }
-                                insertResult(shouldReplaceContent)
+                                insertResult(shouldReplaceContent: shouldReplaceContent)
                             }
                         }
                     }
@@ -118,7 +116,7 @@ struct AIPropositionView: View {
             }
             .customAlert(isPresented: $isShowingReplaceContentAlert) {
                 ReplaceMessageContentView {
-                    insertResult(true)
+                    insertResult(shouldReplaceContent: true)
                 }
             }
             .mailButtonPrimaryColor(MailResourcesAsset.aiColor.swiftUIColor)
@@ -128,7 +126,7 @@ struct AIPropositionView: View {
         }
     }
 
-    private func insertResult(_ shouldReplaceContent: Bool) {
+    private func insertResult(shouldReplaceContent: Bool) {
         guard !aiModel.isLoading, let content = aiModel.conversation.last?.content else { return }
         matomo.track(
             eventWithCategory: .aiWriter,

diff --git a/Mail/Views/Alerts/ReplaceMessageContentView.swift b/Mail/Views/Alerts/ReplaceMessageContentView.swift
@@ -23,6 +23,8 @@ import MailResources
 import SwiftUI
 
 struct ReplaceMessageContentView: View {
+    @LazyInjectService private var matomo: MatomoUtils
+
     @State private var doNotShowAIReplaceMessageAgain = UserDefaults.shared.doNotShowAIReplaceMessageAgain
 
     let action: () -> Void
@@ -43,8 +45,7 @@ struct ReplaceMessageContentView: View {
             .padding(.bottom, UIPadding.alertDescriptionBottom)
 
             ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.aiReplacementDialogPositiveButton) {
-                @LazyInjectService var matomo: MatomoUtils
-                matomo.track(eventWithCategory: .aiWriter, name: "replacePropositionDialog")
+                matomo.track(eventWithCategory: .aiWriter, name: "replacePropositionConfirm")
                 if doNotShowAIReplaceMessageAgain {
                     matomo.track(eventWithCategory: .aiWriter, action: .data, name: "doNotShowAgain")
                 }
@@ -53,6 +54,9 @@ struct ReplaceMessageContentView: View {
                 action()
             }
         }
+        .onAppear {
+            matomo.track(eventWithCategory: .aiWriter, name: "replacePropositionDialog")
+        }
     }
 }