diff options
Diffstat (limited to 'anastasis/src/main')
6 files changed, 207 insertions, 6 deletions
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectUserAttributesScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectUserAttributesScreen.kt index e0badcb..b7e1a4e 100644 --- a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectUserAttributesScreen.kt +++ b/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectUserAttributesScreen.kt @@ -93,7 +93,7 @@ fun SelectUserAttributesScreen( Text(stringResource(it)) } ?: if (attr.optional == true) { Text(stringResource(R.string.field_optional)) - } else null + } else {} } when (attr.type) { "string" -> OutlinedTextField( @@ -131,7 +131,7 @@ fun SelectUserAttributesScreen( } } -fun fieldStatus( +private fun fieldStatus( field: UserAttributeSpec, value: String? = null, ): FieldStatus = if (value == null) { diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/dialogs/EditMethodDialog.kt b/anastasis/src/main/java/net/taler/anastasis/ui/dialogs/EditMethodDialog.kt index 2b2f776..a7c3f62 100644 --- a/anastasis/src/main/java/net/taler/anastasis/ui/dialogs/EditMethodDialog.kt +++ b/anastasis/src/main/java/net/taler/anastasis/ui/dialogs/EditMethodDialog.kt @@ -28,7 +28,9 @@ import androidx.compose.ui.res.stringResource import net.taler.anastasis.R import net.taler.anastasis.shared.Utils import net.taler.anastasis.models.AuthMethod +import net.taler.anastasis.ui.forms.EditEmailForm import net.taler.anastasis.ui.forms.EditQuestionForm +import net.taler.anastasis.ui.forms.EditSmsForm @Composable fun EditMethodDialog( @@ -47,9 +49,15 @@ fun EditMethodDialog( when(type ?: method?.type) { AuthMethod.Type.Question -> EditQuestionForm( method = localMethod, - onMethodEdited = { - localMethod = it - }, + onMethodEdited = { localMethod = it }, + ) + AuthMethod.Type.Sms -> EditSmsForm( + method = localMethod, + onMethodEdited = { localMethod = it } + ) + AuthMethod.Type.Email -> EditEmailForm( + method = localMethod, + onMethodEdited = { localMethod = it } ) else -> {} } diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditEmailForm.kt b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditEmailForm.kt new file mode 100644 index 0000000..0e1a840 --- /dev/null +++ b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditEmailForm.kt @@ -0,0 +1,94 @@ +/* + * This file is part of GNU Taler + * (C) 2023 Taler Systems S.A. + * + * GNU Taler is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 3, or (at your option) any later version. + * + * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + * A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + */ + +package net.taler.anastasis.ui.forms + +import android.util.Patterns +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import net.taler.anastasis.R +import net.taler.anastasis.models.AuthMethod +import net.taler.anastasis.shared.FieldStatus + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun EditEmailForm( + method: AuthMethod? = null, + onMethodEdited: (method: AuthMethod) -> Unit, +) { + val localMethod = method ?: AuthMethod( + type = AuthMethod.Type.Email, + instructions = stringResource(R.string.auth_instruction_email, ""), + challenge = "", + mimeType = "text/plain", + ) + + val context = LocalContext.current + val focusRequester1 = remember { FocusRequester() } + val focusManager = LocalFocusManager.current + val status = fieldStatus(localMethod.challenge) + + OutlinedTextField( + modifier = Modifier + .focusRequester(focusRequester1) + .fillMaxWidth(), + value = localMethod.challenge, + isError = status.error, + supportingText = { + status.msgRes?.let { Text(stringResource(it)) } + }, + maxLines = 1, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Email, + imeAction = ImeAction.Done, + ), + keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), + onValueChange = { + onMethodEdited(localMethod.copy( + instructions = context.getString(R.string.auth_instruction_email, it), + challenge = it, + )) + }, + label = { Text(stringResource(R.string.email)) }, + ) + + LaunchedEffect(Unit) { + focusRequester1.requestFocus() + } +} + +private fun fieldStatus(email: String): FieldStatus = if (email.isBlank()) { + FieldStatus.Blank +} else if (Patterns.EMAIL_ADDRESS.matcher(email).matches()) { + FieldStatus.Valid +} else { + FieldStatus.Invalid +}
\ No newline at end of file diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt index 38017b9..fb17088 100644 --- a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt +++ b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt @@ -45,7 +45,7 @@ fun EditQuestionForm( type = AuthMethod.Type.Question, instructions = "", challenge = "", - mimeType = "plain/text", + mimeType = "text/plain", ) val focusRequester1 = remember { FocusRequester() } diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSmsForm.kt b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSmsForm.kt new file mode 100644 index 0000000..fe573d2 --- /dev/null +++ b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSmsForm.kt @@ -0,0 +1,95 @@ +/* + * This file is part of GNU Taler + * (C) 2023 Taler Systems S.A. + * + * GNU Taler is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 3, or (at your option) any later version. + * + * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + * A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + */ + +package net.taler.anastasis.ui.forms + +import android.util.Patterns +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import net.taler.anastasis.R +import net.taler.anastasis.models.AuthMethod +import net.taler.anastasis.shared.FieldStatus + + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun EditSmsForm( + method: AuthMethod? = null, + onMethodEdited: (method: AuthMethod) -> Unit, +) { + val localMethod = method ?: AuthMethod( + type = AuthMethod.Type.Sms, + instructions = stringResource(R.string.auth_instruction_sms, ""), + challenge = "", + mimeType = "text/plain", + ) + + val context = LocalContext.current + val focusRequester1 = remember { FocusRequester() } + val focusManager = LocalFocusManager.current + val status = fieldStatus(localMethod.challenge) + + OutlinedTextField( + modifier = Modifier + .focusRequester(focusRequester1) + .fillMaxWidth(), + value = localMethod.challenge, + isError = status.error, + supportingText = { + status.msgRes?.let { Text(stringResource(it)) } + }, + maxLines = 1, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Phone, + imeAction = ImeAction.Done, + ), + keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), + onValueChange = { + onMethodEdited(localMethod.copy( + instructions = context.getString(R.string.auth_instruction_sms, it), + challenge = it, + )) + }, + label = { Text(stringResource(R.string.sms)) }, + ) + + LaunchedEffect(Unit) { + focusRequester1.requestFocus() + } +} + +private fun fieldStatus(phone: String): FieldStatus = if (phone.isBlank()) { + FieldStatus.Blank +} else if (Patterns.PHONE.matcher(phone).matches()) { + FieldStatus.Valid +} else { + FieldStatus.Invalid +}
\ No newline at end of file diff --git a/anastasis/src/main/res/values/strings.xml b/anastasis/src/main/res/values/strings.xml index b8776c4..bd903c1 100644 --- a/anastasis/src/main/res/values/strings.xml +++ b/anastasis/src/main/res/values/strings.xml @@ -21,6 +21,8 @@ <string name="continent">Continent</string> <string name="question">Security question</string> <string name="answer">Answer</string> + <string name="email">E-mail</string> + <string name="sms">SMS</string> <string name="policy_n">Policy %1$d</string> <string name="provided_by">Provided by %1$s</string> <string name="disabled">Disabled</string> @@ -51,6 +53,8 @@ <string name="auth_method_iban">IBAN</string> <string name="auth_method_mail">Mail</string> <string name="auth_method_totp">TOTP</string> + <string name="auth_instruction_email">Email to %1$s</string> + <string name="auth_instruction_sms">Sms to %1$s</string> <string name="backup_providers">Manage backup providers</string> <string name="add_challenge">Add challenge</string> <string name="add_policy">Add policy</string> |