Updated profile screen with new design and feedback

Author: srikanth-vg

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/2D0369 Profile icon.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x69",
+          "green" : "0x03",
+          "red" : "0x2D"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/8F57DE Profile icon .colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xDE",
+          "green" : "0x57",
+          "red" : "0x8F"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/DDDDDD line.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xDD",
+          "green" : "0xDD",
+          "red" : "0xDD"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/F5F5F5 light gray background.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF5",
+          "green" : "0xF5",
+          "red" : "0xF5"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GoInfoGame/GoInfoGame/Helpers/Generated/Strings+Generated.swift

@@ -17,8 +17,12 @@ internal enum L10n {
     internal static let cantSay = L10n.tr("Localizable", "cant_say", fallback: "Can't Say")
     /// Don't show again for this session
     internal static let dontShowAgain = L10n.tr("Localizable", "dont_show_again", fallback: "Don't show again for this session")
+    /// My Profile
+    internal static let myProfile = L10n.tr("Localizable", "My Profile", fallback: "My Profile")
     /// OTHER ANSWERS...
     internal static let otherAnswers = L10n.tr("Localizable", "other_answers", fallback: "OTHER ANSWERS...")
+    /// Preferences
+    internal static let preferences = L10n.tr("Localizable", "Preferences", fallback: "Preferences")
     /// Are there one or more street lamps within 10 feet of this Bus stop?
     internal static let questBusStopLitTitle = L10n.tr("Localizable", "quest_busStopLit_title", fallback: "Are there one or more street lamps within 10 feet of this Bus stop?")
     /// What’s the height of the curbs at this crossing?

GoInfoGame/GoInfoGame/Helpers/Generated/XCAssets+Generated.swift

@@ -26,13 +26,17 @@ internal typealias AssetImageTypeAlias = ImageAsset.Image
 internal enum Asset {
   internal static let accentColor = ColorAsset(name: "AccentColor")
   internal enum Colors {
+    internal static let _2D0369ProfileIcon = ColorAsset(name: "2D0369 Profile icon")
     internal static let _42526ETextFieldText = ColorAsset(name: "42526E Text field text")
     internal static let _83879BTextFiledTitle = ColorAsset(name: "83879B Text filed title")
+    internal static let _8F57DEProfileIcon = ColorAsset(name: "8F57DE Profile icon ")
     internal static let accentLavender = ColorAsset(name: "Accent Lavender")
     internal static let accentPink = ColorAsset(name: "Accent Pink")
     internal static let d5DBE6BorderColorGray = ColorAsset(name: "D5DBE6 Border Color gray")
+    internal static let ddddddLine = ColorAsset(name: "DDDDDD line")
     internal static let e5E5E5GrayBackgroudn = ColorAsset(name: "E5E5E5  Gray backgroudn")
     internal static let e7E3EELightPurpuleBg = ColorAsset(name: "E7E3EE Light Purpule bg")
+    internal static let f5F5F5LightGrayBackground = ColorAsset(name: "F5F5F5 light gray background")
     internal static let huskyGold = ColorAsset(name: "Husky Gold")
     internal static let huskyPurple = ColorAsset(name: "Husky Purple")
     internal static let theme = ColorAsset(name: "theme")

GoInfoGame/GoInfoGame/Login/BiometricToggleView.swift

@@ -29,6 +29,8 @@ struct BiometricToggleView: View {
             }
         )) {
             Text(biometricToggleText)
+                .font(FontFamily.Lato.regular.swiftUIFont(size: 16))
+                .foregroundStyle(Asset.Colors._42526ETextFieldText.swiftUIColor)
         }
         .tint(Asset.Colors.accentPink.swiftUIColor)
     }

GoInfoGame/GoInfoGame/UserProfile/View/UserProfileView.swift

@@ -9,6 +9,7 @@ import SwiftUI
 import LocalAuthentication
 
 struct UserProfileView: View {
+    @Environment(\.dismiss) var dismiss
 
     @StateObject private var viewModel = UserProfileViewModel()
 
@@ -21,42 +22,82 @@ struct UserProfileView: View {
     var body: some View {
         Group {
             ZStack {
+                Asset.Colors.f5F5F5LightGrayBackground.swiftUIColor
                 VStack {
-                    Text("My Profile")
-                        .font(.custom("Lato-Bold", size: 25))
-                        .padding(.bottom, 50)
-                        .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
-                    HStack(alignment: .center, spacing: 16) {
-                        profileImage
+                    ZStack {
+                        Asset.Colors.e7E3EELightPurpuleBg.swiftUIColor
+                            .edgesIgnoringSafeArea(.top)
+                            .padding(.top, 0)
 
-                        VStack(alignment: .leading, spacing: 4) {
-                            Text(userFullName())
-                                .font(.custom("Lato-Bold", size: 20))
-                            Text(viewModel.user?.email ?? "")
-                                .font(.custom("Lato-Regular", size: 18))
+                        VStack(alignment: .center, spacing: 16) {
+                            profileImage
+                            
+                            VStack(alignment: .center, spacing: 6) {
+                                Text(userFullName())
+                                    .font(FontFamily.Lato.bold.swiftUIFont(fixedSize: 20))
+                                Text(viewModel.user?.email ?? " ")
+                                    .font(FontFamily.Lato.regular.swiftUIFont(fixedSize: 16))
+                            }
+                            .foregroundStyle(Asset.Colors._42526ETextFieldText.swiftUIColor)
                         }
-                        
-                        Spacer()
                     }
-                    .padding([.bottom], 200)
+                    .frame(height: 200)
 
-                    if BiometricAuthManager.canEvaluateBiometrics() {
-                        BiometricToggleView(isEnabled: $useBiometricID) {status in
-                            if status {
-                                showPasswordAuthenticationView = true
-                            } else {
-                                SessionManager.shared.logout(environment: APIConfiguration.shared.environment, clearBiometricCreds: true)
+                    ZStack {
+                        Color.white
+                        VStack(alignment: .leading, spacing: 25) {
+                            Text(L10n.Localizable.preferences.uppercased())
+                                .font(FontFamily.Lato.bold.swiftUIFont(size: 14))
+                                .foregroundStyle(Asset.Colors._83879BTextFiledTitle.swiftUIColor)
+                            
+                            if BiometricAuthManager.canEvaluateBiometrics() {
+                                BiometricToggleView(isEnabled: $useBiometricID) {status in
+                                    if status {
+                                        showPasswordAuthenticationView = true
+                                    } else {
+                                        SessionManager.shared.logout(environment: APIConfiguration.shared.environment, clearBiometricCreds: true)
+                                    }
+                                }
+                            }
+                            
+                            Line()
+                                .stroke(style: .init(dash: [4]))
+                                .foregroundStyle(Asset.Colors.ddddddLine.swiftUIColor)
+                                .frame(height: 1)
+                            
+                            HStack {
+                                Spacer()
+                                logOutButton
+                                Spacer()
                             }
+                            
+                            Spacer()
                         }
-                        .padding([.bottom], 30)
-                    }                    
-                    
-                    logOutButton
+                        .padding()
+                    }
+                    .padding()
+                    .padding(.bottom, 0)
+                    .cornerRadius(20)
+                    .clipped()
+                }
+                .navigationBarBackButtonHidden()
+                .toolbar {
+                    ToolbarItem(placement: .navigationBarLeading) {
+                        Button(action: {
+                            dismiss()
+                        }) {
+                            Image(systemName: "arrow.left")
+                                .resizable()
+                                .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
+                        }
+                    }
 
-                    Spacer()
+                    ToolbarItem(placement: .principal) {
+                        Text(L10n.Localizable.myProfile)
+                            .font(FontFamily.Lato.bold.swiftUIFont(size: 16))
+                            .foregroundStyle(Asset.Colors._42526ETextFieldText.swiftUIColor)
+                    }
                 }
-                .padding(20)
-                .navigationBarTitleDisplayMode(.inline)
             }
             .overlay {
                 if showPasswordAuthenticationView {
@@ -68,10 +109,7 @@ struct UserProfileView: View {
                        showPasswordAuthenticationView = false
                     } onFailure: { error in
                         useBiometricID = false
-                        
-                        
                     }
-
                 }
             }
         }
@@ -85,15 +123,23 @@ struct UserProfileView: View {
         if let userModel = viewModel.user {
             return userModel.getFullName()
         }
-        return ""
+        return " "
 
     }
 
     private var profileImage: some View {
-        Image(systemName: "person.fill")
-            .resizable()
-            .frame(width: 50, height: 50)
-            .clipShape(Circle())
+        ZStack {
+            Image(systemName: "person.fill")
+                .resizable()
+                .frame(width: 50, height: 50)
+                .foregroundStyle(.white)
+                .clipShape(Circle())
+        }
+        .frame(width: 60, height: 60)
+        .background{
+            LinearGradient(gradient: Gradient(colors: [Asset.Colors._8F57DEProfileIcon.swiftUIColor, Asset.Colors._2D0369ProfileIcon.swiftUIColor,]), startPoint: .top, endPoint: .bottom)
+        }
+        .clipShape(Circle())
     }
 
 
@@ -106,16 +152,30 @@ struct UserProfileView: View {
                }
           //  accessToken = nil
         } label: {
-            Text("LOGOUT")
-                .font(.custom("Lato-Bold", size: 15))
-                .foregroundColor(Color.white)
-                .padding()
-                .background(Color(red: 0.79, green: 0.0, blue: 0.0))
-                .cornerRadius(25)
+            HStack(spacing: 10) {
+                Image(systemName: "rectangle.portrait.and.arrow.right")
+                    .foregroundStyle(.white)
+                Text("Logout")
+                    .font(FontFamily.Lato.bold.swiftUIFont(fixedSize: 16))
+                    .foregroundColor(Color.white)
+                    
+            }
+            .padding()
+            .background(Asset.Colors.accentPink.swiftUIColor)
+            .cornerRadius(25)
         }
     }
 }
 
+struct Line: Shape {
+    func path(in rect: CGRect) -> Path {
+        var path = Path()
+        path.move(to: CGPoint(x: 0, y: 0))
+        path.addLine(to: CGPoint(x: rect.width, y: 0))
+        return path
+    }
+}
+
 #Preview {
     UserProfileView()
 }

GoInfoGame/GoInfoGame/en.lproj/Localizable.strings

@@ -104,3 +104,5 @@
 
 // AVIV
 "App Name" = "AVIV ScoutRoute";
+"Preferences" = "Preferences";
+"My Profile" = "My Profile";