From 378837e25b30afb00ae59e4cc0db9054736e9112 Mon Sep 17 00:00:00 2001 From: Valentin Perignon Date: Mon, 17 Jul 2023 13:43:57 +0200 Subject: [PATCH] feat: Use UIConstants --- Mail/Views/Bottom sheets/Actions/ActionsView.swift | 6 +++--- Mail/Views/Bottom sheets/Actions/ContactActionsView.swift | 6 +++--- Mail/Views/Bottom sheets/Actions/ReportJunkView.swift | 6 +++--- MailCore/UI/UIConstants.swift | 4 ++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Mail/Views/Bottom sheets/Actions/ActionsView.swift b/Mail/Views/Bottom sheets/Actions/ActionsView.swift index d8d3bf060f..b9832e2987 100644 --- a/Mail/Views/Bottom sheets/Actions/ActionsView.swift +++ b/Mail/Views/Bottom sheets/Actions/ActionsView.swift @@ -48,7 +48,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 @@ -71,10 +71,10 @@ struct ActionsView: View { } } } - .padding(.horizontal, 24) + .padding(.horizontal, UIConstants.actionsViewCellHorizontalPadding) } } - .padding(.horizontal, 8) + .padding(.horizontal, UIConstants.actionsViewHorizontalPadding) .matomoView(view: [MatomoUtils.View.bottomSheet.displayName, "ActionsView"]) } } diff --git a/Mail/Views/Bottom sheets/Actions/ContactActionsView.swift b/Mail/Views/Bottom sheets/Actions/ContactActionsView.swift index 6a6a17be7d..a320074ddb 100644 --- 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 index 11b9bdbce0..bc08c0ccb7 100644 --- a/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift +++ b/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift @@ -43,7 +43,7 @@ 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() @@ -56,10 +56,10 @@ struct ReportJunkView: View { } } } - .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 index c36e7c0c75..b2e5c39f67 100644 --- 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