From 9178133d1441d3837c2e8922f475ffeef55cdbe0 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Thu, 24 Aug 2023 16:58:31 +1000
Subject: [PATCH] refactor on paddings

---
 Session/Onboarding/DisplayNameView.swift      | 14 ++++++++++----
 Session/Onboarding/LandingView.swift          |  8 ++++++--
 Session/Onboarding/LoadAccountView.swift      | 19 ++++++++++++++-----
 .../Components/SessionTextField.swift         |  6 ++----
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Session/Onboarding/DisplayNameView.swift b/Session/Onboarding/DisplayNameView.swift
index 36b068ea1..71178c6c6 100644
--- a/Session/Onboarding/DisplayNameView.swift
+++ b/Session/Onboarding/DisplayNameView.swift
@@ -37,21 +37,27 @@ struct DisplayNameView: View {
                         .bold()
                         .font(.system(size: Values.veryLargeFontSize))
                         .foregroundColor(themeColor: .textPrimary)
-                        .padding(.bottom, Values.mediumSpacing)
+                    
+                    Spacer(minLength: 0)
+                        .frame(maxHeight: 2 * Values.mediumSpacing)
                     
                     let explanation: String = (self.flow == .register) ? "onboarding_display_name_explanation".localized() : "onboarding_display_name_explanation_new".localized()
                     Text(explanation)
                         .font(.system(size: Values.smallFontSize))
                         .foregroundColor(themeColor: .textPrimary)
-                        .padding(.vertical, Values.mediumSpacing)
+                        .fixedSize(horizontal: false, vertical: true)
+                    
+                    Spacer(minLength: 0)
+                        .frame(maxHeight: 2 * Values.mediumSpacing)
                     
                     SessionTextField(
                         $displayName,
                         placeholder: "onboarding_display_name_hint".localized(),
                         error: $error
                     )
-                    .padding(.top, Values.mediumSpacing)
-                    .padding(.bottom, Values.veryLargeSpacing)
+                    
+                    Spacer(minLength: 0)
+                        .frame(maxHeight: Values.massiveSpacing)
                     
                     Spacer(minLength: 0)
                 }
diff --git a/Session/Onboarding/LandingView.swift b/Session/Onboarding/LandingView.swift
index 19e426229..999d641b3 100644
--- a/Session/Onboarding/LandingView.swift
+++ b/Session/Onboarding/LandingView.swift
@@ -30,10 +30,11 @@ struct LandingView: View {
                         .bold()
                         .font(.system(size: Values.veryLargeFontSize))
                         .foregroundColor(themeColor: .textPrimary)
-                        .padding(.bottom, Values.largeSpacing)
+                    
+                    Spacer(minLength: 0)
+                        .frame(maxHeight: 2 * Values.mediumSpacing)
                     
                     FakeChat($numberOfBubblesShown)
-                        .padding(.bottom, Values.mediumSpacing)
                         .onAppear {
                             guard numberOfBubblesShown < 4 else { return }
                             
@@ -52,6 +53,9 @@ struct LandingView: View {
                             }
                         }
                     
+                    Spacer(minLength: 0)
+                        .frame(maxHeight: Values.massiveSpacing)
+                    
                     Spacer(minLength: 0)
                 }
                 .padding(.vertical, Values.mediumSpacing)
diff --git a/Session/Onboarding/LoadAccountView.swift b/Session/Onboarding/LoadAccountView.swift
index f1f5be424..b3ab05936 100644
--- a/Session/Onboarding/LoadAccountView.swift
+++ b/Session/Onboarding/LoadAccountView.swift
@@ -182,19 +182,25 @@ struct EnterRecoveryPasswordView: View{
         ZStack(alignment: .center) {
             VStack(
                 alignment: .leading,
-                spacing: Values.mediumSpacing
+                spacing: 0
             ) {
-                Spacer()
+                Spacer(minLength: 0)
                 
                 Text("onboarding_recovery_password_tab_title".localized())
                     .bold()
                     .font(.system(size: Values.veryLargeFontSize))
                     .foregroundColor(themeColor: .textPrimary)
                 
+                Spacer(minLength: 0)
+                    .frame(maxHeight: 2 * Values.mediumSpacing)
+                
                 Text("onboarding_recovery_password_tab_explanation".localized())
                     .font(.system(size: Values.smallFontSize))
                     .foregroundColor(themeColor: .textPrimary)
-                    .padding(.vertical, Values.mediumSpacing)
+                    .fixedSize(horizontal: false, vertical: true)
+                
+                Spacer(minLength: 0)
+                    .frame(maxHeight: 2 * Values.mediumSpacing)
                 
                 SessionTextField(
                     $recoveryPassword,
@@ -202,10 +208,13 @@ struct EnterRecoveryPasswordView: View{
                     error: $error
                 )
                 
-                Spacer()
+                Spacer(minLength: 0)
+                    .frame(maxHeight: Values.massiveSpacing)
+                
+                Spacer(minLength: 0)
             }
             .padding(.horizontal, Values.veryLargeSpacing)
-            .padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight)
+            .padding(.bottom, Values.largeButtonHeight)
             
             VStack() {
                 Spacer()
diff --git a/SessionUIKit/Components/SessionTextField.swift b/SessionUIKit/Components/SessionTextField.swift
index 621557c5d..a364ad89c 100644
--- a/SessionUIKit/Components/SessionTextField.swift
+++ b/SessionUIKit/Components/SessionTextField.swift
@@ -42,10 +42,8 @@ public struct SessionTextField: View {
                 .foregroundColor(themeColor: (error?.isEmpty == false) ? .danger : .textPrimary)
             }
             .padding(.horizontal, Values.largeSpacing)
-            .frame(
-                maxWidth: .infinity,
-                maxHeight: Self.height
-            )
+            .frame(maxWidth: .infinity)
+            .frame(height: Self.height)
             .overlay(
                 RoundedRectangle(
                     cornerSize: CGSize(