Merge pull request #454 from PermanentOrg/feature/VSP-1444-iPad-Login…

…-Screen VSP-1442 [IOS][Mobile]Login Screen #2 fixed founded bugs
PermanentOrg · Sep 18, 2024 · 016ac0e · 016ac0e
2 parents 92d9f78 + a59c240
commit 016ac0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Permanent/Modules/Authentication/Screens/LoginView.swift b/Permanent/Modules/Authentication/Screens/LoginView.swift
@@ -90,7 +90,7 @@ struct LoginView: View {
                         .layoutPriority(0.5)
 
                 }
-                SmallRoundButtonImageView(type: .noColor, imagePlace: .onRight, text: "Register", image: Image(.iconauthUserPlus), action: {
+                SmallRoundButtonImageView(type: .noColor, imagePlace: .onRight, text: "Sign Up", image: Image(.iconauthUserPlus), action: {
                 })
                 .buttonStyle(NoTapAnimationStyle())
 
@@ -100,8 +100,9 @@ struct LoginView: View {
                 }
             }
             .padding(Constants.Design.isPhone ? 32 : 64)
-            .padding(.leading, Constants.Design.isPhone ? 32 : 0)
+            .padding(.leading, Constants.Design.isPhone ? 0 : -16)
             .padding(.top, Constants.Design.isPhone ? 32 : 0)
+            .padding(.bottom, Constants.Design.isPhone ? 8 : 0)
             ErrorBannerView(message: viewModel.bannerErrorMessage, isVisible: $viewModel.showErrorBanner)
         }
         .onChange(of: viewModel.loginStatus, perform: { status in

diff --git a/Permanent/Modules/Authentication/Views/CustomLoginFormView.swift b/Permanent/Modules/Authentication/Views/CustomLoginFormView.swift
@@ -19,13 +19,13 @@ struct CustomLoginFormView: View {
 
     var body: some View {
         VStack(spacing: 20) {
-            TextField("Username", text: $username)
-                .textStyle(UsualRegularMediumTextStyle())
+            TextField("", text: $username)
+                .textStyle(UsualSmallXRegularTextStyle())
                 .placeholder(when: username.isEmpty) {
                     Text("Email address".uppercased())
-                        .font(.custom("Usual", size: 10))
-                        .kerning(1.6)
                         .foregroundColor(.white)
+                        .font(.custom("Usual-Regular", size: 10))
+                        .kerning(1.6)
                         .lineLimit(1)
                 }
                 .foregroundColor(.white)
@@ -52,7 +52,8 @@ struct CustomLoginFormView: View {
                     focusedField = .username
                 }
 
-            SecureField("Password", text: $password)
+            SecureField("", text: $password)
+                .font(.custom("Usual-Regular", size: 14))
                 .foregroundColor(.white)
                 .placeholder(when: password.isEmpty) {
                     Text("Password".uppercased())

diff --git a/Permanent/Modules/Authentication/Views/ErrorBannerView.swift b/Permanent/Modules/Authentication/Views/ErrorBannerView.swift
@@ -74,5 +74,6 @@ struct ErrorBannerView: View {
             }
         }
         .padding(.horizontal, Constants.Design.isPhone ? 32 : 64) // Adjust this padding as needed for the notification's position
+        .padding(.leading, Constants.Design.isPhone ? 0 : -16)
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,5 +74,6 @@ struct ErrorBannerView: View { @@
                 }
             }
             .padding(.horizontal, Constants.Design.isPhone ? 32 : 64) // Adjust this padding as needed for the notification's position
+            .padding(.leading, Constants.Design.isPhone ? 0 : -16)
         }
     }