mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add error message below text fields in Register view

Browse source
This commit is contained in:
Benoit Martins 2024-07-03 14:16:33 +02:00
parent b92690865f
commit 09ea819b55
2 changed files with 57 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Linphone/UI/Assistant/Fragments/RegisterFragment.swift
View file

@ -91,10 +91,19 @@ struct RegisterFragment: View {
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(isNameFocused ? Color.orangeMain500 : Color.gray200, lineWidth: 1)
.stroke(isNameFocused ? Color.orangeMain500 : (!registerViewModel.usernameError.isEmpty ? Color.redDanger500 : Color.gray200), lineWidth: 1)
)
.padding(.bottom)
.focused($isNameFocused)
.onChange(of: registerViewModel.username) { _ in
if !registerViewModel.usernameError.isEmpty {
registerViewModel.usernameError = ""
}
}
Text(registerViewModel.usernameError)
.foregroundStyle(Color.redDanger500)
.default_text_style_600(styleSize: 15)
.padding(.bottom)
Text(String(localized: "Phone number")+"*")
.default_text_style_700(styleSize: 15)
@ -128,6 +137,11 @@ struct RegisterFragment: View {
.autocapitalization(.none)
.padding(.leading, 5)
.keyboardType(.numberPad)
.onChange(of: registerViewModel.phoneNumber) { _ in
if !registerViewModel.phoneNumberError.isEmpty {
registerViewModel.phoneNumberError = ""
}
}
}
.frame(height: 25)
.padding(.horizontal, 20)
@ -136,11 +150,15 @@ struct RegisterFragment: View {
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(isPhoneNumberFocused ? Color.orangeMain500 : Color.gray200, lineWidth: 1)
.stroke(isPhoneNumberFocused ? Color.orangeMain500 : (!registerViewModel.phoneNumberError.isEmpty ? Color.redDanger500 : Color.gray200), lineWidth: 1)
)
.padding(.bottom)
.focused($isPhoneNumberFocused)
Text(registerViewModel.phoneNumberError)
.foregroundStyle(Color.redDanger500)
.default_text_style_600(styleSize: 15)
.padding(.bottom)
Text(String(localized: "password")+"*")
.default_text_style_700(styleSize: 15)
.padding(.bottom, -5)
@ -152,6 +170,11 @@ struct RegisterFragment: View {
.default_text_style(styleSize: 15)
.frame(height: 25)
.focused($isPasswordFocused)
.onChange(of: registerViewModel.passwd) { _ in
if !registerViewModel.passwordError.isEmpty {
registerViewModel.passwordError = ""
}
}
} else {
TextField("password", text: $registerViewModel.passwd)
.default_text_style(styleSize: 15)
@ -159,6 +182,11 @@ struct RegisterFragment: View {
.autocapitalization(.none)
.frame(height: 25)
.focused($isPasswordFocused)
.onChange(of: registerViewModel.passwd) { _ in
if !registerViewModel.passwordError.isEmpty {
registerViewModel.passwordError = ""
}
}
}
}
@ -178,9 +206,13 @@ struct RegisterFragment: View {
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(isPasswordFocused ? Color.orangeMain500 : Color.gray200, lineWidth: 1)
.stroke(isPasswordFocused ? Color.orangeMain500 : (!registerViewModel.passwordError.isEmpty ? Color.redDanger500 : Color.gray200), lineWidth: 1)
)
.padding(.bottom)
Text(registerViewModel.passwordError)
.foregroundStyle(Color.redDanger500)
.default_text_style_600(styleSize: 15)
.padding(.bottom)
NavigationLink(isActive: $registerViewModel.isLinkActive, destination: {
RegisterCodeConfirmationFragment(registerViewModel: registerViewModel)

19
Linphone/UI/Assistant/Viewmodel/RegisterViewModel.swift
View file

@ -96,6 +96,10 @@ class RegisterViewModel: ObservableObject {
getDialPlansList()
getAccountCreationToken()
self.usernameError = ""
self.phoneNumberError = ""
self.passwordError = ""
NotificationCenter.default.addObserver(forName: accountTokenNotification, object: nil, queue: nil) { notification in
if !(self.username.isEmpty || self.passwd.isEmpty) {
if let token = notification.userInfo?["token"] as? String {
@ -175,6 +179,21 @@ class RegisterViewModel: ObservableObject {
}
}
parameterErrors?.keys.forEach({ parameter in
let parameterErrorMessage = parameterErrors?.getString(key: parameter) ?? ""
switch parameter {
case "username":
self.usernameError = parameterErrorMessage
case "password":
self.passwordError = parameterErrorMessage
case "phone":
self.phoneNumberError = parameterErrorMessage
default:
break
}
})
switch request.type {
case .SendAccountCreationTokenByPush:
Log.warn("\(RegisterViewModel.TAG) Cancelling job waiting for push notification")