diff --git a/Resell/Models/Post.swift b/Resell/Models/Post.swift index a83df62..e8bc687 100644 --- a/Resell/Models/Post.swift +++ b/Resell/Models/Post.swift @@ -101,7 +101,7 @@ struct PostBody: Codable { case description case categories case condition - case original_price = "original_price" + case original_price = "originalPrice" case imagesBase64 case userId } diff --git a/Resell/Views/Home/ProfileView.swift b/Resell/Views/Home/ProfileView.swift index 586a0a0..9d7093e 100644 --- a/Resell/Views/Home/ProfileView.swift +++ b/Resell/Views/Home/ProfileView.swift @@ -38,6 +38,7 @@ struct ProfileView: View { .font(Constants.Fonts.body2) .foregroundStyle(Constants.Colors.black) .padding(.bottom, 28) + .padding(.horizontal, 24) .lineLimit(3) profileTabsView diff --git a/Resell/Views/ProductDetails/ProductDetailsView.swift b/Resell/Views/ProductDetails/ProductDetailsView.swift index c90b829..f1d8c51 100644 --- a/Resell/Views/ProductDetails/ProductDetailsView.swift +++ b/Resell/Views/ProductDetails/ProductDetailsView.swift @@ -86,7 +86,9 @@ struct ProductDetailsView: View { .frame(width: 36, height: 24) .frame(width: 44, height: 44) .contentShape(Rectangle()) + .offset(x: -10) } + .background(.ultraThinMaterial, in: Circle()) .padding(.leading, 12) Spacer() @@ -102,8 +104,12 @@ struct ProductDetailsView: View { .foregroundStyle(Constants.Colors.white) .frame(width: 44, height: 44) .contentShape(Rectangle()) + } + .background(.ultraThinMaterial, in: Circle()) .padding(.trailing, 12) + + } .padding(.top, topSafeArea * 2 + 4) diff --git a/Resell/Views/Settings/EditProfileView.swift b/Resell/Views/Settings/EditProfileView.swift index 4df403d..8d9bc52 100644 --- a/Resell/Views/Settings/EditProfileView.swift +++ b/Resell/Views/Settings/EditProfileView.swift @@ -26,15 +26,22 @@ struct EditProfileView: View { // MARK: - UI var body: some View { - VStack { - profileImageView - .padding(.bottom, 40) - - nameView - - editFieldsView - - Spacer() + ScrollViewReader { proxy in + ScrollView { + VStack { + profileImageView + .padding(.bottom, 40) + + nameView + + editFieldsView + + Spacer() + } + .onTapGesture { + proxy.scrollTo("bioField", anchor: .center) + } + } } .padding(.top, 40) .background(Constants.Colors.white) @@ -175,6 +182,7 @@ struct EditProfileView: View { } .padding(.top, 40) .padding(.horizontal, Constants.Spacing.horizontalPadding) + .ignoresSafeArea(.keyboard, edges: .bottom) } // MARK: - Functions diff --git a/Resell/Views/Settings/SettingsView.swift b/Resell/Views/Settings/SettingsView.swift index 926c8f0..efe82b4 100644 --- a/Resell/Views/Settings/SettingsView.swift +++ b/Resell/Views/Settings/SettingsView.swift @@ -46,7 +46,7 @@ struct SettingsView: View { router.push(.feedback) } case .reviewTesting: - settingsRow(title: "🧪 Test Reviews", icon: "feedback") { + settingsRow(title: "Test Reviews", icon: "feedback") { router.push(.reviewTesting) } case .blockedUsers: @@ -54,7 +54,7 @@ struct SettingsView: View { router.push(.blockedUsers) } case .eula: - settingsRow(title: "Term and Conditions", icon: "terms") { + settingsRow(title: "Terms and Conditions", icon: "terms") { viewModel.didShowWebView = true } case .logout: