Mercurial > public > lazybear

changeset 315:a46d85f99dc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update SignUp View
author Dennis Concepción Martín <66180929+denniscm190@users.noreply.github.com>
date Fri, 26 Mar 2021 00:05:01 +0100
parents ec6a8f637266
children a5dccf6309ef
files LazyBear/Views/Home/Helpers/UserHelper.swift LazyBear/Views/Onboarding/Helpers/ListAvatarHelper.swift LazyBear/Views/Onboarding/SignUpView.swift LazyBear/Views/Onboarding/WelcomeView.swift
diffstat 4 files changed, 28 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/LazyBear/Views/Home/Helpers/UserHelper.swift	Fri Mar 26 00:04:41 2021 +0100
+++ b/LazyBear/Views/Home/Helpers/UserHelper.swift	Fri Mar 26 00:05:01 2021 +0100
@@ -14,7 +14,7 @@
         GeometryReader { geo in
             HStack {
                 UserImage()
-                    .frame(height: geo.size.height * 0.1)
+                    .frame(height: geo.size.height * 0.15)
                     .padding(.horizontal)
                 
                 VStack(alignment: .leading) {
@@ -36,17 +36,13 @@
     
     var body: some View {
         let avatar = userSettings.first!.avatar
-        RoundedRectangle(cornerRadius: 20)
+        Image(avatar)
+            .resizable()
             .aspectRatio(1.0, contentMode: .fit)
-            .foregroundColor(Color("default"))
-            .opacity(0.3)
-            .overlay(
-                Image(avatar)
-                    .resizable()
-                    .aspectRatio(1.0, contentMode: .fit)
-                    .cornerRadius(20)
-                    .padding(5)
-            )
+            .cornerRadius(20)
+            .shadow(color: Color.black.opacity(0.2), radius: 10)
+            .padding(5)
+            
     }
 }
 
--- a/LazyBear/Views/Onboarding/Helpers/ListAvatarHelper.swift	Fri Mar 26 00:04:41 2021 +0100
+++ b/LazyBear/Views/Onboarding/Helpers/ListAvatarHelper.swift	Fri Mar 26 00:05:01 2021 +0100
@@ -19,7 +19,7 @@
         NavigationView {
             ScrollView(showsIndicators: false) {
                 LazyVGrid(columns: columns, spacing: 10) {
-                    ForEach((1..<9), id: \.self) { index in
+                    ForEach((1..<11), id: \.self) { index in
                         let avatar = "random\(index)"
                         Button(action: {
                             environmentSignUp.avatar = avatar
@@ -53,6 +53,6 @@
             .scaledToFit()
             .clipShape(Circle())
             .padding()
-            .shadow(color: Color.gray.opacity(0.3), radius: 10, x: 0.0, y: 0.0)
+            .shadow(color: Color.black.opacity(0.2), radius: 10)
     }
 }
--- a/LazyBear/Views/Onboarding/SignUpView.swift	Fri Mar 26 00:04:41 2021 +0100
+++ b/LazyBear/Views/Onboarding/SignUpView.swift	Fri Mar 26 00:05:01 2021 +0100
@@ -21,20 +21,31 @@
             GeometryReader { geo in
                 NavigationView {
                     VStack(alignment: .leading) {
+                        Text("Let us cutomise your experience.")
+                            .padding(.bottom)
+                            .opacity(0.6)
+                        
                         ProfileAvatar(size: geo.size.height * 0.3, showingAvatars: $showingAvatars)
                             .padding(.bottom)
                             
                         UserNameTextfield(username: $environmentSignUp.username)
                             .padding(.bottom)
                         
+                        Spacer()
                         Button(action: {checkAndSave()}) {
                             NextButton(text: "Continue")
-                                .padding(.bottom, 50)
                         }
+                        HStack {
+                            Spacer()
+                            Text("We do not sell your data to third parties.")
+                                .opacity(0.6)
+                            Spacer()
+                        }
+                            .font(.caption)
+                        .padding(.bottom, 30)
                     }
                     .padding()
                     .navigationTitle("Sign Up")
-                    .navigationBarTitleDisplayMode(.inline)
                 }
             }
             .alert(isPresented: $usernameIsEmptyAlert) {
@@ -86,7 +97,7 @@
                     .frame(maxWidth: size, maxHeight: size)
                     .scaledToFit()
                     .clipShape(Circle())
-                    .shadow(color: Color.gray.opacity(0.3), radius: 10, x: 0.0, y: 0.0)
+                    .shadow(color: Color.black.opacity(0.2), radius: 10)
                 
                 if !environmentSignUp.hideAvatarSelector {
                     Button(action: { self.showingAvatars = true }) {
@@ -113,7 +124,9 @@
     @Binding var username: String
     
     var body: some View {
-        VStack {
+        VStack(alignment: .leading) {
+            Text("Choose your username")
+                .font(.callout)
             TextField("Username", text: $username) { isEditing in
                 if isEditing {  // If it's true
                     environmentSignUp.hideAvatarSelector = isEditing
--- a/LazyBear/Views/Onboarding/WelcomeView.swift	Fri Mar 26 00:04:41 2021 +0100
+++ b/LazyBear/Views/Onboarding/WelcomeView.swift	Fri Mar 26 00:05:01 2021 +0100
@@ -28,7 +28,7 @@
                     Spacer()
                     Image("default")
                         .resizable()
-                        .frame(width: geo.size.width * 0.2, height: geo.size.width * 0.2)
+                        .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25)
                         .cornerRadius(25)
                         .shadow(color: Color.black.opacity(0.2), radius: 10)
                     
@@ -43,6 +43,7 @@
                     
                             
                     Text("Easily follow your stocks and the markets in real-time.")
+                        .padding(.top, 5)
                     
                     HStack {
                         if self.showingProgressView {