robonen/mayday
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

refactor: notifications and settings view models; enhance login and registration UI

Browse Source
This commit is contained in:
Andrew Robonen
2026-03-15 21:40:20 +07:00
parent 0947c048c1
commit 37b87ececd
45 changed files with 985 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mayday/Views/Auth/RegisterView.swift
+97 -63
View File
@@ -10,76 +10,110 @@ struct RegisterView: View {
@State private var showVerify = false
@State private var registeredEmail = ""
private var isFormInvalid: Bool {
!isFormValid || authViewModel.isLoading
}
var body: some View {
VStack(spacing: 24) {
Spacer()
ZStack {
ScrollView {
VStack(spacing: 24) {
Spacer(minLength: 24)
Text("register_title")
.font(.largeTitle.bold())
VStack(spacing: 10) {
Image("Logo")
.resizable()
.scaledToFit()
.frame(width: 76, height: 76)
.clipShape(RoundedRectangle(cornerRadius: 18, style: .continuous))
.shadow(color: .red.opacity(0.22), radius: 12, y: 6)
VStack(spacing: 16) {
TextField("Email", text: $email)
.textFieldStyle(.roundedBorder)
.textContentType(.emailAddress)
.keyboardType(.emailAddress)
.autocorrectionDisabled()
.textInputAutocapitalization(.never)
SecureField("password", text: $password)
.textFieldStyle(.roundedBorder)
.textContentType(.newPassword)
SecureField("confirm_password", text: $confirmPassword)
.textFieldStyle(.roundedBorder)
.textContentType(.newPassword)
}
if password.count > 0 && password.count < 8 {
Text("password_min_length")
.foregroundStyle(.red)
.font(.footnote)
}
if confirmPassword.count > 0 && password != confirmPassword {
Text("passwords_mismatch")
.foregroundStyle(.red)
.font(.footnote)
}
if let error = authViewModel.error {
Text(error)
.foregroundStyle(.red)
.font(.footnote)
.multilineTextAlignment(.center)
}
Button {
Task {
let success = await authViewModel.register(email: email, password: password)
if success {
registeredEmail = email
showVerify = true
Text("register_title")
.font(.largeTitle.bold())
}
VStack(spacing: 14) {
AppTextField(title: "Email", icon: "envelope.fill", text: $email)
.textContentType(.emailAddress)
.keyboardType(.emailAddress)
.autocorrectionDisabled()
.textInputAutocapitalization(.never)
AppSecureField(title: "password", icon: "lock.fill", text: $password)
.textContentType(.newPassword)
AppSecureField(title: "confirm_password", icon: "lock.rotation", text: $confirmPassword)
.textContentType(.newPassword)
}
if password.count > 0 && password.count < 8 {
Text("password_min_length")
.foregroundStyle(.red)
.font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading)
}
if confirmPassword.count > 0 && password != confirmPassword {
Text("passwords_mismatch")
.foregroundStyle(.red)
.font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading)
}
if let error = authViewModel.error {
Text(error)
.foregroundStyle(.red)
.font(.footnote)
.multilineTextAlignment(.leading)
.frame(maxWidth: .infinity, alignment: .leading)
}
Button {
Task {
let success = await authViewModel.register(email: email, password: password)
if success {
registeredEmail = email
showVerify = true
}
}
} label: {
ZStack {
RoundedRectangle(cornerRadius: 14, style: .continuous)
.fill(
LinearGradient(
colors: [Color.red, Color.red.opacity(0.82)],
startPoint: .topLeading,
endPoint: .bottomTrailing
)
)
.frame(height: 52)
if authViewModel.isLoading {
ProgressView()
.tint(.white)
} else {
Text("register_button")
.font(.headline)
.foregroundStyle(.white)
}
}
}
.disabled(isFormInvalid)
.opacity(isFormInvalid ? 0.6 : 1)
Button("register_has_account") { dismiss() }
.font(.footnote.weight(.semibold))
.foregroundStyle(.secondary)
Spacer(minLength: 8)
}
} label: {
if authViewModel.isLoading {
ProgressView().frame(maxWidth: .infinity)
} else {
Text("register_button").frame(maxWidth: .infinity)
}
.cardContainer()
}
.navigationDestination(isPresented: $showVerify) {
VerifyEmailView(email: registeredEmail, password: password)
}
.buttonStyle(.borderedProminent)
.disabled(!isFormValid || authViewModel.isLoading)
Button("register_has_account") { dismiss() }
.font(.footnote)
Spacer()
}
.padding()
.navigationDestination(isPresented: $showVerify) {
VerifyEmailView(email: registeredEmail)
}
.appBackground()
.navigationTitle("register_title")
.navigationBarTitleDisplayMode(.inline)
}