From 497000ec03b36f52ca1ab1c4c2a9d1b85df368e1 Mon Sep 17 00:00:00 2001 From: Ivan Baheux Date: Tue, 10 Jun 2025 09:21:48 +0200 Subject: [PATCH 1/2] feat: add warning message and icon on pin/password screen --- .../e/parentalcontrol/MainActivity.kt | 26 ++++++++++++++++++- .../main/res/drawable/outline_warning_24.xml | 5 ++++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/outline_warning_24.xml diff --git a/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt b/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt index 9d9579f..2a2c575 100644 --- a/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt +++ b/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt @@ -64,6 +64,7 @@ import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.Lock import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button +import androidx.compose.material3.Card import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -282,7 +283,12 @@ class MainActivity : ComponentActivity() { Column( modifier = Modifier.fillMaxWidth() - .padding(bottom = Dimens.SCREEN_PADDING, top = Dimens.SCREEN_PADDING), + .padding( + bottom = Dimens.SCREEN_PADDING, + top = Dimens.SCREEN_PADDING, + start = Dimens.SCREEN_PADDING, + end = Dimens.SCREEN_PADDING + ), verticalArrangement = Arrangement.spacedBy(Dimens.SCREEN_PADDING), horizontalAlignment = Alignment.CenterHorizontally ) { @@ -291,6 +297,24 @@ class MainActivity : ComponentActivity() { mainScreen(page = Pages.SetupConfirmPinPassword) } } + Card(modifier = Modifier.padding(16.dp)) { + Column( + modifier = Modifier.fillMaxWidth().padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Icon( + painter = painterResource(R.drawable.outline_warning_24), + contentDescription = stringResource(R.string.warning_icon_desc), + tint = colorResource(foundation.e.elib.R.color.e_accent), + modifier = Modifier.padding(bottom = 8.dp) + ) + Text( + text = stringResource(R.string.auth_warning), + fontWeight = FontWeight.Normal, + modifier = Modifier.padding(top = 8.dp) + ) + } + } Icon( imageVector = Icons.Filled.Lock, diff --git a/app/src/main/res/drawable/outline_warning_24.xml b/app/src/main/res/drawable/outline_warning_24.xml new file mode 100644 index 0000000..9363fe5 --- /dev/null +++ b/app/src/main/res/drawable/outline_warning_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 502aac1..fe0a9f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,6 +11,8 @@ Pin mismatch Password mismatch Please select the security you want to set prevent Parental Control to be deactivated by anyone but yourself. + Please carefully save and remember this password/PIN as it\'ll be needed for future changes or for disabling the feature.\nWhen the password/PIN is forgotten, the only solution to make changes or disable the feature is to factory reset the device through recovery mode. + Warning Icon Next Confirm Must be at least 4 digits -- GitLab From 3e4492ca832017e079d945db962b10ba1e55f7d8 Mon Sep 17 00:00:00 2001 From: Ivan Baheux Date: Thu, 19 Jun 2025 15:30:08 +0200 Subject: [PATCH 2/2] tl: Added fr, it, de, es translation for pin/password warning --- app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c467f6b..c960d74 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -11,6 +11,8 @@ Passwort bestätigen Der PIN stimmt nicht überein Das Passwort stimmt nicht überein + Bitte speichern und merken Sie sich dieses Passwort/PIN sorgfältig, da es für zukünftige Änderungen oder zum Deaktivieren der Funktion benötigt wird.\nWenn das Passwort/PIN vergessen wird, ist die einzige Lösung, um Änderungen vorzunehmen oder die Funktion zu deaktivieren, das Zurücksetzen des Geräts auf die Werkseinstellungen über den Wiederherstellungsmodus. + Warnsymbol 7-11 Jahre alt 12-15 Jahre alt 16-17 Jahre alt diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e1a9d11..eb2ebcf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,6 +18,8 @@ Confirma tu contraseña Pin incorrecto Contraseña incorrecta + Por favor, guarda y recuerda cuidadosamente esta contraseña/PIN, ya que será necesario para futuros cambios o para desactivar la función.\nCuando se olvide la contraseña/PIN, la única solución para realizar cambios o desactivar la función es restablecer el dispositivo a la configuración de fábrica mediante el modo de recuperación. + Icono de advertencia Siguiente Confirmar Debe tener mínimo 4 dígitos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b2a0a1b..649655d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -12,6 +12,8 @@ Code PIN différent Mot de passe différent Merci de sélectionner le type de sécurité que vous voulez définir pour empêcher la désactivation du Contrôle Parental par une autre personne que vous. + Veuillez enregistrer et mémoriser soigneusement ce mot de passe/PIN car il sera nécessaire pour les modifications futures ou pour désactiver la fonctionnalité.\nLorsque le mot de passe/PIN est oublié, la seule solution pour apporter des modifications ou désactiver la fonctionnalité est de réinitialiser l\'appareil aux paramètres d\'usine via le mode de récupération. + Icône d\'avertissement Suivant Confirmer Doit contenir au moins 4 chiffres diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6b98012..75d5b73 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -12,6 +12,8 @@ Conferma la tua password Pin non corrispondenti Password non corrispondenti + Si prega di salvare e ricordare con attenzione questa password/PIN poiché sarà necessario per future modifiche o per disabilitare la funzione.\nQuando la password/PIN viene dimenticata, l\'unica soluzione per apportare modifiche o disabilitare la funzione è ripristinare il dispositivo alle impostazioni di fabbrica tramite la modalità di recupero. + Icona di avviso 0-3 anni 4-6 anni 7-11 anni -- GitLab