Mercurial > public > lazybear

changeset 320:e828c2b0764c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor update SignUpView
author Dennis Concepción Martín <66180929+denniscm190@users.noreply.github.com>
date Sat, 27 Mar 2021 20:32:45 +0100
parents 62d278295bb7
children 8f8d5ad3dfa0
files LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate LazyBear/Views/Onboarding/Helpers/Avatar.swift LazyBear/Views/Onboarding/Helpers/AvatarCreator.swift LazyBear/Views/Onboarding/SignUpView.swift
diffstat 4 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
Binary file LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate has changed
--- a/LazyBear/Views/Onboarding/Helpers/Avatar.swift	Sat Mar 27 20:26:15 2021 +0100
+++ b/LazyBear/Views/Onboarding/Helpers/Avatar.swift	Sat Mar 27 20:32:45 2021 +0100
@@ -36,10 +36,6 @@
                 )
         }
         .padding()
-        .background(
-            Circle()
-                .foregroundColor(Color(firstAvatar.background))
-        )
     }
 }
 extension Image {
--- a/LazyBear/Views/Onboarding/Helpers/AvatarCreator.swift	Sat Mar 27 20:26:15 2021 +0100
+++ b/LazyBear/Views/Onboarding/Helpers/AvatarCreator.swift	Sat Mar 27 20:32:45 2021 +0100
@@ -15,11 +15,17 @@
     var components = ["Hair", "Eyes", "Mouth", "Body"]
     @State private var selectedComponent = "Hair"
     @Environment(\.presentationMode) var avatarGeneratorPresentation
+    @EnvironmentObject var firstAvatar: FirstAvatar
     
     var body: some View {
         NavigationView {
             VStack {
                 Avatar()
+                    .shadow(color: Color.gray.opacity(0.2), radius: 10)
+                    .background(
+                        Circle()
+                            .foregroundColor(Color(firstAvatar.background))
+                    )
                     .padding(.top)
                 
                 Picker("Select a component", selection: $selectedComponent) {
--- a/LazyBear/Views/Onboarding/SignUpView.swift	Sat Mar 27 20:26:15 2021 +0100
+++ b/LazyBear/Views/Onboarding/SignUpView.swift	Sat Mar 27 20:32:45 2021 +0100
@@ -111,7 +111,11 @@
             ZStack(alignment: .topTrailing) {
                 Button(action: { self.showingAvatarGenerator = true; self.hapticsManager.simpleSuccess()}) {
                     Avatar()
-                    .shadow(color: Color.gray.opacity(0.2), radius: 10)
+                        .shadow(color: Color.gray.opacity(0.2), radius: 10)
+                        .background(
+                            Circle()
+                                .foregroundColor(Color(firstAvatar.background))
+                        )
                     
                 }
             }