From 6060f2288ff0929cf96f891e9b88582847d4b480 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 6 Nov 2026 12:17:37 -0500 Subject: [PATCH 01/10] feat(wow): voice type and keyboard chat bar for World of Warcraft (#2171) * Add voice and keyboard chat input for World of Warcraft Open a chat bar with an editable text field when a WoW client focuses a text box (reported by Proton's winex11 IME context hook through agent/wine-ime.json). First use asks for Voice type or Android keyboard with a remember toggle; the choice is also in the side menu's Keyboard group while a WoW client runs. Voice type uses the device's speech recognition service. On dual-screen devices the bar and keyboard open on the second screen. Send types the text and presses Enter; Cancel presses Escape. * Cover the Arm64 WoW client in the chat match test * Give the second-screen chat bar the session's result and back owners * Open the WoW chat bar with the game field's current text When the bar opens, select and copy the game's text field and fill the bar with it through the session clipboard bridge, then put the guest clipboard back. Send selects the field first, so the bar's text replaces what was there instead of being appended. * Keep WoW chat consistent across screen changes and failed field reads Close the bar when the game field closes even after the program name is cleared, move the bar to the top screen when the second screen drops it, and drop any pending second-screen keyboard request when the bar opens. A field read that gets no copy of its own leaves the game text unselected and Send then types without replacing it. Ctrl is only pressed and released when nothing else holds it, and a pending read ends when the clipboard bridge stops. * fix(session): Close WoW chat for other programs and keep the game cursor on cancelled reads --- .../com/droiddeck/launcher/SessionActivity.kt | 116 ++++++++- .../droiddeck/launcher/agent/AgentGuest.kt | 19 +- .../droiddeck/launcher/input/KeyboardHost.kt | 42 ++-- .../launcher/input/SessionClipboard.kt | 28 ++- .../launcher/session/SessionPrefs.kt | 9 + .../launcher/ui/BottomScreenTyping.kt | 23 +- .../droiddeck/launcher/ui/FrontEndWidgets.kt | 22 ++ .../launcher/ui/SecondScreenPresentation.kt | 37 ++- .../droiddeck/launcher/ui/SessionOverlay.kt | 12 + .../droiddeck/launcher/ui/SlowUsbDialog.kt | 29 +-- .../java/com/droiddeck/launcher/ui/WowChat.kt | 230 ++++++++++++++++++ app/src/main/res/values-ar/strings.xml | 8 + app/src/main/res/values-b+es+419/strings.xml | 8 + app/src/main/res/values-bg/strings.xml | 8 + app/src/main/res/values-cs/strings.xml | 8 + app/src/main/res/values-da/strings.xml | 8 + app/src/main/res/values-de/strings.xml | 8 + app/src/main/res/values-el/strings.xml | 8 + app/src/main/res/values-es/strings.xml | 8 + app/src/main/res/values-fi/strings.xml | 8 + app/src/main/res/values-fr/strings.xml | 8 + app/src/main/res/values-hi/strings.xml | 8 + app/src/main/res/values-hu/strings.xml | 8 + app/src/main/res/values-in/strings.xml | 8 + app/src/main/res/values-it/strings.xml | 8 + app/src/main/res/values-ja/strings.xml | 8 + app/src/main/res/values-ko/strings.xml | 8 + app/src/main/res/values-ms/strings.xml | 8 + app/src/main/res/values-nb/strings.xml | 8 + app/src/main/res/values-nl/strings.xml | 8 + app/src/main/res/values-pl/strings.xml | 8 + app/src/main/res/values-pt-rPT/strings.xml | 8 + app/src/main/res/values-pt/strings.xml | 8 + app/src/main/res/values-ro/strings.xml | 8 + app/src/main/res/values-ru/strings.xml | 8 + app/src/main/res/values-sv/strings.xml | 8 + app/src/main/res/values-th/strings.xml | 8 + app/src/main/res/values-tr/strings.xml | 8 + app/src/main/res/values-uk/strings.xml | 8 + app/src/main/res/values-vi/strings.xml | 8 + app/src/main/res/values-zh-rCN/strings.xml | 8 + app/src/main/res/values-zh-rHK/strings.xml | 8 + app/src/main/res/values-zh-rTW/strings.xml | 8 + app/src/main/res/values/strings.xml | 8 + .../com/droiddeck/launcher/ui/WowChatTest.kt | 21 ++ 45 files changed, 785 insertions(+), 67 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/WowChat.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/WowChatTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2363b8beb5..1647647147 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.imePadding import android.hardware.input.InputManager import android.hardware.display.DisplayManager import android.content.Intent @@ -233,6 +234,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var screenKeyBind: List? = null private var screenKeyDir: Int? = null private var screenKeyTextFocus = false + private val appTextFocus get() = screenKeyTextFocus || wowChat.request != null + private val wowChat by lazy { com.droiddeck.launcher.ui.WowChat(this, ::sendWowChat, ::cancelWowChat, ::readGameField) } + private var wowChatBottom: SecondScreenPresentation? = null + private var wowChatOnTop by mutableStateOf(false) private var screenKeyEdit by mutableStateOf(null) private var screenLayoutsOpen by mutableStateOf(false) private var screenKeysShown by mutableStateOf(true) @@ -910,6 +915,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() } androidx.compose.runtime.LaunchedEffect(AgentGuest.desktopTextField) { onDesktopTextField(AgentGuest.desktopTextField) } + androidx.compose.runtime.LaunchedEffect(AgentGuest.gameTextField, AgentGuest.gameProgram) { onGameTextField(AgentGuest.gameTextField) } + androidx.compose.runtime.LaunchedEffect(wowChat.request) { placeWowChat() } androidx.compose.runtime.LaunchedEffect(pipUi, pcKeyboardOpen) { updateDesktopKeyboardButton() } val keyboardRequestsSeen = androidx.compose.runtime.remember { intArrayOf(AgentGuest.keyboardRequests) } androidx.compose.runtime.LaunchedEffect(AgentGuest.keyboardRequests) { @@ -1033,6 +1040,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } } + if (wowChat.asking) com.droiddeck.launcher.ui.WowChatChoiceDialog(wowChat) + if (wowChatOnTop && wowChat.request != null) androidx.compose.foundation.layout.Box( + Modifier.fillMaxSize().imePadding(), contentAlignment = androidx.compose.ui.Alignment.BottomCenter, + ) { com.droiddeck.launcher.ui.WowChatPanel(wowChat) } if (gestureSettingsOpen) com.droiddeck.launcher.ui.TouchGestureDialog( game = gestureGame, onDismiss = { gestureSettingsOpen = false }, @@ -1310,6 +1321,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, onKeyboard = { drawerOpen = false; pcKeyboardOpen = false; keyboard?.toggle() }, onHardwareKeyboard = ::togglePcKeyboard, + wowChatShown = com.droiddeck.launcher.ui.WowChat.isWow(AgentGuest.gameProgram), + wowChat = wowChat.remembered, + onWowChat = wowChat::choose, controller = controllerSettings, onRumble = { on -> updateControllerPrefs { ControllerPrefs.setRumble(this@SessionActivity, on) } }, onSteamButton = { on -> updateControllerPrefs { ControllerPrefs.setSteamButton(this@SessionActivity, on) } }, @@ -2642,7 +2656,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen && !SessionState.suspended && !ended && !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && - !gestureSettingsOpen && !screenKeyTextFocus && window.decorView.hasWindowFocus() + !gestureSettingsOpen && !appTextFocus && window.decorView.hasWindowFocus() if (steamVolume) { val audio = getSystemService(android.media.AudioManager::class.java) if (com.droiddeck.launcher.input.SteamVolumeKeys.dispatch(event, !audio.isVolumeFixed) { direction -> @@ -2656,10 +2670,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Log.i(TAG, String.format(java.util.Locale.ROOT, "back key device=%d (%s) source=0x%x flags=0x%x", event.deviceId, event.device?.name, event.source, event.flags)) } - val mouseToGuest = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && + val mouseToGuest = !pipUi && !appTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !SessionState.suspended && !(::loading.isInitialized && (loading.visible || loading.ended)) if (mouseBackInput.onKeyEvent(event, mouseToGuest)) return true - val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + val backToQam = !pipUi && !appTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen && !SessionState.suspended && padBridge?.canHoldQam() == true if (backQamInput.onKeyEvent(event, backToQam)) { @@ -2668,7 +2682,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } if (pipUi) return true - if (screenKeyTextFocus) return super.dispatchKeyEvent(event) + if (appTextFocus) return super.dispatchKeyEvent(event) if (physicalShortcuts.onKey( event, enabled = SessionState.running && !SessionState.suspended && @@ -3552,20 +3566,96 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { showCursor(px, py) } - private fun openBottomKeyboard() { - if (!started) return + private fun bottomKeyboardPresentation(): SecondScreenPresentation? { + if (!started) return null if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) { - val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return null if (drawerOpen || drawerPinned) drawerOpen = false typingReturnMode = secondScreenMode selectedSecondScreenDisplay = target.displayId selectSecondScreenMode(SecondScreenMode.KEYBOARD_TRACKPAD) } - val presentation = secondScreenPresentation ?: return - if (!presentation.showsKeyboard) return - val display = presentation.display?.displayId ?: return + return secondScreenPresentation?.takeIf { it.showsKeyboard && it.display != null } + } + + private fun openBottomKeyboard() { + val presentation = bottomKeyboardPresentation() ?: return presentation.requestKeyboard(forField = true) - com.droiddeck.launcher.ui.SessionTyping.focusDisplay(this, display) + com.droiddeck.launcher.ui.SessionTyping.focusDisplay(this, presentation.display.displayId) + } + + private fun onGameTextField(focused: Boolean) { + if (!focused || !com.droiddeck.launcher.ui.WowChat.isWow(AgentGuest.gameProgram)) wowChat.chatClosed() + else if (resumed && !pipUi && !pcKeyboardOpen && + resources.configuration.hardKeyboardHidden != android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO) { + keyboard?.takeIf { it.shown }?.hide() + wowChat.chatOpened() + } + } + + private fun placeWowChat() { + val open = wowChat.request != null + val shown = wowChatBottom + wowChatOnTop = false + if (open && shown == null) { + val presentation = bottomKeyboardPresentation() + if (presentation == null) { + wowChatOnTop = true + return + } + wowChatBottom = presentation + presentation.showChat(onLost = { + if (wowChatBottom === presentation) { + wowChatBottom = null + wowChatOnTop = wowChat.request != null + } + }) { + androidx.compose.runtime.CompositionLocalProvider( + androidx.activity.compose.LocalActivityResultRegistryOwner provides this, + androidx.activity.compose.LocalOnBackPressedDispatcherOwner provides this, + ) { DroidDeckTheme { com.droiddeck.launcher.ui.WowChatPanel(wowChat) } } + } + com.droiddeck.launcher.ui.SessionTyping.focusDisplay(this, presentation.display.displayId) + } else if (!open && shown != null) { + wowChatBottom = null + shown.hideChat() + if (secondScreenPresentation === shown) bottomKeyboardClosed() + } + } + + private fun sendWowChat(text: String, replace: Boolean) { + val host = keyboard ?: return + if (replace) { + selectGameField() + if (text.isEmpty()) host.tap(KeyEvent.KEYCODE_DEL) + } else { + WaylandCompositor.nativeSendKey(KEY_END, 1) + WaylandCompositor.nativeSendKey(KEY_END, 0) + } + host.type(text) + host.tap(KeyEvent.KEYCODE_ENTER) + } + + private fun selectGameField(vararg then: Int) { + val held = KEY_LEFTCTRL in guestKeysDown || KEY_LEFTCTRL in gestureKeysDown + if (!held) WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 1) + for (key in intArrayOf(KEY_A) + then) { + WaylandCompositor.nativeSendKey(key, 1) + WaylandCompositor.nativeSendKey(key, 0) + } + if (!held) WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 0) + } + + private fun readGameField(done: (String?) -> Unit) { + sessionClipboard.captureGuest(FIELD_READ_MS, onTimeout = { + WaylandCompositor.nativeSendKey(KEY_END, 1) + WaylandCompositor.nativeSendKey(KEY_END, 0) + }, onText = done) + selectGameField(KEY_C) + } + + private fun cancelWowChat() { + keyboard?.tap(KeyEvent.KEYCODE_ESCAPE) } private fun bottomKeyboardClosed() { @@ -5199,6 +5289,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val AXIS_UNITS_PER_PIXEL = 3f private const val KEY_LEFTCTRL = 29 private const val KEY_RIGHTCTRL = 97 + private const val KEY_A = 30 + private const val KEY_C = 46 + private const val KEY_END = 107 + private const val FIELD_READ_MS = 600L private const val BTN_SIDE = 0x113 private const val BTN_EXTRA = 0x114 private const val DESKTOP_GRAB_TAP_MS = 500L diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt index a89c14c66a..eaa2bbc0f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt @@ -26,6 +26,10 @@ object AgentGuest { private set var keyboardRequests by mutableIntStateOf(0) private set + var gameTextField by mutableStateOf(false) + private set + var gameProgram by mutableStateOf(null) + private set var keyboardDismissals by mutableIntStateOf(0) private set @Volatile private var keyboardRoute = false @@ -43,7 +47,7 @@ object AgentGuest { observer?.stopWatching() observer = null lastFocusKey = null - main.post { steamKeyboard = false; desktopTextField = false } + main.post { steamKeyboard = false; desktopTextField = false; gameTextField = false; gameProgram = null } val dir = dir(context) dir.deleteRecursively() dir.mkdirs() @@ -59,6 +63,7 @@ object AgentGuest { "focus.json" -> readJson(File(dir, path))?.let(::recordFocus) "keyboard.json" -> readJson(File(dir, path))?.let { recordKeyboard(this, it) } "ime.json" -> readJson(File(dir, path))?.let { recordTextField(this, it) } + "wine-ime.json" -> readJson(File(dir, path))?.let { recordGameTextField(this, it) } "keyboard-request.json" -> readJson(File(dir, path))?.let { recordKeyboardRequest(this) } "keyboard-dismiss.json" -> readJson(File(dir, path))?.let { recordKeyboardDismiss(this) } } @@ -71,7 +76,7 @@ object AgentGuest { synchronized(lock) { observer?.stopWatching() observer = null - main.post { steamKeyboard = false; desktopTextField = false } + main.post { steamKeyboard = false; desktopTextField = false; gameTextField = false; gameProgram = null } } } @@ -129,6 +134,16 @@ object AgentGuest { SessionEvents.record("ime.changed", mapOf("textField" to focused, "seq" to snapshot.optInt("seq"))) } + private fun recordGameTextField(source: FileObserver, snapshot: JSONObject) { + val focused = snapshot.optBoolean("textField") + val program = snapshot.optString("program").takeIf { it.isNotEmpty() } + synchronized(lock) { + if (source !== observer) return + main.post { gameProgram = program; gameTextField = focused } + } + SessionEvents.record("game.ime.changed", mapOf("textField" to focused, "program" to program, "seq" to snapshot.optInt("seq"))) + } + private fun recordFocus(snapshot: JSONObject) { val fields = linkedMapOf( "focusedApp" to snapshot.opt("focusedApp"), diff --git a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt index ab2550a4a8..6656b7697f 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt @@ -89,21 +89,31 @@ class KeyboardHost( clearFocus() } + fun type(text: CharSequence?) { + if (text.isNullOrEmpty()) return + val events = map.getEvents(text.toString().toCharArray()) + if (events != null) { + for (event in events) sendKeyEvent(event) + } else { + for (ch in text) { + val t = System.currentTimeMillis() + val down = KeyEvent(t, t, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_UNKNOWN, 0, 0, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, 0) + sendKeyEvent(CharKeyEvent(down, ch)) + sendKeyEvent(CharKeyEvent(KeyEvent.changeAction(down, KeyEvent.ACTION_UP), ch)) + } + } + } + + fun tap(keyCode: Int) { + val t = System.currentTimeMillis() + sendKeyEvent(KeyEvent(t, t, KeyEvent.ACTION_DOWN, keyCode, 0)) + sendKeyEvent(KeyEvent(t, t, KeyEvent.ACTION_UP, keyCode, 0)) + } + private inner class KeyConnection : BaseInputConnection(this, false) { override fun commitText(text: CharSequence?, newCursorPosition: Int): Boolean { - if (text.isNullOrEmpty()) return true - val events = map.getEvents(text.toString().toCharArray()) - if (events != null) { - for (event in events) sendKeyEvent(event) - } else { - for (ch in text) { - val t = System.currentTimeMillis() - val down = KeyEvent(t, t, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_UNKNOWN, 0, 0, - KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, 0) - sendKeyEvent(CharKeyEvent(down, ch)) - sendKeyEvent(CharKeyEvent(KeyEvent.changeAction(down, KeyEvent.ACTION_UP), ch)) - } - } + type(text) return true } @@ -123,12 +133,6 @@ class KeyboardHost( return true } - private fun tap(keyCode: Int) { - val t = System.currentTimeMillis() - sendKeyEvent(KeyEvent(t, t, KeyEvent.ACTION_DOWN, keyCode, 0)) - sendKeyEvent(KeyEvent(t, t, KeyEvent.ACTION_UP, keyCode, 0)) - } - override fun getTextBeforeCursor(n: Int, flags: Int): CharSequence = "" override fun getTextAfterCursor(n: Int, flags: Int): CharSequence = "" override fun getSelectedText(flags: Int): CharSequence? = null diff --git a/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt b/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt index c29c772112..a32ba0c4e6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt @@ -19,11 +19,20 @@ class SessionClipboard(context: Context, private val hasFocus: () -> Boolean) { private var published = false private var shared: String? = null private var echo: String? = null + private var capture: ((String?) -> Unit)? = null + private var captureBefore: String? = null + private var captureLate: (() -> Unit)? = null private val androidListener = ClipboardManager.OnPrimaryClipChangedListener { refresh(changed = true) } private val guestListener = object : WaylandCompositor.ClipboardListener { override fun onGuestClipboardText(text: String) { handler.post { - if (active && hasFocus() && WaylandCompositor.isClipboardListener(this)) { + val taken = capture?.takeIf { text != captureBefore } + if (taken != null && WaylandCompositor.isClipboardListener(this)) { + capture = null + handler.removeCallbacks(captureTimeout) + WaylandCompositor.setClipboardText(shared) + taken(text) + } else if (active && hasFocus() && WaylandCompositor.isClipboardListener(this)) { val current = clipboard.primaryClip?.takeIf { it.itemCount > 0 }?.getItemAt(0)?.text shared = text published = true @@ -36,6 +45,21 @@ class SessionClipboard(context: Context, private val hasFocus: () -> Boolean) { } } + private val captureTimeout = Runnable { + val taken = capture ?: return@Runnable + capture = null + captureLate?.invoke() + taken(null) + } + + fun captureGuest(timeoutMs: Long, onTimeout: () -> Unit = {}, onText: (String?) -> Unit) { + capture?.let { handler.removeCallbacks(captureTimeout); it(null) } + capture = onText + captureLate = onTimeout + captureBefore = shared + handler.postDelayed(captureTimeout, timeoutMs) + } + fun start() { if (active) return active = true @@ -47,6 +71,8 @@ class SessionClipboard(context: Context, private val hasFocus: () -> Boolean) { fun stop() { if (!active) return active = false + handler.removeCallbacks(captureTimeout) + capture?.let { capture = null; it(null) } clipboard.removePrimaryClipChangedListener(androidListener) WaylandCompositor.clearClipboardListener(guestListener) handler.removeCallbacksAndMessages(null) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index a7541e2619..9c314ade25 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -351,6 +351,8 @@ object SessionPrefs { } const val PC_KEYBOARD_SIZE_DEFAULT = 47 + const val WOW_CHAT_VOICE = "voice" + const val WOW_CHAT_KEYBOARD = "keyboard" val PC_KEYBOARD_SIZE_RANGE = 25..70 const val PC_KEYBOARD_OPACITY_DEFAULT = 100 val PC_KEYBOARD_OPACITY_RANGE = 30..100 @@ -362,6 +364,13 @@ object SessionPrefs { prefs(context).edit().putInt("pcKeyboardSize", percent.coerceIn(PC_KEYBOARD_SIZE_RANGE)).apply() } + fun wowChatInput(context: Context): String? = + prefs(context).getString("wowChatInput", null)?.takeIf { it == WOW_CHAT_VOICE || it == WOW_CHAT_KEYBOARD } + + fun setWowChatInput(context: Context, mode: String?) { + prefs(context).edit().apply { if (mode == null) remove("wowChatInput") else putString("wowChatInput", mode) }.apply() + } + fun pcKeyboardOpacity(context: Context): Int = prefs(context).getInt("pcKeyboardOpacity", PC_KEYBOARD_OPACITY_DEFAULT).takeIf { it in PC_KEYBOARD_OPACITY_RANGE } ?: PC_KEYBOARD_OPACITY_DEFAULT diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenTyping.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenTyping.kt index 50f62b8cfd..faac0ed580 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenTyping.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenTyping.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -110,7 +111,16 @@ internal class BottomScreenTextInput(private val fallback: TextInputService) : P } @Composable -internal fun TypingPanel(request: TypingRequest, onDone: () -> Unit) { +internal fun TypingPanel( + request: TypingRequest, + modifier: Modifier = Modifier.fillMaxSize(), + title: String = stringResource(R.string.dual_typing_title), + done: String = stringResource(R.string.dual_typing_done), + onCancel: (() -> Unit)? = null, + leading: (@Composable () -> Unit)? = null, + showKeyboard: Boolean = true, + onDone: () -> Unit, +) { val colors = MaterialTheme.colorScheme var field by remember(request) { mutableStateOf(request.value) } LaunchedEffect(request.value) { @@ -120,19 +130,22 @@ internal fun TypingPanel(request: TypingRequest, onDone: () -> Unit) { val keyboard = LocalSoftwareKeyboardController.current LaunchedEffect(request) { kotlinx.coroutines.delay(120) + if (!showKeyboard) return@LaunchedEffect runCatching { focus.requestFocus() } keyboard?.show() } val options = request.imeOptions val secret = options.keyboardType == KeyboardType.Password || options.keyboardType == KeyboardType.NumberPassword Column( - Modifier.fillMaxSize().background(colors.background).padding(horizontal = 20.dp, vertical = 14.dp), + modifier.background(colors.background).padding(horizontal = 20.dp, vertical = 14.dp), verticalArrangement = Arrangement.spacedBy(10.dp), ) { - Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - Text(stringResource(R.string.dual_typing_title), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + leading?.invoke() + Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant, modifier = Modifier.weight(1f)) - Button(onClick = onDone, modifier = Modifier.testTag("dual-typing-done")) { Text(stringResource(R.string.dual_typing_done)) } + if (onCancel != null) OutlinedButton(onClick = onCancel, modifier = Modifier.testTag("dual-typing-cancel")) { Text(stringResource(R.string.common_cancel)) } + Button(onClick = onDone, modifier = Modifier.testTag("dual-typing-done")) { Text(done) } } OutlinedTextField( value = field, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index 2ec816eb12..f12ad81ddb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -56,6 +56,7 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.rotate import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.semantics.Role @@ -150,6 +151,27 @@ internal fun Chip(t: String, ok: Boolean) { @Composable internal fun rememberHot(src: MutableInteractionSource): Boolean = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value +@Composable +internal fun DialogToggleRow(label: String, checked: Boolean, onChange: (Boolean) -> Unit) { + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val flip = { onChange(!checked) } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .border(if (hot) 2.dp else 1.dp, if (hot) pal.signal else pal.line, Shape12) + .hoverable(src) + .clickable(interactionSource = src, indication = null, role = Role.Switch, onClick = flip) + .controllerConfirm(onClick = flip) + .padding(start = 14.dp, end = 4.dp), + ) { + Text(label, fontSize = 14.sp, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f)) + ToggleSwitch(checked, label = label, modifier = Modifier.focusProperties { canFocus = false }) { onChange(it) } + } +} + @Composable internal fun PrimaryButton( text: String, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index 4e738716fc..bd89179663 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -46,6 +46,8 @@ class SecondScreenPresentation( private val frame = FrameLayout(context) private var menuView: androidx.compose.ui.platform.ComposeView? = null private var dashboardView: androidx.compose.ui.platform.ComposeView? = null + private var chatView: androidx.compose.ui.platform.ComposeView? = null + private var chatLost: (() -> Unit)? = null var menuShown = false private set private val root = LinearLayout(context).apply { @@ -78,7 +80,7 @@ class SecondScreenPresentation( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { root.setOnApplyWindowInsetsListener { view, insets -> if (insets.isVisible(WindowInsets.Type.ime())) imeSeen = true - else if (imeSeen) keyboardClosed() + else if (imeSeen && chatView == null) keyboardClosed() view.onApplyWindowInsets(insets) } } @@ -128,6 +130,37 @@ class SecondScreenPresentation( if (created && isShowing && currentMode == SecondScreenMode.TERMINAL && terminalPanel?.ready != true) renderMode() } + fun showChat(onLost: () -> Unit, content: @androidx.compose.runtime.Composable () -> Unit) { + if (!showsKeyboard || chatView != null) return + keyboardHost?.takeIf { it.shown }?.hide() + keyboardShown.value = false + keyboardPending = false + fieldKeyboard = false + chatLost = onLost + ownComposeViews() + val view = androidx.compose.ui.platform.ComposeView(context).apply { + isFocusable = true + isFocusableInTouchMode = true + setContent { content() } + } + chatView = view + root.addView(view, 1.coerceAtMost(root.childCount), LinearLayout.LayoutParams(-1, -2)) + } + + fun hideChat() { + chatLost = null + dropChat() + } + + private fun dropChat() { + val view = chatView ?: return + chatView = null + chatLost?.let { lost -> chatLost = null; sessionActivity.runOnUiThread(lost) } + imeSeen = false + root.removeView(view) + view.disposeComposition() + } + val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode == SecondScreenMode.KEYBOARD_TRACKPAD val showsControls: Boolean get() = isShowing && currentMode != SecondScreenMode.NONE @@ -178,6 +211,7 @@ class SecondScreenPresentation( showMenu(false) closeDashboard() closeTerminal() + dropChat() keyboardHost?.hide() keyboardHost = null dismiss() @@ -212,6 +246,7 @@ class SecondScreenPresentation( } private fun renderMode() { + dropChat() fieldKeyboard = false keyboardHost?.hide() keyboardHost = null diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 92074c314e..17409c85bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -264,6 +264,9 @@ class DrawerActions( val onImportLossless: () -> Unit, val onKeyboard: () -> Unit, val onHardwareKeyboard: () -> Unit, + val wowChatShown: Boolean = false, + val wowChat: String? = null, + val onWowChat: (String?) -> Unit = {}, val onSteamMenu: (() -> Unit)?, val onQam: (() -> Unit)?, val onAchievements: (() -> Unit)? = null, @@ -698,6 +701,15 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont host.open = null; a.onKeyboard() } } + if (a.wowChatShown) ChoiceRow( + host, "wow-chat", stringResource(R.string.wow_chat_title), null, + listOf( + null to stringResource(R.string.wow_chat_ask), + SessionPrefs.WOW_CHAT_VOICE to stringResource(R.string.wow_chat_voice), + SessionPrefs.WOW_CHAT_KEYBOARD to stringResource(R.string.pckb_android), + ), + a.wowChat, chipModifier = focus.track(page, "wow-chat"), onPick = a.onWowChat, + ) val keyboardContext = LocalContext.current remember { PcKeyboardPrefs.load(keyboardContext) } SliderRow( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SlowUsbDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/SlowUsbDialog.kt index 6ba15e324c..6c86d5589b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SlowUsbDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SlowUsbDialog.kt @@ -1,14 +1,8 @@ package com.droiddeck.launcher.ui -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.hoverable -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Usb @@ -18,12 +12,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.focus.focusProperties -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.semantics.Role import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.res.stringResource @@ -48,23 +37,7 @@ internal fun SlowUsbDialog(drive: UsbLink.SlowDrive, never: Boolean, onNever: (B stringResource(message, drive.name, UsbLink.generation(drive.mbps), speed, UsbLink.megabytesPerSecond(drive.mbps)), fontSize = 13.sp, lineHeight = 18.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - val flip = { onNever(!never) } - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), - modifier = Modifier.fillMaxWidth().clip(Shape12) - .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) - .border(if (hot) 2.dp else 1.dp, if (hot) pal.signal else pal.line, Shape12) - .hoverable(src) - .clickable(interactionSource = src, indication = null, role = Role.Switch, onClick = flip) - .controllerConfirm(onClick = flip) - .padding(start = 14.dp, end = 4.dp), - ) { - Text(stringResource(R.string.slow_usb_never), fontSize = 14.sp, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f)) - ToggleSwitch(never, label = stringResource(R.string.slow_usb_never), modifier = Modifier.focusProperties { canFocus = false }) { onNever(it) } - } + DialogToggleRow(stringResource(R.string.slow_usb_never), never, onNever) Row(horizontalArrangement = Arrangement.End, modifier = Modifier.fillMaxWidth()) { PrimaryButton(stringResource(R.string.slow_usb_dismiss), modifier = Modifier.focusRequester(focus), onClick = close) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WowChat.kt b/app/src/main/java/com/droiddeck/launcher/ui/WowChat.kt new file mode 100644 index 0000000000..b2a2dd3847 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/WowChat.kt @@ -0,0 +1,230 @@ +package com.droiddeck.launcher.ui + +import android.Manifest +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.os.Bundle +import android.speech.RecognitionListener +import android.speech.RecognizerIntent +import android.speech.SpeechRecognizer +import android.widget.Toast +import androidx.activity.compose.BackHandler +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Mic +import androidx.compose.material3.FilledIconToggleButton +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextRange +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.ImeOptions +import androidx.compose.ui.text.input.TextFieldValue +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionPrefs + +class WowChat( + private val context: Context, + private val onSend: (String, Boolean) -> Unit, + private val onCancel: () -> Unit, + private val readField: ((String?) -> Unit) -> Unit = {}, +) { + var request by mutableStateOf(null) + private set + var asking by mutableStateOf(false) + private set + var listening by mutableStateOf(false) + private set + var voice by mutableStateOf(false) + private set + var remembered by mutableStateOf(SessionPrefs.wowChatInput(context)) + private set + private var recognizer: SpeechRecognizer? = null + private var spokenBase = "" + private var fieldRead = false + + val open: Boolean get() = request != null || asking + + fun chatOpened() { + if (open) return + when (val mode = remembered) { + null -> asking = true + else -> start(mode) + } + } + + fun chatClosed() { + asking = false + finish() + } + + fun pick(mode: String, remember: Boolean) { + asking = false + if (remember) choose(mode) + start(mode) + } + + fun choose(mode: String?) { + SessionPrefs.setWowChatInput(context, mode) + remembered = SessionPrefs.wowChatInput(context) + } + + fun dismissChoice() { + asking = false + onCancel() + } + + fun send() { + val text = request?.value?.text.orEmpty() + val replace = fieldRead + finish() + onSend(text, replace) + } + + fun cancel() { + finish() + onCancel() + } + + private fun start(mode: String) { + voice = mode == SessionPrefs.WOW_CHAT_VOICE && voiceAvailable(context) + if (mode == SessionPrefs.WOW_CHAT_VOICE && !voice) Toast.makeText(context, R.string.wow_chat_voice_unavailable, Toast.LENGTH_SHORT).show() + val opened = TypingRequest(TextFieldValue(""), ImeOptions(singleLine = true, imeAction = ImeAction.Send), {}, {}) + fieldRead = false + request = opened + readField { text -> + if (request === opened && !text.isNullOrEmpty() && opened.value.text.isEmpty()) { + fieldRead = true + opened.value = TextFieldValue(text, TextRange(text.length)) + if (recognizer != null) spokenBase = "${text.trimEnd()} " + } + } + } + + private fun finish() { + stopListening() + request = null + voice = false + } + + fun listen() { + val active = request ?: return + stopListening() + val speech = runCatching { SpeechRecognizer.createSpeechRecognizer(context) }.getOrNull() ?: return + recognizer = speech + spokenBase = active.value.text.trimEnd().let { if (it.isEmpty()) it else "$it " } + speech.setRecognitionListener(object : RecognitionListener { + override fun onReadyForSpeech(params: Bundle?) { listening = true } + override fun onBeginningOfSpeech() {} + override fun onRmsChanged(rmsdB: Float) {} + override fun onBufferReceived(buffer: ByteArray?) {} + override fun onEndOfSpeech() {} + override fun onError(error: Int) { if (recognizer === speech) stopListening() } + override fun onResults(results: Bundle?) { + if (recognizer !== speech) return + heard(results) + stopListening() + } + override fun onPartialResults(partialResults: Bundle?) { if (recognizer === speech) heard(partialResults) } + override fun onEvent(eventType: Int, params: Bundle?) {} + }) + val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH) + .putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM) + .putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true) + .putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, context.packageName) + runCatching { speech.startListening(intent) }.onFailure { stopListening() } + } + + private fun heard(results: Bundle?) { + val spoken = results?.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.firstOrNull()?.takeIf { it.isNotBlank() } ?: return + val text = spokenBase + spoken + request?.value = TextFieldValue(text, TextRange(text.length)) + } + + fun stopListening() { + listening = false + val speech = recognizer ?: return + recognizer = null + runCatching { speech.cancel() } + runCatching { speech.destroy() } + } + + companion object { + private val PROGRAM = Regex("wow[\\w-]*\\.exe", RegexOption.IGNORE_CASE) + + fun isWow(program: String?): Boolean = program != null && PROGRAM.matches(program) + + fun voiceAvailable(context: Context): Boolean = SpeechRecognizer.isRecognitionAvailable(context) + } +} + +@Composable +internal fun WowChatPanel(chat: WowChat, modifier: Modifier = Modifier.fillMaxWidth()) { + val request = chat.request ?: return + val context = LocalContext.current + val mic = rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted -> + if (granted) chat.listen() else Toast.makeText(context, R.string.wow_chat_mic_denied, Toast.LENGTH_SHORT).show() + } + val listen = { + if (context.checkSelfPermission(Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) chat.listen() + else mic.launch(Manifest.permission.RECORD_AUDIO) + } + LaunchedEffect(request) { if (chat.voice) listen() } + DisposableEffect(request) { onDispose { chat.stopListening() } } + BackHandler(onBack = chat::cancel) + TypingPanel( + request, modifier, + title = stringResource(if (chat.listening) R.string.wow_chat_listening else R.string.wow_chat_title), + done = stringResource(R.string.wow_chat_send), + onCancel = chat::cancel, + showKeyboard = !chat.voice, + leading = if (WowChat.voiceAvailable(context)) ({ + FilledIconToggleButton( + checked = chat.listening, + onCheckedChange = { on -> if (on) listen() else chat.stopListening() }, + modifier = Modifier.testTag("wow-chat-mic"), + ) { Icon(Icons.Filled.Mic, stringResource(R.string.wow_chat_voice)) } + }) else null, + onDone = chat::send, + ) +} + +@Composable +internal fun WowChatChoiceDialog(chat: WowChat) { + var remember by remember { mutableStateOf(true) } + var picked by remember { mutableStateOf(null) } + val shown = rememberShown { + val mode = picked + if (mode != null) chat.pick(mode, remember) else chat.dismissChoice() + } + val close = { shown.targetState = false } + val choose = { mode: String -> picked = mode; close() } + val focus = remember { FocusRequester() } + LaunchedEffect(Unit) { runCatching { focus.requestFocus() } } + AppDialog(shown, close, "wowChat", wide = false, maxWidth = 520.dp) { + DialogTitleRow(stringResource(R.string.wow_chat_title), close) + DialogToggleRow(stringResource(R.string.wow_chat_remember), remember) { remember = it } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, androidx.compose.ui.Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.pckb_android), modifier = Modifier.testTag("wow-chat-keyboard")) { choose(SessionPrefs.WOW_CHAT_KEYBOARD) } + PrimaryButton(stringResource(R.string.wow_chat_voice), icon = Icons.Filled.Mic, + modifier = Modifier.focusRequester(focus).testTag("wow-chat-voice")) { choose(SessionPrefs.WOW_CHAT_VOICE) } + } + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 16f0619db6..5b1426b750 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3829,4 +3829,12 @@ الحالة الشركاء الألعاب المتابَعة + إدخال الدردشة + الكتابة بالصوت + تذكّر هذا الاختيار + السؤال في كل مرة + إرسال + جارٍ الاستماع… + الكتابة بالصوت غير متاحة على هذا الجهاز. + يلزم الوصول إلى الميكروفون للكتابة بالصوت. 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 8b1721bc10..4b54a8daa2 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3685,4 +3685,12 @@ Estado Socios Juegos seguidos + Entrada del chat + Dictado por voz + Recordar esta selección + Preguntar cada vez + Enviar + Escuchando… + El dictado por voz no está disponible en este dispositivo. + Se necesita acceso al micrófono para el dictado por voz. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 358d75a9aa..f3cadc899b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3673,4 +3673,12 @@ Статус Партньори Следвани игри + Въвеждане в чата + Гласово въвеждане + Запомни този избор + Питай всеки път + Изпрати + Слушане… + Гласовото въвеждане не е налично на това устройство. + За гласово въвеждане е нужен достъп до микрофона. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6754288b86..c6e35ae37a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3751,4 +3751,12 @@ Stav Partneři Sledované hry + Zadávání do chatu + Hlasové psaní + Zapamatovat tuto volbu + Pokaždé se zeptat + Odeslat + Poslouchám… + Hlasové psaní není na tomto zařízení k dispozici. + Pro hlasové psaní je potřeba přístup k mikrofonu. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ea071e368d..e93dd58db8 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3673,4 +3673,12 @@ Status Partnere Fulgte spil + Chatinput + Stemmeindtastning + Husk dette valg + Spørg hver gang + Send + Lytter… + Stemmeindtastning er ikke tilgængelig på denne enhed. + Mikrofonadgang er nødvendig for stemmeindtastning. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 80592b9cf9..e00048becf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3673,4 +3673,12 @@ Status Partner Gefolgte Spiele + Chat-Eingabe + Spracheingabe + Diese Auswahl merken + Jedes Mal fragen + Senden + Hört zu… + Spracheingabe ist auf diesem Gerät nicht verfügbar. + Für die Spracheingabe wird Mikrofonzugriff benötigt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ed95ca732b..8c1f1f43ff 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3673,4 +3673,12 @@ Κατάσταση Συνεργάτες Παιχνίδια που ακολουθείτε + Εισαγωγή συνομιλίας + Φωνητική πληκτρολόγηση + Απομνημόνευση αυτής της επιλογής + Ερώτηση κάθε φορά + Αποστολή + Ακρόαση… + Η φωνητική πληκτρολόγηση δεν είναι διαθέσιμη σε αυτή τη συσκευή. + Απαιτείται πρόσβαση στο μικρόφωνο για φωνητική πληκτρολόγηση. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ec88bde659..52be78eafb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3712,4 +3712,12 @@ Estado Socios Juegos seguidos + Entrada del chat + Dictado por voz + Recordar esta selección + Preguntar cada vez + Enviar + Escuchando… + El dictado por voz no está disponible en este dispositivo. + Se necesita acceso al micrófono para el dictado por voz. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 99d8f2927e..a413c8d9ac 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3673,4 +3673,12 @@ Tila Kumppanit Seuratut pelit + Chatin syöttö + Puhekirjoitus + Muista tämä valinta + Kysy joka kerta + Lähetä + Kuunnellaan… + Puhekirjoitus ei ole käytettävissä tällä laitteella. + Puhekirjoitus vaatii mikrofonin käyttöoikeuden. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c1f038b346..5009c3e5a6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3712,4 +3712,12 @@ Statut Partenaires Jeux suivis + Saisie du chat + Saisie vocale + Mémoriser ce choix + Demander à chaque fois + Envoyer + Écoute… + La saisie vocale n\'est pas disponible sur cet appareil. + L\'accès au micro est nécessaire pour la saisie vocale. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index b93df883c4..edf039eeba 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3673,4 +3673,12 @@ स्थिति पार्टनर फ़ॉलो किए गए गेम + चैट इनपुट + आवाज़ से टाइप करें + यह चुनाव याद रखें + हर बार पूछें + भेजें + सुन रहा है… + इस डिवाइस पर आवाज़ से टाइपिंग उपलब्ध नहीं है। + आवाज़ से टाइपिंग के लिए माइक्रोफ़ोन की अनुमति चाहिए। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c5c237894f..0ac1a8beca 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3673,4 +3673,12 @@ Állapot Partnerek Követett játékok + Csevegés bevitele + Hangalapú gépelés + Választás megjegyzése + Kérdezzen minden alkalommal + Küldés + Figyelés… + A hangalapú gépelés nem érhető el ezen az eszközön. + A hangalapú gépeléshez mikrofon-hozzáférés szükséges. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index ae21a832e2..a2db31f53e 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3643,4 +3643,12 @@ Status Mitra Game yang diikuti + Input obrolan + Ketik dengan suara + Ingat pilihan ini + Tanya setiap kali + Kirim + Mendengarkan… + Ketik dengan suara tidak tersedia di perangkat ini. + Akses mikrofon diperlukan untuk mengetik dengan suara. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8b398a0bf0..d3d5045a05 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3712,4 +3712,12 @@ Stato Partner Giochi seguiti + Input della chat + Digitazione vocale + Ricorda questa scelta + Chiedi ogni volta + Invia + In ascolto… + La digitazione vocale non è disponibile su questo dispositivo. + Per la digitazione vocale serve l\'accesso al microfono. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bc94884bc4..7c959249fa 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3643,4 +3643,12 @@ ステータス パートナー フォロー中のゲーム + チャット入力 + 音声入力 + この選択を記憶する + 毎回確認する + 送信 + 聞き取り中… + このデバイスでは音声入力を使用できません。 + 音声入力にはマイクへのアクセスが必要です。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a95aee40d6..3ecd46598f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3643,4 +3643,12 @@ 상태 파트너 팔로우한 게임 + 채팅 입력 + 음성 입력 + 이 선택 기억하기 + 매번 묻기 + 보내기 + 듣는 중… + 이 기기에서는 음성 입력을 사용할 수 없습니다. + 음성 입력을 하려면 마이크 접근 권한이 필요합니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 31ef4ac49a..12666f1644 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3643,4 +3643,12 @@ Status Rakan kongsi Permainan diikuti + Input sembang + Taip dengan suara + Ingat pilihan ini + Tanya setiap kali + Hantar + Mendengar… + Taip dengan suara tidak tersedia pada peranti ini. + Akses mikrofon diperlukan untuk menaip dengan suara. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a043a54e44..191e8e54b5 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3673,4 +3673,12 @@ Status Partnere Fulgte spill + Chatinndata + Taleinntasting + Husk dette valget + Spør hver gang + Send + Lytter… + Taleinntasting er ikke tilgjengelig på denne enheten. + Mikrofontilgang trengs for taleinntasting. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 35c7869b43..47b574eb88 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3673,4 +3673,12 @@ Status Partners Gevolgde games + Chatinvoer + Spraakinvoer + Deze keuze onthouden + Elke keer vragen + Verzenden + Luisteren… + Spraakinvoer is niet beschikbaar op dit apparaat. + Voor spraakinvoer is toegang tot de microfoon nodig. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d2a2215b0a..8982560cb1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3751,4 +3751,12 @@ Status Partnerzy Obserwowane gry + Wpisywanie na czacie + Pisanie głosowe + Zapamiętaj ten wybór + Pytaj za każdym razem + Wyślij + Słucham… + Pisanie głosowe nie jest dostępne na tym urządzeniu. + Pisanie głosowe wymaga dostępu do mikrofonu. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a9e731fdbf..38ab08a785 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3712,4 +3712,12 @@ Estado Parceiros Jogos seguidos + Introdução no chat + Escrita por voz + Lembrar esta escolha + Perguntar sempre + Enviar + A ouvir… + A escrita por voz não está disponível neste dispositivo. + É necessário acesso ao microfone para a escrita por voz. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d7fbad21ab..7b5faee1fd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3712,4 +3712,12 @@ Status Parceiros Jogos seguidos + Entrada do chat + Digitação por voz + Lembrar esta escolha + Perguntar sempre + Enviar + Ouvindo… + A digitação por voz não está disponível neste dispositivo. + É preciso acesso ao microfone para a digitação por voz. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d1063b3e66..747948cc26 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3712,4 +3712,12 @@ Stare Parteneri Jocuri urmărite + Introducere în chat + Tastare vocală + Ține minte această alegere + Întreabă de fiecare dată + Trimite + Se ascultă… + Tastarea vocală nu este disponibilă pe acest dispozitiv. + Pentru tastarea vocală este necesar accesul la microfon. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d439181311..65220e106a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3834,4 +3834,12 @@ Статус Партнёры Отслеживаемые игры + Ввод в чат + Голосовой ввод + Запомнить этот выбор + Спрашивать каждый раз + Отправить + Слушаю… + Голосовой ввод недоступен на этом устройстве. + Для голосового ввода нужен доступ к микрофону. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 9974ee7e40..f2c4b11c2b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3673,4 +3673,12 @@ Status Partner Följda spel + Chattinmatning + Röstinmatning + Kom ihåg det här valet + Fråga varje gång + Skicka + Lyssnar… + Röstinmatning är inte tillgänglig på den här enheten. + Mikrofonåtkomst krävs för röstinmatning. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 918e464e95..f05a5158e0 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3643,4 +3643,12 @@ สถานะ พาร์ตเนอร์ เกมที่ติดตาม + การป้อนแชท + พิมพ์ด้วยเสียง + จดจำตัวเลือกนี้ + ถามทุกครั้ง + ส่ง + กำลังฟัง… + อุปกรณ์นี้ไม่รองรับการพิมพ์ด้วยเสียง + ต้องอนุญาตให้เข้าถึงไมโครโฟนเพื่อพิมพ์ด้วยเสียง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a216eba5c4..9e95d2f134 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3673,4 +3673,12 @@ Durum Ortaklar Takip edilen oyunlar + Sohbet girişi + Sesle yazma + Bu seçimi hatırla + Her seferinde sor + Gönder + Dinleniyor… + Sesle yazma bu cihazda kullanılamıyor. + Sesle yazma için mikrofon erişimi gerekiyor. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ba1e2c40cd..2a82143256 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3751,4 +3751,12 @@ Статус Партнери Ігри, за якими ви стежите + Введення в чат + Голосове введення + Запам\'ятати цей вибір + Питати щоразу + Надіслати + Слухаю… + Голосове введення недоступне на цьому пристрої. + Для голосового введення потрібен доступ до мікрофона. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 67fce23953..8a4f6cc4c5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3643,4 +3643,12 @@ Trạng thái Đối tác Game đang theo dõi + Nhập trò chuyện + Nhập bằng giọng nói + Ghi nhớ lựa chọn này + Hỏi mỗi lần + Gửi + Đang nghe… + Thiết bị này không hỗ trợ nhập bằng giọng nói. + Cần quyền truy cập micrô để nhập bằng giọng nói. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3741cc7a20..d2b7610f8a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3647,4 +3647,12 @@ 状态 合作伙伴 已关注的游戏 + 聊天输入 + 语音输入 + 记住此选择 + 每次询问 + 发送 + 正在聆听… + 此设备不支持语音输入。 + 语音输入需要麦克风权限。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 13d936163e..7b176d7c14 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3646,4 +3646,12 @@ GPU 透過 Mali 橋接 透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式 關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU + 聊天輸入 + 語音輸入 + 記住此選擇 + 每次詢問 + 傳送 + 正在聆聽… + 此裝置不支援語音輸入。 + 語音輸入需要咪高峰權限。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 36d9e27c97..d32c71feb4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3646,4 +3646,12 @@ GPU 透過 Mali 橋接 透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式 關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU + 聊天輸入 + 語音輸入 + 記住此選擇 + 每次詢問 + 傳送 + 正在聆聽… + 此裝置不支援語音輸入。 + 語音輸入需要麥克風權限。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc711e86e6..c1bcfd576c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3831,4 +3831,12 @@ Status Partners Followed games + Chat input + Voice type + Remember this selection + Ask each time + Send + Listening… + Voice typing is not available on this device. + Microphone access is needed for voice typing. diff --git a/app/src/test/java/com/droiddeck/launcher/ui/WowChatTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/WowChatTest.kt new file mode 100644 index 0000000000..bb82e3ef89 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/WowChatTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class WowChatTest { + @Test + fun everyWowClientMatches() { + listOf("wow.exe", "Wow.exe", "wowclassic.exe", "wowclassict.exe", "wowb.exe", "wow-64.exe", "wow-arm64.exe", "wowt.exe").forEach { + assertTrue(it, WowChat.isWow(it)) + } + } + + @Test + fun otherProgramsAreUnaffected() { + listOf(null, "", "battle.net.exe", "steam.exe", "notwow.exe", "wow.exe.bak", "wow", "cyberpunk2077.exe").forEach { + assertFalse(it.toString(), WowChat.isWow(it)) + } + } +} From 69c6c14f3f2c484de1057ada2f362553cd979b58 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 6 Nov 2026 13:17:13 -0500 Subject: [PATCH 02/10] fix(wow): Clear the game field selection after reading and sending chat (#2175) * fix(wow): Clear the game field selection after reading and sending chat * fix(wow): Skip the field cleanup when the chat request has closed --- .../com/droiddeck/launcher/SessionActivity.kt | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 1647647147..df843a039d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3629,11 +3629,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { selectGameField() if (text.isEmpty()) host.tap(KeyEvent.KEYCODE_DEL) } else { - WaylandCompositor.nativeSendKey(KEY_END, 1) - WaylandCompositor.nativeSendKey(KEY_END, 0) + endGameField() } host.type(text) host.tap(KeyEvent.KEYCODE_ENTER) + uiHandler.postDelayed({ + if (AgentGuest.gameTextField && com.droiddeck.launcher.ui.WowChat.isWow(AgentGuest.gameProgram)) endGameField() + }, FIELD_SETTLE_MS) + } + + private fun endGameField() { + WaylandCompositor.nativeSendKey(KEY_END, 1) + WaylandCompositor.nativeSendKey(KEY_END, 0) } private fun selectGameField(vararg then: Int) { @@ -3647,10 +3654,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun readGameField(done: (String?) -> Unit) { - sessionClipboard.captureGuest(FIELD_READ_MS, onTimeout = { - WaylandCompositor.nativeSendKey(KEY_END, 1) - WaylandCompositor.nativeSendKey(KEY_END, 0) - }, onText = done) + val opened = wowChat.request + val stillOpen = { wowChat.request === opened && AgentGuest.gameTextField } + sessionClipboard.captureGuest(FIELD_READ_MS, onTimeout = { if (stillOpen()) endGameField() }) { text -> + if (text != null && stillOpen()) endGameField() + done(text) + } selectGameField(KEY_C) } @@ -5293,6 +5302,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val KEY_C = 46 private const val KEY_END = 107 private const val FIELD_READ_MS = 600L + private const val FIELD_SETTLE_MS = 200L private const val BTN_SIDE = 0x113 private const val BTN_EXTRA = 0x114 private const val DESKTOP_GRAB_TAP_MS = 500L From 1001bc00af3d172b8a3a3fe0db175194706f7d48 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:24:37 -0500 Subject: [PATCH 03/10] fix: PiP scales the full-size output instead of shrinking it (#2174) * fix: PiP scales the full-size output instead of shrinking it * fix: hide the performance HUD as PiP starts so it does not flash at full size --- .../main/java/com/droiddeck/launcher/SessionActivity.kt | 5 ++--- .../main/java/com/droiddeck/launcher/session/PipPolicy.kt | 8 -------- .../java/com/droiddeck/launcher/session/PipPolicyTest.kt | 6 ------ 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index df843a039d..39d84113a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2284,9 +2284,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun windowOutputSize(width: Int, height: Int): Pair? { - if (width <= 0 || height <= 0) return null - if (isInPictureInPictureMode) return com.droiddeck.launcher.session.PipPolicy.outputSize( - width, height, SessionState.outputSize.first, SessionState.outputSize.second) + if (width <= 0 || height <= 0 || isInPictureInPictureMode) return null if (bottomGame != null) return when { SessionState.followScreen -> com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, false, SessionState.followScale) @@ -4384,6 +4382,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun showPipUi(show: Boolean) { pipUi = show if (show) { + if (::hud.isInitialized) hud.setHidden(true) drawerOpen = false pcKeyboardOpen = false achievementsOpen = false diff --git a/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt b/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt index b5c9f112f8..d2d4d49bd9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt @@ -11,12 +11,4 @@ object PipPolicy { height.toDouble() / width > 2.39 -> 100 to 239 else -> width to height } - - fun outputSize(width: Int, height: Int, outputWidth: Int, outputHeight: Int): Pair? { - if (width <= 0 || height <= 0 || outputWidth <= 0 || outputHeight <= 0) return null - val scale = minOf(width.toFloat() / outputWidth, height.toFloat() / outputHeight) - val fittedWidth = ((outputWidth * scale).toInt() and 1.inv()).coerceAtLeast(2) - val fittedHeight = ((outputHeight * scale).toInt() and 1.inv()).coerceAtLeast(2) - return fittedWidth to fittedHeight - } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt index 40b169fad9..1261abd542 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt @@ -24,10 +24,4 @@ class PipPolicyTest { assertEquals(100 to 239, PipPolicy.aspect(1080, 5760)) assertEquals(16 to 9, PipPolicy.aspect(0, 0)) } - - @Test fun pipOutputFitsTheResizedSurfaceWithoutChangingAspectRatio() { - assertEquals(640 to 360, PipPolicy.outputSize(640, 480, 1920, 1080)) - assertEquals(480 to 270, PipPolicy.outputSize(480, 270, 1920, 1080)) - assertNull(PipPolicy.outputSize(0, 270, 1920, 1080)) - } } From 42b2810822f55ec798578a7419e46050a680bf12 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:36:52 -0500 Subject: [PATCH 04/10] ci: retry PR test build cleanup and sweep leftovers every six hours (#2180) --- .github/workflows/pr-release-cleanup.yml | 12 ++++- .github/workflows/pr-release-sweep.yml | 57 ++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/pr-release-sweep.yml diff --git a/.github/workflows/pr-release-cleanup.yml b/.github/workflows/pr-release-cleanup.yml index edb76a7788..3a2580d0e3 100644 --- a/.github/workflows/pr-release-cleanup.yml +++ b/.github/workflows/pr-release-cleanup.yml @@ -47,10 +47,18 @@ jobs: PR_NUMBER: ${{ github.event.pull_request.number }} run: | set -euo pipefail + retry() { + for attempt in 1 2 3 4; do + "$@" && return 0 + [ "$attempt" = 4 ] || sleep $((attempt * 20)) + done + return 1 + } + existing=$(retry gh api --paginate "repos/Droid-Deck/DroidDeck-CI/releases?per_page=100" --jq '.[].tag_name') found=0 for tag in "pr-$PR_NUMBER" "pr-$PR_NUMBER.0"; do - if gh release view "$tag" -R Droid-Deck/DroidDeck-CI >/dev/null 2>&1; then - gh release delete "$tag" -R Droid-Deck/DroidDeck-CI --yes --cleanup-tag + if grep -qxF "$tag" <<<"$existing"; then + retry gh release delete "$tag" -R Droid-Deck/DroidDeck-CI --yes --cleanup-tag echo "Deleted $tag" found=1 fi diff --git a/.github/workflows/pr-release-sweep.yml b/.github/workflows/pr-release-sweep.yml new file mode 100644 index 0000000000..6ea1874e27 --- /dev/null +++ b/.github/workflows/pr-release-sweep.yml @@ -0,0 +1,57 @@ +name: PR Release Sweep +run-name: sweep test builds of closed PRs + +on: + schedule: + - cron: '17 */6 * * *' + workflow_dispatch: + +permissions: + contents: read + pull-requests: read + +concurrency: + group: pr-release-sweep + cancel-in-progress: false + +jobs: + sweep: + runs-on: ubuntu-24.04 + timeout-minutes: 15 + steps: + - uses: actions/create-github-app-token@v2 + id: ci-token + with: + app-id: ${{ vars.DROIDDECK_CI_APP_ID }} + private-key: ${{ secrets.DROIDDECK_CI_APP_KEY }} + owner: Droid-Deck + repositories: DroidDeck-CI + - name: Delete test builds whose PR is no longer open + env: + CI_TOKEN: ${{ steps.ci-token.outputs.token }} + GH_TOKEN: ${{ github.token }} + run: | + set -euo pipefail + retry() { + for attempt in 1 2 3 4; do + "$@" && return 0 + [ "$attempt" = 4 ] || sleep $((attempt * 20)) + done + return 1 + } + tags=$(GH_TOKEN="$CI_TOKEN" retry gh api --paginate "repos/Droid-Deck/DroidDeck-CI/releases?per_page=100" --jq '.[].tag_name' | + grep -E '^pr-[0-9]+(\.0)?$' || true) + failed=0 + for tag in $tags; do + number=${tag#pr-} + number=${number%.0} + state=$(retry gh api "repos/$GITHUB_REPOSITORY/pulls/$number" --jq .state) || { failed=1; continue; } + if [ "$state" != open ]; then + if GH_TOKEN="$CI_TOKEN" retry gh release delete "$tag" -R Droid-Deck/DroidDeck-CI --yes --cleanup-tag; then + echo "Deleted $tag (PR #$number is $state)" + else + failed=1 + fi + fi + done + exit "$failed" From 88acdbc3ab494374963bc27d5c4a529e0b34e78b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 6 Nov 2026 13:36:56 -0500 Subject: [PATCH 05/10] ci: publish gamescope builds to DroidDeck-Components and never replace a tag (#2181) --- .github/workflows/build-gamescope.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-gamescope.yml b/.github/workflows/build-gamescope.yml index 57dd575010..f18c9ad84e 100644 --- a/.github/workflows/build-gamescope.yml +++ b/.github/workflows/build-gamescope.yml @@ -39,11 +39,25 @@ jobs: path: | gamescope.tzst gamescope.tzst.sha256 + - uses: actions/create-github-app-token@v2 + id: components-token + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + with: + app-id: ${{ vars.DROIDDECK_CI_APP_ID }} + private-key: ${{ secrets.DROIDDECK_CI_APP_KEY }} + owner: Droid-Deck + repositories: DroidDeck-Components - name: Publish if: github.event_name == 'workflow_dispatch' && inputs.tag != '' env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ steps.components-token.outputs.token }} + GH_REPO: Droid-Deck/DroidDeck-Components + TAG: ${{ inputs.tag }} run: | set -euo pipefail - gh release create "${{ inputs.tag }}" --latest=false --prerelease=false --title "${{ inputs.tag }}" --notes "gamescope 3.16.29 with tools/gamescope/patches; staged by the apk over /usr/local/bin/gamescope. sha256 $(cut -d' ' -f1 gamescope.tzst.sha256)" gamescope.tzst gamescope.tzst.sha256 || gh release upload "${{ inputs.tag }}" gamescope.tzst gamescope.tzst.sha256 --clobber - gh release edit "${{ inputs.tag }}" --latest=false --prerelease=false + if gh release view "$TAG" >/dev/null 2>&1; then + echo "::error::$TAG is already published in DroidDeck-Components, and published tags are never replaced: use a new tag" + exit 1 + fi + gh release create "$TAG" --latest=false --prerelease=false --title "$TAG" --notes "gamescope 3.16.29 with tools/gamescope/patches ($GITHUB_REPOSITORY $GITHUB_SHA, run $GITHUB_RUN_ID); staged by the apk over /usr/local/bin/gamescope. sha256 $(cut -d' ' -f1 gamescope.tzst.sha256)" gamescope.tzst gamescope.tzst.sha256 + gh release edit "$TAG" --latest=false --prerelease=false From 5f180d909b0f7fd578a675be913534573d9be3b9 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 6 Nov 2026 13:56:25 -0500 Subject: [PATCH 06/10] fix(input): Click a touch stick only on a fast double tap (#2173) * fix(input): Click a touch stick only on a fast double tap * fix(input): Count the release position in stick tap travel * fix(input): Treat cancelled pointer-ups as cancelled stick touches --- .../launcher/input/OnScreenControls.kt | 24 +++++++- .../launcher/input/OnScreenControlsTest.kt | 57 ++++++++++++++++++- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index cd252c5255..dc26a75f55 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -15,6 +15,7 @@ import android.view.View import android.view.WindowInsets import com.droiddeck.launcher.session.SessionPrefs import kotlin.math.abs +import kotlin.math.hypot import kotlin.math.max import kotlin.math.min import kotlin.math.sin @@ -48,6 +49,10 @@ class OnScreenControls( var dirty = false var clicked = false var lastUp = 0L + var downAt = 0L + var downX = 0f + var downY = 0f + var travel = 0f val wide = id in shoulderIds val halfW get() = if (wide) radius * SHOULDER_WIDTH else radius val halfH get() = if (wide) radius * SHOULDER_HEIGHT else radius @@ -61,6 +66,7 @@ class OnScreenControls( } fun drag(x: Float, y: Float): Boolean { + travel = max(travel, hypot(x - downX, y - downY)) var dx = x - ax var dy = y - ay val d = sqrt(dx * dx + dy * dy) @@ -73,6 +79,14 @@ class OnScreenControls( } private val stickRedraw = ThrottledRedraw(this, STICK_REDRAW_MS) + private val tapSlop = android.view.ViewConfiguration.get(context).scaledTouchSlop.toFloat() + + private fun stickTap(control: Control, event: MotionEvent): Boolean { + val i = event.actionIndex + val travel = max(control.travel, hypot(event.getX(i) - control.downX, event.getY(i) - control.downY)) + return stickTap(control.downAt, event.eventTime, travel, tapSlop, control.clicked, + event.actionMasked == MotionEvent.ACTION_CANCEL || (event.flags and MotionEvent.FLAG_CANCELED) != 0) + } private val controls = listOf( Control("up", "dpad", -1, 26f, 0f, -52f), @@ -545,6 +559,10 @@ class OnScreenControls( control.pressedBy = event.getPointerId(index) if (control.stick >= 0) { control.clicked = settings.stickClick && control.lastUp > 0L && event.eventTime - control.lastUp < DOUBLE_TAP_MS + control.downAt = event.eventTime + control.downX = event.getX(index) + control.downY = event.getY(index) + control.travel = 0f val adaptive = settings.adaptiveSticks control.ax = if (adaptive) event.getX(index) else control.cx control.ay = if (adaptive) event.getY(index) else control.cy @@ -613,7 +631,7 @@ class OnScreenControls( for (control in controls) { if (control.pressedBy == pointer || event.actionMasked == MotionEvent.ACTION_CANCEL) { if (control.pressedBy != -1) changed = true - if (control.stick >= 0 && control.pressedBy != -1) control.lastUp = if (control.clicked || event.actionMasked == MotionEvent.ACTION_CANCEL) 0L else event.eventTime + if (control.stick >= 0 && control.pressedBy != -1) control.lastUp = if (stickTap(control, event)) event.eventTime else 0L control.pressedBy = -1 control.clicked = false if (control.stick >= 0 && (control.kx != 0f || control.ky != 0f)) control.dirty = true @@ -794,6 +812,10 @@ class OnScreenControls( private companion object { const val DOUBLE_TAP_MS = 300L + const val STICK_TAP_MS = 200L + + internal fun stickTap(downAt: Long, upAt: Long, travel: Float, slop: Float, clicked: Boolean, cancelled: Boolean): Boolean = + !clicked && !cancelled && upAt - downAt <= STICK_TAP_MS && travel <= slop const val STICK_REDRAW_MS = 33L const val MIN_STICK_MOVE_PX = 1f const val MIN_FACE_MM = 9.5f diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt index 646df7795a..b071b04906 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt @@ -169,6 +169,59 @@ class OnScreenControlsTest { assertEquals(true, field(control("ls"), "clicked")) } + @Test fun aCancelledSecondFingerDoesNotArmAStickClick() { + touch(MotionEvent.ACTION_DOWN, 7 to (660f to 400f)) + touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (660f to 400f), 9 to (540f to 400f)) + touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 7 to (660f to 400f), 9 to (540f to 400f), flags = MotionEvent.FLAG_CANCELED) + touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (660f to 400f), 9 to (540f to 400f)) + assertEquals(false, field(control("ls"), "clicked")) + touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 7 to (660f to 400f), 9 to (540f to 400f)) + touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (660f to 400f), 9 to (540f to 400f)) + assertEquals(true, field(control("ls"), "clicked")) + } + + @Test fun movingTheStickAndTouchingItAgainDoesNotClickIt() { + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + touch(MotionEvent.ACTION_MOVE, 1 to (600f to 400f)) + touch(MotionEvent.ACTION_UP, 1 to (600f to 400f)) + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + assertEquals(false, field(control("ls"), "clicked")) + } + + @Test fun liftingFarFromTheTouchPointDoesNotArmAStickClick() { + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + touch(MotionEvent.ACTION_UP, 1 to (600f to 400f)) + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + assertEquals(false, field(control("ls"), "clicked")) + } + + @Test fun aLongHoldThenAQuickTouchDoesNotClickTheStick() { + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + time += 600 + touch(MotionEvent.ACTION_UP, 1 to (540f to 400f)) + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + assertEquals(false, field(control("ls"), "clicked")) + } + + @Test fun aFastDoubleTapClicksTheStickAndCanBeHeldWhileMoving() { + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + touch(MotionEvent.ACTION_UP, 1 to (540f to 400f)) + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + touch(MotionEvent.ACTION_MOVE, 1 to (600f to 400f)) + assertEquals(true, field(control("ls"), "clicked")) + touch(MotionEvent.ACTION_UP, 1 to (600f to 400f)) + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + assertEquals(false, field(control("ls"), "clicked")) + } + + @Test fun aSlowSecondTapDoesNotClickTheStick() { + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + touch(MotionEvent.ACTION_UP, 1 to (540f to 400f)) + time += 400 + touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f)) + assertEquals(false, field(control("ls"), "clicked")) + } + @Test fun buttonsTakePriorityOverAdaptiveRegions() { val button = control("a") touch(MotionEvent.ACTION_DOWN, 3 to (value(button, "cx") to value(button, "cy"))) @@ -461,10 +514,10 @@ class OnScreenControlsTest { return color } - private fun touch(action: Int, vararg pointers: Pair>): Boolean { + private fun touch(action: Int, vararg pointers: Pair>, flags: Int = 0): Boolean { val properties = pointers.map { (id, _) -> MotionEvent.PointerProperties().apply { this.id = id; toolType = MotionEvent.TOOL_TYPE_FINGER } }.toTypedArray() val coords = pointers.map { (_, position) -> MotionEvent.PointerCoords().apply { x = position.first; y = position.second; pressure = 1f; size = 1f } }.toTypedArray() - val event = MotionEvent.obtain(1000L, time++, action, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0) + val event = MotionEvent.obtain(1000L, time++, action, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, flags) return try { view.onTouchEvent(event) } finally { event.recycle() } } } From 116728917ff887e376d1469c34156abd92275c5e Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 6 Nov 2026 13:56:30 -0500 Subject: [PATCH 07/10] fix(input): Keep the Android pointer hidden over the game after hovering session menus (#2176) * fix(input): Keep the Android pointer hidden over the game after hovering session menus * fix(input): Defer the overlay pointer icon from a container, since ComposeView is final --- .../main/java/com/droiddeck/launcher/SessionActivity.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 39d84113a3..99fe2528ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -831,7 +831,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(it)) } sessionOverlay = createSessionOverlay() - root.addView(sessionOverlay) + root.addView(object : FrameLayout(this) { + override fun onResolvePointerIcon(event: MotionEvent, pointerIndex: Int): android.view.PointerIcon? = + if (platformPointerShown == true) super.onResolvePointerIcon(event, pointerIndex) else null + }.apply { addView(sessionOverlay) }) setContentView(root) glassesScope.launch { Glasses.state.collect { glasses = it @@ -4087,7 +4090,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun appUiOwnsPointer(): Boolean = - drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive || bottomOutputActive || touchEditorOpen + drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive || bottomOutputActive || touchEditorOpen || wowChatOnTop private fun applyPlatformPointer(shown: Boolean) { if (!::sessionRoot.isInitialized || !::surfaceView.isInitialized) return From a81da1e4768918b9aa507e5f8a65f7f937520fc2 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 6 Nov 2026 13:56:34 -0500 Subject: [PATCH 08/10] feat(components): Auto updates for FEX, DXVK and VKD3D-Proton (#2156) * feat(components): Auto updates for FEX, DXVK and VKD3D-Proton Each component gets an Auto or Manual mode on the Default Components page. Auto installs the newest DroidDeck-Components nightly into every Proton that ships the component, matching each Proton's ARM64EC or x64 flavour, keeps the current and replaced builds, and removes older builds it downloaded. A game that ran on the previous build and exits within 30 seconds twice on the new one rolls the line back; the failed build is skipped until a newer one is published. Existing manual choices keep that component on Manual, and DXVK stays on Manual while a GPU rule pins its version. * fix(components): Auto notes per line, Original label and first-update rollback Boot history on the Original is recorded before the first update so that update can roll back, rollback notes stay with their own component, the Original shows by name, and new Protons get the current build even when no newer one is published. * fix(components): Auto owns only its own downloads and follows in-place Proton updates Auto deletes only builds it downloaded, re-swaps a Proton whose version changed under an existing choice, reports a missing nightly listing as a failed check, writes its state atomically so the page can read it without waiting on a download, and words the rollback and download messages to match what it does. * fix(components): Auto keeps a rollback and reads updated Protons' own files After a rollback only a build newer than every rejected one is taken, so an older build still listed in the nightly cannot replace the restored one. Flavour detection treats a choice saved for an older Proton version as not applied, so a Proton Steam updated in place is read from its own files and re-swapped. A failed state rename falls back to a direct write and is logged. * fix(components): Keep the last good Auto state when a save fails * fix(components): Serialise Auto state reads and writes * Install the Linux runtime by itself on first launch The runtime auto-update skipped devices with no runtime, so FEX, Proton, DXVK and VKD3D waited for the first Steam launch to install it. Claim a first install when the device never had a runtime, on a usable network, outside battery saver and with a supported GPU, and check Proton as soon as the runtime is ready. A runtime the user removed stays removed. * fix(components): Check components as soon as Proton is installed The Auto check stamped its hourly timer even when no Proton was installed yet, so a fresh device waited an hour after Proton arrived. Skip the stamp until a Proton exists and run the check right after a Proton install finishes. * fix(components): Apply stored builds on every check and retry unfinished rollbacks A held or failed download no longer skips applying the stored build or stamps the hourly timer. Stored builds are applied on every check, so a new Proton is reconciled inside the hour, and a check requested while one runs is queued. A rollback that could not restore or swap a Proton is retried and reported only once it finishes. Removing the runtime marks it as seen so it is not installed again, and the failed-save test skips where the process can still write read-only files. * fix(components): Keep rollback restores pending until applied and save state on failure * fix(components): Hold newer builds until a pending rollback is applied * fix(components): Drop pending restores for removed Protons * fix(components): Never auto-install a non-ARM64X build over a Proton's own ARM64X DXVK or VKD3D * fix(components): Read probe archives outside the lock and block auto updates while the original build is unknown * fix(components): Require ARM64X when any Proton on the line needs it, and before each swap --- .../com/droiddeck/launcher/ComponentsMenu.kt | 43 +++ .../droiddeck/launcher/FrontEndActivity.kt | 34 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 2 + .../launcher/runtime/RuntimeAutoUpdate.kt | 16 +- .../launcher/session/ComponentUpdater.kt | 312 ++++++++++++++++++ .../launcher/session/ComponentUpdates.kt | 127 +++++++ .../launcher/session/ComponentsManager.kt | 73 ++++ .../launcher/session/SessionPrefs.kt | 11 + .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/ComponentsPage.kt | 64 +++- .../droiddeck/launcher/ui/GpuDriversPanel.kt | 43 ++- app/src/main/res/values-ar/strings.xml | 13 + app/src/main/res/values-b+es+419/strings.xml | 13 + app/src/main/res/values-bg/strings.xml | 13 + app/src/main/res/values-cs/strings.xml | 13 + app/src/main/res/values-da/strings.xml | 13 + app/src/main/res/values-de/strings.xml | 13 + app/src/main/res/values-el/strings.xml | 13 + app/src/main/res/values-es/strings.xml | 13 + app/src/main/res/values-fi/strings.xml | 13 + app/src/main/res/values-fr/strings.xml | 13 + app/src/main/res/values-hi/strings.xml | 13 + app/src/main/res/values-hu/strings.xml | 13 + app/src/main/res/values-in/strings.xml | 13 + app/src/main/res/values-it/strings.xml | 13 + app/src/main/res/values-ja/strings.xml | 13 + app/src/main/res/values-ko/strings.xml | 13 + app/src/main/res/values-ms/strings.xml | 13 + app/src/main/res/values-nb/strings.xml | 13 + app/src/main/res/values-nl/strings.xml | 13 + app/src/main/res/values-pl/strings.xml | 13 + app/src/main/res/values-pt-rPT/strings.xml | 13 + app/src/main/res/values-pt/strings.xml | 13 + app/src/main/res/values-ro/strings.xml | 13 + app/src/main/res/values-ru/strings.xml | 13 + app/src/main/res/values-sv/strings.xml | 13 + app/src/main/res/values-th/strings.xml | 13 + app/src/main/res/values-tr/strings.xml | 13 + app/src/main/res/values-uk/strings.xml | 13 + app/src/main/res/values-vi/strings.xml | 13 + app/src/main/res/values-zh-rCN/strings.xml | 13 + app/src/main/res/values-zh-rHK/strings.xml | 13 + app/src/main/res/values-zh-rTW/strings.xml | 13 + app/src/main/res/values/strings.xml | 13 + .../droiddeck/launcher/ProtonMenuAutoTest.kt | 13 + .../launcher/runtime/RuntimeAutoUpdateTest.kt | 17 +- .../launcher/session/ComponentUpdatesTest.kt | 243 ++++++++++++++ docs/development/game-environment.md | 16 + 48 files changed, 1410 insertions(+), 35 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt index cbd7603708..db1d3eda5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt @@ -5,8 +5,11 @@ import android.util.Log import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.ComponentUpdater +import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.session.ProtonDefault +import com.droiddeck.launcher.session.SessionPrefs internal class ComponentsMenu(private val activity: android.app.Activity, private val ui: Handler) { var compSnapshot by mutableStateOf(null) @@ -20,6 +23,10 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat get() = downloads private set(value) { downloads = value } val compDownloadRevision: Long get() = downloadRevision + var compModes by mutableStateOf>(emptyMap()) + var compAuto by mutableStateOf>>(emptyMap()) + var compAutoHeld by mutableStateOf>(emptySet()) + var compAutoChecking by mutableStateOf(false) private var shownDefault: String? = null fun refreshComponents(snapshotFirst: Boolean = false) { @@ -29,7 +36,14 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat val snap = runCatching { ComponentsManager.snapshot(activity) }.onFailure { Log.w(TAG, "components", it) }.getOrNull() val cat = runCatching { ComponentsManager.catalog(activity, false) }.getOrNull() val chosen = snap?.let { s -> runCatching { ProtonDefault.selectedId(activity, s.protons.map { it.proton }) }.getOrNull() } + runCatching { ComponentUpdater.settle(activity) } + val modes = ComponentsManager.COMPONENTS.associateWith { SessionPrefs.componentMode(activity, it) } + val auto = ComponentsManager.COMPONENTS.associateWith { runCatching { ComponentUpdater.status(activity, it) }.getOrDefault(emptyList()) } + val held = if (runCatching { ComponentsManager.hardwareDxvk(activity) }.getOrDefault(false)) setOf("dxvk") else emptySet() ui.post { + compModes = modes + compAuto = auto + compAutoHeld = held compSnapshot = snap ?: ComponentsManager.Snapshot(emptyList(), emptyList()) if (cat != null && cat.fetchedAt > 0) { compCatalog = cat.items; compCatalogAt = cat.fetchedAt } if (chosen != null && chosen != shownDefault) { @@ -42,6 +56,35 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat }, "components").start() } + fun chooseComponentMode(comp: String, mode: String) { + SessionPrefs.setComponentMode(activity, comp, mode) + compModes = compModes + (comp to mode) + if (mode != ComponentUpdates.AUTO) return + checkComponentUpdates(force = true) + } + + private var checkAgain: Boolean? = null + + fun checkComponentUpdates(force: Boolean) { + if (compAutoChecking) { + checkAgain = force || checkAgain == true + return + } + compAutoChecking = true + Thread({ + val notes = runCatching { ComponentUpdater.ensure(activity, force) }.onFailure { Log.w(TAG, "component updates", it) }.getOrDefault(emptyList()) + ui.post { + compAutoChecking = false + checkAgain?.let { again -> + checkAgain = null + checkComponentUpdates(again) + } + if (notes.isNotEmpty()) android.widget.Toast.makeText(activity, notes.joinToString("\n"), android.widget.Toast.LENGTH_LONG).show() + refreshComponents() + } + }, "component-updates").start() + } + fun chooseProton(id: String) { val proton = compSnapshot?.protons?.firstOrNull { it.proton.id == id }?.proton ?: return compProton = id diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 919d02cabd..13a96efc15 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -40,6 +40,8 @@ import com.droiddeck.launcher.ui.PackageRow import com.droiddeck.launcher.ui.exposeTestTags import com.droiddeck.launcher.session.OfflineMode import com.droiddeck.launcher.session.ProtonExtras +import com.droiddeck.launcher.session.ComponentUpdater +import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.ui.ComponentsPage import com.droiddeck.launcher.session.GameSaves @@ -94,7 +96,11 @@ class FrontEndActivity : ComponentActivity() { private val components = ComponentsMenu(this, ui) private val decky = DeckyMenu(this, ui) private val updates = UpdatesMenu(this, ui) - private val protons = ProtonMenu(this, ui) { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null } + private val protons = ProtonMenu( + this, ui, + idle = { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null }, + onInstalled = { if (!OfflineMode.enabled(this)) components.checkComponentUpdates(force = false) }, + ) private var installed by mutableStateOf(null) private var flood by mutableStateOf(null) @@ -1880,6 +1886,13 @@ class FrontEndActivity : ComponentActivity() { if (applied.isNotEmpty()) ui.post { android.widget.Toast.makeText(this, getString(R.string.main_applied, applied.joinToString(", ")), android.widget.Toast.LENGTH_LONG).show() } + if (!OfflineMode.enabled(this)) { + val updated = runCatching { ComponentUpdater.ensure(this, force = false) } + .onFailure { android.util.Log.w("ComponentUpdater", "automatic component updates", it) }.getOrDefault(emptyList()) + if (updated.isNotEmpty()) ui.post { + android.widget.Toast.makeText(this, updated.joinToString("\n"), android.widget.Toast.LENGTH_LONG).show() + } + } ui.post { componentsQueueBusy = false if (showComponents) components.refreshComponents() @@ -2153,7 +2166,15 @@ class FrontEndActivity : ComponentActivity() { onDeletePackage = { file -> components.componentAction(getString(R.string.comp_busy_deleting)) { ComponentsManager.deletePackage(this, file) } }, onDeleteOriginal = { version -> components.compProton?.let { pid -> components.componentAction(getString(R.string.comp_busy_deleting)) { ComponentsManager.deleteOriginal(this, pid, components.compComp, version) } } }, onDownload = { components.downloadComponent(it) }, - onRefresh = { components.refreshComponentCatalog() }, + onRefresh = { + components.refreshComponentCatalog() + if (components.compModes.values.any { it == ComponentUpdates.AUTO }) components.checkComponentUpdates(force = true) + }, + compModes = components.compModes, + compAuto = components.compAuto, + compAutoHeld = components.compAutoHeld, + compAutoChecking = components.compAutoChecking, + onCompMode = { comp, mode -> components.chooseComponentMode(comp, mode) }, onImport = { pickComponent.launch(InAppFilePicker.buildIntent(this, WCP_EXT, getString(R.string.comp_pick_wcp))) }, onBack = { if (!com.droiddeck.launcher.ui.Hops.back { showComponents = false }) showComponents = false }, games = steamGames, @@ -2982,6 +3003,7 @@ class FrontEndActivity : ComponentActivity() { private fun removeRuntime() { if (runtimeChangesBlocked()) return val removal = LinuxRuntimeInstaller.beginUninstall(this) ?: return + com.droiddeck.launcher.runtime.RuntimeAutoUpdate.seed(this) ready = false com.droiddeck.launcher.runtime.RuntimeInstallService.keepRemovalAlive(this) followRuntimeOperation { removal.run(it) } @@ -3008,6 +3030,7 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, it, android.widget.Toast.LENGTH_LONG).show() } refresh() + if (ok == true && LinuxRuntime.isInstalled(this)) protons.checkUpdates() } }, "runtime-operation").start() } @@ -3015,9 +3038,12 @@ class FrontEndActivity : ComponentActivity() { private fun autoUpdateRuntime() { val release = available?.takeIf { catalogFresh } ?: return if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED) || runtimeChangesBlocked() || removalPending) return - if (release.version == installed || installed == null) return + if (installed != null) com.droiddeck.launcher.runtime.RuntimeAutoUpdate.seed(this) + if (release.version == installed) return + if (installed == null && (OfflineMode.enabled(this) || !com.droiddeck.launcher.core.DeviceSupport.canDraw(this) || + !com.droiddeck.launcher.frontend.AutoComponents.online(this) || com.droiddeck.launcher.frontend.AutoComponents.unfavourable(this))) return if (com.droiddeck.launcher.runtime.RuntimeAutoUpdate.claim(this, installed, release.version)) { - Log.i(TAG, "runtime: updating $installed to ${release.version} by itself") + Log.i(TAG, "runtime: installing ${release.version} over ${installed ?: "nothing"} by itself") install(release) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 5251b50da3..c8fe30c9e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -18,6 +18,7 @@ import com.droiddeck.launcher.runtime.LinuxRuntimeInstaller internal class ProtonMenu( private val activity: android.app.Activity, private val ui: Handler, + private val onInstalled: () -> Unit = {}, private val idle: () -> Boolean = { true }, ) { private object Operation { @@ -61,6 +62,7 @@ internal class ProtonMenu( if (automatic) Log.w("ProtonMenu", "auto-update ${tool.id}: $problem") else android.widget.Toast.makeText(activity, problem, android.widget.Toast.LENGTH_LONG).show() } + if (problem == null) onInstalled() if (automatic) ensureAutoUpdates() } }, "install-proton-$id").start() diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt index 5bb53bbc0e..880f447bee 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt @@ -8,8 +8,10 @@ object RuntimeAutoUpdate { const val MAX_ATTEMPTS = 3 const val RETRY_MS = 10 * 60_000L - fun due(installed: String?, release: String?, attempts: Int, lastAt: Long = 0L, now: Long = lastAt + RETRY_MS): Boolean = - installed != null && !release.isNullOrEmpty() && release != installed && attempts < MAX_ATTEMPTS && + private const val SEEDED = "seeded" + + fun due(installed: String?, release: String?, attempts: Int, lastAt: Long = 0L, now: Long = lastAt + RETRY_MS, first: Boolean = false): Boolean = + (installed != null || first) && !release.isNullOrEmpty() && release != installed && attempts < MAX_ATTEMPTS && (attempts == 0 || now - lastAt !in 0 until RETRY_MS) fun key(appVersion: Int, release: String) = "$appVersion:$release" @@ -20,11 +22,17 @@ object RuntimeAutoUpdate { val key = key(BuildConfig.VERSION_CODE, release) synchronized(this) { val attempts = prefs.getInt(key, 0) - if (!due(installed, release, attempts, prefs.getLong("$key@at", 0L), now)) return false + val first = installed == null && !prefs.getBoolean(SEEDED, false) + if (!due(installed, release, attempts, prefs.getLong("$key@at", 0L), now, first)) return false val edit = prefs.edit() - prefs.all.keys.filterNot { it.startsWith("${BuildConfig.VERSION_CODE}:") }.forEach { edit.remove(it) } + prefs.all.keys.filterNot { it.startsWith("${BuildConfig.VERSION_CODE}:") || it == SEEDED }.forEach { edit.remove(it) } edit.putInt(key, attempts + 1).putLong("$key@at", now).apply() return true } } + + fun seed(context: Context) { + val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + if (!prefs.getBoolean(SEEDED, false)) prefs.edit().putBoolean(SEEDED, true).apply() + } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt new file mode 100644 index 0000000000..e428ede2a0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt @@ -0,0 +1,312 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.util.AtomicFile +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.AutoComponents +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +object ComponentUpdater { + private const val TAG = "ComponentUpdater" + private const val CHECK_EVERY_MS = 3_600_000L + private const val BOOTED_KEPT = 200 + private val lock = Any() + private val io = Any() + + data class Status(val line: String, val current: String, val previous: String, val protons: List, val note: String) + + private fun file(context: Context) = File(File(context.filesDir, "components").apply { mkdirs() }, "updates.json") + + private fun load(context: Context): JSONObject = synchronized(io) { + runCatching { JSONObject(String(AtomicFile(file(context)).readFully(), Charsets.UTF_8)) }.getOrDefault(JSONObject()) + } + + private fun save(context: Context, state: JSONObject) { + synchronized(io) { + val atomic = AtomicFile(file(context)) + val output = runCatching { atomic.startWrite() }.onFailure { Log.w(TAG, "could not save", it) }.getOrNull() ?: return + try { + output.write(state.toString(1).toByteArray(Charsets.UTF_8)) + atomic.finishWrite(output) + } catch (error: Exception) { + atomic.failWrite(output) + Log.w(TAG, "could not save", error) + } + } + } + + private fun Map>.fileOf(p: ComponentsManager.Proton, comp: String): String? = + this[p.id]?.get(comp)?.takeIf { it.protonVersion == p.version }?.file + + private class Target(val comp: String, val p: ComponentsManager.Proton, val line: ComponentUpdates.Line, val ls: JSONObject) { + val key: String get() = line.key + } + + private fun JSONObject.obj(key: String): JSONObject = optJSONObject(key) ?: JSONObject().also { put(key, it) } + + private fun JSONArray?.strings(): Set = this?.let { a -> (0 until a.length()).map { a.optString(it) }.toSet() } ?: emptySet() + + private fun JSONObject.strings(key: String): Set = optJSONArray(key).strings() + + private fun JSONObject?.ints(): Map = this?.keys()?.asSequence()?.associateWith { optInt(it) } ?: emptyMap() + + private fun JSONObject?.texts(): Map = this?.keys()?.asSequence()?.associateWith { optString(it) } ?: emptyMap() + + fun settle(context: Context) { + val owned = load(context).optJSONObject("lines")?.let { lines -> lines.keys().asSequence().flatMap { lines.optJSONObject(it).strings("owned") }.toSet() } ?: emptySet() + val choices = ComponentsManager.activeChoices(context).values.flatMap { it.entries } + for (comp in ComponentsManager.COMPONENTS) { + if (SessionPrefs.componentModeChosen(context, comp)) continue + val manual = choices.any { (c, choice) -> c == comp && !choice.auto && choice.file !in owned && !choice.file.startsWith("original ") } + SessionPrefs.setComponentMode(context, comp, if (manual) ComponentUpdates.MANUAL else ComponentUpdates.AUTO) + } + } + + private fun managed(context: Context, comp: String): Boolean = + SessionPrefs.componentMode(context, comp) == ComponentUpdates.AUTO && !(comp == "dxvk" && ComponentsManager.hardwareDxvk(context)) + + private fun logLines(context: Context): Sequence { + val dir = ComponentsManager.steamLogs(context) + return sequenceOf("console_log.previous.txt", "console_log.txt").map { File(dir, it) }.filter { it.isFile } + .flatMap { f -> runCatching { f.readLines() }.getOrDefault(emptyList()).asSequence() } + } + + private val STAMP = Regex("""^\[(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)]""") + + private fun latestStamp(context: Context): String = + logLines(context).mapNotNull { STAMP.find(it)?.groupValues?.get(1) }.maxOrNull() ?: "0" + + private fun lineOf(context: Context, state: JSONObject, p: ComponentsManager.Proton, comp: String): ComponentUpdates.Line? { + if (!ComponentsManager.supports(p, comp)) return null + if (comp == "fex") return ComponentUpdates.line("fex", false) + val key = "${p.id}|${p.version}" + val flavors = state.obj("flavors").obj(key) + val arm64ec = if (flavors.has(comp)) flavors.optBoolean(comp) else ComponentsManager.arm64ec(context, p, comp)?.also { flavors.put(comp, it) } + return arm64ec?.let { ComponentUpdates.line(comp, it) } + } + + fun ensure(context: Context, force: Boolean): List = synchronized(lock) { + if (SessionState.running) return emptyList() + settle(context) + val state = load(context) + val notes = ArrayList() + val protons = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList()) + judge(context, state, protons, notes) + val due = force || System.currentTimeMillis() - state.optLong("checkedAt") >= CHECK_EVERY_MS + val wanted = ComponentsManager.COMPONENTS.filter { managed(context, it) } + if (wanted.isEmpty() || protons.isEmpty()) { + save(context, state) + return notes + } + try { + dropRemoved(state, protons) + val checked = due && check(context, state, protons, wanted, force, notes) + apply(context, state, protons, wanted, notes) + prune(context, state) + if (checked) state.put("checkedAt", System.currentTimeMillis()) + } finally { + save(context, state) + } + notes + } + + private fun check( + context: Context, state: JSONObject, protons: List, wanted: List, force: Boolean, notes: MutableList, + ): Boolean { + if (!AutoComponents.isOnline(context)) { + state.put("note", context.getString(R.string.comp_auto_waits_network)) + return false + } + val catalog = runCatching { ComponentsManager.catalog(context, true).items } + .onFailure { Log.w(TAG, "catalog", it) }.getOrDefault(emptyList()) + if (catalog.none { it.release == ComponentsManager.DD_NIGHTLY }) { + state.put("note", context.getString(R.string.comp_auto_check_failed)) + return false + } + val holdBack = !force && AutoComponents.constrained(context) + val lines = state.obj("lines") + var complete = true + state.remove("note") + for (comp in wanted) for (p in protons) { + val line = lineOf(context, state, p, comp) ?: continue + val ls = lines.obj(line.key) + if (rollingBack(ls)) { + complete = false + continue + } + val target = ComponentUpdates.pick(catalog, line, ls.strings("bad")) + if (target == null || ls.optString("current") == target.file) continue + val stored = ComponentsManager.isStored(context, target.file) + if (!stored) { + if (holdBack) { + state.put("note", context.getString(R.string.comp_auto_waits_unmetered)) + complete = false + continue + } + val got = runCatching { ComponentsManager.download(context, target) {} } + if (got.isFailure) { + Log.w(TAG, "download ${target.file}", got.exceptionOrNull()) + state.put("note", context.getString(R.string.comp_auto_check_failed)) + complete = false + continue + } + } + val stocks = protons.filter { lineOf(context, state, it, comp)?.key == line.key }.map { ComponentsManager.arm64x(context, it, comp) } + if (ComponentUpdates.needsArm64x(line, stocks) && !ComponentsManager.packageArm64x(context, target.file, comp)) { + Log.w(TAG, "${target.file} is not ARM64X like ${p.name}'s own ${line.key}; skipped") + ls.put("bad", JSONArray(ls.strings("bad") + target.file)) + if (!stored) runCatching { ComponentsManager.deletePackage(context, target.file) } + continue + } + ls.put("previous", ls.optString("current").ifEmpty { ComponentUpdates.ORIGINAL }) + .put("current", target.file).put("since", latestStamp(context)).put("failed", JSONObject()) + if (!stored) ls.put("owned", JSONArray(ls.strings("owned") + target.file)) + ls.remove("note") + notes += context.getString(R.string.comp_auto_updated, ComponentsManager.LABEL[comp], target.file.removeSuffix(".wcp")) + } + return complete + } + + private fun apply(context: Context, state: JSONObject, protons: List, wanted: List, notes: MutableList) { + val lines = state.obj("lines") + val targets = wanted.flatMap { comp -> + protons.mapNotNull { p -> lineOf(context, state, p, comp)?.let { line -> lines.optJSONObject(line.key)?.let { Target(comp, p, line, it) } } } + } + val choices = ComponentsManager.activeChoices(context) + for (t in targets) { + val from = t.ls.optJSONObject("restore")?.optString(t.p.id).orEmpty() + val current = t.ls.optString("current") + if (from.isNotEmpty()) { + if (choices.fileOf(t.p, t.comp) == from) runCatching { ComponentsManager.restore(context, t.p.id, t.comp, ComponentsManager.safeName(t.p.version)) } + .onFailure { Log.w(TAG, "restore ${t.p.name} ${t.key}", it) } + } else if (current.isNotEmpty() && choices.fileOf(t.p, t.comp) != current) { + if (ComponentUpdates.needsArm64x(t.line, listOf(ComponentsManager.arm64x(context, t.p, t.comp))) && + !ComponentsManager.packageArm64x(context, current, t.comp)) continue + runCatching { ComponentsManager.swap(context, t.p.id, current) }.onFailure { Log.w(TAG, "${t.p.name} ${t.key}", it) } + } + } + val after = ComponentsManager.activeChoices(context) + val unfinished = HashSet() + for (t in targets) { + val restore = t.ls.optJSONObject("restore") + val from = restore?.optString(t.p.id).orEmpty() + val current = t.ls.optString("current") + if (from.isNotEmpty()) { + if (after.fileOf(t.p, t.comp) == from) unfinished += t.key else restore?.remove(t.p.id) + } else if (current.isNotEmpty() && after.fileOf(t.p, t.comp) != current) { + unfinished += t.key + } + } + for (key in lines.keys().asSequence().toList()) { + val ls = lines.optJSONObject(key) ?: continue + val pending = ls.optString("pendingNote") + if (pending.isEmpty() || key in unfinished || (ls.optJSONObject("restore")?.length() ?: 0) > 0) continue + ls.remove("pendingNote") + ls.put("note", pending) + notes += pending + } + } + + internal fun dropRemoved(state: JSONObject, protons: List) { + val installed = protons.mapTo(HashSet()) { it.id } + val lines = state.optJSONObject("lines") ?: return + for (key in lines.keys().asSequence().toList()) { + val restore = lines.optJSONObject(key)?.optJSONObject("restore") ?: continue + for (id in restore.keys().asSequence().toList()) if (id !in installed) restore.remove(id) + } + } + + internal fun rollingBack(ls: JSONObject): Boolean = + (ls.optJSONObject("restore")?.length() ?: 0) > 0 || ls.optString("pendingNote").isNotEmpty() + + private fun judge(context: Context, state: JSONObject, protons: List, notes: MutableList) { + val mark = state.optString("logMark") + val runs = ComponentUpdates.launches(logLines(context), mark) + if (runs.isEmpty()) return + state.put("logMark", runs.maxOf { it.start }) + val byTool = protons.associateBy { it.dir.name } + val lines = state.obj("lines") + for (comp in ComponentsManager.COMPONENTS) { + val onLine = HashMap>() + for (run in runs) { + val p = byTool[run.tool] ?: continue + if (ComponentsManager.gameComponents(context, run.app).containsKey(comp)) continue + val line = lineOf(context, state, p, comp) ?: continue + onLine.getOrPut(line.key) { ArrayList() } += run + } + for ((key, list) in onLine) { + val ls = lines.obj(key) + val verdict = ComponentUpdates.judge(ComponentUpdates.Trial( + ls.optString("current"), ls.optString("previous"), ls.optString("since"), + ls.optJSONObject("booted").texts(), ls.optJSONObject("failed").ints(), + ), list) + ls.put("booted", JSONObject(verdict.booted.entries.toList().takeLast(BOOTED_KEPT).associate { it.key to it.value } as Map<*, *>)) + ls.put("failed", JSONObject(verdict.failed as Map<*, *>)) + if (verdict.rollBack && managed(context, comp)) rollBack(context, state, protons, comp, key, notes) + } + } + } + + private fun rollBack(context: Context, state: JSONObject, protons: List, comp: String, key: String, notes: MutableList) { + val ls = state.obj("lines").obj(key) + val bad = ls.optString("current") + val back = ls.optString("previous") + val choices = ComponentsManager.activeChoices(context) + val targets = protons.filter { lineOf(context, state, it, comp)?.key == key && choices.fileOf(it, comp) == bad } + for (p in targets) { + runCatching { + if (back == ComponentUpdates.ORIGINAL) ComponentsManager.restore(context, p.id, comp, ComponentsManager.safeName(p.version)) + else ComponentsManager.swap(context, p.id, back) + }.onFailure { Log.w(TAG, "roll back ${p.name} $key", it) } + } + val after = ComponentsManager.activeChoices(context) + val unfinished = targets.filter { after.fileOf(it, comp) == bad } + ls.put("bad", JSONArray(ls.strings("bad") + bad)).put("current", back).put("previous", ComponentUpdates.ORIGINAL) + .put("since", latestStamp(context)).put("failed", JSONObject()) + if (back == ComponentUpdates.ORIGINAL) ls.obj("restore").let { restore -> unfinished.forEach { restore.put(it.id, bad) } } + val label = ComponentsManager.LABEL[comp] + val shown = back.ifEmpty { context.getString(R.string.comp_tag_original) }.removeSuffix(".wcp") + val note = context.getString(R.string.comp_auto_rolled_back, label, bad.removeSuffix(".wcp"), shown) + Log.w(TAG, note) + if (unfinished.isNotEmpty()) { + ls.put("pendingNote", note) + return + } + ls.remove("pendingNote") + ls.put("note", note) + notes += note + prune(context, state) + } + + private fun prune(context: Context, state: JSONObject) { + val lines = state.obj("lines") + val selected = ComponentsManager.selectedPackages(context) + val keep = lines.keys().asSequence().flatMap { k -> + val ls = lines.optJSONObject(k) ?: return@flatMap emptySequence() + ComponentUpdates.keep(ls.optString("current"), ls.optString("previous"), selected).asSequence() + }.toSet() + for (k in lines.keys().asSequence().toList()) { + val ls = lines.optJSONObject(k) ?: continue + val owned = ls.strings("owned") + val gone = owned.filter { it !in keep && runCatching { ComponentsManager.deletePackage(context, it) }.isSuccess } + ls.put("owned", JSONArray(owned - gone.toSet())) + } + } + + fun status(context: Context, comp: String): List { + val state = load(context) + val lines = state.optJSONObject("lines") ?: JSONObject() + val protons = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList()) + val byLine = protons.groupBy { lineOf(context, state, it, comp)?.key } + return ComponentUpdates.LINES.filter { it.comp == comp }.mapNotNull { line -> + val on = byLine[line.key].orEmpty() + val ls = lines.optJSONObject(line.key) + if (on.isEmpty() && ls == null) return@mapNotNull null + val note = ls?.optString("note").orEmpty().ifEmpty { state.optString("note") } + Status(line.key, ls?.optString("current").orEmpty(), ls?.optString("previous").orEmpty(), on.map { it.name }, note) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt new file mode 100644 index 0000000000..7acf29a4ec --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt @@ -0,0 +1,127 @@ +package com.droiddeck.launcher.session + +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.text.SimpleDateFormat +import java.util.Locale + +object ComponentUpdates { + const val AUTO = "auto" + const val MANUAL = "manual" + const val ORIGINAL = "" + const val BOOT_SECONDS = 30L + const val BOOTED_SECONDS = 60L + const val FAILED_BOOTS_BEFORE_ROLLBACK = 2 + + data class Line(val key: String, val comp: String, val prefix: String) + + val LINES = listOf( + Line("dxvk", "dxvk", "DD-dxvk-"), + Line("dxvk-arm64ec", "dxvk", "DD-dxvk-arm64ec-"), + Line("vkd3d", "vkd3d", "DD-vkd3d-proton-"), + Line("vkd3d-arm64ec", "vkd3d", "DD-vkd3d-proton-arm64ec-"), + Line("fex", "fex", "DD-FEXCore-"), + ) + + fun line(comp: String, arm64ec: Boolean): Line = LINES.first { + it.comp == comp && (comp == "fex" || it.key.endsWith("-arm64ec") == arm64ec) + } + + fun pick(items: List, line: Line, bad: Set): ComponentsManager.CatalogItem? { + val newestBad = bad.filter { belongs(it, line) }.maxWithOrNull { a, b -> ProtonExtras.compareVersions(a, b) } + return items.filter { it.release == ComponentsManager.DD_NIGHTLY && it.comp == line.comp && belongs(it.file, line) } + .filter { newestBad == null || ProtonExtras.compareVersions(it.file, newestBad) > 0 } + .maxWithOrNull { a, b -> ProtonExtras.compareVersions(a.file, b.file) } + } + + fun belongs(file: String, line: Line): Boolean = + file.startsWith(line.prefix) && file.removePrefix(line.prefix).firstOrNull()?.isDigit() == true + + fun arm64ec(pe: ByteArray): Boolean? = runCatching { + val b = ByteBuffer.wrap(pe).order(ByteOrder.LITTLE_ENDIAN) + val header = b.getInt(0x3c) + if (b.getInt(header) != 0x4550) return null + val sections = b.getShort(header + 6).toInt() and 0xffff + val optionalSize = b.getShort(header + 20).toInt() and 0xffff + val optional = header + 24 + if ((b.getShort(optional).toInt() and 0xffff) != 0x20b) return false + val loadConfigRva = b.getInt(optional + 112 + 10 * 8) + if (loadConfigRva == 0) return false + val table = optional + optionalSize + var offset = -1 + for (i in 0 until sections) { + val s = table + i * 40 + val size = b.getInt(s + 8) + val va = b.getInt(s + 12) + if (loadConfigRva >= va && loadConfigRva < va + maxOf(size, 1)) offset = b.getInt(s + 20) + loadConfigRva - va + } + if (offset < 0) return null + b.getInt(offset) >= 0xC8 + 8 && b.getLong(offset + 0xC8) != 0L + }.getOrNull() + + fun arm64x(pe: ByteArray): Boolean = runCatching { + val b = ByteBuffer.wrap(pe).order(ByteOrder.LITTLE_ENDIAN) + val header = b.getInt(0x3c) + b.getInt(header) == 0x4550 && (b.getShort(header + 4).toInt() and 0xffff) == 0xaa64 && arm64ec(pe) == true + }.getOrDefault(false) + + fun needsArm64x(line: Line, stocks: List): Boolean = + line.key.endsWith("-arm64ec") && stocks.any { it != false } + + data class Launch(val app: String, val tool: String, val start: String, val seconds: Long) + + private val PROCESS = Regex("""^\[(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)] Game process (added|removed)\s*: AppID (\d+)(?: "(.*))?""") + private val TOOL = Regex("""compatibilitytools\.d/([^/'"]+)['"]?/|steamapps/common/([^/'"]+)['"]?/proton""") + + fun launches(log: Sequence, after: String): List { + val format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US) + val open = HashMap>() + val out = ArrayList() + for (line in log) { + val m = PROCESS.find(line) ?: continue + val (time, what, app) = m.destructured + if (time <= after) continue + if (what == "added") { + val tool = TOOL.find(m.groupValues[4])?.let { t -> t.groupValues[1].ifEmpty { t.groupValues[2] } } ?: continue + open[app] = time to tool + } else { + val (start, tool) = open.remove(app) ?: continue + val seconds = runCatching { (format.parse(time)!!.time - format.parse(start)!!.time) / 1000 }.getOrNull() ?: continue + out += Launch(app, tool, start, seconds) + } + } + return out + } + + data class Trial( + val current: String, + val previous: String, + val since: String, + val booted: Map, + val failed: Map, + ) + + data class Verdict(val booted: Map, val failed: Map, val rollBack: Boolean) + + fun judge(trial: Trial, runs: List): Verdict { + val booted = trial.booted.toMutableMap() + val failed = trial.failed.toMutableMap() + var rollBack = false + for (run in runs) { + val build = if (trial.since.isNotEmpty() && run.start > trial.since) trial.current else trial.previous + if (run.seconds >= BOOTED_SECONDS) { + booted[run.app] = build + if (build == trial.current) failed.remove(run.app) + } else if (run.seconds < BOOT_SECONDS && build == trial.current && trial.current != trial.previous && + booted[run.app] == trial.previous) { + val n = (failed[run.app] ?: 0) + 1 + failed[run.app] = n + if (n >= FAILED_BOOTS_BEFORE_ROLLBACK) rollBack = true + } + } + return Verdict(booted, failed, rollBack) + } + + fun keep(current: String, previous: String, selected: Set): Set = + (setOf(current, previous) + selected) - ORIGINAL +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index df5db5eb64..edc68aea3d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -84,6 +84,7 @@ object ComponentsManager { private fun root(context: Context) = LinuxRuntime.rootDir(context) private fun steam(context: Context) = File(root(context), "root/.local/share/Steam") + fun steamLogs(context: Context) = File(steam(context), "logs") private fun host(context: Context, guest: String) = File(root(context), guest.removePrefix("/")) private fun dataDir(context: Context) = File(context.filesDir, "components").apply { mkdirs() } private fun packagesDir(context: Context) = File(dataDir(context), "packages").apply { mkdirs() } @@ -1031,6 +1032,78 @@ object ComponentsManager { ForcedPackage(setOf(GpuInfo.Family.A6XX), "dxvk", "dxvk-2.7.1-linux.wcp", "Dxvk-Linux"), ) + private val ARM64EC_PROBE = mapOf("dxvk" to "d3d11.dll", "vkd3d" to "d3d12.dll") + + fun arm64ec(context: Context, p: Proton, comp: String): Boolean? = stockProbe(context, p, comp)?.let(ComponentUpdates::arm64ec) + + fun arm64x(context: Context, p: Proton, comp: String): Boolean? = stockProbe(context, p, comp)?.let(ComponentUpdates::arm64x) + + fun packageArm64x(context: Context, file: String, comp: String): Boolean { + val rel = "${COMP_DIR[comp] ?: return false}/aarch64-windows/${ARM64EC_PROBE.getValue(comp)}" + val f = File(packagesDir(context), safeName(file)).takeIf { it.isFile } ?: return false + return runCatching { readWcpEntry(f, rel) }.getOrNull()?.let(ComponentUpdates::arm64x) == true + } + + private fun readWcpEntry(f: File, rel: String): ByteArray? = readWcp(f) { tar -> + var found: ByteArray? = null + while (found == null) { + val e = tar.nextTarEntry ?: break + if (!e.isDirectory && normalize(e.name) == rel) found = tar.readBytes() + } + found + } + + private fun stockProbe(context: Context, p: Proton, comp: String): ByteArray? { + val rel = "${COMP_DIR[comp] ?: return null}/aarch64-windows/${ARM64EC_PROBE.getValue(comp)}" + val original = synchronized(lock) { + val swapped = loadState(context).optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject(comp) + ?.let { liveSelection("active", it, p) } == true + if (!swapped) return File(p.dir, rel).takeIf { it.isFile }?.let { runCatching { it.readBytes() }.getOrNull() } + originalFile(context, p, comp).takeIf { it.isFile } ?: return null + } + return runCatching { readWcpEntry(original, rel) }.getOrNull() + } + + fun supports(p: Proton, comp: String): Boolean = + if (comp == "fex") File(p.dir, FEX_FILES.first()).isFile else File(p.dir, "${COMP_DIR.getValue(comp)}/aarch64-windows").isDirectory + + fun hardwareDxvk(context: Context): Boolean = + runtimeManaged(context, "dxvk") || FORCED_PACKAGES.any { it.comp == "dxvk" && it.matches(GpuInfo.detect()) } || + (com.droiddeck.launcher.core.DeviceSupport.vkBridge(context) && !SessionPrefs.bridgeProtonDxvk(context) && + bridgeDxvk(AppVulkan.detect(context)) != null) + + data class Choice(val file: String, val auto: Boolean, val protonVersion: String) + + fun activeChoices(context: Context): Map> = synchronized(lock) { + val active = loadState(context).optJSONObject("active") ?: return emptyMap() + active.keys().asSequence().toList().associateWith { pid -> + val comps = active.optJSONObject(pid) ?: JSONObject() + comps.keys().asSequence().toList().mapNotNull { c -> + comps.optJSONObject(c)?.let { c to Choice(it.optString("file"), it.optBoolean("auto"), it.optString("protonVersion")) } + }.toMap() + } + } + + fun selectedPackages(context: Context): Set = synchronized(lock) { + val state = loadState(context) + buildSet { + for (key in listOf("active", "queued")) { + val byProton = state.optJSONObject(key) ?: continue + for (pid in byProton.keys()) { + val comps = byProton.optJSONObject(pid) ?: continue + for (c in comps.keys()) comps.optJSONObject(c)?.optString("file")?.takeIf(String::isNotEmpty)?.let(::add) + } + } + val profiles = state.optJSONObject("profiles") + profiles?.keys()?.forEach { scope -> + val profile = profiles.optJSONObject(scope) ?: return@forEach + for (c in COMPONENTS) profile.optString(c).takeIf(String::isNotEmpty)?.let(::add) + } + } + } + + fun isStored(context: Context, file: String): Boolean = File(packagesDir(context), safeName(file)).isFile + internal fun forcedPackageWanted(activeFile: String?, protonVersionMatches: Boolean): Boolean = activeFile.isNullOrEmpty() || !protonVersionMatches diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 9c314ade25..2abf094c0f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -508,6 +508,17 @@ object SessionPrefs { prefs(context).edit().putString("gpuDriverMode", mode).apply() } + fun componentMode(context: Context, comp: String): String = + prefs(context).getString("componentMode.$comp", ComponentUpdates.AUTO) + ?.takeIf { it == ComponentUpdates.AUTO || it == ComponentUpdates.MANUAL } ?: ComponentUpdates.AUTO + + fun componentModeChosen(context: Context, comp: String): Boolean = prefs(context).contains("componentMode.$comp") + + fun setComponentMode(context: Context, comp: String, mode: String) { + require(mode == ComponentUpdates.AUTO || mode == ComponentUpdates.MANUAL) + prefs(context).edit().putString("componentMode.$comp", mode).commit() + } + fun settleGpuDriverMode(context: Context) { val p = prefs(context) if (p.contains("gpuDriverMode")) return diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index f315c1e1a6..df74d80544 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -30,7 +30,7 @@ object SettingsReset { ) internal val SESSION_PREFIXES = listOf( - "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "performanceMode.", "suspendPolicy.", + "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "performanceMode.", "suspendPolicy.", "componentMode.", ) private val STEAM_TOUCH_KEYS = listOf("feedback", "autoFade", "gyro", "shake") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 43f613486d..3746a32dee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -81,6 +81,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.ComponentUpdater +import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.session.ComponentsManager.CatalogItem import com.droiddeck.launcher.session.ComponentsManager.Snapshot @@ -163,6 +165,11 @@ fun ComponentsPage( protons: ProtonsState = ProtonsState(), protonActions: ProtonsActions = ProtonsActions(), protonOptions: @Composable () -> Unit = {}, + compModes: Map = emptyMap(), + compAuto: Map> = emptyMap(), + compAutoHeld: Set = emptySet(), + compAutoChecking: Boolean = false, + onCompMode: (String, String) -> Unit = { _, _ -> }, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -521,6 +528,8 @@ fun ComponentsPage( else -> stringResource(R.string.comp_nightlies_count, availableRows(l, catalog, snapshot).size) } } + val moded: (String) -> Boolean = { it in compModes && it !in compAutoHeld && !ComponentsManager.runtimeManaged(it, gpu.systemPowerVr) } + val automatic: (String) -> Boolean = { moded(it) && compModes[it] == ComponentUpdates.AUTO } val installedRows: @Composable ColumnScope.(String, Boolean) -> Unit = { l, right -> when (l) { PROTON_TAB -> { @@ -535,7 +544,7 @@ fun ComponentsPage( (if (swaps > 0) stringResource(R.string.comp_swapped, v.proton.version, swaps) else stringResource(R.string.comp_all_original, v.proton.version)) .let { if (v.inUseByGame) stringResource(R.string.comp_game_running_suffix, it) else it }, v.proton.id == view?.proton?.id, removable = removable, - modifier = (if (i == 0) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), + modifier = (if (i == 0 && !moded(l)) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), onSelect = { if (v.proton.id != view?.proton?.id) { onProton(v.proton.id); flyHome(key, PROTON_TAB) } }, onDelete = { if (extra != null) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { @@ -555,7 +564,7 @@ fun ComponentsPage( val key = "row:$l:${item.file ?: item.protonVersion}" ChoiceLine( item.name, item.detail, item.selected, item.removable, tag = item.tag, enabled = !managedDxvk, - modifier = (if (i == 0 && !managedDxvk) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), + modifier = (if (i == 0 && !managedDxvk && !moded(l)) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), onSelect = { if (managedDxvk || item.selected || p == null) return@ChoiceLine val waits = if (view.inUseByGame) ctx.getString(R.string.comp_waits_long) else ctx.getString(R.string.comp_applies_long) @@ -680,15 +689,31 @@ fun ComponentsPage( label = "layerRows", ) { k -> body(k) } } - if (single) { - slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } - Spacer(Modifier.height(12.dp)) - slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } - } else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.Top) { - Column(Modifier.weight(1f)) { slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } } - Column(Modifier.weight(1f)) { slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } } + if (moded(l)) slide { k -> + if (moded(k)) Column(verticalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(bottom = 14.dp)) { + PanelHeading(stringResource(R.string.comp_mode_title)) + ModeChoices( + listOf( + Triple(ComponentUpdates.AUTO, R.string.common_auto, R.string.comp_mode_auto_detail), + Triple(ComponentUpdates.MANUAL, R.string.drivers_manual, R.string.comp_mode_manual_detail), + ), + if (automatic(k)) ComponentUpdates.AUTO else ComponentUpdates.MANUAL, single, firstRow, + onPick = { onCompMode(k, it) }, + ) + if (automatic(k)) AutoComponentBody(ComponentsManager.LABEL[k] ?: k, compAuto[k].orEmpty(), compAutoChecking) + } + } + if (!automatic(l)) { + if (single) { + slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } + Spacer(Modifier.height(12.dp)) + slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } + } else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.Top) { + Column(Modifier.weight(1f)) { slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } } + Column(Modifier.weight(1f)) { slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } } + } + Box(Modifier.padding(top = 14.dp)) { slide { k -> actions(k) } } } - Box(Modifier.padding(top = 14.dp)) { slide { k -> actions(k) } } if (l == "fex") { SettingsGroup(stringResource(R.string.fex_preset_title)) { SettingsRow(stringResource(R.string.fex_preset_title), null) { @@ -1078,6 +1103,25 @@ private fun RowGroup(title: String, content: @Composable ColumnScope.() -> Unit) } } +@Composable +private fun AutoComponentBody(label: String, lines: List, checking: Boolean) { + val colors = MaterialTheme.colorScheme + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + PanelTitle(stringResource(R.string.comp_auto_title, label), stringResource(R.string.comp_auto_hint)) + if (lines.isEmpty()) EmptyLine(stringResource(R.string.comp_auto_none)) + for (line in lines) { + val previous = line.previous.removeSuffix(".wcp").ifEmpty { stringResource(R.string.comp_tag_original) } + val fallback = if (line.current.isEmpty()) null else stringResource(R.string.comp_auto_fallback, previous) + PanelRow( + line.current.removeSuffix(".wcp").ifEmpty { stringResource(if (checking) R.string.comp_auto_checking else R.string.comp_tag_original) }, + listOfNotNull(line.protons.joinToString(", ").ifEmpty { null }, fallback).joinToString(" · "), + selected = true, onClick = null, + ) + } + lines.map { it.note }.filter { it.isNotEmpty() }.distinct().forEach { Text(it, fontSize = 13.sp, color = colors.onSurfaceVariant) } + } +} + @Composable private fun EmptyLine(text: String) { Text(text, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt index f0df5a2209..823c065aa6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -250,18 +250,8 @@ internal fun GpuDriversBody( Triple(GPU_MODE_PAIR, R.string.gpu_mode_pair, R.string.gpu_mode_pair_detail), Triple(GPU_MODE_MIX, R.string.gpu_mode_mix, R.string.gpu_mode_mix_detail), ) - val choice: @Composable (Int, Modifier) -> Unit = { i, mod -> - val (id, title, detail) = modes[i] - PanelRow( - stringResource(title), stringResource(detail), gpu.mode == id, - modifier = mod.then(if (gpu.mode == id) Modifier.focusRequester(first) else Modifier) - .then(if (i == 0) Modifier.onGloballyPositioned { placed[1] = it }.onFocusChanged { if (it.isFocused) revealCard() } else Modifier), - onClick = { if (gpu.mode != id) actions.onMode(id) }, - ) - } - if (single) Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { modes.indices.forEach { choice(it, Modifier) } } - else Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min)) { - modes.indices.forEach { choice(it, Modifier.weight(1f).fillMaxHeight()) } + ModeChoices(modes, gpu.mode, single, first, onPick = actions.onMode) { i -> + if (i == 0) Modifier.onGloballyPositioned { placed[1] = it }.onFocusChanged { if (it.isFocused) revealCard() } else Modifier } when (gpu.mode) { GPU_MODE_AUTO -> AutoBody(gpu, actions) @@ -439,12 +429,35 @@ internal const val SLOT_DISPLAY = "panel" internal const val SLOT_RUNTIME = "rt" @Composable -private fun PanelHeading(text: String) { +internal fun ModeChoices( + modes: List>, + selected: String, + single: Boolean, + first: FocusRequester, + onPick: (String) -> Unit, + extra: (Int) -> Modifier = { Modifier }, +) { + val choice: @Composable (Int, Modifier) -> Unit = { i, mod -> + val (id, title, detail) = modes[i] + PanelRow( + stringResource(title), stringResource(detail), selected == id, + modifier = mod.then(if (selected == id) Modifier.focusRequester(first) else Modifier).then(extra(i)), + onClick = { if (selected != id) onPick(id) }, + ) + } + if (single) Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { modes.indices.forEach { choice(it, Modifier) } } + else Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min)) { + modes.indices.forEach { choice(it, Modifier.weight(1f).fillMaxHeight()) } + } +} + +@Composable +internal fun PanelHeading(text: String) { Text(text.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) } @Composable -private fun PanelTitle(title: String, hint: String) { +internal fun PanelTitle(title: String, hint: String) { Column(verticalArrangement = Arrangement.spacedBy(3.dp), modifier = Modifier.padding(top = 4.dp)) { Text(title, fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) Text(hint, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) @@ -461,7 +474,7 @@ private fun Pill(text: String, fill: Color, ink: Color) { } @Composable -private fun PanelRow( +internal fun PanelRow( title: String, detail: String, selected: Boolean, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5b1426b750..c552295915 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -564,6 +564,19 @@ قيد الاستخدام جديد مخزّن + كيفية اختيار الإصدارات + أحدث إصدار من DroidDeck، محدّث دائمًا + اختر الإصدارات وثبّتها بنفسك + يُبقي Auto ‏%1$s محدّثًا + تُثبَّت الإصدارات الجديدة في الخلفية. إذا أُغلقت لعبة كانت تعمل خلال ثوانٍ مرتين، يعود Auto إلى الإصدار الذي كان يعمل. + الاحتياطي: %1$s + جارٍ البحث عن إصدارات… + لا يستخدمه أي Proton مثبّت + تنتظر تحديثات Auto اتصالًا. + تعذّر البحث عن إصدارات جديدة. + تنتظر الإصدارات الجديدة اتصالًا غير محدود، وإيقاف توفير البطارية، وجهازًا غير ساخن. + تم تحديث %1$s إلى %2$s. + أغلق %1$s %2$s لعبة خلال ثوانٍ مرتين، لذا عاد Auto إلى %3$s. الأداء أنوية CPU وإصلاحات الجلسة واسم المضيف. يُطبَّق في الجلسة التالية. أنوية عميل Steam 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 4b54a8daa2..32d66b003d 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -558,6 +558,19 @@ En uso Nuevo Guardado + Cómo se eligen las versiones + Versión más reciente de DroidDeck, siempre al día + Elige e instala las versiones tú mismo + Auto mantiene %1$s al día + Las nuevas versiones se instalan en segundo plano. Si un juego que funcionaba se cierra en segundos dos veces, Auto vuelve a la versión que funcionaba. + Respaldo: %1$s + Buscando versiones… + Ningún Proton instalado lo usa + Las actualizaciones Auto esperan una conexión. + No se pudieron buscar nuevas versiones. + Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío. + %1$s actualizado a %2$s. + %1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s. Rendimiento Núcleos de CPU, correcciones de sesión y nombre del host. Se aplica en la próxima sesión. Núcleos del cliente de Steam diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f3cadc899b..5c961b0336 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -556,6 +556,19 @@ В употреба Ново Запазено + Как се избират версиите + Най-новата версия на DroidDeck, винаги актуална + Избирайте и инсталирайте версии сами + Auto поддържа %1$s актуален + Новите версии се инсталират във фонов режим. Ако игра, която е работила, се затвори до секунди два пъти, Auto се връща към работещата версия. + Резервна: %1$s + Търсене на версии… + Нито един инсталиран Proton не го използва + Актуализациите Auto чакат връзка. + Новите версии не можаха да бъдат проверени. + Новите версии чакат неотчитана връзка, изключен режим за пестене на батерията и охладено устройство. + %1$s е обновен до %2$s. + %1$s %2$s два пъти затвори игра до секунди, затова Auto се върна към %3$s. Производителност CPU ядра, корекции на сесията и името на хоста. Прилага се от следващата сесия. Ядра за клиента на Steam diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c6e35ae37a..5eb8849f47 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -560,6 +560,19 @@ Používá se Nové Uloženo + Jak se vybírají sestavení + Nejnovější sestavení DroidDeck, stále aktuální + Vyberte a instalujte sestavení sami + Auto udržuje %1$s aktuální + Nová sestavení se instalují na pozadí. Pokud se hra, která dřív fungovala, dvakrát zavře během pár sekund, Auto se vrátí k funkčnímu sestavení. + Záložní: %1$s + Hledání sestavení… + Žádný nainstalovaný Proton to nepoužívá + Aktualizace Auto čekají na připojení. + Nová sestavení nelze zkontrolovat. + Nová sestavení čekají na neměřené připojení, vypnutou úsporu baterie a nepřehřáté zařízení. + %1$s aktualizováno na %2$s. + %1$s %2$s dvakrát zavřelo hru během pár sekund, proto se Auto vrátilo k %3$s. Výkon Jádra CPU, opravy relace a název hostitele. Použije se od příští relace. Jádra pro klienta Steam diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e93dd58db8..2048de93e7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -556,6 +556,19 @@ I brug Ny Gemt + Sådan vælges builds + Nyeste DroidDeck-build, altid opdateret + Vælg og installer builds selv + Auto holder %1$s opdateret + Nye builds installeres i baggrunden. Hvis et spil, der virkede før, lukker inden for sekunder to gange, går Auto tilbage til det build, der virkede. + Reserve: %1$s + Søger efter builds… + Ingen installeret Proton bruger dette + Auto-opdateringer venter på en forbindelse. + Kunne ikke søge efter nye builds. + Nye builds venter på en ubegrænset forbindelse, slået batterisparer fra og en kølig enhed. + %1$s opdateret til %2$s. + %1$s %2$s lukkede et spil inden for sekunder to gange, så Auto gik tilbage til %3$s. Ydelse CPU-kerner, sessionsrettelser og værtsnavn. Gælder fra næste session. Steam-klientens kerner diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e00048becf..ae04fc0d9c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -556,6 +556,19 @@ In Verwendung Neu Gespeichert + Wie Builds gewählt werden + Neuester DroidDeck-Build, stets aktuell + Builds selbst auswählen und installieren + Auto hält %1$s aktuell + Neue Builds werden im Hintergrund installiert. Schließt sich ein Spiel, das vorher lief, zweimal nach wenigen Sekunden, kehrt Auto zum funktionierenden Build zurück. + Ausweich-Build: %1$s + Suche nach Builds… + Kein installiertes Proton nutzt dies + Auto-Updates warten auf eine Verbindung. + Neue Builds konnten nicht geprüft werden. + Neue Builds warten auf eine nicht getaktete Verbindung, ausgeschalteten Energiesparmodus und ein kühles Gerät. + %1$s auf %2$s aktualisiert. + %1$s %2$s hat ein Spiel zweimal nach wenigen Sekunden beendet, daher ist Auto zu %3$s zurückgekehrt. Leistung CPU-Kerne, Sitzungskorrekturen und der Hostname. Gilt ab der nächsten Sitzung. Steam-Client-Kerne diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8c1f1f43ff..8d7be5031f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -556,6 +556,19 @@ Σε χρήση Νέο Αποθηκευμένο + Πώς επιλέγονται οι εκδόσεις + Νεότερη έκδοση DroidDeck, πάντα ενημερωμένη + Επιλέξτε και εγκαταστήστε εκδόσεις μόνοι σας + Το Auto κρατά το %1$s ενημερωμένο + Οι νέες εκδόσεις εγκαθίστανται στο παρασκήνιο. Αν ένα παιχνίδι που λειτουργούσε κλείσει μέσα σε δευτερόλεπτα δύο φορές, το Auto επιστρέφει στην έκδοση που λειτουργούσε. + Εφεδρική: %1$s + Αναζήτηση εκδόσεων… + Κανένα εγκατεστημένο Proton δεν το χρησιμοποιεί + Οι ενημερώσεις Auto περιμένουν σύνδεση. + Δεν ήταν δυνατός ο έλεγχος για νέες εκδόσεις. + Οι νέες εκδόσεις περιμένουν σύνδεση χωρίς όριο δεδομένων, απενεργοποιημένη εξοικονόμηση μπαταρίας και δροσερή συσκευή. + Το %1$s ενημερώθηκε σε %2$s. + Το %1$s %2$s έκλεισε ένα παιχνίδι μέσα σε δευτερόλεπτα δύο φορές, οπότε το Auto επέστρεψε στο %3$s. Απόδοση Πυρήνες CPU, διορθώσεις συνεδρίας και το όνομα κεντρικού υπολογιστή. Εφαρμόζεται στην επόμενη συνεδρία. Πυρήνες πελάτη Steam diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 52be78eafb..3ac7f5a9cf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -558,6 +558,19 @@ En uso Nuevo Guardado + Cómo se eligen las versiones + Versión más reciente de DroidDeck, siempre al día + Elige e instala las versiones tú mismo + Auto mantiene %1$s al día + Las nuevas versiones se instalan en segundo plano. Si un juego que funcionaba se cierra en segundos dos veces, Auto vuelve a la versión que funcionaba. + Respaldo: %1$s + Buscando versiones… + Ningún Proton instalado lo usa + Las actualizaciones Auto esperan una conexión. + No se pudieron buscar nuevas versiones. + Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío. + %1$s actualizado a %2$s. + %1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s. Rendimiento Núcleos de CPU, correcciones de sesión y nombre del host. Se aplica en la próxima sesión. Núcleos del cliente de Steam diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a413c8d9ac..c2a8c24cc6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -556,6 +556,19 @@ Käytössä Uusi Tallennettu + Miten versiot valitaan + Uusin DroidDeck-versio, aina ajan tasalla + Valitse ja asenna versiot itse + Auto pitää %1$s ajan tasalla + Uudet versiot asentuvat taustalla. Jos aiemmin toiminut peli sulkeutuu sekunneissa kahdesti, Auto palaa toimineeseen versioon. + Varaversio: %1$s + Haetaan versioita… + Mikään asennettu Proton ei käytä tätä + Auto-päivitykset odottavat yhteyttä. + Uusia versioita ei voitu tarkistaa. + Uudet versiot odottavat rajoittamatonta yhteyttä, virransäästön poistoa ja viileää laitetta. + %1$s päivitetty versioon %2$s. + %1$s %2$s sulki pelin sekunneissa kahdesti, joten Auto palasi versioon %3$s. Suorituskyky CPU-ytimet, istunnon korjaukset ja isäntänimi. Tulee voimaan seuraavassa istunnossa. Steam-asiakasohjelman ytimet diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5009c3e5a6..1b8ff67fbe 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -558,6 +558,19 @@ Utilisé Nouveau Enregistré + Choix des versions + Dernière version DroidDeck, toujours à jour + Choisir et installer les versions vous-même + Auto garde %1$s à jour + Les nouvelles versions s\'installent en arrière-plan. Si un jeu qui fonctionnait se ferme deux fois en quelques secondes, Auto revient à la version qui fonctionnait. + Secours : %1$s + Recherche de versions… + Aucun Proton installé ne l\'utilise + Les mises à jour Auto attendent une connexion. + Impossible de vérifier les nouvelles versions. + Les nouvelles versions attendent une connexion non limitée, l\'économiseur de batterie désactivé et un appareil frais. + %1$s mis à jour vers %2$s. + %1$s %2$s a fermé un jeu en quelques secondes deux fois, Auto est donc revenu à %3$s. Performance Cœurs CPU, correctifs de session et nom d\'hôte. Prendra effet à la prochaine session. Cœurs du client Steam diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index edf039eeba..3bae590a2d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -556,6 +556,19 @@ उपयोग में नया सेव है + बिल्ड कैसे चुने जाते हैं + सबसे नया DroidDeck बिल्ड, हमेशा अपडेट + बिल्ड खुद चुनें और इंस्टॉल करें + Auto %1$s को अपडेट रखता है + नए बिल्ड बैकग्राउंड में इंस्टॉल होते हैं। अगर पहले चलने वाला गेम दो बार कुछ सेकंड में बंद हो जाए, तो Auto काम करने वाले बिल्ड पर लौट जाता है। + फ़ॉलबैक: %1$s + बिल्ड खोजे जा रहे हैं… + कोई इंस्टॉल Proton इसका उपयोग नहीं करता + Auto अपडेट कनेक्शन का इंतज़ार कर रहे हैं। + नए बिल्ड नहीं जाँचे जा सके। + नए बिल्ड बिना सीमा वाले कनेक्शन, बंद बैटरी सेवर और ठंडे डिवाइस का इंतज़ार करते हैं। + %1$s को %2$s पर अपडेट किया गया। + %1$s %2$s ने दो बार कुछ सेकंड में गेम बंद कर दिया, इसलिए Auto %3$s पर लौट गया। परफ़ॉर्मेंस CPU कोर, सेशन फ़िक्स और होस्ट नाम। अगले सेशन से लागू होता है। Steam क्लाइंट कोर diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0ac1a8beca..3d560663ad 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -556,6 +556,19 @@ Használatban Új Tárolva + Hogyan választódnak a buildek + Legújabb DroidDeck build, mindig naprakész + Buildek kiválasztása és telepítése saját kézzel + Az Auto naprakészen tartja: %1$s + Az új buildek a háttérben települnek. Ha egy korábban működő játék kétszer is másodperceken belül bezárul, az Auto visszaáll a működő buildre. + Tartalék: %1$s + Buildek keresése… + Egyik telepített Proton sem használja + Az Auto frissítések kapcsolatra várnak. + Nem sikerült új buildeket keresni. + Az új buildek nem forgalomkorlátos kapcsolatra, kikapcsolt energiatakarékos módra és hűvös eszközre várnak. + %1$s frissítve: %2$s. + %1$s %2$s kétszer is másodperceken belül bezárt egy játékot, ezért az Auto visszaállt erre: %3$s. Teljesítmény CPU-magok, munkamenet-javítások és a hosztnév. A következő munkamenettől érvényes. Steam-kliens magok diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a2db31f53e..f7b605249a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -554,6 +554,19 @@ Digunakan Baru Tersimpan + Cara build dipilih + Build DroidDeck terbaru, selalu mutakhir + Pilih dan pasang build sendiri + Auto menjaga %1$s tetap mutakhir + Build baru dipasang di latar belakang. Jika game yang sebelumnya berjalan tertutup dalam hitungan detik dua kali, Auto kembali ke build yang berfungsi. + Cadangan: %1$s + Mencari build… + Tidak ada Proton terpasang yang memakainya + Pembaruan Auto menunggu koneksi. + Tidak dapat memeriksa build baru. + Build baru menunggu koneksi tanpa kuota, penghemat baterai mati, dan perangkat yang dingin. + %1$s diperbarui ke %2$s. + %1$s %2$s menutup game dalam hitungan detik dua kali, jadi Auto kembali ke %3$s. Performa Core CPU, perbaikan sesi, dan nama host. Berlaku pada sesi berikutnya. Core klien Steam diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d3d5045a05..0aa5bccc70 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -558,6 +558,19 @@ In uso Nuovo Salvato + Come vengono scelte le build + Build DroidDeck più recente, sempre aggiornata + Scegli e installa tu le build + Auto mantiene aggiornato %1$s + Le nuove build si installano in background. Se un gioco che funzionava si chiude in pochi secondi per due volte, Auto torna alla build che funzionava. + Riserva: %1$s + Ricerca build… + Nessun Proton installato lo usa + Gli aggiornamenti Auto attendono una connessione. + Impossibile cercare nuove build. + Le nuove build attendono una connessione non a consumo, il risparmio batteria disattivato e un dispositivo fresco. + %1$s aggiornato a %2$s. + %1$s %2$s ha chiuso un gioco in pochi secondi per due volte, quindi Auto è tornato a %3$s. Prestazioni Core della CPU, correzioni della sessione e nome host. Si applica dalla prossima sessione. Core del client Steam diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7c959249fa..ba0c4cb1a0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -554,6 +554,19 @@ 使用中 新規 保存済み + ビルドの選び方 + 最新の DroidDeck ビルドを常に維持 + ビルドを自分で選んでインストール + Auto が %1$s を最新に保ちます + 新しいビルドはバックグラウンドでインストールされます。以前動いていたゲームが数秒で 2 回終了した場合、Auto は動作していたビルドに戻します。 + 予備: %1$s + ビルドを確認中… + これを使うインストール済み Proton はありません + Auto 更新は接続を待っています。 + 新しいビルドを確認できませんでした。 + 新しいビルドは従量制でない接続、バッテリーセーバーのオフ、端末が熱くない状態を待ちます。 + %1$s を %2$s に更新しました。 + %1$s %2$s でゲームが数秒で 2 回終了したため、Auto は %3$s に戻しました。 パフォーマンス CPUコア、セッション修正、ホスト名。次回のセッションで有効になります。 Steamクライアントコア diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3ecd46598f..b3a368777a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -554,6 +554,19 @@ 사용 중 신규 저장됨 + 빌드 선택 방식 + 최신 DroidDeck 빌드, 항상 최신 유지 + 빌드를 직접 선택하고 설치 + Auto가 %1$s을(를) 최신으로 유지합니다 + 새 빌드는 백그라운드에서 설치됩니다. 이전에 실행되던 게임이 몇 초 만에 두 번 종료되면 Auto가 작동하던 빌드로 되돌립니다. + 대체: %1$s + 빌드 확인 중… + 이를 사용하는 설치된 Proton이 없습니다 + Auto 업데이트가 연결을 기다리는 중입니다. + 새 빌드를 확인할 수 없습니다. + 새 빌드는 데이터 무제한 연결, 배터리 세이버 꺼짐, 기기가 뜨겁지 않은 상태를 기다립니다. + %1$s을(를) %2$s(으)로 업데이트했습니다. + %1$s %2$s(으)로 게임이 몇 초 만에 두 번 종료되어 Auto가 %3$s(으)로 되돌렸습니다. 성능 CPU 코어, 세션 수정 및 호스트 이름. 다음 세션에 적용됩니다. Steam 클라이언트 코어 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 12666f1644..15512b395b 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -554,6 +554,19 @@ Digunakan Baharu Disimpan + Cara binaan dipilih + Binaan DroidDeck terbaharu, sentiasa terkini + Pilih dan pasang binaan sendiri + Auto memastikan %1$s sentiasa terkini + Binaan baharu dipasang di latar belakang. Jika permainan yang pernah berjalan tertutup dalam beberapa saat dua kali, Auto kembali ke binaan yang berfungsi. + Sandaran: %1$s + Mencari binaan… + Tiada Proton terpasang yang menggunakannya + Kemas kini Auto menunggu sambungan. + Tidak dapat menyemak binaan baharu. + Binaan baharu menunggu sambungan tanpa meter, penjimat bateri dimatikan dan peranti yang sejuk. + %1$s dikemas kini ke %2$s. + %1$s %2$s menutup permainan dalam beberapa saat dua kali, jadi Auto kembali ke %3$s. Prestasi Teras CPU, pembaikan sesi dan nama hos. Berkuat kuasa pada sesi seterusnya. Teras klien Steam diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 191e8e54b5..ab859f0e15 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -556,6 +556,19 @@ I bruk Ny Lagret + Slik velges bygg + Nyeste DroidDeck-bygg, alltid oppdatert + Velg og installer bygg selv + Auto holder %1$s oppdatert + Nye bygg installeres i bakgrunnen. Hvis et spill som fungerte før lukkes innen sekunder to ganger, går Auto tilbake til bygget som fungerte. + Reserve: %1$s + Ser etter bygg… + Ingen installert Proton bruker dette + Auto-oppdateringer venter på en tilkobling. + Kunne ikke se etter nye bygg. + Nye bygg venter på en ubegrenset tilkobling, avslått batterisparing og en kjølig enhet. + %1$s oppdatert til %2$s. + %1$s %2$s lukket et spill innen sekunder to ganger, så Auto gikk tilbake til %3$s. Ytelse CPU-kjerner, sesjonsfikser og vertsnavnet. Gjelder fra neste sesjon. Steam-klientens kjerner diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 47b574eb88..ea4e0eb572 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -556,6 +556,19 @@ In gebruik Nieuw Bewaard + Hoe builds worden gekozen + Nieuwste DroidDeck-build, altijd actueel + Kies en installeer builds zelf + Auto houdt %1$s actueel + Nieuwe builds worden op de achtergrond geïnstalleerd. Sluit een game die eerder werkte twee keer binnen enkele seconden, dan gaat Auto terug naar de build die werkte. + Terugval: %1$s + Zoeken naar builds… + Geen geïnstalleerde Proton gebruikt dit + Auto-updates wachten op een verbinding. + Kon niet op nieuwe builds controleren. + Nieuwe builds wachten op een onbeperkte verbinding, batterijbesparing uit en een koel apparaat. + %1$s bijgewerkt naar %2$s. + %1$s %2$s sloot een game twee keer binnen enkele seconden, dus Auto ging terug naar %3$s. Prestaties CPU-cores, sessiefixes en de hostnaam. Geldt vanaf de volgende sessie. Cores voor de Steam-client diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8982560cb1..52a42187a6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -560,6 +560,19 @@ W użyciu Nowy Zapisany + Jak wybierane są wersje + Najnowsza wersja DroidDeck, zawsze aktualna + Wybieraj i instaluj wersje samodzielnie + Auto utrzymuje %1$s w aktualności + Nowe wersje instalują się w tle. Jeśli gra, która działała, dwa razy zamknie się po kilku sekundach, Auto wróci do działającej wersji. + Zapasowa: %1$s + Szukanie wersji… + Żaden zainstalowany Proton tego nie używa + Aktualizacje Auto czekają na połączenie. + Nie udało się sprawdzić nowych wersji. + Nowe wersje czekają na połączenie bez limitu, wyłączone oszczędzanie baterii i chłodne urządzenie. + %1$s zaktualizowano do %2$s. + %1$s %2$s dwa razy zamknął grę po kilku sekundach, więc Auto wróciło do %3$s. Wydajność Rdzenie CPU, poprawki sesji i nazwa hosta. Działa od następnej sesji. Rdzenie klienta Steam diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 38ab08a785..668919b906 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -558,6 +558,19 @@ Em utilização Novo Guardado + Como as versões são escolhidas + Versão mais recente do DroidDeck, sempre atualizada + Escolha e instale as versões manualmente + Auto mantém %1$s atualizado + As novas versões são instaladas em segundo plano. Se um jogo que funcionava fechar em segundos duas vezes, Auto volta à versão que funcionava. + Reserva: %1$s + A procurar versões… + Nenhum Proton instalado usa isto + As atualizações Auto aguardam uma ligação. + Não foi possível procurar novas versões. + As novas versões aguardam uma ligação não limitada, a poupança de bateria desligada e o dispositivo fresco. + %1$s atualizado para %2$s. + %1$s %2$s fechou um jogo em segundos duas vezes, por isso Auto voltou a %3$s. Desempenho Núcleos da CPU, correções da sessão e nome do anfitrião. Aplica-se na próxima sessão. Núcleos do cliente Steam diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7b5faee1fd..2fbd7414c9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -558,6 +558,19 @@ Em uso Novo Armazenado + Como as versões são escolhidas + Versão mais recente do DroidDeck, sempre atualizada + Escolha e instale as versões você mesmo + Auto mantém %1$s atualizado + Novas versões são instaladas em segundo plano. Se um jogo que funcionava fechar em segundos duas vezes, Auto volta para a versão que funcionava. + Reserva: %1$s + Procurando versões… + Nenhum Proton instalado usa isto + As atualizações Auto aguardam uma conexão. + Não foi possível procurar novas versões. + Novas versões aguardam uma conexão não limitada, a economia de bateria desligada e o aparelho frio. + %1$s atualizado para %2$s. + %1$s %2$s fechou um jogo em segundos duas vezes, então Auto voltou para %3$s. Desempenho Núcleos da CPU, correções da sessão e o nome do host. Vale a partir da próxima sessão. Núcleos do cliente Steam diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 747948cc26..69751c27cb 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -558,6 +558,19 @@ În uz Nou Salvat + Cum se aleg versiunile + Cea mai nouă versiune DroidDeck, mereu actualizată + Alege și instalează singur versiunile + Auto menține %1$s actualizat + Versiunile noi se instalează în fundal. Dacă un joc care mergea se închide în câteva secunde de două ori, Auto revine la versiunea care funcționa. + Rezervă: %1$s + Se caută versiuni… + Niciun Proton instalat nu folosește asta + Actualizările Auto așteaptă o conexiune. + Nu s-au putut căuta versiuni noi. + Versiunile noi așteaptă o conexiune fără limită de date, economisirea bateriei oprită și un dispozitiv răcit. + %1$s actualizat la %2$s. + %1$s %2$s a închis un joc în câteva secunde de două ori, așa că Auto a revenit la %3$s. Performanță Nuclee CPU, remedieri de sesiune și numele hostului. Se aplică la sesiunea următoare. Nuclee pentru clientul Steam diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 65220e106a..b8198adfcc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -579,6 +579,19 @@ Используется Новый Сохранено + Как выбираются сборки + Новейшая сборка DroidDeck, всегда актуальна + Выбирайте и устанавливайте сборки сами + Auto поддерживает %1$s в актуальном состоянии + Новые сборки ставятся в фоне. Если игра, которая раньше работала, дважды закроется за несколько секунд, Auto вернётся к рабочей сборке. + Запасная: %1$s + Поиск сборок… + Ни один установленный Proton это не использует + Обновления Auto ждут подключения. + Не удалось проверить новые сборки. + Новые сборки ждут безлимитного подключения, выключенной экономии заряда и остывшего устройства. + %1$s обновлён до %2$s. + %1$s %2$s дважды закрыл игру за несколько секунд, поэтому Auto вернулся к %3$s. Производительность Ядра CPU, исправления сессии и имя хоста. Вступит в силу в следующей сессии. Ядра клиента Steam diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f2c4b11c2b..0fcfbcb0f8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -556,6 +556,19 @@ I bruk Ny Sparad + Hur byggen väljs + Senaste DroidDeck-bygget, alltid aktuellt + Välj och installera byggen själv + Auto håller %1$s aktuellt + Nya byggen installeras i bakgrunden. Om ett spel som fungerade stängs inom sekunder två gånger går Auto tillbaka till bygget som fungerade. + Reserv: %1$s + Söker efter byggen… + Ingen installerad Proton använder detta + Auto-uppdateringar väntar på en anslutning. + Kunde inte söka efter nya byggen. + Nya byggen väntar på en obegränsad anslutning, avstängt batterisparläge och en sval enhet. + %1$s uppdaterat till %2$s. + %1$s %2$s stängde ett spel inom sekunder två gånger, så Auto gick tillbaka till %3$s. Prestanda CPU-kärnor, sessionsfixar och värdnamnet. Gäller från nästa session. Steam-klientens kärnor diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index f05a5158e0..c1b88770b2 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -554,6 +554,19 @@ ใช้งานอยู่ ใหม่ บันทึกไว้ + วิธีเลือกบิลด์ + บิลด์ DroidDeck ล่าสุด อัปเดตอยู่เสมอ + เลือกและติดตั้งบิลด์เอง + Auto ทำให้ %1$s เป็นปัจจุบัน + บิลด์ใหม่จะติดตั้งในเบื้องหลัง หากเกมที่เคยเล่นได้ปิดลงภายในไม่กี่วินาทีสองครั้ง Auto จะกลับไปใช้บิลด์ที่ใช้งานได้ + สำรอง: %1$s + กำลังค้นหาบิลด์… + ไม่มี Proton ที่ติดตั้งใช้สิ่งนี้ + การอัปเดต Auto กำลังรอการเชื่อมต่อ + ตรวจหาบิลด์ใหม่ไม่ได้ + บิลด์ใหม่จะรอการเชื่อมต่อที่ไม่จำกัดปริมาณ ปิดโหมดประหยัดแบตเตอรี่ และอุปกรณ์ที่ไม่ร้อน + อัปเดต %1$s เป็น %2$s แล้ว + %1$s %2$s ทำให้เกมปิดภายในไม่กี่วินาทีสองครั้ง Auto จึงกลับไปใช้ %3$s ประสิทธิภาพ คอร์ CPU การแก้ไขเซสชัน และชื่อโฮสต์ จะมีผลในเซสชันถัดไป คอร์สำหรับไคลเอนต์ Steam diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9e95d2f134..30708430fd 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -556,6 +556,19 @@ Kullanımda Yeni Saklandı + Sürümler nasıl seçilir + En yeni DroidDeck sürümü, hep güncel + Sürümleri kendin seç ve yükle + Auto %1$s bileşenini güncel tutar + Yeni sürümler arka planda yüklenir. Önceden çalışan bir oyun iki kez saniyeler içinde kapanırsa Auto çalışan sürüme geri döner. + Yedek: %1$s + Sürümler aranıyor… + Yüklü hiçbir Proton bunu kullanmıyor + Auto güncellemeleri bağlantı bekliyor. + Yeni sürümler denetlenemedi. + Yeni sürümler sınırsız bir bağlantı, kapalı pil tasarrufu ve serin bir cihaz bekler. + %1$s, %2$s sürümüne güncellendi. + %1$s %2$s bir oyunu iki kez saniyeler içinde kapattı, bu yüzden Auto %3$s sürümüne döndü. Performans CPU çekirdekleri, oturum düzeltmeleri ve ana bilgisayar adı. Sonraki oturumda uygulanır. Steam istemcisi çekirdekleri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2a82143256..dad9d6c46a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -560,6 +560,19 @@ Використовується Нове Збережено + Як вибираються збірки + Найновіша збірка DroidDeck, завжди актуальна + Вибирайте та встановлюйте збірки самостійно + Auto підтримує %1$s в актуальному стані + Нові збірки встановлюються у фоні. Якщо гра, яка раніше працювала, двічі закриється за кілька секунд, Auto повернеться до робочої збірки. + Запасна: %1$s + Пошук збірок… + Жоден встановлений Proton цього не використовує + Оновлення Auto чекають на з’єднання. + Не вдалося перевірити нові збірки. + Нові збірки чекають на безлімітне з’єднання, вимкнену економію заряду та охолоджений пристрій. + %1$s оновлено до %2$s. + %1$s %2$s двічі закрив гру за кілька секунд, тому Auto повернувся до %3$s. Продуктивність Ядра CPU, виправлення сеансу та ім’я хоста. Застосовується в наступному сеансі. Ядра клієнта Steam diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 8a4f6cc4c5..8b1b6c93c5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -554,6 +554,19 @@ Đang dùng Mới Đã lưu + Cách chọn bản dựng + Bản dựng DroidDeck mới nhất, luôn cập nhật + Tự chọn và cài bản dựng + Auto giữ %1$s luôn cập nhật + Bản dựng mới được cài ở nền. Nếu một trò chơi từng chạy được bị đóng sau vài giây hai lần, Auto quay lại bản dựng đã chạy được. + Dự phòng: %1$s + Đang tìm bản dựng… + Không Proton nào đã cài dùng thành phần này + Cập nhật Auto đang chờ kết nối. + Không thể kiểm tra bản dựng mới. + Bản dựng mới chờ kết nối không đo lưu lượng, tắt tiết kiệm pin và thiết bị đủ mát. + Đã cập nhật %1$s lên %2$s. + %1$s %2$s làm trò chơi đóng sau vài giây hai lần, nên Auto đã quay lại %3$s. Hiệu năng Lõi CPU, các bản sửa phiên và tên máy chủ. Áp dụng từ phiên sau. Lõi client Steam diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d2b7610f8a..2e480621bb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -554,6 +554,19 @@ 使用中 新 已存储 + 版本的选择方式 + 最新 DroidDeck 版本,始终保持更新 + 自行选择并安装版本 + Auto 会让 %1$s 保持最新 + 新版本会在后台安装。如果之前能运行的游戏两次在几秒内关闭,Auto 会退回到之前可用的版本。 + 备用:%1$s + 正在检查版本… + 没有已安装的 Proton 使用它 + Auto 更新正在等待网络连接。 + 无法检查新版本。 + 新版本将等待不按流量计费的网络、关闭省电模式且设备不过热时下载。 + %1$s 已更新到 %2$s。 + %1$s %2$s 两次在几秒内关闭了游戏,因此 Auto 已退回到 %3$s。 性能 CPU 核心、会话修复和主机名。将在下次会话生效。 Steam 客户端核心 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 7b176d7c14..30f10dfa3b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -554,6 +554,19 @@ 使用中 新 已儲存 + 版本的選擇方式 + 最新 DroidDeck 版本,持續保持更新 + 自行選擇並安裝版本 + Auto 會令 %1$s 保持最新 + 新版本會在背景安裝。如果之前能執行的遊戲兩次在幾秒內關閉,Auto 會退回到之前可用的版本。 + 備用:%1$s + 正在檢查版本… + 沒有已安裝的 Proton 使用它 + Auto 更新正在等待網絡連線。 + 無法檢查新版本。 + 新版本將等待非按流量收費的網絡、關閉省電模式且裝置不過熱時下載。 + %1$s 已更新至 %2$s。 + %1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。 效能 CPU 核心、會話修正和主機名稱。下次會話生效。 Steam 用戶端核心 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d32c71feb4..20bab6679c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -554,6 +554,19 @@ 使用中 新 已儲存 + 版本的選擇方式 + 最新 DroidDeck 版本,持續保持更新 + 自行選擇並安裝版本 + Auto 會讓 %1$s 保持最新 + 新版本會在背景安裝。如果先前能執行的遊戲兩次在幾秒內關閉,Auto 會退回到先前可用的版本。 + 備用:%1$s + 正在檢查版本… + 沒有已安裝的 Proton 使用它 + Auto 更新正在等待網路連線。 + 無法檢查新版本。 + 新版本將等待非計量網路、關閉省電模式且裝置不過熱時下載。 + %1$s 已更新至 %2$s。 + %1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。 效能 CPU 核心、工作階段修復和主機名稱。下次工作階段生效。 Steam 用戶端核心 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1bcfd576c..936935e11e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -604,6 +604,19 @@ In use New Stored + How builds are chosen + Newest DroidDeck build, kept current + Pick and install builds yourself + Auto keeps %1$s current + New builds install in the background. If a game that ran before closes within seconds twice, Auto goes back to the build that worked. + Fallback: %1$s + Checking for builds… + No installed Proton uses this + Auto updates wait for a connection. + Couldn\'t check for new builds. + New builds wait for an unmetered connection, battery saver off and a cool device. + %1$s updated to %2$s. + %1$s %2$s closed a game within seconds twice, so Auto went back to %3$s. Performance CPU cores, session fixes and the host name. Applies next session. Steam client cores diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 9f79a6efad..7aff486917 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -134,6 +134,19 @@ class ProtonMenuAutoTest { assertEquals(listOf("droiddeck"), attempts) } + @Test fun aFinishedInstallStartsTheComponentCheckAndAFailedOneDoesNot() { + var checks = 0 + val watched = ProtonMenu(activity, Handler(Looper.getMainLooper()), onInstalled = { checks++ }) { idle } + watched.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + watched.installProton("droiddeck") + waitUntil { watched.protonBusyId == null && checks == 1 } + assertEquals(1, checks) + watched.installer = { _, _ -> "failed" } + watched.installProton("ge") + waitUntil { watched.protonBusyId == null } + assertEquals(1, checks) + } + @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt index 8357f9694c..e47ec934ac 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt @@ -17,8 +17,23 @@ class RuntimeAutoUpdateTest { assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2")) } - @Test fun noRuntimeOrTheSameOneIsLeftAlone() { + @Test fun aFirstLaunchInstallsTheRuntimeByItself() { + assertTrue(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2")) + } + + @Test fun aRuntimeTheUserRemovedIsNotPutBack() { + RuntimeAutoUpdate.seed(context) assertFalse(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2")) + assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2")) + } + + @Test fun aFailingFirstInstallStopsTryingAfterAFewLaunches() { + repeat(RuntimeAutoUpdate.MAX_ATTEMPTS) { assertTrue(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2", it * RuntimeAutoUpdate.RETRY_MS)) } + assertFalse(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2", 10 * RuntimeAutoUpdate.RETRY_MS)) + } + + @Test fun theSameOrNoReleaseIsLeftAlone() { + assertFalse(RuntimeAutoUpdate.claim(context, null, null)) assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc2", "ubuntu-r1-rc2")) assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", null)) assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "")) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt new file mode 100644 index 0000000000..4711ad3162 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt @@ -0,0 +1,243 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.nio.file.Files + +@RunWith(RobolectricTestRunner::class) +class ComponentUpdatesTest { + private fun item(file: String, comp: String, release: String = ComponentsManager.DD_NIGHTLY) = + ComponentsManager.CatalogItem(file, comp, release, "https://github.com/Droid-Deck/DroidDeck-Components/releases/download/x/$file", 1, "sha256:" + "0".repeat(64)) + + private val catalog = listOf( + item("DD-dxvk-3.1.1+188-nightly.wcp", "dxvk"), + item("DD-dxvk-3.1.1+190-nightly.wcp", "dxvk"), + item("DD-dxvk-arm64ec-3.1.1+188-nightly.wcp", "dxvk"), + item("DD-dxvk-gplasync-3.1.1+190-nightly.wcp", "dxvk"), + item("dxvk-3.1.1-linux.wcp", "dxvk", "Dxvk-Linux"), + item("DD-vkd3d-proton-3.1+30-nightly.wcp", "vkd3d"), + item("DD-vkd3d-proton-arm64ec-3.1+30-nightly.wcp", "vkd3d"), + item("DD-FEXCore-2611+3-nightly.wcp", "fex"), + ) + + @Test fun eachLineFollowsOnlyItsOwnPublishedFlavour() { + assertEquals("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("dxvk", false), emptySet())?.file) + assertEquals("DD-dxvk-arm64ec-3.1.1+188-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("dxvk", true), emptySet())?.file) + assertEquals("DD-vkd3d-proton-arm64ec-3.1+30-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("vkd3d", true), emptySet())?.file) + assertEquals("DD-vkd3d-proton-3.1+30-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("vkd3d", false), emptySet())?.file) + assertEquals("DD-FEXCore-2611+3-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("fex", true), emptySet())?.file) + assertEquals("fex", ComponentUpdates.line("fex", false).key) + } + + @Test fun aBadBuildIsSkippedAndNothingElseIsPickedInItsPlace() { + val plain = ComponentUpdates.line("dxvk", false) + assertNull(ComponentUpdates.pick(catalog, plain, setOf("DD-dxvk-3.1.1+190-nightly.wcp"))) + assertEquals("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.pick(catalog, plain, setOf("DD-dxvk-3.1.1+188-nightly.wcp"))?.file) + assertEquals("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.pick(catalog, plain, setOf("DD-vkd3d-proton-3.1+40-nightly.wcp"))?.file) + assertNull(ComponentUpdates.pick(catalog, ComponentUpdates.line("fex", false), setOf("DD-FEXCore-2611+3-nightly.wcp"))) + assertNull(ComponentUpdates.pick(catalog.filter { it.release != ComponentsManager.DD_NIGHTLY }, plain, emptySet())) + } + + private fun pe(machine: Int, pe32plus: Boolean, hybrid: Boolean?): ByteArray { + val b = ByteBuffer.allocate(0x800).order(ByteOrder.LITTLE_ENDIAN) + b.put(0, 'M'.code.toByte()).put(1, 'Z'.code.toByte()).putInt(0x3c, 0x80) + b.putInt(0x80, 0x4550).putShort(0x84, machine.toShort()).putShort(0x86, 1) + val optional = 0x98 + val optionalSize = if (pe32plus) 240 else 224 + b.putShort(0x94, optionalSize.toShort()) + b.putShort(optional, if (pe32plus) 0x20b.toShort() else 0x10b.toShort()) + val section = optional + optionalSize + b.putInt(section + 8, 0x1000).putInt(section + 12, 0x1000).putInt(section + 20, 0x400) + if (hybrid != null && pe32plus) { + b.putInt(optional + 112 + 10 * 8, 0x1100) + b.putInt(0x500, 0x140) + if (hybrid) b.putLong(0x500 + 0xC8, 0x180001000L) + } + return b.array() + } + + @Test fun arm64ecAndArm64xImagesAreToldApartFromPlainX64ByTheirHybridMetadata() { + assertEquals(true, ComponentUpdates.arm64ec(pe(0xaa64, true, true))) + assertEquals(true, ComponentUpdates.arm64ec(pe(0x8664, true, true))) + assertEquals(false, ComponentUpdates.arm64ec(pe(0x8664, true, false))) + assertEquals(false, ComponentUpdates.arm64ec(pe(0x8664, true, null))) + assertEquals(false, ComponentUpdates.arm64ec(pe(0x14c, false, null))) + assertNull(ComponentUpdates.arm64ec(ByteArray(16))) + } + + @Test fun onlyAHybridArm64ImageCountsAsArm64x() { + assertTrue(ComponentUpdates.arm64x(pe(0xaa64, true, true))) + assertFalse(ComponentUpdates.arm64x(pe(0x8664, true, true))) + assertFalse(ComponentUpdates.arm64x(pe(0xaa64, true, false))) + assertFalse(ComponentUpdates.arm64x(ByteArray(16))) + } + + @Test fun anArm64ecLineNeedsArm64xUnlessTheProtonsOwnBuildIsKnownNotToBe() { + val ec = ComponentUpdates.line("dxvk", true) + assertTrue(ComponentUpdates.needsArm64x(ec, listOf(true))) + assertTrue(ComponentUpdates.needsArm64x(ec, listOf(null))) + assertFalse(ComponentUpdates.needsArm64x(ec, listOf(false))) + assertTrue(ComponentUpdates.needsArm64x(ec, listOf(false, true))) + assertFalse(ComponentUpdates.needsArm64x(ec, listOf(false, false))) + assertFalse(ComponentUpdates.needsArm64x(ComponentUpdates.line("dxvk", false), listOf(null))) + assertFalse(ComponentUpdates.needsArm64x(ComponentUpdates.line("fex", false), listOf(null))) + } + + private val log = """ + [2026-11-05 20:00:00] Game process added : AppID 49520 "/root/.local/share/Steam/linuxarm64/steam-launch-wrapper -- /root/.local/share/Steam/steamrtarm64/reaper SteamLaunch AppId=49520 -- '/root/.local/share/Steam/compatibilitytools.d/DroidDeck-Proton 11-12.1'/droiddeck-proton-wrap waitforexitandrun 'Borderlands2.exe'" + [2026-11-05 20:00:05] Game process updated : AppID 49520 "x" + [2026-11-05 20:10:00] Game process removed: AppID 49520 "x" + [2026-11-05 20:11:00] Game process added : AppID 413150 "/root/.local/share/Steam/steamapps/common/Proton - Experimental/proton waitforexitandrun 'Stardew Valley.exe'" + [2026-11-05 20:11:12] Game process removed: AppID 413150 "x" + [2026-11-05 20:12:00] Game process added : AppID 22380 "/usr/bin/true no tool here" + [2026-11-05 20:12:02] Game process removed: AppID 22380 "x" + """.trimIndent().lines().asSequence() + + @Test fun launchesComeFromSteamsOwnProcessLinesWithTheirProtonAndDuration() { + val runs = ComponentUpdates.launches(log, "") + assertEquals(listOf( + ComponentUpdates.Launch("49520", "DroidDeck-Proton 11-12.1", "2026-11-05 20:00:00", 600), + ComponentUpdates.Launch("413150", "Proton - Experimental", "2026-11-05 20:11:00", 12), + ), runs) + assertEquals(listOf("413150"), ComponentUpdates.launches(log, "2026-11-05 20:10:30").map { it.app }) + } + + private fun run(app: String, start: String, seconds: Long) = ComponentUpdates.Launch(app, "DroidDeck-Proton 11-12.1", start, seconds) + + private val trial = ComponentUpdates.Trial("new.wcp", ComponentUpdates.ORIGINAL, "2026-11-05 12:00:00", emptyMap(), emptyMap()) + + @Test fun aGameThatBootedOnThePreviousBuildAndTwiceFailsOnTheNewOneRollsTheLineBack() { + val verdict = ComponentUpdates.judge(trial, listOf( + run("100", "2026-11-05 10:00:00", 900), + run("100", "2026-11-05 13:00:00", 4), + run("100", "2026-11-05 13:05:00", 6), + )) + assertTrue(verdict.rollBack) + assertEquals(2, verdict.failed["100"]) + } + + @Test fun oneFailedBootOrAGameThatNeverBootedBeforeDoesNotRollBack() { + assertFalse(ComponentUpdates.judge(trial, listOf(run("100", "2026-11-05 10:00:00", 900), run("100", "2026-11-05 13:00:00", 4))).rollBack) + assertFalse(ComponentUpdates.judge(trial, listOf(run("200", "2026-11-05 13:00:00", 4), run("200", "2026-11-05 13:05:00", 4))).rollBack) + } + + @Test fun aGameThatBootsOnTheNewBuildStopsCountingShortRunsAsFailures() { + val verdict = ComponentUpdates.judge(trial, listOf( + run("100", "2026-11-05 10:00:00", 900), + run("100", "2026-11-05 13:00:00", 4), + run("100", "2026-11-05 13:10:00", 1200), + run("100", "2026-11-05 14:00:00", 4), + )) + assertFalse(verdict.rollBack) + assertEquals("new.wcp", verdict.booted["100"]) + assertNull(verdict.failed["100"]) + } + + @Test fun bootsOnTheOriginalBeforeTheFirstUpdateLetTheFirstBuildRollBack() { + val original = ComponentUpdates.Trial(ComponentUpdates.ORIGINAL, ComponentUpdates.ORIGINAL, "", emptyMap(), emptyMap()) + val before = ComponentUpdates.judge(original, listOf(run("100", "2026-11-05 10:00:00", 900), run("200", "2026-11-05 10:30:00", 3))) + assertFalse(before.rollBack) + assertEquals(mapOf("100" to ComponentUpdates.ORIGINAL), before.booted) + val after = ComponentUpdates.judge(trial.copy(booted = before.booted), listOf(run("100", "2026-11-05 13:00:00", 4), run("100", "2026-11-05 13:05:00", 6))) + assertTrue(after.rollBack) + } + + @Test fun aProtonUpdatedInPlaceIsReadFromItsOwnFilesAgain() { + val context = ApplicationProvider.getApplicationContext() + val dir = Files.createTempDirectory(context.cacheDir.toPath(), "proton").toFile() + File(dir, "files/lib/wine/dxvk/aarch64-windows").apply { mkdirs() }.resolve("d3d11.dll").writeBytes(pe(0xaa64, true, true)) + val proton = ComponentsManager.Proton("Test-Proton", "Test Proton", dir, "/p", "Test-Proton-2", false) + val state = File(context.filesDir, "components/state.json").apply { parentFile?.mkdirs() } + fun active(version: String) = state.writeText(JSONObject().put("active", JSONObject().put("Test-Proton", JSONObject() + .put("dxvk", JSONObject().put("file", "DD-dxvk-arm64ec-3.1.1+188-nightly.wcp").put("protonVersion", version)))).toString()) + + active("Test-Proton-1") + assertEquals(true, ComponentsManager.arm64ec(context, proton, "dxvk")) + active("Test-Proton-2") + assertNull(ComponentsManager.arm64ec(context, proton, "dxvk")) + } + + @Test fun aFailedSaveKeepsTheLastGoodStateAndTheNextSaveReplacesItWhole() { + val context = ApplicationProvider.getApplicationContext() + val dir = File(context.filesDir, "components").apply { mkdirs() } + val state = File(dir, "updates.json") + val saved = JSONObject().put("checkedAt", System.currentTimeMillis()).put("lines", JSONObject().put("fex", JSONObject() + .put("current", "DD-FEXCore-2611+3-nightly.wcp").put("bad", JSONArray().put("DD-FEXCore-2611+2-nightly.wcp")))).toString() + state.writeText(saved) + state.setWritable(false) + dir.setWritable(false) + try { + org.junit.Assume.assumeFalse(state.canWrite() || dir.canWrite()) + ComponentUpdater.ensure(context, false) + } finally { + dir.setWritable(true) + state.setWritable(true) + } + assertEquals(saved, state.readText()) + + ComponentUpdater.ensure(context, false) + val fex = JSONObject(state.readText()).getJSONObject("lines").getJSONObject("fex") + assertEquals("DD-FEXCore-2611+3-nightly.wcp", fex.getString("current")) + assertEquals("DD-FEXCore-2611+2-nightly.wcp", fex.getJSONArray("bad").getString(0)) + assertFalse(state.readText() == saved) + assertTrue(dir.list()!!.none { it.startsWith("updates.json.") }) + } + + @Test fun aLineWithAnUnfinishedRollbackTakesNoNewerBuildUntilItIsApplied() { + assertTrue(ComponentUpdater.rollingBack(JSONObject().put("restore", JSONObject().put("proton", "DD-dxvk-2.5.wcp")))) + assertTrue(ComponentUpdater.rollingBack(JSONObject().put("pendingNote", "rolled back"))) + assertFalse(ComponentUpdater.rollingBack(JSONObject().put("restore", JSONObject()).put("current", "DD-dxvk-2.4.wcp"))) + } + + @Test fun aRemovedProtonNoLongerHoldsItsLineInARollback() { + val line = JSONObject().put("restore", JSONObject().put("gone", "DD-dxvk-2.5.wcp")) + val state = JSONObject().put("lines", JSONObject().put("dxvk", line)) + ComponentUpdater.dropRemoved(state, emptyList()) + assertFalse(ComponentUpdater.rollingBack(line)) + } + + @Test fun aTwoDigitNightlyBuildIsNewerThanASingleDigitOne() { + val items = listOf(item("DD-FEXCore-2611+9-nightly.wcp", "fex"), item("DD-FEXCore-2611+10-nightly.wcp", "fex")) + assertEquals("DD-FEXCore-2611+10-nightly.wcp", ComponentUpdates.pick(items, ComponentUpdates.line("fex", false), emptySet())?.file) + assertNull(ComponentUpdates.pick(items, ComponentUpdates.line("fex", false), setOf("DD-FEXCore-2611+10-nightly.wcp"))) + } + + @Test fun readsDuringSavesNeverLoseTheState() { + val context = ApplicationProvider.getApplicationContext() + val state = File(context.filesDir, "components/updates.json").apply { parentFile?.mkdirs() } + state.writeText(JSONObject().put("checkedAt", System.currentTimeMillis()).put("lines", JSONObject().put("fex", JSONObject() + .put("current", "DD-FEXCore-2611+3-nightly.wcp").put("bad", JSONArray().put("DD-FEXCore-2611+2-nightly.wcp")))).toString()) + val done = java.util.concurrent.atomic.AtomicBoolean(false) + val reader = Thread { + while (!done.get()) { + ComponentUpdater.settle(context) + ComponentUpdater.status(context, "fex") + } + }.apply { start() } + try { + repeat(400) { ComponentUpdater.ensure(context, false) } + } finally { + done.set(true) + reader.join() + } + val fex = JSONObject(state.readText()).getJSONObject("lines").getJSONObject("fex") + assertEquals("DD-FEXCore-2611+2-nightly.wcp", fex.getJSONArray("bad").getString(0)) + } + + @Test fun onlyTheCurrentAndThePreviousBuildAndUserSelectionsAreKept() { + assertEquals(setOf("b.wcp", "a.wcp", "mine.wcp"), ComponentUpdates.keep("b.wcp", "a.wcp", setOf("mine.wcp"))) + assertEquals(setOf("b.wcp"), ComponentUpdates.keep("b.wcp", ComponentUpdates.ORIGINAL, emptySet())) + } +} diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index c1607ec5fb..682f930360 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -35,6 +35,22 @@ selection, and restores Default component choices for the next game. **Use Default** removes the game override. Component packages must first be downloaded or imported on the Default Components page. +FEX, DXVK and VKD3D-Proton each have an **Auto** or **Manual** mode on the Default +Components page. Auto is the default unless a component already uses a package the +user picked, which keeps it on Manual. In Auto, DroidDeck checks the +DroidDeck-Components nightly release when DroidDeck is opened, at most hourly and +never during a running session, and installs the newest build into every Proton that ships that +component. DXVK and VKD3D-Proton follow the flavour of each Proton's own files: +ARM64EC/ARM64X builds get the `arm64ec` package, plain x64 builds the plain one. +Auto keeps the current build and the one it replaced and deletes older builds it +downloaded itself; packages selected anywhere, including in game profiles, are never +removed. Steam's process log tells it how long each game ran. A game that ran +for at least a minute on the previous build and then exits within 30 seconds twice +on the new one rolls back every component line that changed since that boot, and +each failed build is skipped until a newer one is published. Games with their own component override are +not counted. DXVK stays on Manual while a GPU rule pins a DXVK version (Adreno 6xx and +the Vulkan bridge). Manual keeps the existing download, import and restore lists. + Before publishing game component choices, DroidDeck preserves each Proton build's original components, including an explicitly empty bundle when a component is not shipped. Those restore choices remain after the last override is cleared. A missing From e1987ca785bd6beb86a54fe1b02e05fb8571325f Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 6 Nov 2026 14:35:10 -0500 Subject: [PATCH 09/10] chore: pin gamescope to the DroidDeck-Components p22 release (#2183) --- tools/gamescope/release.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index a8b4653dc0..88f8ff1cf9 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ -GAMESCOPE_REPO=Droid-Deck/DroidDeck -GAMESCOPE_TAG=gamescope-3.16.29-pr2029-22b50d182 -GAMESCOPE_SHA256=d6bf0fe2ebb98e1fc7c9a09fccce7d7916c9cc6a10016018040cda01a940b781 +GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components +GAMESCOPE_TAG=gamescope-3.16.29-p22 +GAMESCOPE_SHA256=2b7e7481df5f5f7355d224d3a0d4205557367172653dff1d7206a230b6c78b46 From 542bbf89c34102fbc6f3592b5a3e36829f4ac63e Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 6 Nov 2026 15:31:09 -0500 Subject: [PATCH 10/10] fix: launch Battle.net and store games from any game page tab (#2185) * fix(library): Keep one Play request per game and show Starting while it prepares * Track launch preparation per game * Keep each game preparing until its own worker finishes * Drop store lookups that finish after the activity ends --- .../droiddeck/launcher/FrontEndActivity.kt | 40 +++++++++++++++---- .../launcher/frontend/AutoComponents.kt | 4 +- .../droiddeck/launcher/frontend/Library.kt | 1 + .../droiddeck/launcher/ui/FrontEndScreen.kt | 2 + .../com/droiddeck/launcher/ui/GameDetail.kt | 6 ++- .../droiddeck/launcher/ui/StoresDownloads.kt | 4 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 15 +------ 7 files changed, 46 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 13a96efc15..748048d335 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -207,6 +207,7 @@ class FrontEndActivity : ComponentActivity() { private var gameStoresSpeedTier by mutableStateOf("fast") private var navRequest by mutableStateOf(null) private val gameLaunchRequest = java.util.concurrent.atomic.AtomicLong() + private var preparingGames by mutableStateOf(emptySet()) private var storesShowMature by mutableStateOf(false) private var storesSort by mutableStateOf(SessionPrefs.STORES_SORTS.first()) private var storesView by mutableStateOf(SessionPrefs.DEFAULT_STORES_VIEW) @@ -1143,6 +1144,7 @@ class FrontEndActivity : ComponentActivity() { installed = installed, ready = ready, available = available?.version, removalPending = removalPending, runtimeActionsBlocked = runtimeChangesBlocked(), vkBridge = vkBridge, venus = venus, venusHostVulkan = venusHostVulkan, vkBridgeSafe = vkBridgeSafe, bridgeProtonDxvk = bridgeProtonDxvk, adreno = adrenoGpu, shortcutPicker = shortcutPicker, + preparingGames = preparingGames, shortcutLibraryScanning = shortcutLibraryScanning, gameSyncFolder = gameSyncFolder, busy = busy, stage = stage, percent = percent, @@ -1221,14 +1223,26 @@ class FrontEndActivity : ComponentActivity() { }, onSteamGame = { g -> if (shortcutPicker) chooseGameShortcut(g) - else { - val request = gameLaunchRequest.incrementAndGet() - com.droiddeck.launcher.frontend.AutoComponents.beforeLaunch(this, g) { - if (request != gameLaunchRequest.get() || isFinishing || isDestroyed) return@beforeLaunch - com.droiddeck.launcher.stores.StoreLaunch.prepare(this, g) { - if (request == gameLaunchRequest.get() && !isFinishing && !isDestroyed) launchGame(g) + else if (g.launchKey !in preparingGames) { + preparingGames = preparingGames + g.launchKey + prepareAndLaunch(g, g.launchKey) + } + }, + onStoreGame = { store, id -> + val key = "${store.id}:$id" + if (key !in preparingGames) { + preparingGames = preparingGames + key + val app = applicationContext + Thread({ + val g = runCatching { com.droiddeck.launcher.stores.StoreLaunch.installedGame(app, store, id) }.getOrNull() + runOnUiThread { + if (g != null && !isFinishing && !isDestroyed) prepareAndLaunch(g, key) + else { + preparingGames = preparingGames - key + if (g == null && !isFinishing && !isDestroyed) android.widget.Toast.makeText(this, R.string.stores_launch_not_registered, android.widget.Toast.LENGTH_LONG).show() + } } - } + }, "store-play").start() } }, onEpicLauncher = { openEpicLauncher() }, @@ -1955,6 +1969,18 @@ class FrontEndActivity : ComponentActivity() { if (Build.VERSION.SDK_INT >= 33) state.getParcelable(key, Intent::class.java) else @Suppress("DEPRECATION") state.getParcelable(key) + private fun prepareAndLaunch(g: Library.SteamGame, key: String) { + val request = gameLaunchRequest.incrementAndGet() + val done = { preparingGames = preparingGames - key } + com.droiddeck.launcher.frontend.AutoComponents.beforeLaunch(this, g, onBlocked = done) { + if (request != gameLaunchRequest.get() || isFinishing || isDestroyed) { done(); return@beforeLaunch } + com.droiddeck.launcher.stores.StoreLaunch.prepare(this, g) { + done() + if (request == gameLaunchRequest.get() && !isFinishing && !isDestroyed) launchGame(g) + } + } + } + override fun onDestroy() { gameLaunchRequest.incrementAndGet() cancelCompatLaunch() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt index 1359ecf953..d6fe58ad7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt @@ -475,15 +475,15 @@ object AutoComponents { return true } - fun beforeLaunch(context: Context, game: Library.SteamGame, onReady: () -> Unit) { + fun beforeLaunch(context: Context, game: Library.SteamGame, onBlocked: () -> Unit = {}, onReady: () -> Unit) { val app = context.applicationContext Thread({ val ready = runCatching { prepareLaunch(app, game) }.getOrElse { Log.w(TAG, "${game.name}: launch repair discovery failed: ${it.javaClass.simpleName}: ${it.message}") false } + Handler(Looper.getMainLooper()).post(if (ready) onReady else onBlocked) queueGame(app, game, asked = false) - if (ready) Handler(Looper.getMainLooper()).post(onReady) }, "auto-components-launch").apply { isDaemon = true; start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 723181f080..ef7ec06a10 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -23,6 +23,7 @@ object Library { SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo) val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId) + val launchKey: String get() = if (storeId != null) "$source:$storeId" else gameIdString val profileKey: String get() = when { source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() library == ADDED -> java.lang.Integer.toUnsignedString(appId) 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 fda8c6fedb..f4900797ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -122,6 +122,7 @@ class FrontEndState( val frameGen: FrameGen.Mode = FrameGen.Mode.OFF, val lossless: Lossless.State = Lossless.State.NONE, val shortcutPicker: Boolean = false, + val preparingGames: Set = emptySet(), val shortcutLibraryScanning: Boolean = false, val gameSyncFolder: String? = null, val pageKey: String? = null, @@ -188,6 +189,7 @@ class FrontEndActions( val onPlayDesktopUi: () -> Unit, val onSteamUrl: (String) -> Unit = {}, val onSteamGame: (Library.SteamGame) -> Unit, + val onStoreGame: (com.droiddeck.launcher.stores.Store, String) -> Unit = { _, _ -> }, val onGameShortcut: (Library.SteamGame) -> Unit = {}, val onExportGameFile: (Library.SteamGame) -> Unit = {}, val onSyncGameFiles: () -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index e1e027d78f..390295f696 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -408,11 +408,13 @@ internal fun GameActions( !cloud && (game != null || installed != null) -> { val gone = storeKey?.let { StoresState.uninstalling[it] } val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) + val preparing = (game?.launchKey ?: storeKey)?.let { it in s.preparingGames } == true PrimaryButton( - stringResource(R.string.stores_play), enabled = !s.busy && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), + stringResource(if (preparing) R.string.store_starting else R.string.stores_play), + enabled = !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn, ) { - if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(ctx, store, id, s, a) + if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(store, id, s, a) } if (game != null) { if (compactMenu) GameMoreMenu(game, a) else { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index e4b70af9fe..8988e16a17 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -221,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } } } @@ -374,7 +374,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) CancelAction { DownloadQueue.clear(ctx, d.key) } } DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index f9e2ed798f..c5f31f5d32 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1430,18 +1430,7 @@ internal fun openUrl(ctx: android.content.Context, url: String) { runCatching { ctx.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)) } } -internal fun launchStoreGame(ctx: android.content.Context, store: Store, id: String, s: FrontEndState, a: FrontEndActions) { +internal fun launchStoreGame(store: Store, id: String, s: FrontEndState, a: FrontEndActions) { val game = s.steamGames.firstOrNull { it.source == store.id && it.storeId == id } - if (game != null) { - a.onSteamGame(game) - return - } - val app = ctx.applicationContext - Thread({ - val installed = runCatching { com.droiddeck.launcher.stores.StoreLaunch.installedGame(app, store, id) }.getOrNull() - StoresState.post { - if (installed == null) android.widget.Toast.makeText(ctx, R.string.stores_launch_not_registered, android.widget.Toast.LENGTH_LONG).show() - else a.onSteamGame(installed) - } - }, "store-play").start() + if (game != null) a.onSteamGame(game) else a.onStoreGame(store, id) }