From 570dd3c11de92de49a182e7ac269089b29db6760 Mon Sep 17 00:00:00 2001 From: julia-andersson Date: Thu, 23 Jan 2025 16:49:02 +0100 Subject: [PATCH 1/3] fix spacing and alignment --- .../Addons/Sources/Navigation/ChangeAddonNavigation.swift | 1 + Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift b/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift index 6066d0f09d..9deaa54fae 100644 --- a/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift +++ b/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift @@ -147,6 +147,7 @@ public struct ChangeAddonNavigation: View { content: { ConfirmChangeAddonScreen() .embededInNavigation( + options: .navigationBarHidden, tracking: ChangeAddonTrackingType.confirmAddonScreen ) .environmentObject(changeAddonNavigationVm) diff --git a/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift b/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift index 6224f051fd..b49525dfcc 100644 --- a/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift +++ b/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift @@ -11,7 +11,7 @@ public struct ConfirmChangeAddonScreen: View { .hFormAttachToBottom { hSection { VStack(spacing: .padding32) { - VStack(spacing: 0) { + VStack(alignment: .leading, spacing: 0) { hText(L10n.addonFlowConfirmationTitle) hText( L10n.addonFlowConfirmationDescription( @@ -19,7 +19,6 @@ public struct ConfirmChangeAddonScreen: View { .displayDateDDMMMYYYYFormat ?? "" ) ) - .multilineTextAlignment(.center) .foregroundColor(hTextColor.Translucent.secondary) } VStack(spacing: .padding8) { @@ -38,8 +37,8 @@ public struct ConfirmChangeAddonScreen: View { } content: { hText(L10n.generalCloseButton) } - } + .padding(.bottom, .padding8) } } .sectionContainerStyle(.transparent) From 31637b132291673ef289fdac99f24c01e19a90a8 Mon Sep 17 00:00:00 2001 From: Sladan Nimcevic Date: Thu, 23 Jan 2025 17:07:29 +0100 Subject: [PATCH 2/3] Removed spacing --- Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift | 1 - Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift | 1 - 2 files changed, 2 deletions(-) diff --git a/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift b/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift index 9deaa54fae..6066d0f09d 100644 --- a/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift +++ b/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift @@ -147,7 +147,6 @@ public struct ChangeAddonNavigation: View { content: { ConfirmChangeAddonScreen() .embededInNavigation( - options: .navigationBarHidden, tracking: ChangeAddonTrackingType.confirmAddonScreen ) .environmentObject(changeAddonNavigationVm) diff --git a/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift b/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift index 45b9db0833..57ccbd49c4 100644 --- a/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift +++ b/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift @@ -38,7 +38,6 @@ public struct ConfirmChangeAddonScreen: View { hText(L10n.generalCloseButton) } } - .padding(.bottom, .padding8) } } .sectionContainerStyle(.transparent) From 762122096dcad0f3b762019f213cc85690f28537 Mon Sep 17 00:00:00 2001 From: julia-andersson Date: Thu, 23 Jan 2025 18:58:13 +0100 Subject: [PATCH 3/3] add padding in view --- Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift | 1 + Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift | 1 + 2 files changed, 2 insertions(+) diff --git a/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift b/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift index 6066d0f09d..9deaa54fae 100644 --- a/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift +++ b/Projects/Addons/Sources/Navigation/ChangeAddonNavigation.swift @@ -147,6 +147,7 @@ public struct ChangeAddonNavigation: View { content: { ConfirmChangeAddonScreen() .embededInNavigation( + options: .navigationBarHidden, tracking: ChangeAddonTrackingType.confirmAddonScreen ) .environmentObject(changeAddonNavigationVm) diff --git a/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift b/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift index 57ccbd49c4..2a7a1268c4 100644 --- a/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift +++ b/Projects/Addons/Sources/Views/ConfirmChangeAddonScreen.swift @@ -39,6 +39,7 @@ public struct ConfirmChangeAddonScreen: View { } } } + .padding(.top, .padding24) } .sectionContainerStyle(.transparent) }