From 8309b7c2902c30efd4aa79c1f4c41291ea8b4b4c Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Fri, 13 Dec 2024 16:34:30 +0100
Subject: [PATCH] make lock screen dialog scrollable

---
 .../lock/LauncherAccessibilityService.kt      |  2 +-
 .../launcher/actions/lock/LockMethod.kt       | 35 ++++++++-----------
 .../launcher/preferences/ColorPreference.kt   |  2 +-
 .../ui/list/apps/AppsRecyclerAdapter.kt       |  2 +-
 .../res/layout/dialog_select_lock_method.xml  | 28 ++++++++++++---
 app/src/main/res/values-de/strings.xml        |  1 -
 app/src/main/res/values-it/strings.xml        |  1 -
 app/src/main/res/values-pt-rBR/strings.xml    |  4 +--
 app/src/main/res/values-tr/strings.xml        |  3 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  2 +-
 app/src/main/res/values/strings.xml           |  4 +--
 11 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/de/jrpie/android/launcher/actions/lock/LauncherAccessibilityService.kt b/app/src/main/java/de/jrpie/android/launcher/actions/lock/LauncherAccessibilityService.kt
index 9e018d1..a8ef6f2 100644
--- a/app/src/main/java/de/jrpie/android/launcher/actions/lock/LauncherAccessibilityService.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/actions/lock/LauncherAccessibilityService.kt
@@ -60,7 +60,7 @@ class LauncherAccessibilityService : AccessibilityService() {
                 setPositiveButton(R.string.dialog_consent_accessibility_ok) { _, _ ->
                     lockScreen(context)
                 }
-                setNegativeButton(R.string.dialog_consent_accessibility_cancel) { _, _ -> }
+                setNegativeButton(R.string.dialog_cancel) { _, _ -> }
             }.create().also { it.show() }.apply {
                 val buttonOk = getButton(AlertDialog.BUTTON_POSITIVE)
                 val checkboxes = listOf(
diff --git a/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt b/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt
index 16572e5..5198288 100644
--- a/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt
@@ -2,7 +2,7 @@ package de.jrpie.android.launcher.actions.lock
 
 import android.content.Context
 import android.os.Build
-import android.view.LayoutInflater
+import android.widget.Button
 import androidx.appcompat.app.AlertDialog
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.preferences.LauncherPreferences
@@ -41,27 +41,22 @@ enum class LockMethod(
                 setMethod(context, DEVICE_ADMIN)
                 return
             }
-            val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom)
-            builder.setNegativeButton("cancel") { _, _ -> }
-            builder.setCustomTitle(
-                LayoutInflater.from(context).inflate(R.layout.dialog_select_lock_method, null)
-            )
-
-            builder.setItems(
-                arrayOf(
-                    context.getString(R.string.screen_lock_method_use_accessibility),
-                    context.getString(R.string.screen_lock_method_use_device_admin)
-                )
-            ) { _, i ->
-                val method = when (i) {
-                    0 -> ACCESSIBILITY_SERVICE
-                    1 -> DEVICE_ADMIN
-                    else -> return@setItems
+            AlertDialog.Builder(context, R.style.AlertDialogCustom).apply {
+                setNegativeButton(R.string.dialog_cancel) { _, _ -> }
+                setView(R.layout.dialog_select_lock_method)
+                // setTitle()
+            }.create().also { it.show() }.apply {
+                findViewById<Button>(R.id.dialog_select_lock_method_button_accessibility)
+                    ?.setOnClickListener {
+                        setMethod(context, ACCESSIBILITY_SERVICE)
+                        cancel()
+                    }
+                findViewById<Button>(R.id.dialog_select_lock_method_button_device_admin)
+                    ?.setOnClickListener {
+                        setMethod(context, DEVICE_ADMIN)
+                        cancel()
                 }
-                setMethod(context, method)
             }
-            builder.show()
-
             return
         }
 
diff --git a/app/src/main/java/de/jrpie/android/launcher/preferences/ColorPreference.kt b/app/src/main/java/de/jrpie/android/launcher/preferences/ColorPreference.kt
index 7913c31..a21d458 100644
--- a/app/src/main/java/de/jrpie/android/launcher/preferences/ColorPreference.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/preferences/ColorPreference.kt
@@ -56,7 +56,7 @@ class ColorPreference(context: Context, attrs: AttributeSet?) :
                 persistInt(currentColor)
                 summary = currentColor.getHex()
             }
-            setNegativeButton(R.string.dialog_select_color_cancel) { _, _ -> }
+            setNegativeButton(R.string.dialog_cancel) { _, _ -> }
         }.create().also { it.show() }.apply {
             val preview = findViewById<EditText>(R.id.dialog_select_color_preview)
 
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/list/apps/AppsRecyclerAdapter.kt b/app/src/main/java/de/jrpie/android/launcher/ui/list/apps/AppsRecyclerAdapter.kt
index da79ddf..4ede98f 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/list/apps/AppsRecyclerAdapter.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/list/apps/AppsRecyclerAdapter.kt
@@ -192,7 +192,7 @@ class AppsRecyclerAdapter(
                     builder.setTitle(title)
                     builder.setView(R.layout.dialog_rename_app)
 
-                    builder.setNegativeButton(R.string.dialog_rename_cancel) { d, _ -> d.cancel() }
+                    builder.setNegativeButton(R.string.dialog_cancel) { d, _ -> d.cancel() }
                     builder.setPositiveButton(R.string.dialog_rename_ok) { d, _ ->
                         appInfo.setCustomLabel(
                             (d as? AlertDialog)
diff --git a/app/src/main/res/layout/dialog_select_lock_method.xml b/app/src/main/res/layout/dialog_select_lock_method.xml
index 07c1dff..ead6172 100644
--- a/app/src/main/res/layout/dialog_select_lock_method.xml
+++ b/app/src/main/res/layout/dialog_select_lock_method.xml
@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:layout_height="wrap_content"
     android:padding="10dp">
 
-    <de.jrpie.android.launcher.ui.util.HtmlTextView
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <de.jrpie.android.launcher.ui.util.HtmlTextView
         android:id="@+id/dialog_select_lock_method_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/screen_lock_method_dialog_text"
         android:textColor="@android:color/black" />
-</LinearLayout>
+
+        <Button
+            android:id="@+id/dialog_select_lock_method_button_accessibility"
+            android:text="@string/screen_lock_method_use_accessibility"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <Button
+            android:id="@+id/dialog_select_lock_method_button_device_admin"
+            android:text="@string/screen_lock_method_use_device_admin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2a80cd7..e0dca2e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -193,7 +193,6 @@
     <string name="alert_no_torch_found">Es wurde keine geeignete Kamera gefunden.</string>
     <string name="alert_torch_access_exception">Fehler: Kein Zugriff auf die Kamera möglich.</string>
     <string name="settings_actions_lock_method">Methode zum Sperren des Bildschirms wählen</string>
-    <string name="dialog_rename_cancel">Abbrechen</string>
     <string name="dialog_rename_ok">Ok</string>
     <string name="dialog_rename_title">%1$s umbenennen</string>
     <string name="toast_lock_screen_not_supported">Fehler: Auf diesem Gerät kann der Bildschirm nicht mittels Bedienungshilfe gesperrt werden. Bitte stattdessen Geräteadministrator verwenden.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 138b67e..0904af4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -192,7 +192,6 @@
     <string name="tutorial_usage_title">Utilizzo</string>
     <string name="tutorial_usage_text">La schermata principale contiene solo data e ora. Nessuna distrazione.</string>
     <string name="alert_requires_android_m">Questa funzione richiede Android 6.0 o successivi.</string>
-    <string name="dialog_rename_cancel">Annulla</string>
     <string name="dialog_rename_ok">Ok</string>
     <string name="dialog_rename_title">Rinomina %1$s</string>
     <string name="list_not_removed">Impossibile rimuovere l\'applicazione</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 848f359..fb88863 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -228,7 +228,6 @@
     <string name="settings_list_layout_item_text">Texto</string>
     <string name="settings_list_layout_item_grid">Grade</string>
     <string name="list_app_rename">Renomear</string>
-    <string name="dialog_rename_cancel">Cancelar</string>
     <string name="dialog_rename_ok">beleza</string>
     <string name="dialog_rename_title">Renomear %1$s</string>
     <string name="settings_theme_font_item_serif_monospace">Serif monospace</string>
@@ -239,14 +238,13 @@
     <string name="dialog_select_color_alpha">Alfa</string>
     <string name="dialog_select_color_blue">Azul</string>
     <string name="dialog_select_color_green">Verde</string>
-    <string name="dialog_select_color_cancel">Cancelar</string>
     <string name="dialog_select_color_color_hex">Cor</string>
     <string name="dialog_choose_color_title">Escola a cor</string>
     <string name="dialog_consent_accessibility_consent">Autorizo a utilização do Serviço de acessibilidade para disponibilizar funcionalidades não relacionadas com a acessibilidade.</string>
     <string name="dialog_consent_accessibility_data_collection">Não autorizo ao µLauncher a coleta de quaisquer dados.</string>
     <string name="dialog_consent_accessibility_title">Ativação do Serviço de acessibilidade</string>
     <string name="dialog_consent_accessibility_ok">Ativar o Serviço de acessibilidade</string>
-    <string name="dialog_consent_accessibility_cancel">Cancelar</string>
+    <string name="dialog_cancel">Cancelar</string>
     <string name="dialog_consent_accessibility_text"><![CDATA[Você está prestes a ativar o Serviço de acessibilidade. Isto concederá <strong>permissões elevadas</strong> ao µLauncher.<br/>µLauncher usará estas permissões <strong>apenas para bloquear a tela</strong>. µLauncher <strong>nunca coletará nenhum dado</strong>. Sobretudo, o µLauncher não implementa o Serviço de acessibilidade para coletar dados.]]></string>
     <string name="dialog_select_color_ok">beleza</string>
     <string name="dialog_consent_accessibility_privileges">Estou ciente de que isto concederá permissões elevadas ao µLauncher.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8adce2a..197f77e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -194,7 +194,7 @@
     <string name="alert_no_torch_found">Fenerli kamera algılanmadı.</string>
     <string name="alert_torch_access_exception">Hata: Fenere erişilemiyor.</string>
     <string name="settings_actions_lock_method">Ekranı kilitleme yöntemini seçin</string>
-    <string name="dialog_rename_cancel">İptal</string>
+    <string name="dialog_cancel">İptal</string>
     <string name="dialog_rename_ok">OK</string>
     <string name="dialog_rename_title">Yeniden Adlandır %1$s</string>
     <string name="settings_theme_color_theme_item_dynamic">Dinamik</string>
@@ -204,7 +204,6 @@
     <string name="dialog_select_color_blue">Mavi</string>
     <string name="dialog_select_color_green">Yeşil</string>
     <string name="dialog_select_color_ok">OK</string>
-    <string name="dialog_select_color_cancel">İptal</string>
     <string name="dialog_select_color_color_hex">Renk</string>
     <string name="dialog_choose_color_title">Renk seçin</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 76009b3..1ca8ba6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -179,7 +179,7 @@
     <string name="toast_lock_screen_not_supported">错误：此设备不支持使用无障碍功能锁定屏幕。请改用设备管理员。</string>
     <string name="screen_lock_method_use_accessibility">使用无障碍服务</string>
     <string name="screen_lock_method_use_device_admin">使用设备管理员</string>
-    <string name="dialog_rename_cancel">取消</string>
+    <string name="dialog_cancel">取消</string>
     <string name="settings_theme_color_theme_item_light">浅色</string>
     <string name="list_other_expand_settings_panel">快速设置</string>
     <string name="alert_lock_screen_failed">错误：锁定屏幕失败。（如果您刚刚升级了应用程序，请尝试在手机设置中手动禁用并重新启用无障碍服务）</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38a3780..c7c7a14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -287,7 +287,6 @@
     <string name="screen_lock_method_use_accessibility">Use Accessibility Service</string>
     <string name="screen_lock_method_use_device_admin">Use Device Admin</string>
     <string name="settings_actions_lock_method">Choose method for locking the screen</string>
-    <string name="dialog_rename_cancel">Cancel</string>
     <string name="dialog_rename_ok">Ok</string>
     <string name="dialog_rename_title">Rename %1$s</string>
     <string name="dialog_select_color_red">Red</string>
@@ -295,7 +294,6 @@
     <string name="dialog_select_color_blue">Blue</string>
     <string name="dialog_select_color_green">Green</string>
     <string name="dialog_select_color_ok">Ok</string>
-    <string name="dialog_select_color_cancel">Cancel</string>
     <string name="dialog_select_color_color_hex">Color</string>
     <string name="dialog_choose_color_title">Choose color</string>
     <string name="dialog_consent_accessibility_privileges">I am aware that this will grant far-reaching privileges to µLauncher.</string>
@@ -305,5 +303,5 @@
     <string name="dialog_consent_accessibility_text"><![CDATA[You are about to activate the accessibility service. This will grant <strong>far-reaching privileges</strong> to µLauncher.<br/>µLauncher will use these privileges <strong>only to lock the screen</strong>. µLauncher <strong>will never collect any data</strong>. In particular, µLauncher does not use the accessibility service to collect any data.]]></string>
     <string name="dialog_consent_accessibility_title">Activating the Accessibility Service</string>
     <string name="dialog_consent_accessibility_ok">Activate Accessibility Service</string>
-    <string name="dialog_consent_accessibility_cancel">Cancel</string>
+    <string name="dialog_cancel">Cancel</string>
 </resources>