feat: Use UIConstants

Infomaniak · Jul 17, 2023 · 43b6efd · 43b6efd
1 parent f719aff
commit 43b6efd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/Mail/Views/Bottom sheets/Actions/ActionsView.swift b/Mail/Views/Bottom sheets/Actions/ActionsView.swift
@@ -23,6 +23,8 @@ import MailResources
 import SwiftUI
 
 struct ActionsView: View {
+    @Environment(\.dismiss) private var dismiss
+
     @StateObject var viewModel: ActionsViewModel
 
     init(mailboxManager: MailboxManager,
@@ -48,7 +50,7 @@ struct ActionsView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 12) {
+        VStack(alignment: .leading, spacing: UIConstants.actionsViewSpacing) {
             // Quick actions
             HStack(alignment: .top, spacing: 16) {
                 ForEach(viewModel.quickActions) { action in
@@ -65,16 +67,17 @@ struct ActionsView: View {
                 }
 
                 ActionView(action: action) {
+                    dismiss()
                     Task {
                         await tryOrDisplayError {
                             try await viewModel.didTap(action: action)
                         }
                     }
                 }
-                .padding(.horizontal, 24)
+                .padding(.horizontal, UIConstants.actionsViewCellHorizontalPadding)
             }
         }
-        .padding(.horizontal, 8)
+        .padding(.horizontal, UIConstants.actionsViewHorizontalPadding)
         .matomoView(view: [MatomoUtils.View.bottomSheet.displayName, "ActionsView"])
     }
 }
@@ -125,14 +128,11 @@ struct QuickActionView: View {
 }
 
 struct ActionView: View {
-    @Environment(\.dismiss) private var dismiss
-
     let action: Action
     let handler: () -> Void
 
     var body: some View {
         Button {
-            dismiss()
             handler()
         } label: {
             HStack(spacing: 24) {

diff --git a/Mail/Views/Bottom sheets/Actions/ContactActionsView.swift b/Mail/Views/Bottom sheets/Actions/ContactActionsView.swift
@@ -44,7 +44,7 @@ struct ContactActionsView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 12) {
+        VStack(alignment: .leading, spacing: UIConstants.actionsViewSpacing) {
             ContactActionsHeaderView(displayablePerson: CommonContact(
                 recipient: recipient,
                 contextMailboxManager: mailboxManager
@@ -62,11 +62,11 @@ struct ContactActionsView: View {
                     }
                     handleAction(action)
                 }
-                .padding(.horizontal, 24)
+                .padding(.horizontal, UIConstants.actionsViewCellHorizontalPadding)
             }
         }
         .frame(maxWidth: .infinity, alignment: .leading)
-        .padding(.horizontal, 8)
+        .padding(.horizontal, UIConstants.actionsViewHorizontalPadding)
         .sheet(item: $writtenToRecipient) { writtenToRecipient in
             ComposeMessageView.writingTo(recipient: writtenToRecipient, mailboxManager: mailboxManager)
         }

diff --git a/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift b/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift
@@ -22,6 +22,8 @@ import MailCore
 import SwiftUI
 
 struct ReportJunkView: View {
+    @Environment(\.dismiss) private var dismiss
+
     @StateObject var viewModel: ActionsViewModel
 
     var actions: [Action] = []
@@ -43,23 +45,24 @@ struct ReportJunkView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 12) {
+        VStack(alignment: .leading, spacing: UIConstants.actionsViewSpacing) {
             ForEach(actions) { action in
                 if action != actions.first {
                     IKDivider()
                 }
 
                 ActionView(action: action) {
+                    dismiss()
                     Task {
                         await tryOrDisplayError {
                             try await viewModel.didTap(action: action)
                         }
                     }
                 }
-                .padding(.horizontal, 24)
+                .padding(.horizontal, UIConstants.actionsViewCellHorizontalPadding)
             }
         }
-        .padding(.horizontal, 8)
+        .padding(.horizontal, UIConstants.actionsViewHorizontalPadding)
         .matomoView(view: [MatomoUtils.View.bottomSheet.displayName, "ReportJunkView"])
     }
 }

diff --git a/MailCore/UI/UIConstants.swift b/MailCore/UI/UIConstants.swift
@@ -110,6 +110,10 @@ public enum UIConstants {
 
     public static let bottomSheetHorizontalPadding: CGFloat = 24
 
+    public static let actionsViewSpacing: CGFloat = 12
+    public static let actionsViewHorizontalPadding: CGFloat = 8
+    public static let actionsViewCellHorizontalPadding: CGFloat = 24
+
     public static let unknownRecipientHorizontalPadding: CGFloat = 8
 
     public static let autocompletionVerticalPadding: CGFloat = 8