Fixes #1641

mtotschnig · Feb 1, 2025 · a0ef5ad · a0ef5ad
1 parent cc0baee
commit a0ef5ad
Show file tree

Hide file tree

Showing 78 changed files with 188 additions and 14 deletions.
diff --git a/fints/src/main/java/org/totschnig/fints/Banking.kt b/fints/src/main/java/org/totschnig/fints/Banking.kt
@@ -1,6 +1,5 @@
 package org.totschnig.fints
 
-import android.app.Activity
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import android.text.TextUtils
@@ -249,7 +248,7 @@ class Banking : ProtectedFragmentActivity() {
                 if (tanRequested.value == null && tanMediumRequested.value == null && pushTanRequested.value == null && secMechRequested.value == null) {
                     SetupDialog(dialogState, workState.value, bankingCredentials, errorState) {
                         if (calledFromOnboarding) {
-                            setResult(if (it) Activity.RESULT_OK else Activity.RESULT_CANCELED)
+                            setResult(if (it) RESULT_OK else RESULT_CANCELED)
                             finish()
                         } else {
                             dialogState = DialogState.NoShow
@@ -412,7 +411,7 @@ class Banking : ProtectedFragmentActivity() {
                                             onValueChange = {
                                                 nrDays = try {
                                                     it.toLong()
-                                                } catch (e: NumberFormatException) {
+                                                } catch (_: NumberFormatException) {
                                                     0
                                                 }
                                             },

diff --git a/fints/src/main/java/org/totschnig/fints/Composables.kt b/fints/src/main/java/org/totschnig/fints/Composables.kt
@@ -20,14 +20,16 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccountBalance
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.minimumInteractiveComponentSize
@@ -51,6 +53,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.job
@@ -103,11 +106,12 @@ fun ColumnScope.BankingCredentials(
                 }
             }
         }
+    var showPassword by remember { mutableStateOf(false) }
     OutlinedTextField(
         modifier = Modifier
             .align(Alignment.CenterHorizontally)
             .optional(focusRequester) { this.focusRequester(it) },
-        visualTransformation = PasswordVisualTransformation(),
+        visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
         keyboardOptions = KeyboardOptions(
             keyboardType = KeyboardType.Password,
             imeAction = ImeAction.Done
@@ -122,16 +126,31 @@ fun ColumnScope.BankingCredentials(
             bankingCredentials.value = credentials.copy(password = it.trim())
         },
         label = { Text(text = stringResource(id = RB.string.password)) },
-        singleLine = true
-    )
-    // Not using supportingText parameter of OutlinedTextField, because of
-    // https://issuetracker.google.com/issues/270523016
-    Text(
-        modifier = Modifier.width(OutlinedTextFieldDefaults.MinWidth),
-        text = stringResource(id = R.string.pin_info)
+        singleLine = true,
+        supportingText = {
+            Text(text = stringResource(id = R.string.pin_info))
+        },
+        trailingIcon = {
+            PasswordVisibilityToggleIcon(
+                showPassword = showPassword,
+                onTogglePasswordVisibility = { showPassword = !showPassword })
+        }
     )
 }
 
+@Composable
+fun PasswordVisibilityToggleIcon(
+    showPassword: Boolean,
+    onTogglePasswordVisibility: () -> Unit
+) {
+    val image = if (showPassword) Icons.Filled.Visibility else Icons.Filled.VisibilityOff
+    val contentDescription = stringResource(if (showPassword) RB.string.hide_password else RB.string.show_password)
+
+    IconButton(onClick = onTogglePasswordVisibility) {
+        Icon(imageVector = image, contentDescription = contentDescription)
+    }
+}
+
 @Composable
 fun PushTanDialog(pushTanRequest: PushTanRequest?) {
     pushTanRequest?.let {
@@ -172,7 +191,9 @@ fun TanDialog(tanRequest: TanRequest?) {
                     Text(tanRequest.message)
                     tanRequest.bitmap?.let {
                         Image(
-                            modifier = Modifier.height(200.dp).width(200.dp),
+                            modifier = Modifier
+                                .height(200.dp)
+                                .width(200.dp),
                             bitmap = it.asImageBitmap(),
                             contentDescription = null
                         )
@@ -420,7 +441,7 @@ private fun TanMediaPreview() {
 @Preview
 @Composable
 private fun TanPreview() {
-    val bmp = createRandomBitmap(50,50)
+    val bmp = createRandomBitmap(50, 50)
     TanDialog(TanRequest("Please scan", bmp) {})
 }
 

diff --git a/myExpenses/src/main/res/values-af/aosp.xml b/myExpenses/src/main/res/values-af/aosp.xml
@@ -79,4 +79,6 @@
     <string name="enabled">"Geaktiveer"</string>
     <string name="disabled">"Gedeaktiveer"</string>
     <string name="preview">"Voorskou"</string>
+    <string name="show_password">"Wys wagwoord"</string>
+    <string name="hide_password">"Versteek wagwoord"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-am/aosp.xml b/myExpenses/src/main/res/values-am/aosp.xml
@@ -78,4 +78,6 @@
     <string name="enabled">"ነቅቷል"</string>
     <string name="disabled">"ተሰናክሏል"</string>
     <string name="preview">"ቅድመ-ዕይታ"</string>
+    <string name="show_password">"የይለፍ ቃል አሳይ"</string>
+    <string name="hide_password">"የይለፍ ቃልድ ደብቅ"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-ar/aosp.xml b/myExpenses/src/main/res/values-ar/aosp.xml
@@ -150,4 +150,6 @@
     <string name="enabled">"مفعّل"</string>
     <string name="disabled">"غير مفعّل"</string>
     <string name="preview">"معاينة"</string>
+    <string name="show_password">"إظهار كلمة المرور"</string>
+    <string name="hide_password">"إخفاء كلمة المرور"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-az/aosp.xml b/myExpenses/src/main/res/values-az/aosp.xml
@@ -56,4 +56,6 @@
     <string name="enabled">"Aktiv edilib"</string>
     <string name="disabled">"Deaktiv edilib"</string>
     <string name="preview">"Önizləmə"</string>
+    <string name="show_password">"Parol görünsün"</string>
+    <string name="hide_password">"Şifrəni gizlət"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-b+sr+Latn/aosp.xml b/myExpenses/src/main/res/values-b+sr+Latn/aosp.xml
@@ -55,4 +55,6 @@
     <string name="menu_create_folder">"Novi folder"</string>
     <string name="enabled">"Omogućeno"</string>
     <string name="disabled">"Onemogućeno"</string>
+    <string name="show_password">"Prikaži lozinku"</string>
+    <string name="hide_password">"Sakrij lozinku"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-be/aosp.xml b/myExpenses/src/main/res/values-be/aosp.xml
@@ -62,4 +62,6 @@
     <string name="menu_create_folder">"Новая папка"</string>
     <string name="enabled">"Уключана"</string>
     <string name="disabled">"Выключана"</string>
+    <string name="show_password">"Паказваць пароль"</string>
+    <string name="hide_password">"Схаваць пароль"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-bg/aosp.xml b/myExpenses/src/main/res/values-bg/aosp.xml
@@ -152,4 +152,6 @@
     <string name="enabled">"Активирано"</string>
     <string name="disabled">"Деактивирано"</string>
     <string name="preview">"Визуал."</string>
+    <string name="show_password">"Показване на паролата"</string>
+    <string name="hide_password">"Скриване на паролата"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-bn/aosp.xml b/myExpenses/src/main/res/values-bn/aosp.xml
@@ -64,4 +64,6 @@
     <string name="enabled">"চালু করা আছে"</string>
     <string name="disabled">"বন্ধ করা আছে"</string>
     <string name="preview">"পূর্বরূপ"</string>
+    <string name="show_password">"পাসওয়ার্ড দেখুন"</string>
+    <string name="hide_password">"পাসওয়ার্ড লুকান"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-bs/aosp.xml b/myExpenses/src/main/res/values-bs/aosp.xml
@@ -64,4 +64,6 @@
     <string name="delimiter_tab">"Tabulator"</string>
     <string name="enabled">"Omogućeno"</string>
     <string name="disabled">"Onemogućeno"</string>
+    <string name="show_password">"Prikaži lozinku"</string>
+    <string name="hide_password">"Sakrij lozinku"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-ca/aosp.xml b/myExpenses/src/main/res/values-ca/aosp.xml
@@ -151,4 +151,6 @@
     <string name="enabled">"Activat"</string>
     <string name="disabled">"Desactivat"</string>
     <string name="preview">"Previsual."</string>
+    <string name="show_password">"Mostra la contrasenya"</string>
+    <string name="hide_password">"Amaga la contrasenya"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-cs/aosp.xml b/myExpenses/src/main/res/values-cs/aosp.xml
@@ -153,4 +153,6 @@
     <string name="enabled">"Zapnuto"</string>
     <string name="disabled">"Vypnuto"</string>
     <string name="preview">"Náhled"</string>
+    <string name="show_password">"Zobrazovat heslo"</string>
+    <string name="hide_password">"Skrýt heslo"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-da/aosp.xml b/myExpenses/src/main/res/values-da/aosp.xml
@@ -151,4 +151,6 @@
     <string name="enabled">"Aktiveret"</string>
     <string name="disabled">"Deaktiveret"</string>
     <string name="preview">"Vis eks."</string>
+    <string name="show_password">"Vis adgangskode"</string>
+    <string name="hide_password">"Skjul adgangskoden"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-de/aosp.xml b/myExpenses/src/main/res/values-de/aosp.xml
@@ -150,4 +150,6 @@
     <string name="enabled">"Aktiviert"</string>
     <string name="disabled">"Deaktiviert"</string>
     <string name="preview">"Vorschau"</string>
+    <string name="show_password">"Passwort anzeigen"</string>
+    <string name="hide_password">"Passwort ausblenden"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-el/aosp.xml b/myExpenses/src/main/res/values-el/aosp.xml
@@ -150,4 +150,6 @@
     <string name="enabled">"Ενεργή"</string>
     <string name="disabled">"Ανενεργή"</string>
     <string name="preview">"Προεπισκ."</string>
+    <string name="show_password">"Εμφάνιση κωδικού πρόσβασης"</string>
+    <string name="hide_password">"Απόκρυψη κωδικού πρόσβασης"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-es/aosp.xml b/myExpenses/src/main/res/values-es/aosp.xml
@@ -151,4 +151,6 @@
     <string name="enabled">"Habilitado"</string>
     <string name="disabled">"Inhabilitado"</string>
     <string name="preview">"Vista previa"</string>
+    <string name="show_password">"Mostrar contraseña"</string>
+    <string name="hide_password">"Ocultar contraseña"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-et/aosp.xml b/myExpenses/src/main/res/values-et/aosp.xml
@@ -85,4 +85,6 @@
     <string name="enabled">"Lubatud"</string>
     <string name="disabled">"Keelatud"</string>
     <string name="preview">"Eelvaade"</string>
+    <string name="show_password">"Kuva parool"</string>
+    <string name="hide_password">"Peida parool"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-eu/aosp.xml b/myExpenses/src/main/res/values-eu/aosp.xml
@@ -148,4 +148,6 @@
     <string name="enabled">"Gaituta"</string>
     <string name="disabled">"Desgaituta"</string>
     <string name="preview">"Aurreikusi"</string>
+    <string name="show_password">"Erakutsi pasahitza"</string>
+    <string name="hide_password">"Ezkutatu pasahitza"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-fa/aosp.xml b/myExpenses/src/main/res/values-fa/aosp.xml
@@ -66,4 +66,6 @@
     <string name="enabled">"فعال"</string>
     <string name="disabled">"غیرفعال"</string>
     <string name="preview">"پیش‌نمایش"</string>
+    <string name="show_password">"نمایش گذرواژه"</string>
+    <string name="hide_password">"پنهان کردن گذرواژه"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-fi/aosp.xml b/myExpenses/src/main/res/values-fi/aosp.xml
@@ -84,4 +84,6 @@
     <string name="enabled">"Päällä"</string>
     <string name="disabled">"Ei käytössä"</string>
     <string name="preview">"Esikatselu"</string>
+    <string name="show_password">"Näytä salasana"</string>
+    <string name="hide_password">"Piilota salasana"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-fr/aosp.xml b/myExpenses/src/main/res/values-fr/aosp.xml
@@ -151,4 +151,6 @@
     <string name="enabled">"Activé"</string>
     <string name="disabled">"Désactivé"</string>
     <string name="preview">"Prévisualiser"</string>
+    <string name="show_password">"Afficher le mot de passe"</string>
+    <string name="hide_password">"Masquer le mot de passe"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-gl/aosp.xml b/myExpenses/src/main/res/values-gl/aosp.xml
@@ -83,4 +83,6 @@
     <string name="enabled">"Activouse"</string>
     <string name="disabled">"Desactivouse"</string>
     <string name="preview">"Vista previa"</string>
+    <string name="show_password">"Mostrar contrasinal"</string>
+    <string name="hide_password">"Ocultar contrasinal"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-gu/aosp.xml b/myExpenses/src/main/res/values-gu/aosp.xml
@@ -66,4 +66,6 @@
     <string name="enabled">"ચાલુ છે"</string>
     <string name="disabled">"બંધ છે"</string>
     <string name="preview">"પૂર્વાવલોકન કરો"</string>
+    <string name="show_password">"પાસવર્ડ બતાવો"</string>
+    <string name="hide_password">"પાસવર્ડ છુપાવો"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-hi/aosp.xml b/myExpenses/src/main/res/values-hi/aosp.xml
@@ -67,4 +67,6 @@
     <string name="enabled">"चालू है"</string>
     <string name="disabled">"बंद है"</string>
     <string name="preview">"पूर्वावलोकन"</string>
+    <string name="show_password">"पासवर्ड दिखाएं"</string>
+    <string name="hide_password">"पासवर्ड छिपाएं"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-hr/aosp.xml b/myExpenses/src/main/res/values-hr/aosp.xml
@@ -143,4 +143,6 @@
     <string name="enabled">"Omogućeno"</string>
     <string name="disabled">"Onemogućeno"</string>
     <string name="preview">"Pregled"</string>
+    <string name="show_password">"Prikaži zaporku"</string>
+    <string name="hide_password">"Sakrij zaporku"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-hu/aosp.xml b/myExpenses/src/main/res/values-hu/aosp.xml
@@ -152,4 +152,6 @@
     <string name="enabled">"Engedélyezve"</string>
     <string name="disabled">"Letiltva"</string>
     <string name="preview">"Előnézet"</string>
+    <string name="show_password">"Jelszó megjelenítése"</string>
+    <string name="hide_password">"Jelszó elrejtése"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-hy/aosp.xml b/myExpenses/src/main/res/values-hy/aosp.xml
@@ -79,4 +79,6 @@
     <string name="enabled">"Միացված է"</string>
     <string name="disabled">"Անջատված է"</string>
     <string name="preview">"Նախադիտում"</string>
+    <string name="show_password">"Ցույց տալ գաղտնաբառը"</string>
+    <string name="hide_password">"Թաքցնել գաղտնաբառը"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-in/aosp.xml b/myExpenses/src/main/res/values-in/aosp.xml
@@ -85,4 +85,6 @@
     <string name="enabled">"Aktif"</string>
     <string name="disabled">"Nonaktif"</string>
     <string name="preview">"Pratinjau"</string>
+    <string name="show_password">"Tampilkan sandi"</string>
+    <string name="hide_password">"Sembunyikan sandi"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-is/aosp.xml b/myExpenses/src/main/res/values-is/aosp.xml
@@ -82,4 +82,6 @@
     <string name="enabled">"Virkt"</string>
     <string name="disabled">"Óvirkt"</string>
     <string name="preview">"Forskoða"</string>
+    <string name="show_password">"Sýna aðgangsorð"</string>
+    <string name="hide_password">"Fela aðgangsorð"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-it/aosp.xml b/myExpenses/src/main/res/values-it/aosp.xml
@@ -150,4 +150,6 @@
     <string name="enabled">"Attivato"</string>
     <string name="disabled">"Disattivato"</string>
     <string name="preview">"Anteprima"</string>
+    <string name="show_password">"Mostra password"</string>
+    <string name="hide_password">"Nascondi password"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-iw/aosp.xml b/myExpenses/src/main/res/values-iw/aosp.xml
@@ -142,4 +142,6 @@
     <string name="enabled">"מופעלת"</string>
     <string name="disabled">"מושבתת"</string>
     <string name="preview">"תצוגה מקדימה"</string>
+    <string name="show_password">"הצגת הסיסמה"</string>
+    <string name="hide_password">"הסתר סיסמה"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-ja/aosp.xml b/myExpenses/src/main/res/values-ja/aosp.xml
@@ -148,4 +148,6 @@
     <string name="enabled">"有効"</string>
     <string name="disabled">"無効"</string>
     <string name="preview">"プレビュー"</string>
+    <string name="show_password">"パスワードを表示する"</string>
+    <string name="hide_password">"パスワードを隠す"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-ka/aosp.xml b/myExpenses/src/main/res/values-ka/aosp.xml
@@ -74,4 +74,6 @@
     <string name="enabled">"ჩართულია"</string>
     <string name="disabled">"გათიშულია"</string>
     <string name="preview">"გადახედვა"</string>
+    <string name="show_password">"პაროლის გამოჩენა"</string>
+    <string name="hide_password">"პაროლის დამალვა"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-kk/aosp.xml b/myExpenses/src/main/res/values-kk/aosp.xml
@@ -75,4 +75,6 @@
     <string name="enabled">"Қосулы"</string>
     <string name="disabled">"Өшірулі"</string>
     <string name="preview">"Алдын ала қарау"</string>
+    <string name="show_password">"Құпия сөзді көрсету"</string>
+    <string name="hide_password">"Құпия сөзді жасыру"</string>
 </resources>
diff --git a/myExpenses/src/main/res/values-km/aosp.xml b/myExpenses/src/main/res/values-km/aosp.xml
@@ -134,4 +134,6 @@
     <string name="enabled">"បានបើក"</string>
     <string name="disabled">"បានបិទ"</string>
     <string name="preview">"មើលជាមុន"</string>
+    <string name="show_password">"បង្ហាញពាក្យសម្ងាត់"</string>
+    <string name="hide_password">"លាក់ពាក្យសម្ងាត់"</string>
 </resources>