diff options
| author | Iván Ávalos <avalos@disroot.org> | 2023-10-13 20:50:43 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2023-11-11 13:20:09 -0600 |
| commit | c2c2fadc3af743251031c726653bfdbb12e7ddb0 (patch) | |
| tree | 421cb3f465b760007f6ad9c7ce4a79d4f3f38f8f | |
| parent | 900669f6493f917120f6f7ab1e22c3b6f1ab64e2 (diff) | |
| download | taler-android-c2c2fadc3af743251031c726653bfdbb12e7ddb0.tar.gz taler-android-c2c2fadc3af743251031c726653bfdbb12e7ddb0.tar.bz2 taler-android-c2c2fadc3af743251031c726653bfdbb12e7ddb0.zip | |
[anastasis] Display chosen file in secret editor
| -rw-r--r-- | anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSecretForm.kt | 7 | ||||
| -rw-r--r-- | anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSecretForm.kt b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSecretForm.kt index 9410117..f003a58 100644 --- a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSecretForm.kt +++ b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditSecretForm.kt @@ -27,7 +27,6 @@ import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField @@ -52,6 +51,7 @@ import kotlinx.datetime.LocalDate import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime import net.taler.anastasis.R +import net.taler.anastasis.models.CoreSecret import net.taler.anastasis.shared.Utils.currentDate import net.taler.anastasis.ui.components.DatePickerField import net.taler.anastasis.ui.theme.AnastasisTheme @@ -67,13 +67,13 @@ sealed class SecretData { class File(val documentUri: Uri): SecretData() } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun EditSecretForm( modifier: Modifier = Modifier, name: String, data: SecretData, expirationDate: LocalDate, + coreSecret: CoreSecret?, onSecretNameEdited: (name: String) -> Unit, onSecretEdited: (data: SecretData) -> Unit, onExpirationEdited: (expirationDate: LocalDate) -> Unit, @@ -176,7 +176,7 @@ fun EditSecretForm( ) { Text( if (data is SecretData.File) - stringResource(R.string.secret_file_chosen) + coreSecret?.filename ?: stringResource(R.string.secret_file_chosen) else stringResource(R.string.secret_choose_file), overflow = TextOverflow.Ellipsis, @@ -213,6 +213,7 @@ fun EditSecretFormPreview() { name = name, data = data, expirationDate = expirationDate, + coreSecret = null, onSecretNameEdited = { name = it }, onSecretEdited = { data = it }, onExpirationEdited = { expirationDate = it }, diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt index 70eb47d..545d722 100644 --- a/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt +++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt @@ -100,6 +100,7 @@ fun EditSecretScreen( name = secretName, data = secretData, expirationDate = secretExpirationDate.date, + coreSecret = coreSecret, onSecretNameEdited = { name -> secretName = name viewModel.reducerManager?.enterSecretName(name) |