From cbcf39d7c20a3529a98ea7e2aa68bddac9a301bf Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Sun, 15 Nov 2026 23:52:30 +0800 Subject: [PATCH] feat: exit the launcher with three back presses (#1599) Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../com/droiddeck/launcher/ui/ExitGesture.kt | 40 +++++++++++++++++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 17 ++++++-- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 35 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/ExitGesture.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ExitGesture.kt b/app/src/main/java/com/droiddeck/launcher/ui/ExitGesture.kt new file mode 100644 index 0000000000..fd16dd3719 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ExitGesture.kt @@ -0,0 +1,40 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import android.os.SystemClock + +internal fun Context.finishTask() { + var c: Context = this + while (c is ContextWrapper) { + if (c is Activity) { + c.finishAndRemoveTask() + return + } + c = c.baseContext + } +} + +internal object ExitGesture { + private const val WINDOW_MS = 2_000L + + private var count = 0 + private var firstAt = 0L + + fun back(): Int { + val now = SystemClock.uptimeMillis() + if (count == 0 || now - firstAt > WINDOW_MS) { + count = 1 + firstAt = now + } else { + count += 1 + } + return count + } + + fun reset() { + count = 0 + firstAt = 0L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index c936d13c74..369f78edff 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -845,8 +845,19 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com (s.pageKey == null && Hops.origin?.page == selected) || ((s.pageKey == null || page == null) && (selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store")) - BackHandler(enabled = !processSettingsPageVisible && !hasBackTarget) { - if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard) - runCatching { frontFocus.railFor(railSelection).requestFocus() } + val exitArmed = !processSettingsPageVisible && !hasBackTarget + LaunchedEffect(exitArmed, selected) { ExitGesture.reset() } + BackHandler(enabled = exitArmed) { + when (ExitGesture.back()) { + 2 -> android.widget.Toast.makeText(ctx, R.string.exit_hint_back, android.widget.Toast.LENGTH_SHORT).show() + 3 -> { + ExitGesture.reset() + ctx.finishTask() + } + else -> { + if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard) + runCatching { frontFocus.railFor(railSelection).requestFocus() } + } + } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 89fe618284..efacf26d78 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -4264,4 +4264,5 @@ حالة HDR المعروض %1$d من %2$d + اضغط زر الرجوع مرة أخرى للخروج diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 2e52a73788..fe1017d0f9 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -4115,4 +4115,5 @@ Estado HDR Mostrados %1$d de %2$d + Presiona atrás una vez más para salir diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5f44159e56..afd008c20e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -4104,4 +4104,5 @@ Състояние на HDR Показани %1$d от %2$d + Натиснете отново „Назад“, за да излезете diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b5ce797262..0ac15fd477 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -4184,4 +4184,5 @@ Stav HDR Zobrazeno %1$d z %2$d + Stiskněte znovu zpět pro ukončení diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 28d75b49cb..eccc9c6b0b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -4104,4 +4104,5 @@ HDR-status Vist %1$d af %2$d + Tryk tilbage igen for at afslutte diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1f21e47271..9869c65003 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -4104,4 +4104,5 @@ HDR-Status Angezeigt %1$d von %2$d + Noch einmal zurück drücken zum Beenden diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ee0fec4765..54913160a6 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -4104,4 +4104,5 @@ Κατάσταση HDR Εμφανίζονται %1$d από %2$d + Πατήστε ξανά πίσω για έξοδο diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ae7063e602..67fa6e424c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4144,4 +4144,5 @@ Estado HDR Mostrados %1$d de %2$d + Pulsa atrás una vez más para salir diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index e08804e6ee..2e584762f1 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -4104,4 +4104,5 @@ HDR-tila Näkyvissä %1$d / %2$d + Paina takaisin vielä kerran poistuaksesi diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3d8b752b25..6ab5302ef5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -4143,4 +4143,5 @@ État HDR Affichés %1$d sur %2$d + Appuyez à nouveau sur retour pour quitter diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 2b745ec06c..de9884c5d7 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -4104,4 +4104,5 @@ HDR स्थिति दिखाए गए %2$d में से %1$d + बाहर निकलने के लिए फिर से बैक दबाएँ diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4846ffabc4..69cb0fb2b7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -4104,4 +4104,5 @@ HDR állapot Megjelenítve %1$d / %2$d + Nyomd meg még egyszer a visszát a kilépéshez diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1dfc7a8f2a..6a520f1553 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -4074,4 +4074,5 @@ Status HDR Ditampilkan %1$d dari %2$d + Tekan kembali sekali lagi untuk keluar diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0936bff97b..c91ccd8cd6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4143,4 +4143,5 @@ Stato HDR Mostrati %1$d di %2$d + Premi di nuovo indietro per uscire diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 10434076eb..421e2dd33a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -4074,4 +4074,5 @@ HDR 状態 表示中 %2$d 中 %1$d + もう一度戻るを押すと終了します diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4beb86b515..e3ed581703 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -4074,4 +4074,5 @@ HDR 상태 표시됨 %2$d 중 %1$d + 한 번 더 뒤로를 누르면 종료됩니다 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index d202e18bc5..fef782c572 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -4074,4 +4074,5 @@ Keadaan HDR Dipaparkan %1$d daripada %2$d + Tekan kembali sekali lagi untuk keluar diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c427fbc686..48ed0b2288 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -4104,4 +4104,5 @@ HDR-status Vist %1$d av %2$d + Trykk tilbake én gang til for å avslutte diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b559370fab..55ae1e7d32 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -4104,4 +4104,5 @@ HDR-status Getoond %1$d van %2$d + Druk nog één keer op terug om af te sluiten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0b27fa7f0e..a4f57aaace 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4184,4 +4184,5 @@ Stan HDR Pokazane %1$d z %2$d + Naciśnij wstecz jeszcze raz, aby wyjść diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 29c45ede21..97cffb7dec 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -4143,4 +4143,5 @@ Estado HDR Mostrados %1$d de %2$d + Prima novamente o botão Voltar para sair diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index f966fabc05..84db6c1161 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -4151,4 +4151,5 @@ Estado HDR Exibidos %1$d de %2$d + Pressione o botão Voltar novamente para sair diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 8f560e9cbb..545eec1d84 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -4144,4 +4144,5 @@ Stare HDR Afișate %1$d din %2$d + Apasă din nou înapoi pentru a ieși diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3023e72f1f..931b0b4a7d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4184,4 +4184,5 @@ Состояние HDR Показано %1$d из %2$d + Нажмите «Назад» ещё раз, чтобы выйти diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 47365131be..8292ce86b8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -4104,4 +4104,5 @@ HDR-status Visade %1$d av %2$d + Tryck tillbaka igen för att avsluta diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index be1f83c7d4..90e8a3dd1f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -4074,4 +4074,5 @@ สถานะ HDR ที่แสดง %1$d จาก %2$d + กดกลับอีกครั้งเพื่อออก diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 34d1082486..e3693cf086 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -4104,4 +4104,5 @@ HDR durumu Gösterilen %1$d / %2$d + Çıkmak için bir kez daha geri basın diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 924f1ddf79..574c5efa39 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4184,4 +4184,5 @@ Стан HDR Показано %1$d з %2$d + Натисніть «Назад» ще раз, щоб вийти diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a8532cdbad..1dafadd49c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -4074,4 +4074,5 @@ Trạng thái HDR Đang hiển thị %1$d trên %2$d + Nhấn lại để thoát diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a063a077e1..33cf0f8134 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -4074,4 +4074,5 @@ HDR 状态 已显示 %1$d / %2$d + 再按一次返回键退出 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b3752db043..74a6608b3a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -4074,4 +4074,5 @@ HDR 狀態 已顯示 %1$d / %2$d + 再按一次返回鍵退出 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d8fe8ca729..f8b1849135 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -4074,4 +4074,5 @@ HDR 狀態 已顯示 %1$d / %2$d + 再按一次返回鍵退出 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 737a1b7d46..744552732c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4187,4 +4187,5 @@ HDR state Shown %1$d of %2$d + Press back once more to exit