mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 12:28:40 +00:00
feat: exit the launcher with three back presses (#1599)
Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com>
This commit is contained in:
1 parent
91a217879f
commit
cbcf39d7c2
35 files changed
+87
-3
No files matched your search
@@ -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
|
||||
}
|
||||
}
|
||||
@@ -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() }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4264,4 +4264,5 @@
|
||||
<string name="hud_metric_hdr">حالة HDR</string>
|
||||
<string name="hud_readings_shown">المعروض</string>
|
||||
<string name="hud_readings_count">%1$d من %2$d</string>
|
||||
<string name="exit_hint_back">اضغط زر الرجوع مرة أخرى للخروج</string>
|
||||
</resources>
|
||||
@@ -4115,4 +4115,5 @@
|
||||
<string name="hud_metric_hdr">Estado HDR</string>
|
||||
<string name="hud_readings_shown">Mostrados</string>
|
||||
<string name="hud_readings_count">%1$d de %2$d</string>
|
||||
<string name="exit_hint_back">Presiona atrás una vez más para salir</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">Състояние на HDR</string>
|
||||
<string name="hud_readings_shown">Показани</string>
|
||||
<string name="hud_readings_count">%1$d от %2$d</string>
|
||||
<string name="exit_hint_back">Натиснете отново „Назад“, за да излезете</string>
|
||||
</resources>
|
||||
@@ -4184,4 +4184,5 @@
|
||||
<string name="hud_metric_hdr">Stav HDR</string>
|
||||
<string name="hud_readings_shown">Zobrazeno</string>
|
||||
<string name="hud_readings_count">%1$d z %2$d</string>
|
||||
<string name="exit_hint_back">Stiskněte znovu zpět pro ukončení</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR-status</string>
|
||||
<string name="hud_readings_shown">Vist</string>
|
||||
<string name="hud_readings_count">%1$d af %2$d</string>
|
||||
<string name="exit_hint_back">Tryk tilbage igen for at afslutte</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR-Status</string>
|
||||
<string name="hud_readings_shown">Angezeigt</string>
|
||||
<string name="hud_readings_count">%1$d von %2$d</string>
|
||||
<string name="exit_hint_back">Noch einmal zurück drücken zum Beenden</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">Κατάσταση HDR</string>
|
||||
<string name="hud_readings_shown">Εμφανίζονται</string>
|
||||
<string name="hud_readings_count">%1$d από %2$d</string>
|
||||
<string name="exit_hint_back">Πατήστε ξανά πίσω για έξοδο</string>
|
||||
</resources>
|
||||
@@ -4144,4 +4144,5 @@
|
||||
<string name="hud_metric_hdr">Estado HDR</string>
|
||||
<string name="hud_readings_shown">Mostrados</string>
|
||||
<string name="hud_readings_count">%1$d de %2$d</string>
|
||||
<string name="exit_hint_back">Pulsa atrás una vez más para salir</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR-tila</string>
|
||||
<string name="hud_readings_shown">Näkyvissä</string>
|
||||
<string name="hud_readings_count">%1$d / %2$d</string>
|
||||
<string name="exit_hint_back">Paina takaisin vielä kerran poistuaksesi</string>
|
||||
</resources>
|
||||
@@ -4143,4 +4143,5 @@
|
||||
<string name="hud_metric_hdr">État HDR</string>
|
||||
<string name="hud_readings_shown">Affichés</string>
|
||||
<string name="hud_readings_count">%1$d sur %2$d</string>
|
||||
<string name="exit_hint_back">Appuyez à nouveau sur retour pour quitter</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR स्थिति</string>
|
||||
<string name="hud_readings_shown">दिखाए गए</string>
|
||||
<string name="hud_readings_count">%2$d में से %1$d</string>
|
||||
<string name="exit_hint_back">बाहर निकलने के लिए फिर से बैक दबाएँ</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR állapot</string>
|
||||
<string name="hud_readings_shown">Megjelenítve</string>
|
||||
<string name="hud_readings_count">%1$d / %2$d</string>
|
||||
<string name="exit_hint_back">Nyomd meg még egyszer a visszát a kilépéshez</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">Status HDR</string>
|
||||
<string name="hud_readings_shown">Ditampilkan</string>
|
||||
<string name="hud_readings_count">%1$d dari %2$d</string>
|
||||
<string name="exit_hint_back">Tekan kembali sekali lagi untuk keluar</string>
|
||||
</resources>
|
||||
@@ -4143,4 +4143,5 @@
|
||||
<string name="hud_metric_hdr">Stato HDR</string>
|
||||
<string name="hud_readings_shown">Mostrati</string>
|
||||
<string name="hud_readings_count">%1$d di %2$d</string>
|
||||
<string name="exit_hint_back">Premi di nuovo indietro per uscire</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">HDR 状態</string>
|
||||
<string name="hud_readings_shown">表示中</string>
|
||||
<string name="hud_readings_count">%2$d 中 %1$d</string>
|
||||
<string name="exit_hint_back">もう一度戻るを押すと終了します</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">HDR 상태</string>
|
||||
<string name="hud_readings_shown">표시됨</string>
|
||||
<string name="hud_readings_count">%2$d 중 %1$d</string>
|
||||
<string name="exit_hint_back">한 번 더 뒤로를 누르면 종료됩니다</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">Keadaan HDR</string>
|
||||
<string name="hud_readings_shown">Dipaparkan</string>
|
||||
<string name="hud_readings_count">%1$d daripada %2$d</string>
|
||||
<string name="exit_hint_back">Tekan kembali sekali lagi untuk keluar</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR-status</string>
|
||||
<string name="hud_readings_shown">Vist</string>
|
||||
<string name="hud_readings_count">%1$d av %2$d</string>
|
||||
<string name="exit_hint_back">Trykk tilbake én gang til for å avslutte</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR-status</string>
|
||||
<string name="hud_readings_shown">Getoond</string>
|
||||
<string name="hud_readings_count">%1$d van %2$d</string>
|
||||
<string name="exit_hint_back">Druk nog één keer op terug om af te sluiten</string>
|
||||
</resources>
|
||||
@@ -4184,4 +4184,5 @@
|
||||
<string name="hud_metric_hdr">Stan HDR</string>
|
||||
<string name="hud_readings_shown">Pokazane</string>
|
||||
<string name="hud_readings_count">%1$d z %2$d</string>
|
||||
<string name="exit_hint_back">Naciśnij wstecz jeszcze raz, aby wyjść</string>
|
||||
</resources>
|
||||
@@ -4143,4 +4143,5 @@
|
||||
<string name="hud_metric_hdr">Estado HDR</string>
|
||||
<string name="hud_readings_shown">Mostrados</string>
|
||||
<string name="hud_readings_count">%1$d de %2$d</string>
|
||||
<string name="exit_hint_back">Prima novamente o botão Voltar para sair</string>
|
||||
</resources>
|
||||
@@ -4151,4 +4151,5 @@
|
||||
<string name="hud_metric_hdr">Estado HDR</string>
|
||||
<string name="hud_readings_shown">Exibidos</string>
|
||||
<string name="hud_readings_count">%1$d de %2$d</string>
|
||||
<string name="exit_hint_back">Pressione o botão Voltar novamente para sair</string>
|
||||
</resources>
|
||||
@@ -4144,4 +4144,5 @@
|
||||
<string name="hud_metric_hdr">Stare HDR</string>
|
||||
<string name="hud_readings_shown">Afișate</string>
|
||||
<string name="hud_readings_count">%1$d din %2$d</string>
|
||||
<string name="exit_hint_back">Apasă din nou înapoi pentru a ieși</string>
|
||||
</resources>
|
||||
@@ -4184,4 +4184,5 @@
|
||||
<string name="hud_metric_hdr">Состояние HDR</string>
|
||||
<string name="hud_readings_shown">Показано</string>
|
||||
<string name="hud_readings_count">%1$d из %2$d</string>
|
||||
<string name="exit_hint_back">Нажмите «Назад» ещё раз, чтобы выйти</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR-status</string>
|
||||
<string name="hud_readings_shown">Visade</string>
|
||||
<string name="hud_readings_count">%1$d av %2$d</string>
|
||||
<string name="exit_hint_back">Tryck tillbaka igen för att avsluta</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">สถานะ HDR</string>
|
||||
<string name="hud_readings_shown">ที่แสดง</string>
|
||||
<string name="hud_readings_count">%1$d จาก %2$d</string>
|
||||
<string name="exit_hint_back">กดกลับอีกครั้งเพื่อออก</string>
|
||||
</resources>
|
||||
@@ -4104,4 +4104,5 @@
|
||||
<string name="hud_metric_hdr">HDR durumu</string>
|
||||
<string name="hud_readings_shown">Gösterilen</string>
|
||||
<string name="hud_readings_count">%1$d / %2$d</string>
|
||||
<string name="exit_hint_back">Çıkmak için bir kez daha geri basın</string>
|
||||
</resources>
|
||||
@@ -4184,4 +4184,5 @@
|
||||
<string name="hud_metric_hdr">Стан HDR</string>
|
||||
<string name="hud_readings_shown">Показано</string>
|
||||
<string name="hud_readings_count">%1$d з %2$d</string>
|
||||
<string name="exit_hint_back">Натисніть «Назад» ще раз, щоб вийти</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">Trạng thái HDR</string>
|
||||
<string name="hud_readings_shown">Đang hiển thị</string>
|
||||
<string name="hud_readings_count">%1$d trên %2$d</string>
|
||||
<string name="exit_hint_back">Nhấn lại để thoát</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">HDR 状态</string>
|
||||
<string name="hud_readings_shown">已显示</string>
|
||||
<string name="hud_readings_count">%1$d / %2$d</string>
|
||||
<string name="exit_hint_back">再按一次返回键退出</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">HDR 狀態</string>
|
||||
<string name="hud_readings_shown">已顯示</string>
|
||||
<string name="hud_readings_count">%1$d / %2$d</string>
|
||||
<string name="exit_hint_back">再按一次返回鍵退出</string>
|
||||
</resources>
|
||||
@@ -4074,4 +4074,5 @@
|
||||
<string name="hud_metric_hdr">HDR 狀態</string>
|
||||
<string name="hud_readings_shown">已顯示</string>
|
||||
<string name="hud_readings_count">%1$d / %2$d</string>
|
||||
<string name="exit_hint_back">再按一次返回鍵退出</string>
|
||||
</resources>
|
||||
@@ -4187,4 +4187,5 @@
|
||||
<string name="hud_metric_hdr">HDR state</string>
|
||||
<string name="hud_readings_shown">Shown</string>
|
||||
<string name="hud_readings_count">%1$d of %2$d</string>
|
||||
<string name="exit_hint_back">Press back once more to exit</string>
|
||||
</resources>
|
||||
Reference in new issue
Block a user