update

zshahin-61 · Nov 28, 2023 · ca632dc · ca632dc
1 parent 3544a20
commit ca632dc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/golnaz.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/golnaz.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/UpgradeUpsell/Views/settings/ProfileView.swift b/UpgradeUpsell/Views/settings/ProfileView.swift
@@ -39,7 +39,7 @@ struct ProfileView: View {
                 Text("Profile").bold().font(.title).foregroundColor(.brown)
                 Spacer()
             }
-            Form{
+           // Form{
                 VStack {
                             if let selectedImage = selectedImage {
                                 Image(uiImage: selectedImage)
@@ -68,7 +68,7 @@ struct ProfileView: View {
 
                 FormSection(header: "Personal Details") {
                     TextField("Full Name", text: $nameFromUI)
-                        .padding(.horizontal, 10)
+                        .padding(.horizontal, 5)
                         .frame(width: 280, height: 30)
                         .border(Color.gray, width: 1)
 
@@ -86,15 +86,15 @@ struct ProfileView: View {
                     FormSection(header: "Your Rating") {
                         RatingView(rating: rating)
                             .frame(maxWidth: .infinity)
-                            .padding()
+                         //   .padding()
                             .background(Color(UIColor.systemBackground))
                             .cornerRadius(8)
                     }
                 }
 
                 FormSection(header: "Contact Information") {
                     TextField("Company", text: $companyFromUI)
-                        .padding(.horizontal, 10)
+                        .padding(.horizontal, 5)
                         .frame(width: 280, height: 30)
                         .border(Color.gray, width: 1)
 
@@ -104,15 +104,16 @@ struct ProfileView: View {
                         .border(Color.gray, width: 1)
 
                     TextField("Phone Number", text: $contactNumberFromUI)
-                        .padding(.horizontal, 10)
+                        .padding(.horizontal, 5)
                         .frame(width: 280, height: 30)
                         .border(Color.gray, width: 1)
                 }
 
                 if let err = errorMsg {
                     Text(err).foregroundColor(Color.red).bold()
                 }
-            }
+          //  }
+            Spacer()
             HStack{
                 Button(action: {                //Validate the data such as no mandatory inputs, password rules, etc.
                     //
@@ -186,7 +187,7 @@ struct ProfileView: View {
             }
             Spacer()
         }
-        .padding(.horizontal, 10)
+        .padding(.horizontal, 5)
         .onAppear() {
             if let currentUser = dbHelper.userProfile{
                 self.email = currentUser.email

diff --git a/UpgradeUpsell/Views/settings/SettingsView.swift b/UpgradeUpsell/Views/settings/SettingsView.swift
@@ -29,16 +29,16 @@ struct SettingsView: View {
             VStack {
                 Form {
                     Section(header: Text("Preferences")) {
-//                        Picker("Theme", selection: $themeFromUI) {
-//                            Text("Light").tag("light")
-//                            Text("Dark").tag("dark")
-//                        }
+                        //                        Picker("Theme", selection: $themeFromUI) {
+                        //                            Text("Light").tag("light")
+                        //                            Text("Dark").tag("dark")
+                        //                        }
 
                         Toggle("Dark Mode", isOn: Binding(
-                                       get: { themeManager.selectedTheme == "dark" },
-                                       set: { _ in themeManager.toggleTheme() }
-                                   ))
-                                   .padding()
+                            get: { themeManager.selectedTheme == "dark" },
+                            set: { _ in themeManager.toggleTheme() }
+                        ))
+                        .padding()
 
                         Picker("Language", selection: $langFromUI) {
                             Text("English")//.tag("en_CA")
@@ -100,7 +100,7 @@ struct SettingsView: View {
                             }else if self.role ==  "Owner"{
                                 self.rootScreen = .Home
                             }  else if self.role == "Admin"{
-                                    self.rootScreen = .Admin
+                                self.rootScreen = .Admin
 
                             } else if self.role == "Realtor"
 
@@ -111,7 +111,7 @@ struct SettingsView: View {
                             Text("Back")
                         }.buttonStyle(.borderedProminent)
                     }
-
+                    
                     Section(header: Text("Account")) {
                         Button(action:{
 
@@ -139,11 +139,11 @@ struct SettingsView: View {
                 } else if self.role == "Realtor"
                 {
                     self.rootScreen =  .RealtorHome
-
+                    
                 } else if self.role ==  "Admin"{
                     self.rootScreen =  .Admin
                 }
-
+                
                 //self.presentationMode.wrappedValue.dismiss()
             }) {
                 Text("< Back")
@@ -154,9 +154,9 @@ struct SettingsView: View {
                     self.role = role
                 }
                 dbHelper.getPreferencesFromFirestore(forUserID: dbHelper.userProfile?.id! ?? ""){ (userPref, error) in
-//                    guard let userPref = dbHelper.userPrefrences else{
-//                        return
-//                    }
+                    //                    guard let userPref = dbHelper.userPrefrences else{
+                    //                        return
+                    //                    }
                     if let error = error{
 
                     }else if let userPref = userPref {
@@ -169,6 +169,7 @@ struct SettingsView: View {
                     }
                 }
             }
+
         }
         .alert(isPresented: $showingDeleteAlert) {
             Alert(
@@ -194,6 +195,7 @@ struct SettingsView: View {
                 secondaryButton: .cancel()
             )
         }
+        Spacer()
     }
 }